diff --git a/.clang-tidy b/.clang-tidy index 6a17e66ee1428..c99681aa461fd 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -29,7 +29,6 @@ readability-*,\ -cert-msc51-cpp,\ -misc-non-private-member-variables-in-classes,\ -modernize-avoid-c-arrays,\ --modernize-deprecated-headers,\ -modernize-pass-by-value,\ -modernize-return-braced-init-list,\ -modernize-use-auto,\ diff --git a/.travis.yml b/.travis.yml index 3ef838336f46b..b87495ff7326a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -197,7 +197,7 @@ jobs: compiler: clang addons: &clang60 apt: - packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"] + packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "libpulse-dev", "libpulse0=1:8.0-0ubuntu3.10", "libpulse-mainloop-glib0=1:8.0-0ubuntu3.10"] sources: [*apt_sources, llvm-toolchain-xenial-6.0] - env: CLANG=clang++-7 diff --git a/CMakeLists.txt b/CMakeLists.txt index 64882701ef918..e09dd28c2312d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,14 +11,15 @@ SET(CMAKE_MODULE_PATH SET(CMAKE_TLS_VERIFY ON) # Build options -option(TILES "Build graphical tileset version." "OFF") -option(CURSES "Build curses version." "ON" ) -option(SOUND "Support for in-game sounds & music." "OFF") -option(BACKTRACE "Support for printing stack backtraces on crash" "ON" ) -option(USE_HOME_DIR "Use user's home directory for save files." "ON" ) -option(LOCALIZE "Support for language localizations. Also enable UTF support." "ON" ) -option(LANGUAGES "Compile localization files for specified languages." "" ) -option(DYNAMIC_LINKING "Use dynamic linking. Or use static to remove MinGW dependency instead." "ON") +option(TILES "Build graphical tileset version." "OFF") +option(CURSES "Build curses version." "ON") +option(SOUND "Support for in-game sounds & music." "OFF") +option(BACKTRACE "Support for printing stack backtraces on crash" "ON") +option(USE_HOME_DIR "Use user's home directory for save files." "ON") +option(LOCALIZE "Support for language localizations. Also enable UTF support." "ON") +option(LANGUAGES "Compile localization files for specified languages." "") +option(DYNAMIC_LINKING "Use dynamic linking. Or use static to remove MinGW dependency instead." "ON") +option(JSON_FORMAT "Build JSON formatter" "OFF") option(CATA_CLANG_TIDY_PLUGIN "Build Cata's custom clang-tidy plugin" "OFF") set(CATA_CLANG_TIDY_INCLUDE_DIR "" CACHE STRING "Path to internal clang-tidy headers required for plugin (e.g. ClangTidy.h)") set(CATA_CHECK_CLANG_TIDY "" CACHE STRING "Path to check_clang_tidy.py for plugin tests") @@ -45,7 +46,7 @@ MESSAGE(STATUS "${PROJECT} build environment -- \n") MESSAGE(STATUS "Build realm is : ${CMAKE_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_PROCESSOR}") IF(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Debug) + set(CMAKE_BUILD_TYPE Debug) ENDIF(NOT CMAKE_BUILD_TYPE) if (NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND) @@ -59,17 +60,17 @@ ENDIF(NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND) #OS Check Placeholders. Will be used for BINDIST IF (${CMAKE_SYSTEM_NAME} MATCHES Linux) - SET(_OS_LINUX_ 1) + SET(_OS_LINUX_ 1) ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Linux) IF (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) - SET(_OS_FREEBSD_ 1) + SET(_OS_FREEBSD_ 1) ENDIF (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin) - SET(_OS_DARWIN_ 1) - SET(LOCALIZE OFF) - MESSAGE(STATUS "Disable internationalization on Darwin as it is not supported") + SET(_OS_DARWIN_ 1) + SET(LOCALIZE OFF) + MESSAGE(STATUS "Disable internationalization on Darwin as it is not supported") ENDIF(${CMAKE_SYSTEM_NAME} MATCHES Darwin) include(CheckCXXCompilerFlag) @@ -82,60 +83,60 @@ include(CheckCXXCompilerFlag) #SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -m32") IF (NOT DYNAMIC_LINKING) - SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.dll.a") - SET(BUILD_SHARED_LIBRARIES OFF) - check_cxx_compiler_flag (-static HAVE_STATIC_FLAG) - IF(HAVE_STATIC_FLAG) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") - ENDIF(HAVE_STATIC_FLAG) - # Workaround for cmake link library guesser - SET(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS) # remove -Wl,-Bdynamic - SET(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS) - SET(CMAKE_SHARED_LIBRARY_C_FLAGS) # remove -fPIC - SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS) - SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) # remove -rdynamic - SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.dll.a") + SET(BUILD_SHARED_LIBRARIES OFF) + check_cxx_compiler_flag (-static HAVE_STATIC_FLAG) + IF(HAVE_STATIC_FLAG) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") + ENDIF(HAVE_STATIC_FLAG) + # Workaround for cmake link library guesser + SET(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS) # remove -Wl,-Bdynamic + SET(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS) + SET(CMAKE_SHARED_LIBRARY_C_FLAGS) # remove -fPIC + SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS) + SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) # remove -rdynamic + SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) ELSE (NOT DYNAMIC_LINKING) - IF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # Avoid depending on MinGW runtime DLLs - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++") - ENDIF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") + IF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") + # Avoid depending on MinGW runtime DLLs + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++") + ENDIF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") ENDIF (NOT DYNAMIC_LINKING) -#Sysem specific actions +# System specific actions IF (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) IF(NOT DATA_PREFIX) - SET( DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda) + SET( DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda) ENDIF(NOT DATA_PREFIX) IF(NOT LOCALE_DIR) - SET( LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/share/locale) + SET( LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/share/locale) ENDIF(NOT LOCALE_DIR) IF(NOT BIN_PREFIX) - SET( BIN_PREFIX ${CMAKE_INSTALL_PREFIX}/bin) + SET( BIN_PREFIX ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(NOT BIN_PREFIX) IF(NOT DESKTOP_ENTRY_PATH) - SET( DESKTOP_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/applications) + SET( DESKTOP_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/applications) ENDIF(NOT DESKTOP_ENTRY_PATH) IF(NOT PIXMAPS_ENTRY_PATH) - SET( PIXMAPS_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor) + SET( PIXMAPS_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor) ENDIF(NOT PIXMAPS_ENTRY_PATH) IF(NOT PIXMAPS_UNITY_ENTRY_PATH) - SET( PIXMAPS_UNITY_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-dark) + SET( PIXMAPS_UNITY_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-dark) ENDIF(NOT PIXMAPS_UNITY_ENTRY_PATH) IF(NOT MANPAGE_ENTRY_PATH) - SET( MANPAGE_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/man) + SET( MANPAGE_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/man) ENDIF(NOT MANPAGE_ENTRY_PATH) ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) IF (${CMAKE_SYSTEM_NAME} MATCHES Windows) IF(NOT DATA_PREFIX) - SET(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}) + SET(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}) ENDIF(NOT DATA_PREFIX) IF(NOT LOCALE_DIR) - SET(LOCALE_DIR ${CMAKE_INSTALL_PREFIX}) + SET(LOCALE_DIR ${CMAKE_INSTALL_PREFIX}) ENDIF(NOT LOCALE_DIR) IF(NOT BIN_PREFIX) - SET(BIN_PREFIX ${CMAKE_INSTALL_PREFIX}) + SET(BIN_PREFIX ${CMAKE_INSTALL_PREFIX}) ENDIF(NOT BIN_PREFIX) ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Windows) @@ -144,20 +145,20 @@ MESSAGE(STATUS "${PROJECT_NAME} build options --\n") # Preset variables IF(NOT LANGUAGES) - SET (LANGUAGES de es_AR es_ES fr it_IT ja ko pt_BR ru zh_CN zh_TW) + SET (LANGUAGES de es_AR es_ES fr it_IT ja ko pt_BR ru zh_CN zh_TW) ENDIF(NOT LANGUAGES) IF (GIT_BINARY) - SET(GIT_EXECUTABLE ${GIT_BINARY}) + SET(GIT_EXECUTABLE ${GIT_BINARY}) ELSE (GIT_BINARY) - FIND_PACKAGE(Git) - IF (NOT GIT_FOUND) - MESSAGE(WARNING "Git binary not found. Build version will be set to NULL. Install Git package or use -DGIT_BINARY to set path to git binary.") - ENDIF (NOT GIT_FOUND) + FIND_PACKAGE(Git) + IF (NOT GIT_FOUND) + MESSAGE(WARNING "Git binary not found. Build version will be set to NULL. Install Git package or use -DGIT_BINARY to set path to git binary.") + ENDIF (NOT GIT_FOUND) ENDIF (GIT_BINARY) IF (PREFIX) - ADD_DEFINITIONS(-DPREFIX=${PREFIX}) + ADD_DEFINITIONS(-DPREFIX=${PREFIX}) ENDIF (PREFIX) # Can't compile curses and tiles build's at same time @@ -167,75 +168,79 @@ ENDIF(TILES) # Set build types and display info IF(CMAKE_BUILD_TYPE STREQUAL Debug) - MESSAGE("\n") - MESSAGE(STATUS "Build ${PROJECT} in development mode --\n") - MESSAGE(STATUS "Binaries will be located in: " ${CMAKE_SOURCE_DIR}) - SET(CMAKE_VERBOSE_MAKEFILE ON) - # Since CataclusmDDA does not respect PREFIX for development builds - # and has funny path handlers, we should create resulting Binaries - # in the source redectory - SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY - ${CMAKE_SOURCE_DIR} - CACHE PATH "Single Directory for all Executables." - ) - SET(BIN_PREFIX ${CMAKE_SOURCE_DIR}) + MESSAGE("\n") + MESSAGE(STATUS "Build ${PROJECT} in development mode --\n") + MESSAGE(STATUS "Binaries will be located in: " ${CMAKE_SOURCE_DIR}) + SET(CMAKE_VERBOSE_MAKEFILE ON) + # Since CataclysmDDA does not respect PREFIX for development builds + # and has funny path handlers, we should create resulting Binaries + # in the source directory + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY + ${CMAKE_SOURCE_DIR} + CACHE PATH "Single Directory for all Executables." + ) + SET(BIN_PREFIX ${CMAKE_SOURCE_DIR}) ELSE (CMAKE_BUILD_TYPE STREQUAL Debug) - MESSAGE(STATUS "CMAKE_INSTALL_PREFIX : ${CMAKE_INSTALL_PREFIX}") - MESSAGE(STATUS "BIN_PREFIX : ${BIN_PREFIX}") - MESSAGE(STATUS "DATA_PREFIX : ${DATA_PREFIX}") + MESSAGE(STATUS "CMAKE_INSTALL_PREFIX : ${CMAKE_INSTALL_PREFIX}") + MESSAGE(STATUS "BIN_PREFIX : ${BIN_PREFIX}") + MESSAGE(STATUS "DATA_PREFIX : ${DATA_PREFIX}") IF(LOCALIZE) - MESSAGE(STATUS "LOCALE_PATH : ${LOCALE_DIR}") + MESSAGE(STATUS "LOCALE_PATH : ${LOCALE_DIR}") ENDIF(LOCALIZE) - MESSAGE(STATUS "DESKTOP_ENTRY_PATH : ${DESKTOP_ENTRY_PATH}") - MESSAGE(STATUS "PIXMAPS_ENTRY_PATH : ${PIXMAPS_ENTRY_PATH}") - MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH : ${PIXMAPS_UNITY_ENTRY_PATH}") - MESSAGE(STATUS "MANPAGE_ENTRY_PATH : ${MANPAGE_ENTRY_PATH}\n") - ADD_DEFINITIONS(-DRELEASE) + MESSAGE(STATUS "DESKTOP_ENTRY_PATH : ${DESKTOP_ENTRY_PATH}") + MESSAGE(STATUS "PIXMAPS_ENTRY_PATH : ${PIXMAPS_ENTRY_PATH}") + MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH : ${PIXMAPS_UNITY_ENTRY_PATH}") + MESSAGE(STATUS "MANPAGE_ENTRY_PATH : ${MANPAGE_ENTRY_PATH}\n") + ADD_DEFINITIONS(-DRELEASE) # Use PREFIX as storage of data,gfx, etc.. Usefull only on *nix OS. IF (PREFIX AND NOT WIN32) - ADD_DEFINITIONS(-DDATA_DIR_PREFIX) + ADD_DEFINITIONS(-DDATA_DIR_PREFIX) ENDIF (PREFIX AND NOT WIN32) ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug) - MESSAGE(STATUS "GIT_BINARY : ${GIT_EXECUTABLE}") - MESSAGE(STATUS "DYNAMIC_LINKING : ${DYNAMIC_LINKING}") - MESSAGE(STATUS "TILES : ${TILES}") - MESSAGE(STATUS "CURSES : ${CURSES}") - MESSAGE(STATUS "SOUND : ${SOUND}") - MESSAGE(STATUS "BACKTRACE : ${BACKTRACE}") - MESSAGE(STATUS "LOCALIZE : ${LOCALIZE}") - MESSAGE(STATUS "USE_HOME_DIR : ${USE_HOME_DIR}\n") + MESSAGE(STATUS "GIT_BINARY : ${GIT_EXECUTABLE}") + MESSAGE(STATUS "DYNAMIC_LINKING : ${DYNAMIC_LINKING}") + MESSAGE(STATUS "TILES : ${TILES}") + MESSAGE(STATUS "CURSES : ${CURSES}") + MESSAGE(STATUS "SOUND : ${SOUND}") + MESSAGE(STATUS "BACKTRACE : ${BACKTRACE}") + MESSAGE(STATUS "LOCALIZE : ${LOCALIZE}") + MESSAGE(STATUS "USE_HOME_DIR : ${USE_HOME_DIR}\n") - MESSAGE(STATUS "LANGUAGES : ${LANGUAGES}\n") + MESSAGE(STATUS "LANGUAGES : ${LANGUAGES}\n") - MESSAGE(STATUS "See INSTALL file for details and more info --\n") + MESSAGE(STATUS "See INSTALL file for details and more info --\n") IF(MSVC) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - add_definitions(-D_AMD64_) - else() - add_definitions(-D_X86_) - endif() + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + add_definitions(-D_AMD64_) + else() + add_definitions(-D_X86_) + endif() ELSE() - SET(CATA_WARNINGS - "-Werror -Wall -Wextra \ - -Wmissing-declarations \ - -Wold-style-cast \ - -Woverloaded-virtual \ - -Wpedantic") - # Compact the whitespace in the warning string - string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}") - SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g") + SET(CATA_WARNINGS + "-Werror -Wall -Wextra \ + -Wmissing-declarations \ + -Wold-style-cast \ + -Woverloaded-virtual \ + -Wpedantic") + IF(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") + SET(CATA_WARNINGS "${CATA_WARNINGS} -Wsuggest-override") + ENDIF(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") + # Compact the whitespace in the warning string + string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}") + SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g") ENDIF() SET(CMAKE_CXX_STANDARD 14) # Force out-of-source build IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - MESSAGE(FATAL_ERROR - "This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, create a separate build directory and run 'cmake [options] ' from there.\nSee INSTALL file for details and more info\n" - ) + MESSAGE(FATAL_ERROR + "This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, create a separate build + directory and run 'cmake [options] ' from there.\nSee INSTALL file for details and more info\n" + ) ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) #SET(THREADS_USE_PTHREADS_WIN32 True) @@ -244,123 +249,128 @@ FIND_PACKAGE(Threads REQUIRED) # Check for build types and libraries IF(TILES) - # Find SDL, SDL_ttf & SDL_image for graphical install - MESSAGE(STATUS "Searching for SDL2 library --") - FIND_PACKAGE(SDL2) - IF(NOT SDL2_FOUND) - MESSAGE(FATAL_ERROR - "This project requires SDL2 to be installed to be compiled in graphical mode. Please install the SDL2 development libraries, or try compiling without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and more info\n" - ) - ENDIF(NOT SDL2_FOUND) - - IF (NOT DYNAMIC_LINKING) - # SDL, SDL_Image, SDL_ttf deps are required for static build - MESSAGE(STATUS "Searching for SDL deps libraries --") - FIND_PACKAGE(Freetype REQUIRED) - FIND_PACKAGE(PNG REQUIRED) - FIND_PACKAGE(JPEG REQUIRED) - FIND_PACKAGE(ZLIB REQUIRED) - FIND_PACKAGE(BZip2 REQUIRED) - ENDIF (NOT DYNAMIC_LINKING) - - MESSAGE(STATUS "Searching for SDL2_image library --") - - MESSAGE(STATUS "Searching for SDL2_TTF library --") - FIND_PACKAGE(SDL2_ttf) - IF(NOT SDL2_TTF_FOUND) - MESSAGE(FATAL_ERROR - "This project requires SDL2_ttf to be installed to be compiled in graphical mode. Please install the SDL2_ttf development libraries, or try compiling without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and moreinfo\n" - ) - ENDIF(NOT SDL2_TTF_FOUND) - - MESSAGE(STATUS "Searching for SDL2_image library --\n") - FIND_PACKAGE(SDL2_image) - IF(NOT SDL2_IMAGE_FOUND) - MESSAGE(FATAL_ERROR - "This project requires SDL2_image to be installed to be compiled in graphical mode. Please install the SDL2_image development libraries, or try compiling without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and more info\n" - ) - ENDIF(NOT SDL2_IMAGE_FOUND) - ADD_DEFINITIONS(-DTILES) + # Find SDL, SDL_ttf & SDL_image for graphical install + MESSAGE(STATUS "Searching for SDL2 library --") + FIND_PACKAGE(SDL2) + IF(NOT SDL2_FOUND) + MESSAGE(FATAL_ERROR + "This project requires SDL2 to be installed to be compiled in graphical mode. Please install the SDL2 development libraries, or try compiling + without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and more info\n" + ) + ENDIF(NOT SDL2_FOUND) + + IF (NOT DYNAMIC_LINKING) + # SDL, SDL_Image, SDL_ttf deps are required for static build + MESSAGE(STATUS "Searching for SDL deps libraries --") + FIND_PACKAGE(Freetype REQUIRED) + FIND_PACKAGE(PNG REQUIRED) + FIND_PACKAGE(JPEG REQUIRED) + FIND_PACKAGE(ZLIB REQUIRED) + FIND_PACKAGE(BZip2 REQUIRED) + ENDIF (NOT DYNAMIC_LINKING) + + MESSAGE(STATUS "Searching for SDL2_TTF library --") + FIND_PACKAGE(SDL2_ttf) + IF(NOT SDL2_TTF_FOUND) + MESSAGE(FATAL_ERROR + "This project requires SDL2_ttf to be installed to be compiled in graphical mode. Please install the SDL2_ttf development libraries, or try + compiling without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and moreinfo\n" + ) + ENDIF(NOT SDL2_TTF_FOUND) + + MESSAGE(STATUS "Searching for SDL2_image library --\n") + FIND_PACKAGE(SDL2_image) + IF(NOT SDL2_IMAGE_FOUND) + MESSAGE(FATAL_ERROR + "This project requires SDL2_image to be installed to be compiled in graphical mode. Please install the SDL2_image development libraries, or try + compiling without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and more info\n" + ) + ENDIF(NOT SDL2_IMAGE_FOUND) + ADD_DEFINITIONS(-DTILES) ENDIF(TILES) IF(CURSES) - # Find the ncurses library for a text based compile - MESSAGE(STATUS "Searching for Curses library --\n") - SET(CURSES_NEED_NCURSES TRUE) - SET(CURSES_NEED_WIDE TRUE) - FIND_PACKAGE(Curses) - IF(NOT CURSES_FOUND) - MESSAGE(FATAL_ERROR - "This project requires ncurses to be installed to be compiled in text only mode. Please install the ncurses development libraries, or try compiling with the -DTILES=1 for a graphical compilation.\nSee INSTALL file for details and more info\n" - ) - ENDIF(NOT CURSES_FOUND) + # Find the ncurses library for a text based compile + MESSAGE(STATUS "Searching for Curses library --\n") + SET(CURSES_NEED_NCURSES TRUE) + SET(CURSES_NEED_WIDE TRUE) + FIND_PACKAGE(Curses) + IF(NOT CURSES_FOUND) + MESSAGE(FATAL_ERROR + "This project requires ncurses to be installed to be compiled in text only mode. Please install the ncurses development libraries, or try compiling + with the -DTILES=1 for a graphical compilation.\nSee INSTALL file for details and more info\n" + ) + ENDIF(NOT CURSES_FOUND) ENDIF(CURSES) IF(SOUND) - # You need TILES to be able to use SOUND - IF(NOT TILES) - MESSAGE(FATAL_ERROR - "You must enable graphical support with -DTILES=1 to be able to enable sound support.\nSee INSTALL file for details and more info\n" - ) - ENDIF(NOT TILES) - - # Sound requires SDL_mixer library - MESSAGE(STATUS "Searching for SDL2_mixer library --\n") - FIND_PACKAGE(SDL2_mixer) - IF(NOT SDL2_MIXER_FOUND) - MESSAGE(FATAL_ERROR - "You need the SDL2_mixer development library to be able to compile with sound enabled.\nSee INSTALL file for details and more info\n" - ) - ENDIF(NOT SDL2_MIXER_FOUND) + # You need TILES to be able to use SOUND + IF(NOT TILES) + MESSAGE(FATAL_ERROR + "You must enable graphical support with -DTILES=1 to be able to enable sound support.\nSee INSTALL file for details and more info\n" + ) + ENDIF(NOT TILES) + + # Sound requires SDL_mixer library + MESSAGE(STATUS "Searching for SDL2_mixer library --\n") + FIND_PACKAGE(SDL2_mixer) + IF(NOT SDL2_MIXER_FOUND) + MESSAGE(FATAL_ERROR + "You need the SDL2_mixer development library to be able to compile with sound enabled.\nSee INSTALL file for details and more info\n" + ) + ENDIF(NOT SDL2_MIXER_FOUND) ENDIF(SOUND) IF(BACKTRACE) - ADD_DEFINITIONS(-DBACKTRACE) + ADD_DEFINITIONS(-DBACKTRACE) ENDIF(BACKTRACE) # Ok. Now create build and install recipes IF(LOCALIZE) - IF(WIN32) - FIND_PACKAGE(Libintl) - IF(NOT LIBINTL_FOUND) - MESSAGE(FATAL_ERROR - "You need the libintl development library to be able to compile with Localize support.\nSee INSTALL file for details and more info\n" - ) - ENDIF(NOT LIBINTL_FOUND) - FIND_PACKAGE(Iconv) - IF(NOT ICONV_FOUND) - MESSAGE(FATAL_ERROR - "You need the iconv development library to be able to compile with Localize support.\nSee INSTALL file for details and more info\n" - ) - ENDIF(NOT ICONV_FOUND) - ENDIF(WIN32) - add_subdirectory(lang) - ADD_DEFINITIONS(-DLOCALIZE) + IF(WIN32) + FIND_PACKAGE(Libintl) + IF(NOT LIBINTL_FOUND) + MESSAGE(FATAL_ERROR + "You need the libintl development library to be able to compile with Localize support.\nSee INSTALL file for details and more info\n" + ) + ENDIF(NOT LIBINTL_FOUND) + FIND_PACKAGE(Iconv) + IF(NOT ICONV_FOUND) + MESSAGE(FATAL_ERROr + "You need the iconv development library to be able to compile with Localize support.\nSee INSTALL file for details and more info\n" + ) + ENDIF(NOT ICONV_FOUND) + ENDIF(WIN32) + add_subdirectory(lang) + ADD_DEFINITIONS(-DLOCALIZE) ENDIF(LOCALIZE) IF(USE_HOME_DIR) - ADD_DEFINITIONS(-DUSE_HOME_DIR) + ADD_DEFINITIONS(-DUSE_HOME_DIR) ENDIF(USE_HOME_DIR) add_subdirectory(src) add_subdirectory(data) if (NOT MSVC) - add_subdirectory(src/chkjson) + add_subdirectory(src/chkjson) endif() add_subdirectory(tests) +if (JSON_FORMAT) + add_subdirectory(tools/format) +endif() if (CATA_CLANG_TIDY_PLUGIN) - add_subdirectory(tools/clang-tidy-plugin) + add_subdirectory(tools/clang-tidy-plugin) endif() CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY ) ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" - -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + "${CMAKE_COMMAND}" + -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" ) find_program(CCACHE_FOUND ccache) diff --git a/Makefile b/Makefile index f7431a5b6d854..a99c7e495562e 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,8 @@ # make DYNAMIC_LINKING=1 # Use MSYS2 as the build environment on Windows # make MSYS2=1 +# Turn off all optimizations, even debug-friendly optimizations +# make NOOPT=1 # Astyle all source files. # make astyle # Check if source files are styled properly. @@ -89,6 +91,9 @@ WARNINGS = \ -Wold-style-cast \ -Woverloaded-virtual \ -Wpedantic +ifndef CLANG + WARNINGS += -Wsuggest-override +endif # Uncomment below to disable warnings #WARNINGS = -w DEBUGSYMS = -g @@ -96,6 +101,9 @@ DEBUGSYMS = -g #OTHERS = -O3 #DEFINES = -DNDEBUG +# Tells ccache to keep comments, as they can be meaningful to the compiler (as to suppress warnings). +export CCACHE_COMMENTS=1 + # Disable debug. Comment this out to get logging. #DEFINES = -DENABLE_LOGGING @@ -303,10 +311,18 @@ ifdef RELEASE endif ifndef RELEASE - ifeq ($(shell $(CXX) -E -Og - < /dev/null > /dev/null 2>&1 && echo fog),fog) - OPTLEVEL = -Og - else + ifdef NOOPT + # While gcc claims to include all information required for + # debugging at -Og, at least with gcc 8.3, control flow + # doesn't move line-by-line at -Og. Provide a command-line + # way to turn off optimization (make NOOPT=1) entirely. OPTLEVEL = -O0 + else + ifeq ($(shell $(CXX) -E -Og - < /dev/null > /dev/null 2>&1 && echo fog),fog) + OPTLEVEL = -Og + else + OPTLEVEL = -O0 + endif endif CXXFLAGS += $(OPTLEVEL) endif diff --git a/README.md b/README.md index f9a7e2b5a3738..acba14262f204 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ We also have the following build guides: ## Contribute -Cataclysm:Dark Days Ahead is the result of contributions from over 900 volunteers under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See http://creativecommons.org/licenses/by-sa/3.0/ for details. +Cataclysm:Dark Days Ahead is the result of contributions from over 1000 volunteers under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See http://creativecommons.org/licenses/by-sa/3.0/ for details. Some code distributed with the project is not part of the project and is released under different software licenses, the files covered by different software licenses have their own license notices. [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=146201)](https://www.bountysource.com/trackers/146201-clever-raven-cataclysm-dda?utm_source=146201&utm_medium=shield&utm_campaign=TRACKER_BADGE) diff --git a/android/.gitignore b/android/.gitignore index d7a510e5a97e4..79469f4e55cbd 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,4 +1,5 @@ !config/ +!deps*.zip *.iml .cxx .DS_Store diff --git a/android/app/build.gradle b/android/app/build.gradle index 1bd209c745d25..0feeba630773e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -37,14 +37,25 @@ if (keystorePropertiesFile.exists()) { def njobs = getProperty("j") def localize = getProperty("localize").toBoolean() -def abi32 = getProperty("abi32").toBoolean() -def abi64 = getProperty("abi64").toBoolean() +def abi_arm_32 = getProperty("abi_arm_32").toBoolean() +def abi_arm_64 = getProperty("abi_arm_64").toBoolean() +def abi_x86_32 = getProperty("abi_x86_32").toBoolean() +def abi_x86_64 = getProperty("abi_x86_64").toBoolean() def deps = getProperty("deps") def override_version = getProperty("override_version") def version_header_path = getProperty("version_header_path") +def override_compileSdkVersion = getProperty("override_compileSdkVersion").toInteger() +def override_minSdkVersion = getProperty("override_minSdkVersion").toInteger() +def override_targetSdkVersion = getProperty("override_targetSdkVersion").toInteger() +def override_ndkBuildAppPlatform = getProperty("override_ndkBuildAppPlatform") -if (!abi32 && !abi64) { - throw new GradleException("Both `abi32` and `abi64` properties are set to false") +println("Using compileSdkVersion: $override_compileSdkVersion") +println("Using minSdkVersion: $override_minSdkVersion") +println("Using targetSdkVersion: $override_targetSdkVersion") +println("Using ndkBuildAppPlatform: $override_ndkBuildAppPlatform") + +if (!abi_arm_32 && !abi_arm_64 && !abi_x86_32 && !abi_x86_64) { + throw new GradleException("All supported ABI properties are set to false!") } if (!file(deps).exists()) { throw new GradleException("Dependencies file does not exist:" + deps) @@ -94,7 +105,7 @@ unzipDeps.dependsOn makeLocalization preBuild.dependsOn unzipDeps android { - compileSdkVersion 28 + compileSdkVersion override_compileSdkVersion if (override_version.isEmpty()) { println("Generating version number to $version_header_path") @@ -127,14 +138,15 @@ android { } defaultConfig { - minSdkVersion 14 - targetSdkVersion 28 + minSdkVersion override_minSdkVersion + targetSdkVersion override_targetSdkVersion versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1) versionName new File("$version_header_path").text.split('\"')[1] if (buildAsApplication) { applicationId "com.cleverraven.cataclysmdda" setProperty("archivesBaseName", "cataclysmdda-" + versionName) } + resValue "string", "app_name", "Cataclysm DDA" splits { // Configures multiple APKs based on ABI. @@ -144,12 +156,18 @@ android { // Resets the list of ABIs that Gradle should create APKs for to none. reset() // Specifies a list of ABIs that Gradle should create APKs for. - if (abi32) { + if (abi_arm_32) { include "armeabi-v7a" } - if (abi64) { + if (abi_arm_64) { include "arm64-v8a" } + if (abi_x86_32) { + include "x86" + } + if (abi_x86_64) { + include "x86_64" + } // Specifies that we do not want to also generate a universal APK that includes all ABIs. universalApk false } @@ -157,7 +175,7 @@ android { externalNativeBuild { ndkBuild { - arguments "APP_PLATFORM=android-16", "-j$njobs" + arguments "APP_PLATFORM=$override_ndkBuildAppPlatform", "-j$njobs" } } testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -169,6 +187,7 @@ android { experimental { dimension "version" applicationIdSuffix ".experimental" + resValue "string", "app_name", "Cataclysm DDA (experimental)" } } diff --git a/android/app/deps.zip b/android/app/deps.zip index 75b4d2f68a635..81e9f5697a0c8 100644 Binary files a/android/app/deps.zip and b/android/app/deps.zip differ diff --git a/android/app/deps_debug.zip b/android/app/deps_debug.zip new file mode 100644 index 0000000000000..8958923cbfb52 Binary files /dev/null and b/android/app/deps_debug.zip differ diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 582d64260e0f7..1fe84fa8b2c31 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,6 +1,5 @@ - Cataclysm DDA Installing game data... Upgrading game data... diff --git a/android/gradle.properties b/android/gradle.properties index 237d31ed23283..8fb7fc2b1cdef 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -24,13 +24,21 @@ j=2 # You can override this from the command line by passing "-Plocalize=#" localize=true -# This property controls whether to build 32 bit ABI -# You can override this from the command line by passing "-Pabi32=#" -abi32=true +# This property controls whether to build arm 32 bit ABI +# You can override this from the command line by passing "-Pabi_arm_32=#" +abi_arm_32=true -# This property controls whether to build 64 bit ABI -# You can override this from the command line by passing "-Pabi64=#" -abi64=true +# This property controls whether to build arm 64 bit ABI +# You can override this from the command line by passing "-Pabi_arm_64=#" +abi_arm_64=true + +# This property controls whether to build x86 32 bit ABI +# You can override this from the command line by passing "-Pabi_x86_32=#" +abi_x86_32=false + +# This property controls whether to build x86 64 bit ABI +# You can override this from the command line by passing "-Pabi_x86_64=#" +abi_x86_64=false # This property controls which dependencies file to use # You can override this from the command line by passing "-Pdeps=#" @@ -43,3 +51,19 @@ override_version= # This property controls path where overriden version number header should be generated # You can override this from the command line by passing "-Pversion_header_path=#" version_header_path=app/jni/src/version.h + +# This property controls which compileSdkVersion should be used +# You can override this from the command line by passing "-Poverride_compileSdkVersion=#" +override_compileSdkVersion=28 + +# This property controls which minSdkVersion should be used +# You can override this from the command line by passing "-Poverride_minSdkVersion=#" +override_minSdkVersion=14 + +# This property controls which targetSdkVersion should be used +# You can override this from the command line by passing "-Poverride_targetSdkVersion=#" +override_targetSdkVersion=28 + +# This property controls which ndkBuildAppPlatform should be used +# You can override this from the command line by passing "-Poverride_ndkBuildAppPlatform=#" +override_ndkBuildAppPlatform=android-16 diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 74807d81cd0d8..cc9172489bd68 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -145,7 +145,7 @@ then cd android # Specify dumb terminal to suppress gradle's constatnt output of time spent building, which # fills the log with nonsense. - TERM=dumb ./gradlew assembleRelease -Pj=$num_jobs -Plocalize=false -Pabi32=false -Pabi64=true -Pdeps=/home/travis/build/CleverRaven/Cataclysm-DDA/android/app/deps.zip + TERM=dumb ./gradlew assembleRelease -Pj=$num_jobs -Plocalize=false -Pabi_arm_32=false -Pabi_arm_64=true -Pdeps=/home/travis/build/CleverRaven/Cataclysm-DDA/android/app/deps.zip else make -j "$num_jobs" RELEASE=1 CCACHE=1 BACKTRACE=1 CROSS="$CROSS_COMPILATION" LINTJSON=0 diff --git a/build-scripts/get_all_mods.py b/build-scripts/get_all_mods.py index 27f0e8cd55784..060376a7fcfb3 100755 --- a/build-scripts/get_all_mods.py +++ b/build-scripts/get_all_mods.py @@ -8,12 +8,31 @@ with open(blacklist_filename) as blacklist_file: blacklist = {s.rstrip('\n') for s in blacklist_file.readlines()} -mods = [] +mods_to_keep = [] + +def add_mods(mods): + for mod in mods: + if not mod in all_mod_dependecies: + # Either an invalid mod id, or blacklisted. + return False + for mod in mods: + if not mod in mods_to_keep: + mods_to_keep.append(mod) + return True + +all_mod_dependecies = {} for info in glob.glob('data/mods/*/modinfo.json'): mod_info = json.load(open(info)) - mods.extend(e["ident"] for e in mod_info if e["type"] == "MOD_INFO") + for e in mod_info: + if e["type"] == "MOD_INFO": + ident = e["ident"] + if not ident in blacklist: + all_mod_dependecies[ident] = e.get("dependencies", []) -mods_to_keep = [mod for mod in mods if mod not in blacklist] +for mod in all_mod_dependecies: + if not mod in mods_to_keep: + if add_mods(all_mod_dependecies[mod]): + mods_to_keep.append(mod) print(','.join(mods_to_keep)) diff --git a/build-scripts/mod_test_blacklist b/build-scripts/mod_test_blacklist index 4286dca554c83..5fcc595c4ac3b 100644 --- a/build-scripts/mod_test_blacklist +++ b/build-scripts/mod_test_blacklist @@ -1,51 +1,8 @@ -aftershock -alt_map_key -Animatronics -Battery_Overhaul_Legacy_Mode blazemod -cbm_slots -classic_zombies -crazy_cataclysm crt_expansion -desertpack -DinoMod -ew_pack -FIC_Weapons -FujiStruct -generic_guns Graphical_Overmap -growable-pots -Heavy miners -hydroponics -magiclysm -manualbionicinstall mapgen_demo -Medieval_Stuff -MMA -modular_turrets more_locations -More_Survival_Tools -mutant_npcs -my_sweet_cataclysm -national_guard_camp -No_Anthills -No_Bees -no_faults -no_filthy_clothing -No_Fungi no_medieval_items -no_npc_food -No_Rail_Stations -No_Triffids -novitamins -realguns -safeautodoc -Salvaged_Robots sees_player_hitbutton sees_player_retro -sleepdeprivation -speedydex -stats_through_kills -Tanks -Tolerate_This -Urban_Development diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 9ef2bc3a24ac0..41fac38d3ec55 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,39 +1,39 @@ # Cataclysm data files -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.1.4) SET(CATACLYSM_DATA_DIRS - ${CMAKE_SOURCE_DIR}/data/font - ${CMAKE_SOURCE_DIR}/data/json - ${CMAKE_SOURCE_DIR}/data/mods - ${CMAKE_SOURCE_DIR}/data/names - ${CMAKE_SOURCE_DIR}/data/raw - ${CMAKE_SOURCE_DIR}/data/motd - ${CMAKE_SOURCE_DIR}/data/credits - ${CMAKE_SOURCE_DIR}/data/title + ${CMAKE_SOURCE_DIR}/data/font + ${CMAKE_SOURCE_DIR}/data/json + ${CMAKE_SOURCE_DIR}/data/mods + ${CMAKE_SOURCE_DIR}/data/names + ${CMAKE_SOURCE_DIR}/data/raw + ${CMAKE_SOURCE_DIR}/data/motd + ${CMAKE_SOURCE_DIR}/data/credits + ${CMAKE_SOURCE_DIR}/data/title ) IF(SOUND) - SET(CATACLYSM_DATA_DIRS - ${CATACLYSM_DATA_DIRS} - ${CMAKE_SOURCE_DIR}/data/sound - ) + SET(CATACLYSM_DATA_DIRS + ${CATACLYSM_DATA_DIRS} + ${CMAKE_SOURCE_DIR}/data/sound + ) ENDIF(SOUND) IF(TILES) - SET(CATACLYSM_DATA_DIRS - ${CATACLYSM_DATA_DIRS} - ${CMAKE_SOURCE_DIR}/gfx - ) + SET(CATACLYSM_DATA_DIRS + ${CATACLYSM_DATA_DIRS} + ${CMAKE_SOURCE_DIR}/gfx + ) ENDIF(TILES) SET(CATACLYSM_DATA_FILES - ${CMAKE_SOURCE_DIR}/data/changelog.txt - ${CMAKE_SOURCE_DIR}/data/cataicon.ico - ${CMAKE_SOURCE_DIR}/data/fontdata.json - ${CMAKE_SOURCE_DIR}/LICENSE.txt + ${CMAKE_SOURCE_DIR}/data/changelog.txt + ${CMAKE_SOURCE_DIR}/data/cataicon.ico + ${CMAKE_SOURCE_DIR}/data/fontdata.json + ${CMAKE_SOURCE_DIR}/LICENSE.txt ) IF(RELEASE) - install(DIRECTORY ${CATACLYSM_DATA_DIRS} DESTINATION ${DATA_PREFIX}) - install(FILES ${CATACLYSM_DATA_FILES} DESTINATION ${DATA_PREFIX}) + install(DIRECTORY ${CATACLYSM_DATA_DIRS} DESTINATION ${DATA_PREFIX}) + install(FILES ${CATACLYSM_DATA_FILES} DESTINATION ${DATA_PREFIX}) ENDIF(RELEASE) diff --git a/data/changelog.txt b/data/changelog.txt index c7cd20af3ca22..1e1b28e06bdba 100644 --- a/data/changelog.txt +++ b/data/changelog.txt @@ -154,6 +154,22 @@ Allow martial arts techniques to target humanoids. Add querry to stop trying to fall of sleep after 30min of trying. Sleeping in a vehicle has the same features as sleeping on furnitures. Basecamps: add an emergency recall option. +Allow shooting out lights in the lab. +Add Auto start mode to power gen bionics. +Introduces safe fuel mod and flags for bionics. +Create template from already existing character. +Allow extend to work for mutation_branch::category. +Basecamp storage zone : to populate camp inventory. +JSONize loot zones. +Added an ability to geiger-scan NPCs. +Dynamic NPC spawn anywhere on overmap - not just near player. +Spawn some chemicals with random charges. +Increase wind strength at higher z-levels. +Added auto-picklock on examine. +Vehicles: allow multiple vehicles on a bike rack. +Vehicle autopilot part for patrolling / auto-farming etc. +Allow auto targeting mode for turrets only with installed turret control unit. +Running/crouching while swimming will result in faster/slower swim speed. ## Content: Adds refluffed and modified plasma gun. @@ -258,6 +274,20 @@ Add Grocery bot to carry your groceries. Add blackpowder loads for some cartridges. Adds some islands for lakes. Expand randomly-generated music descriptions. +Mi-go Camp Starting Scenario. +Adds parrot speech options for more mi-go monsters. +Move fungal tower map to JSON and redraw. +Adds street light, traffic lights and utility pole. +Gender-specific clothing on corpses. +Replace outpost laser turrets with M2HB turrets. +Changes CRT TVs to LCD TVs. +NPCs: Update the NPC tutorial including faction camps. +Add miniature railway location with small rails. +Looks_like campaign to decrease tileset workload. +Dozens of new epilogues. +Tailoring system overhaul. +Faction currency overhaul, no more dollars. +Adds dimensional anchor item and some related fluff content. ## Interface: Corpses (not underwear) will be shown on top at the places of death in map extras. @@ -333,6 +363,20 @@ Added ability to toggle minimap on and off in Look Around window. Add visual indicators for dead zombies that can still revive. Add run and crouch colors for the player's symbol in ASCII. Display status for all long activities. +Add option to increase search radius in map view. +Enable autosave by default. +CBM Auto Start threshold options. +Include placeholder text on job categories. +Add 'n:' prefix for item filtering, to search through an items note. +Make AIM window width customizable. +Help players discover how to repair. +Allow saving starting location as part of character template. +Display power capacity in mJ in item description. +Show acid and fire protection in the relayer armor screen. +Adds pain and fatigue penalties on the morale screen, when applicable +Display current power in bionic menu with appropriate unit. +Bionic UI: power displayed in kJ, J or mJ. +Eat menu: Display volume per serving. ## Mods: Re-adds fictional martial arts as a mod. @@ -354,8 +398,12 @@ Add Blood Power Generator CBM to Magiclysm. My Sweet Cataclysm adds the ability to play as an humanoid made of sugar. Heavy mining mod added. Add a mining car. Adult Black Dragon lair. +Adds Graphical Overmap mod. +Adding a bionic prepper faction to Aftershock. +Add Fuji's Military Professions Mod. ## Balance: +Overhaul of all Martial arts. Remove reinforcement of non-cloth items. Allowed moving furniture over spilled liquids. Anesthetic kit is now a tool, it uses anesthesia as charges. @@ -385,6 +433,27 @@ Cbms harvested from NPC are filthy and faulty. Changes game default start date to 30 days after Spring. Being grabbed drastically reduce your dodging ability. Allow zombies to push each other when blocked. +Raw food provides fewer calories compared to cooked. +Triple damage from falling. +Adds controlled burst modes to machine guns. +Exchanged M202A1_talon to M16A4 robots in military outpost. +Adjusts joint servo cost to be realistic. +More realistic temperature, precipitation, humidity, and pressure. +Giant animals drop mutant meat, has negative effects if relied upon. +Balanced bio repair nanobots. +Standardized chemical powders for 1 unit = 1/100 mol. +Apply item spawn scaling factor to monster drops. +Balance bionic power use for realistic values. +Allow large and huge creatures to move through underbrush. +Mouse view was truncating last row of information. +Draw debug vehicle autopilot AI and restore previous behaviour. +Fix accidental IR vision. +Can create camps in buildings that don't face North. +Fixes martial arts initiate message when equipping an item. +Fix error caused by missing array in More Survival Tools mod. +Fixes crashes involving bayonet type items. +Terranian sonar allow to see digging monsters behind walls. +Stops large critters from using tight passages. ## Bugfixes: Fixed long overmap location name being overwritten by "Distance to target:" string. @@ -419,6 +488,20 @@ Fix horses making engine sounds. Fix items lying in furniture get damaged if one is throwing something at them. Items piled up beyond a tile's limit can pass through walls. You are still stuck in rubble even if you clear it with a shovel after getting stuck in it. +Correct magazine inside guns/monsters. +Prevent counterattacks if tired or dead. +Load migration ID strings from the right JSON object. +Nerf Smoke field so that Filter mask protects from smoke. +Mouth encumbrance doesn't drain stamina while walking. +Stop basement parachuting zombies. +Prevent bicycle archery. +Fix for resuming after stamina recovery was interrupted. +Fix starting season calculation. +Maps: stop tunneling tree-felling. +Fix damaged weapons having zero range. +Fix hoe consistency. +Fixed targeting UI issue for reach attack. +Make environmental protection really protect from fields. ## Performance: Limit start location search radius. @@ -454,6 +537,7 @@ Throttle NPC item search. Optimize vine growth special attack. Add adjustable 3D vision Z-level cap. Skip sunlight calculation on uniform z-levels. +Speed up monster action planning. ## Infrastructure: Npctalk: Complete overhaul of NPC conversation infrastructure. @@ -570,10 +654,23 @@ Create enchantment cache for use with enchantment values. Adds JSON capability to range_with_even_chance_of_good_hit. Uses the units::energy infrastructure for bionic power. Clarify some documentation relevant to monsters and basecamp recipes. -Add table of contents to JSON_INFO.md Add a clang-tidy check to check for text style in the c++ code. Encapsulate bionic power and use setter and getter functions. -Move player armor functions to Character scope. +Partial migration of player logic to either character or avatar. +Remove all of the legacy vehicleparts JSON. +Refactor fields: allow multiple effects. +Add regional terrain/furniture resolution to mapgen. +Change snippets to use string ids instead of hashes. +Adds support for different mending methods for a single fault. +item: refactor info() to break it into multiple smaller functions. +Changes scope of various martial arts data from player to a new class. +adjust lighting debug overlay to show exact light values. +Add the ability to load tilesets from user_dir/gfx. +Detect unsed json object members when parsing json data +Add infrastructure to support using vitamin system for toxins. +Simplify generic multiple activity handler. +JSONize scent neutralization for fields. +tilesets: add tools to automatically create tilesheets. ## Build: Npctalk: add a python dialogue validator. @@ -586,6 +683,10 @@ Android build updates. simplify and improve flatpak support. Allow building with Clang using MinGW-w64 libs. Check translator comments with clang-tidy. +Check text style in json strings loaded with class translation. +gfx tools improvements. +Check text style in macro expansions. +compose: handle multiple entries in a single `tile_entry.json` file ## I18N and A11Y: Use translation markers to increase performance. @@ -1287,7 +1388,10 @@ Adds new mod Growable pots. Mainlined Tall Buildings mod. Add urban development buildings to city spawns. Salvaged Robots: More robot themed professions. -USABLE_FIRE tag makes terrain or furniture usable as a nearby fire for crafting. +Creates clairvoyance spells in magiclysm +Adds the ability to pick letters in the spellcasting menu +Magicylsm: NPCs can now teach spells +Added hit_you_effect and hit_me_effect fields to enchantments ## Balance: @@ -1890,6 +1994,7 @@ JSONnizing CBM slot feature. Land Use Codes infrastructure. Moves allergen handling vitamin absorption to JSON. Refactor advanced inventory item movement to use activities. +USABLE_FIRE tag makes terrain or furniture usable as a nearby fire for crafting. ## Build: diff --git a/data/core/basic.json b/data/core/basic.json index a9e3f00242c3d..cb45312e4dc72 100644 --- a/data/core/basic.json +++ b/data/core/basic.json @@ -22,6 +22,7 @@ "container": "bottle_plastic", "quench": 50, "ammo_data": { "ammo_type": "water" }, - "flags": [ "EATEN_COLD" ] + "flags": [ "EATEN_COLD" ], + "use_action": "BLECH_BECAUSE_UNCLEAN" } ] diff --git a/data/json/construction.json b/data/json/construction.json index 51eb552abbf57..68e487e31e6d2 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -1101,7 +1101,7 @@ "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ], "time": "180 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ], - "components": [ [ [ "rock", 12 ] ] ], + "components": [ [ [ "rock", 12 ] ], [ [ "pebble", 50 ] ], [ [ "mortar_build", 1 ] ] ], "pre_special": "check_empty", "post_terrain": "t_rock_wall_half" }, @@ -1113,10 +1113,34 @@ "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ], "time": "180 m", "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ], - "components": [ [ [ "rock", 12 ] ] ], + "components": [ [ [ "rock", 12 ] ], [ [ "mortar_build", 1 ] ] ], "pre_terrain": "t_rock_wall_half", "post_terrain": "t_rock_wall" }, + { + "type": "construction", + "description": "Build Dry Stone Wall", + "//": "Step 1: half the wall", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 1 ] ], + "time": "180 m", + "qualities": [ [ { "id": "DIG", "level": 1 } ] ], + "components": [ [ [ "rock", 12 ] ] ], + "pre_special": "check_empty", + "post_terrain": "t_drystone_wall_half" + }, + { + "type": "construction", + "description": "Build Dry Stone Wall", + "//": "Step 2: the full wall", + "category": "CONSTRUCT", + "required_skills": [ [ "fabrication", 3 ] ], + "time": "180 m", + "qualities": [ [ { "id": "DIG", "level": 2 } ] ], + "components": [ [ [ "rock", 16 ] ] ], + "pre_terrain": "t_drystone_wall_half", + "post_terrain": "t_drystone_wall" + }, { "type": "construction", "description": "Build Pony Wall", @@ -3212,5 +3236,16 @@ "components": [ [ [ "log", 1 ] ] ], "pre_special": "check_empty", "post_terrain": "f_logstool" + }, + { + "type": "construction", + "description": "Build Decorative Tree", + "category": "FURN", + "required_skills": [ [ "fabrication", 0 ] ], + "time": "20 m", + "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ], + "components": [ [ [ "stick", 4 ], [ "log", 1 ] ], [ [ "nail", 20 ] ], [ [ "pine_bough", 8 ] ] ], + "pre_special": "check_empty", + "post_terrain": "f_decorative_tree" } ] diff --git a/data/json/effects.json b/data/json/effects.json index d4ee92de7dfd6..0aa3d56dd07c7 100644 --- a/data/json/effects.json +++ b/data/json/effects.json @@ -926,11 +926,9 @@ "id": "hot", "name": [ "Warm", "Hot", "Scorching" ], "desc": [ "Your %s feels warm.", "Your %s is sweating from the heat.", "Your %s is sweating profusely!" ], - "speed_name": "Hot", "max_intensity": 3, "part_descs": true, "base_mods": { - "speed_mod": [ -2 ], "thirst_tick": [ 2400 ], "thirst_chance": [ 2 ], "pain_min": [ 1 ], @@ -940,14 +938,18 @@ "hurt_chance": [ -300 ], "stamina_chance": [ 2 ] }, - "scaling_mods": { - "speed_mod": [ -4 ], - "thirst_min": [ 1 ], - "thirst_tick": [ -600 ], - "pain_max_val": [ 10 ], - "hurt_chance": [ 200 ], - "stamina_min": [ -1 ] - } + "scaling_mods": { "thirst_min": [ 1 ], "thirst_tick": [ -600 ], "pain_max_val": [ 10 ], "hurt_chance": [ 200 ], "stamina_min": [ -1 ] } + }, + { + "type": "effect_type", + "id": "hot_speed", + "name": [ "Slowdown", "Hampered", "Crushed" ], + "desc": [ "The heat slows you down.", "You struggle to move in this heat.", "The heat is crushing you." ], + "speed_name": "Heat slowdown", + "max_intensity": 3, + "part_descs": true, + "base_mods": { "speed_mod": [ -2 ] }, + "scaling_mods": { "speed_mod": [ -4 ] } }, { "type": "effect_type", diff --git a/data/json/flags.json b/data/json/flags.json index 46e1f80c97b89..d3d58bb655d66 100644 --- a/data/json/flags.json +++ b/data/json/flags.json @@ -7,6 +7,7 @@ }, { "id": "EFFECT_INVISIBLE", + "context": [ ], "type": "json_flag" }, { @@ -70,6 +71,7 @@ }, { "id": "EFFECT_NIGHT_VISION", + "context": [ ], "type": "json_flag" }, { @@ -144,6 +146,7 @@ { "id": "ETHEREAL_ITEM", "type": "json_flag", + "context": [ ], "info": "This item disappears as soon as its timer runs out whether it is food or not." }, { @@ -388,6 +391,12 @@ "//": "Prevents the item from participating in the encumbrance system when worn.", "info": "It seems partially intangible, and can occupy the same space as other things when worn." }, + { + "id": "SHEATH_AXE", + "type": "json_flag", + "context": [ "GENERIC", "TOOL" ], + "//": "This item can be stored in a sheath of the appropriate size." + }, { "id": "SHEATH_KNIFE", "type": "json_flag", @@ -502,6 +511,13 @@ "//": "Prevents the item from making the body part count as unfriendly to water and thus causing negative morale from being wet.", "info": "This clothing performs well even when soaking wet. This can feel good." }, + { + "id": "POWERARMOR_COMPATIBLE", + "type": "json_flag", + "context": [ "ARMOR", "TOOL_ARMOR" ], + "//": "Allows power armor to be worn with compatible armors like ear plugs and mouthpieces.", + "info": "This item can be worn simultaneously with power armor." + }, { "id": "furred", "type": "json_flag", @@ -659,6 +675,12 @@ "context": [ "SPELL" ], "//": "Chooses a spell at random to cast from extra_effects. See MAGIC.md for details" }, + { + "id": "PAIN_NORESIST", + "type": "json_flag", + "context": [ "SPELL" ], + "//": "pain altering spells can't be resisted (like with the deadened trait)" + }, { "id": "NON_THRESH", "type": "json_flag", @@ -667,38 +689,47 @@ }, { "id": "EFFECT_FEATHER_FALL", + "context": [ ], "type": "json_flag" }, { "id": "EFFECT_BIO_IMMUNE", + "context": [ ], "type": "json_flag" }, { "id": "EFFECT_BASH_IMMUNE", + "context": [ ], "type": "json_flag" }, { "id": "EFFECT_CUT_IMMUNE", + "context": [ ], "type": "json_flag" }, { "id": "EFFECT_ACID_IMMUNE", + "context": [ ], "type": "json_flag" }, { "id": "EFFECT_STAB_IMMUNE", + "context": [ ], "type": "json_flag" }, { "id": "EFFECT_HEAT_IMMUNE", + "context": [ ], "type": "json_flag" }, { "id": "EFFECT_COLD_IMMUNE", + "context": [ ], "type": "json_flag" }, { "id": "ELECTRIC_IMMUNE", + "context": [ ], "type": "json_flag" }, { diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 0e87becbedbbd..2160d9d039a6e 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -91,7 +91,7 @@ "move_cost_mod": -1, "coverage": 60, "required_str": 13, - "max_volume": 800, + "max_volume": "200 L", "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "MINEABLE" ], "deconstruct": { "items": [ @@ -135,7 +135,7 @@ "move_cost_mod": -1, "coverage": 60, "required_str": 12, - "max_volume": 150, + "max_volume": "37500 ml", "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "MINEABLE" ], "deconstruct": { "items": [ @@ -191,7 +191,7 @@ { "item": "motor_tiny", "count": 1 } ] }, - "max_volume": 800, + "max_volume": "200 L", "bash": { "str_min": 18, "str_max": 50, @@ -235,7 +235,7 @@ { "item": "motor_tiny", "count": 1 } ] }, - "max_volume": 1000, + "max_volume": "250 L", "bash": { "str_min": 12, "str_max": 50, @@ -306,7 +306,7 @@ "move_cost_mod": -1, "coverage": 60, "required_str": 12, - "max_volume": 120, + "max_volume": "30 L", "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "MINEABLE" ], "deconstruct": { "items": [ @@ -361,7 +361,7 @@ { "item": "pilot_light", "count": 1 } ] }, - "max_volume": 160, + "max_volume": "40 L", "bash": { "str_min": 8, "str_max": 30, @@ -398,7 +398,7 @@ { "item": "wire", "count": [ 1, 4 ] } ] }, - "max_volume": 160, + "max_volume": "40 L", "bash": { "str_min": 8, "str_max": 30, @@ -434,7 +434,7 @@ { "item": "pipe", "count": [ 1, 3 ] } ] }, - "max_volume": 160, + "max_volume": "40 L", "bash": { "str_min": 12, "str_max": 30, diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json index e4a2b4098c47c..7d06035f2e94a 100644 --- a/data/json/furniture_and_terrain/furniture-decorative.json +++ b/data/json/furniture_and_terrain/furniture-decorative.json @@ -205,5 +205,39 @@ { "item": "pipe", "count": [ 0, 1 ] } ] } + }, + { + "type": "furniture", + "id": "f_winter_wreath", + "name": "pine wreath", + "description": "A decorative wreath for the winter holidays.", + "symbol": "o", + "color": "light_green", + "move_cost_mod": -1, + "required_str": 10, + "flags": [ "PLACE_ITEM" ] + }, + { + "type": "furniture", + "id": "f_decorative_tree", + "name": "decorative tree", + "description": "A decorative tree for the winter holidays.", + "symbol": "+", + "color": "light_green", + "looks_like": "t_tree_pine", + "move_cost_mod": -1, + "required_str": 10, + "flags": [ "BLOCKSDOOR", "PLACE_ITEM", "EASY_DECONSTRUCT" ], + "bash": { + "str_min": 20, + "str_max": 40, + "sound": "smash!", + "sound_fail": "thump.", + "items": [ + { "item": "pine_bough", "count": [ 4, 6 ] }, + { "item": "nail", "count": [ 5, 14 ] }, + { "item": "stick", "count": [ 1, 3 ] } + ] + } } ] diff --git a/data/json/furniture_and_terrain/furniture-domestic_plants.json b/data/json/furniture_and_terrain/furniture-domestic_plants.json index c0d9c5e3f0be4..316c8c1e5bad1 100644 --- a/data/json/furniture_and_terrain/furniture-domestic_plants.json +++ b/data/json/furniture_and_terrain/furniture-domestic_plants.json @@ -8,7 +8,7 @@ "move_cost_mod": 2, "description": "A variety of plant, used for decoration.", "required_str": 5, - "max_volume": 40, + "max_volume": "10 L", "flags": [ "CONTAINER", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "TINY", "TRANSPARENT", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ @@ -44,7 +44,7 @@ "color": "yellow", "move_cost_mod": 2, "required_str": 5, - "max_volume": 40, + "max_volume": "10 L", "flags": [ "CONTAINER", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "TINY", "TRANSPARENT", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json index c2f947e551738..535e2fc19afb0 100644 --- a/data/json/furniture_and_terrain/furniture-fireplaces.json +++ b/data/json/furniture_and_terrain/furniture-fireplaces.json @@ -29,7 +29,7 @@ "move_cost_mod": 2, "coverage": 60, "required_str": 10, - "max_volume": 1000, + "max_volume": "250 L", "flags": [ "TRANSPARENT", "CONTAINER", "FIRE_CONTAINER", "SUPPRESS_SMOKE", "PLACE_ITEM", "MOUNTABLE" ], "examine_action": "fireplace", "bash": { diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json index 3e1775b39eabe..47110a1cbbf37 100644 --- a/data/json/furniture_and_terrain/furniture-medical.json +++ b/data/json/furniture_and_terrain/furniture-medical.json @@ -177,7 +177,7 @@ "move_cost_mod": 2, "coverage": 80, "required_str": 18, - "max_volume": 7000, + "max_volume": "1750 L", "looks_like": "f_fridge", "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR" ], "deconstruct": { @@ -234,7 +234,7 @@ { "item": "sheet_metal_small", "count": [ 0, 4 ] } ] }, - "max_volume": 7000, + "max_volume": "1750 L", "bash": { "str_min": 35, "str_max": 80, diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json index 2ee49791a36f7..f8f1790bc3bbb 100644 --- a/data/json/furniture_and_terrain/furniture-plumbing.json +++ b/data/json/furniture_and_terrain/furniture-plumbing.json @@ -10,7 +10,7 @@ "coverage": 30, "required_str": -1, "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ], - "max_volume": 800, + "max_volume": "200 L", "examine_action": "keg", "keg_capacity": 600, "bash": { diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json index 7d9450ee57262..589312f1bdf83 100644 --- a/data/json/furniture_and_terrain/furniture-recreation.json +++ b/data/json/furniture_and_terrain/furniture-recreation.json @@ -356,7 +356,7 @@ "color": "blue", "move_cost_mod": -1, "coverage": 50, - "max_volume": 15, + "max_volume": "3750 ml", "required_str": 7, "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM" ], "deconstruct": { diff --git a/data/json/furniture_and_terrain/furniture-rural.json b/data/json/furniture_and_terrain/furniture-rural.json index db76bf183f21a..582e9e2b7a6cb 100644 --- a/data/json/furniture_and_terrain/furniture-rural.json +++ b/data/json/furniture_and_terrain/furniture-rural.json @@ -28,7 +28,7 @@ "description": "Pile of chipped wood pieces. You can move it with a shovel.", "color": "brown", "move_cost_mod": 6, - "max_volume": 3000, + "max_volume": "750 L", "required_str": -1, "flags": [ "TRANSPARENT", diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json index f1bb34e80ba5c..aad5c2346144e 100644 --- a/data/json/furniture_and_terrain/furniture-seats.json +++ b/data/json/furniture_and_terrain/furniture-seats.json @@ -148,7 +148,7 @@ "required_str": 3, "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ], "deconstruct": { "items": [ { "item": "2x4", "count": 3 }, { "item": "nail", "charges": [ 2, 6 ] } ] }, - "max_volume": 3500, + "max_volume": "875 L", "bash": { "str_min": 6, "str_max": 20, @@ -173,7 +173,7 @@ "deployed_item": "camp_chair", "examine_action": "deployed_furniture", "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ], - "max_volume": 3500, + "max_volume": "875 L", "deconstruct": { "items": [ { "item": "camp_chair", "count": 1 } ] } }, { @@ -213,7 +213,7 @@ "bonus_fire_warmth_feet": 1000, "required_str": 5, "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ], - "max_volume": 3000, + "max_volume": "750 L", "deconstruct": { "items": [ { "item": "log", "count": 1 } ] }, "bash": { "str_min": 12, diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json index 29760296b607d..0d4735f4ae641 100644 --- a/data/json/furniture_and_terrain/furniture-storage.json +++ b/data/json/furniture_and_terrain/furniture-storage.json @@ -17,7 +17,7 @@ { "item": "nail", "charges": [ 12, 16 ] } ] }, - "max_volume": 8000, + "max_volume": "2000 L", "bash": { "str_min": 6, "str_max": 40, @@ -41,7 +41,7 @@ "deconstruct": { "items": [ { "item": "2x4", "count": 14 }, { "item": "wood_panel", "count": 2 }, { "item": "nail", "charges": [ 12, 20 ] } ] }, - "max_volume": 8000, + "max_volume": "2000 L", "bash": { "str_min": 6, "str_max": 40, @@ -85,7 +85,7 @@ { "item": "rag", "count": [ 15, 20 ] } ] }, - "max_volume": 3500, + "max_volume": "875 L", "bash": { "str_min": 12, "str_max": 40, @@ -118,7 +118,7 @@ { "item": "rag", "count": [ 15, 20 ] } ] }, - "max_volume": 3500, + "max_volume": "875 L", "bash": { "str_min": 12, "str_max": 40, @@ -200,10 +200,20 @@ "floor_bedding_warmth": 200, "required_str": 3, "deconstruct": { "items": [ { "item": "box_large", "count": 1 } ] }, - "max_volume": 6000, + "max_volume": "1500 L", "deployed_item": "box_large", "examine_action": "deployed_furniture", - "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "EASY_DECONSTRUCT", "BASHABLE", "HIDE_PLACE", "NO_SIGHT" ], + "flags": [ + "TRANSPARENT", + "FLAMMABLE_ASH", + "PLACE_ITEM", + "ORGANIC", + "EASY_DECONSTRUCT", + "BASHABLE", + "HIDE_PLACE", + "NO_SIGHT", + "CONTAINER" + ], "bash": { "str_min": 2, "str_max": 15, @@ -253,7 +263,7 @@ "deconstruct": { "items": [ { "item": "2x4", "count": 6 }, { "item": "wood_panel", "count": [ 0, 1 ] }, { "item": "nail", "charges": [ 6, 8 ] } ] }, - "max_volume": 8000, + "max_volume": "2000 L", "bash": { "str_min": 12, "str_max": 40, @@ -283,7 +293,7 @@ { "item": "pipe", "count": [ 0, 4 ] } ] }, - "max_volume": 1600, + "max_volume": "400 L", "bash": { "str_min": 12, "str_max": 40, @@ -308,7 +318,7 @@ "move_cost_mod": -1, "coverage": 30, "required_str": 14, - "max_volume": 1000, + "max_volume": "250 L", "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ], "examine_action": "gunsafe_ml", "bash": { @@ -333,7 +343,7 @@ "move_cost_mod": -1, "coverage": 30, "required_str": 14, - "max_volume": 1000, + "max_volume": "250 L", "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ], "bash": { "str_min": 40, @@ -357,7 +367,7 @@ "move_cost_mod": -1, "coverage": 30, "required_str": 14, - "max_volume": 1000, + "max_volume": "250 L", "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ], "examine_action": "gunsafe_el", "bash": { @@ -391,7 +401,7 @@ { "item": "pipe", "count": [ 4, 8 ] } ] }, - "max_volume": 2000, + "max_volume": "500 L", "bash": { "str_min": 12, "str_max": 40, @@ -417,7 +427,7 @@ "deconstruct": { "items": [ { "item": "2x4", "count": 2 }, { "item": "nail", "charges": [ 2, 5 ] }, { "item": "sheet_metal", "count": 1 } ] }, - "max_volume": 40, + "max_volume": "10 L", "bash": { "str_min": 12, "str_max": 50, @@ -450,7 +460,7 @@ { "item": "wheel_caster", "count": 1 } ] }, - "max_volume": 7000, + "max_volume": "1750 L", "bash": { "str_min": 6, "str_max": 30, @@ -483,7 +493,7 @@ { "item": "sheet_metal_small", "count": [ 0, 4 ] } ] }, - "max_volume": 7000, + "max_volume": "1750 L", "bash": { "str_min": 6, "str_max": 30, @@ -516,7 +526,7 @@ { "item": "nail", "charges": [ 32, 40 ] } ] }, - "max_volume": 6000, + "max_volume": "1500 L", "bash": { "str_min": 6, "str_max": 40, @@ -537,7 +547,7 @@ "required_str": 4, "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ], "deconstruct": { "items": [ { "item": "nail", "charges": [ 2, 6 ] }, { "item": "2x4", "count": 2 } ] }, - "max_volume": 120, + "max_volume": "30 L", "bash": { "str_min": 6, "str_max": 30, @@ -556,7 +566,7 @@ "move_cost_mod": -1, "coverage": 40, "required_str": 5, - "max_volume": 80, + "max_volume": "20 L", "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "SHORT" ], "bash": { "str_min": 8, @@ -576,7 +586,7 @@ "move_cost_mod": -1, "coverage": 30, "required_str": 14, - "max_volume": 1000, + "max_volume": "250 L", "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ], "open": "f_safe_o", "examine_action": "open_safe", @@ -602,7 +612,7 @@ "move_cost_mod": -1, "coverage": 30, "required_str": 14, - "max_volume": 1000, + "max_volume": "250 L", "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ], "examine_action": "safe", "bash": { @@ -627,7 +637,7 @@ "move_cost_mod": -1, "coverage": 30, "required_str": 14, - "max_volume": 1000, + "max_volume": "250 L", "flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ], "close": "f_safe_c", "bash": { @@ -651,7 +661,7 @@ "color": "light_cyan", "move_cost_mod": 1, "required_str": 5, - "max_volume": 80, + "max_volume": "20 L", "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "SHORT" ], "bash": { "str_min": 8, @@ -676,7 +686,7 @@ "deconstruct": { "items": [ { "item": "2x4", "count": 20 }, { "item": "nail", "charges": [ 16, 24 ] }, { "item": "pipe", "count": 2 } ] }, - "max_volume": 2000, + "max_volume": "500 L", "bash": { "str_min": 12, "str_max": 40, @@ -710,7 +720,7 @@ { "item": "lock", "count": [ 0, 1 ] } ] }, - "max_volume": 800, + "max_volume": "200 L", "bash": { "str_min": 8, "str_max": 30, @@ -738,7 +748,7 @@ { "item": "pipe", "count": [ 4, 8 ] } ] }, - "max_volume": 2000, + "max_volume": "500 L", "bash": { "str_min": 16, "str_max": 40, diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index a8274256c5ca0..65d1168c40013 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -501,7 +501,7 @@ "description": "Pile of various metals, bricks, and other building materials. You could clear it with a shovel.", "color": "light_gray", "move_cost_mod": 6, - "max_volume": 3000, + "max_volume": "750 L", "required_str": -1, "flags": [ "TRANSPARENT", @@ -525,7 +525,7 @@ "symbol": "^", "color": "dark_gray", "move_cost_mod": 6, - "max_volume": 3000, + "max_volume": "750 L", "required_str": -1, "flags": [ "TRANSPARENT", @@ -549,7 +549,7 @@ "symbol": "#", "color": "green", "move_cost_mod": 8, - "max_volume": 3000, + "max_volume": "750 L", "required_str": -1, "flags": [ "TRANSPARENT", @@ -573,7 +573,7 @@ "symbol": "#", "color": "cyan", "move_cost_mod": 6, - "max_volume": 3000, + "max_volume": "750 L", "required_str": -1, "flags": [ "TRANSPARENT", diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index 5bd4fad664b52..a43b8f031fb0c 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -62,7 +62,7 @@ "coverage": 40, "required_str": -1, "examine_action": "kiln_empty", - "max_volume": 500, + "max_volume": "125 L", "crafting_pseudo_item": "char_kiln", "flags": [ "CONTAINER", "FIRE_CONTAINER", "PLACE_ITEM", "EASY_DECONSTRUCT", "MINEABLE" ], "deconstruct": { "items": [ { "item": "rock", "count": [ 35, 40 ] } ] }, @@ -106,7 +106,7 @@ "coverage": 40, "required_str": -1, "examine_action": "kiln_empty", - "max_volume": 500, + "max_volume": "125 L", "crafting_pseudo_item": "char_kiln", "flags": [ "CONTAINER", "FIRE_CONTAINER", "PLACE_ITEM" ], "deconstruct": { "items": [ { "item": "metal_tank", "count": [ 1, 4 ] }, { "item": "pipe", "count": [ 2, 4 ] } ] }, @@ -158,7 +158,7 @@ "coverage": 40, "required_str": -1, "examine_action": "arcfurnace_empty", - "max_volume": 800, + "max_volume": "200 L", "crafting_pseudo_item": "arcfurnace", "flags": [ "CONTAINER", "FIRE_CONTAINER", "PLACE_ITEM" ], "deconstruct": { "items": [ { "item": "metal_tank", "count": [ 1, 4 ] }, { "item": "pipe", "count": [ 2, 4 ] } ] }, diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index 887da1a249e11..43153c8408fc1 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -7,7 +7,7 @@ "symbol": "&", "color": "green", "move_cost": 0, - "max_volume": 8000, + "max_volume": "2000 L", "flags": [ "TRANSPARENT", "REDUCE_SCENT", "PERMEABLE" ], "examine_action": "recycle_compactor", "bash": { diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json index 7c2d7515c3063..76b17eb09cbec 100644 --- a/data/json/furniture_and_terrain/terrain-mechanisms.json +++ b/data/json/furniture_and_terrain/terrain-mechanisms.json @@ -454,7 +454,7 @@ "flags": [ "NOITEM", "INDOORS" ], "examine_action": "elevator", "bash": { - "str_min": 8, + "str_min": 40, "str_max": 150, "sound": "crunch!", "sound_fail": "whack!", @@ -485,7 +485,7 @@ "roof": "t_flat_roof", "flags": [ "NOITEM", "INDOORS" ], "bash": { - "str_min": 8, + "str_min": 40, "str_max": 150, "sound": "crunch!", "sound_fail": "whack!", diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json index 5a5f91f6c905b..bb3426965b7c0 100644 --- a/data/json/furniture_and_terrain/terrain-walls.json +++ b/data/json/furniture_and_terrain/terrain-walls.json @@ -1323,5 +1323,46 @@ { "item": "scrap", "count": [ 2, 4 ] } ] } + }, + { + "type": "terrain", + "id": "t_drystone_wall", + "name": "field stone wall", + "description": "A sturdy dry stone wall. Just rocks fitted together without mortar.", + "symbol": "LINE_OXOX", + "color": "light_gray", + "move_cost": 0, + "coverage": 100, + "roof": "t_flat_roof", + "flags": [ "NOITEM", "WALL", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ], + "connects_to": "WALL", + "bash": { + "str_min": 50, + "str_max": 200, + "sound": "crash!", + "sound_fail": "whump!", + "ter_set": "t_null", + "items": [ { "item": "rock", "count": [ 8, 18 ] }, { "item": "pebble", "count": [ 20, 38 ] } ] + } + }, + { + "type": "terrain", + "id": "t_drystone_wall_half", + "name": "field stone half-wall", + "description": "A half height sturdy dry stone wall. Just rocks fitted together without mortar. Complete as is or with extensive work it could be doubled in height.", + "symbol": "#", + "color": "light_gray", + "move_cost": 4, + "coverage": 60, + "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "MINEABLE" ], + "connects_to": "WALL", + "bash": { + "str_min": 30, + "str_max": 120, + "sound": "crash!", + "sound_fail": "whump!", + "ter_set": "t_null", + "items": [ { "item": "rock", "count": [ 3, 8 ] }, { "item": "pebble", "count": [ 20, 38 ] } ] + } } ] diff --git a/data/json/harvest.json b/data/json/harvest.json index 49512175917ee..b1797d8d28962 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -139,7 +139,7 @@ { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 }, + { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } ] }, @@ -152,7 +152,7 @@ { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 }, + { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } ] }, @@ -401,10 +401,10 @@ "type": "harvest", "message": "You laboriously dissect the colossal insect.", "entries": [ - { "drop": "meat", "base_num": [ 40, 55 ], "scale_num": [ 0.5, 0.7 ], "max": 80, "type": "flesh" }, + { "drop": "mutant_meat", "base_num": [ 40, 55 ], "scale_num": [ 0.5, 0.7 ], "max": 80, "type": "flesh" }, { "drop": "acidchitin_piece", "base_num": [ 2, 6 ], "scale_num": [ 0.3, 0.6 ], "max": 10, "type": "bone" }, { "drop": "sweetbread", "base_num": [ 3, 4 ], "scale_num": [ 0.4, 0.6 ], "max": 8, "type": "offal" }, - { "drop": "fat", "base_num": [ 5, 8 ], "scale_num": [ 0.6, 0.8 ], "max": 18, "type": "flesh" } + { "drop": "mutant_fat", "base_num": [ 5, 8 ], "scale_num": [ 0.6, 0.8 ], "max": 18, "type": "flesh" } ] }, { @@ -421,8 +421,8 @@ "id": "arachnid_acid", "type": "harvest", "entries": [ - { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, - { "drop": "fat", "type": "flesh", "mass_ratio": 0.04 }, + { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 }, + { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, { "drop": "acidchitin_piece", "type": "bone", "mass_ratio": 0.1 } ] @@ -535,7 +535,7 @@ { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, - { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.01 } + { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.01 } ] }, { @@ -547,7 +547,7 @@ { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, - { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.01 } + { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.01 } ] }, { diff --git a/data/json/item_actions.json b/data/json/item_actions.json index e5f96e95a57fe..6ef8357bfa6c1 100644 --- a/data/json/item_actions.json +++ b/data/json/item_actions.json @@ -84,11 +84,6 @@ "id": "HOTPLATE", "name": "Heat up food (with it)" }, - { - "type": "item_action", - "id": "MISC_REPAIR", - "name": "Repair wood/paper/bone/chitin" - }, { "type": "item_action", "id": "TOOLMOD_ATTACH", @@ -299,6 +294,11 @@ "id": "BLECH", "name": "Drink" }, + { + "type": "item_action", + "id": "BLECH_BECAUSE_UNCLEAN", + "name": "Drink" + }, { "type": "item_action", "id": "C4", @@ -1024,6 +1024,11 @@ "id": "place_monster", "name": "Activate" }, + { + "type": "item_action", + "id": "place_npc", + "name": "Activate" + }, { "type": "item_action", "id": "place_trap", diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index aa011cf9667f9..34b11cd597c70 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -607,5 +607,65 @@ { "item": "seasoning_italian", "prob": 65 }, { "item": "seasoning_salt", "prob": 65 } ] + }, + { + "id": "SUS_bathroom_sink", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This group is for a bathroom sink.", + "subtype": "collection", + "entries": [ + { "item": "soap_holder", "prob": 40 }, + { "item": "soap", "count": [ 1, 4 ], "prob": 90 }, + { "item": "razor_shaving", "count": [ 1, 2 ], "prob": 20 }, + { "item": "bleach", "prob": 15 }, + { "item": "ammonia", "prob": 20 }, + { "item": "toothbrush_plain", "count": [ 1, 3 ], "prob": 45 } + ] + }, + { + "id": "SUS_hair_drawer", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This group is for a drawer for haircare tools.", + "subtype": "collection", + "entries": [ + { "item": "hairbrush", "count": [ 1, 2 ], "prob": 90 }, + { "item": "comb_pocket", "count": [ 1, 2 ], "prob": 75 }, + { "item": "curler_hair", "prob": 25 }, + { "item": "hair_dryer", "prob": 60 }, + { "item": "curling_iron", "prob": 20 } + ] + }, + { + "id": "SUS_toilet", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This group is for things you often find stored on or next to a toilet.", + "subtype": "collection", + "entries": [ + { "distribution": [ { "item": "plunger_toilet", "prob": 90 }, { "item": "plunger_futuristic", "prob": 10 } ] }, + { "item": "brush_toilet", "prob": 75 }, + { "item": "toilet_paper", "prob": 80 } + ] + }, + { + "id": "SUS_bathroom_cabinet", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This group is for a bathroom cabinet.", + "subtype": "collection", + "entries": [ + { "item": "soap", "count": [ 1, 4 ], "prob": 70 }, + { + "distribution": [ { "item": "razor_shaving", "count": [ 1, 2 ], "prob": 50 }, { "item": "shavingkit", "prob": 50 } ], + "prob": 75 + }, + { "item": "mirror", "prob": 25 }, + { "item": "string_floss", "count": [ 1, 2 ], "prob": 60 }, + { "item": "sponge", "count": [ 1, 3 ], "prob": 75 }, + { "collection": [ { "item": "candle", "count": [ 1, 2 ] }, { "item": "matches" } ], "prob": 20 }, + { "item": "toilet_paper", "prob": 80 } + ] } ] diff --git a/data/json/itemgroups/SUS/evac_shelter.json b/data/json/itemgroups/SUS/evac_shelter.json index bd7f9d562f9e9..67739a044b844 100644 --- a/data/json/itemgroups/SUS/evac_shelter.json +++ b/data/json/itemgroups/SUS/evac_shelter.json @@ -3,7 +3,7 @@ "id": "SUS_evac_shelter_locker", "type": "item_group", "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", - "//2": "Each locker contains by spec one jacket, one blanket, one gas mask, a flashlight, a plastic bowl and utensils, a lighter, and two bottles of water. Not every locker is fully stocked.", + "//2": "Each locker contains by spec one jacket, one blanket, one gas mask, a flashlight, a whistle, a plastic bowl and utensils, a lighter, and two bottles of water. Not every locker is fully stocked.", "subtype": "collection", "entries": [ { "item": "evac_pamphlet", "prob": 99 }, @@ -13,6 +13,7 @@ { "item": "flashlight", "prob": 50 }, { "item": "light_disposable_cell", "prob": 10 }, { "item": "lighter", "prob": 20 }, + { "item": "whistle", "prob": 70 }, { "item": "water_clean", "count": [ 1, 2 ], "prob": 80 }, { "item": "protein_bar_evac", "count": [ 2, 3 ] }, { @@ -83,7 +84,8 @@ { "item": "1st_aid", "count": [ 1, 3 ], "prob": 65 }, { "item": "two_way_radio", "prob": 65 }, { "item": "light_disposable_cell", "count": [ 2, 4 ], "prob": 65 }, - { "item": "electric_lantern", "prob": 35 } + { "item": "electric_lantern", "prob": 35 }, + { "item": "barometer", "prob": 8 } ], "prob": 10 }, @@ -92,7 +94,8 @@ { "item": "detergent", "count": [ 0, 2 ] }, { "item": "brush", "prob": 85 }, { "item": "bleach", "prob": 45 }, - { "item": "ammonia", "prob": 15 } + { "item": "ammonia", "prob": 15 }, + { "item": "vinegar", "prob": 10 } ], "prob": 15 }, @@ -121,6 +124,7 @@ "distribution": [ { "collection": [ + { "item": "folding_poncho", "count": [ 1, 10 ], "prob": 60 }, { "item": "emer_blanket", "count": [ 1, 10 ], "prob": 60 }, { "item": "jacket_evac", "count": [ 1, 10 ], "prob": 50 } ], @@ -139,7 +143,8 @@ { "item": "extinguisher", "prob": 50 }, { "item": "1st_aid", "prob": 5 }, { "item": "two_way_radio", "prob": 25 }, - { "item": "electric_lantern", "prob": 5 } + { "item": "electric_lantern", "prob": 5 }, + { "item": "wearable_light", "prob": 5 } ], "prob": 10 }, @@ -163,6 +168,7 @@ { "item": "box_small", "prob": 5 }, { "item": "bag_plastic", "prob": 5 }, { "item": "bowl_plastic", "prob": 5 }, + { "item": "vitamins", "prob": 5 }, { "item": "can_food_unsealed", "count": [ 1, 30 ], "prob": 90 }, { "item": "can_opener", "prob": 90 } ], @@ -184,6 +190,7 @@ { "item": "brush", "prob": 90 }, { "item": "bleach", "prob": 45 }, { "item": "ammonia", "prob": 25 }, + { "item": "mirror", "prob": 12 }, { "item": "1st_aid", "prob": 60 }, { "item": "paper", "count": [ 1, 3 ] }, { "item": "evac_pamphlet", "prob": 10 } diff --git a/data/json/itemgroups/SUS/garage.json b/data/json/itemgroups/SUS/garage.json new file mode 100644 index 0000000000000..c00aa5f661177 --- /dev/null +++ b/data/json/itemgroups/SUS/garage.json @@ -0,0 +1,28 @@ +[ + { + "id": "SUS_welding_gear", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This group is for a rack of welding gear.", + "subtype": "collection", + "entries": [ + { + "distribution": [ + { + "collection": [ + { "item": "oxy_torch" }, + { "item": "weldtank", "count": [ 1, 3 ], "prob": 80 }, + { "item": "tinyweldtank", "count": [ 1, 3 ], "prob": 60 } + ], + "prob": 30 + }, + { + "collection": [ { "item": "welder" }, { "item": "medium_plus_battery_cell", "count": [ 1, 3 ], "prob": 80 } ], + "prob": 70 + } + ] + }, + { "distribution": [ { "item": "welding_mask", "prob": 70 }, { "item": "goggles_welding", "prob": 70 } ] } + ] + } +] diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index 5a7b6381a3ed5..15d24bf031e2e 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -94,14 +94,20 @@ "items": [ { "group": "clothing_soldier_shirt" }, { "item": "jacket_army" }, + { "item": "elbow_pads", "prob": 10 }, { "item": "pants_army" }, + { "item": "knee_pads", "prob": 85 }, { "item": "boots_combat" }, - { "item": "helmet_army", "prob": 20 }, - { "item": "gloves_tactical", "prob": 10 }, - { "item": "elbow_pads", "prob": 10 }, + { "item": "helmet_army", "prob": 80 }, + { "item": "gloves_tactical", "prob": 60 }, { "group": "clothing_tactical_leg", "prob": 15 }, { "group": "clothing_tactical_torso", "prob": 15 }, - { "group": "underwear" }, + { + "distribution": [ + { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] }, + { "distribution": [ { "item": "briefs" }, { "item": "boxer_briefs" }, { "item": "boxer_shorts" } ] } + ] + }, { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] }, { "distribution": [ @@ -123,14 +129,20 @@ "items": [ { "group": "clothing_soldier_shirt" }, { "item": "winter_jacket_army" }, + { "item": "elbow_pads", "prob": 10 }, { "item": "winter_pants_army" }, + { "item": "knee_pads", "prob": 85 }, { "item": "boots_combat" }, - { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 20 }, - { "collection": [ { "item": "gloves_liner" }, { "item": "winter_gloves_army" } ], "prob": 40 }, - { "item": "elbow_pads", "prob": 10 }, + { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 80 }, + { "collection": [ { "item": "gloves_liner" }, { "item": "winter_gloves_army" } ], "prob": 80 }, { "group": "clothing_tactical_leg", "prob": 15 }, { "group": "clothing_tactical_torso", "prob": 15 }, - { "group": "underwear" }, + { + "distribution": [ + { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] }, + { "distribution": [ { "item": "briefs" }, { "item": "boxer_briefs" }, { "item": "boxer_shorts" } ] } + ] + }, { "distribution": [ { "item": "socks", "prob": 10 }, { "item": "socks_wool", "prob": 90 } ] }, { "distribution": [ @@ -259,7 +271,7 @@ "id": "clothing_tactical_leg", "type": "item_group", "//": "Tactical gear that can be strapped to the legs", - "items": [ [ "knee_pads", 100 ], [ "legpouch_large", 100 ], [ "legrig", 100 ] ] + "items": [ [ "legpouch_large", 100 ], [ "legrig", 100 ] ] }, { "id": "clothing_tactical_torso", @@ -516,7 +528,404 @@ [ "jade_brooch", 80 ], [ "pearl_collar", 50 ], [ "silver_bracelet", 30 ], - [ "gold_bracelet", 20 ] + [ "gold_bracelet", 20 ], + { "group": "earrings_silver", "prob": 10 }, + { "group": "earrings_gold", "prob": 10 }, + { "group": "earrings_platinum", "prob": 10 } + ] + }, + { + "id": "cufflinks_silver", + "type": "item_group", + "items": [ + [ "cufflinks", 50 ], + [ "cufflinks_intricate", 50 ], + [ "citrine_silver_cufflinks", 50 ], + [ "diamond_silver_cufflinks", 50 ], + [ "emerald_silver_cufflinks", 50 ], + [ "peridot_silver_cufflinks", 50 ], + [ "amethyst_silver_cufflinks", 50 ], + [ "sapphire_silver_cufflinks", 50 ], + [ "aquamarine_silver_cufflinks", 50 ], + [ "blue_topaz_silver_cufflinks", 50 ], + [ "tourmaline_silver_cufflinks", 50 ], + [ "alexandrite_silver_cufflinks", 50 ], + [ "pearl_silver_cufflinks", 50 ], + [ "opal_silver_cufflinks", 50 ], + [ "ruby_silver_cufflinks", 50 ], + [ "garnet_silver_cufflinks", 50 ] + ] + }, + { + "id": "cufflinks_gold", + "type": "item_group", + "items": [ + [ "citrine_gold_cufflinks", 50 ], + [ "diamond_gold_cufflinks", 50 ], + [ "emerald_gold_cufflinks", 50 ], + [ "peridot_gold_cufflinks", 50 ], + [ "amethyst_gold_cufflinks", 50 ], + [ "sapphire_gold_cufflinks", 50 ], + [ "aquamarine_gold_cufflinks", 50 ], + [ "blue_topaz_gold_cufflinks", 50 ], + [ "tourmaline_gold_cufflinks", 50 ], + [ "alexandrite_gold_cufflinks", 50 ], + [ "pearl_gold_cufflinks", 50 ], + [ "opal_gold_cufflinks", 50 ], + [ "ruby_gold_cufflinks", 50 ], + [ "garnet_gold_cufflinks", 50 ] + ] + }, + { + "id": "cufflinks_platinum", + "type": "item_group", + "items": [ + [ "citrine_platinum_cufflinks", 50 ], + [ "diamond_platinum_cufflinks", 50 ], + [ "emerald_platinum_cufflinks", 50 ], + [ "peridot_platinum_cufflinks", 50 ], + [ "amethyst_platinum_cufflinks", 50 ], + [ "sapphire_platinum_cufflinks", 50 ], + [ "aquamarine_platinum_cufflinks", 50 ], + [ "blue_topaz_platinum_cufflinks", 50 ], + [ "tourmaline_platinum_cufflinks", 50 ], + [ "alexandrite_platinum_cufflinks", 50 ], + [ "pearl_platinum_cufflinks", 50 ], + [ "opal_platinum_cufflinks", 50 ], + [ "ruby_platinum_cufflinks", 50 ], + [ "garnet_platinum_cufflinks", 50 ] + ] + }, + { + "id": "dental_grills", + "type": "item_group", + "items": [ + [ "gold_dental_grill", 50 ], + [ "platinum_dental_grill", 50 ], + [ "citrine_dental_grill", 50 ], + [ "diamond_dental_grill", 50 ], + [ "emerald_dental_grill", 50 ], + [ "peridot_dental_grill", 50 ], + [ "amethyst_dental_grill", 50 ], + [ "sapphire_dental_grill", 50 ], + [ "aquamarine_dental_grill", 50 ], + [ "blue_topaz_dental_grill", 50 ], + [ "tourmaline_dental_grill", 50 ], + [ "alexandrite_dental_grill", 50 ], + [ "ruby_dental_grill", 50 ], + [ "garnet_dental_grill", 50 ] + ] + }, + { + "id": "tiaras_silver", + "type": "item_group", + "items": [ + [ "citrine_silver_tiara", 50 ], + [ "diamond_silver_tiara", 50 ], + [ "emerald_silver_tiara", 50 ], + [ "peridot_silver_tiara", 50 ], + [ "amethyst_silver_tiara", 50 ], + [ "sapphire_silver_tiara", 50 ], + [ "aquamarine_silver_tiara", 50 ], + [ "blue_topaz_silver_tiara", 50 ], + [ "tourmaline_silver_tiara", 50 ], + [ "alexandrite_silver_tiara", 50 ], + [ "pearl_silver_tiara", 50 ], + [ "opal_silver_tiara", 50 ], + [ "ruby_silver_tiara", 50 ], + [ "garnet_silver_tiara", 50 ] + ] + }, + { + "id": "tiaras_gold", + "type": "item_group", + "items": [ + [ "citrine_gold_tiara", 50 ], + [ "diamond_gold_tiara", 50 ], + [ "emerald_gold_tiara", 50 ], + [ "peridot_gold_tiara", 50 ], + [ "amethyst_gold_tiara", 50 ], + [ "sapphire_gold_tiara", 50 ], + [ "aquamarine_gold_tiara", 50 ], + [ "blue_topaz_gold_tiara", 50 ], + [ "tourmaline_gold_tiara", 50 ], + [ "alexandrite_gold_tiara", 50 ], + [ "pearl_gold_tiara", 50 ], + [ "opal_gold_tiara", 50 ], + [ "ruby_gold_tiara", 50 ], + [ "garnet_gold_tiara", 50 ] + ] + }, + { + "id": "tiaras_platinum", + "type": "item_group", + "items": [ + [ "citrine_platinum_tiara", 50 ], + [ "diamond_platinum_tiara", 50 ], + [ "emerald_platinum_tiara", 50 ], + [ "peridot_platinum_tiara", 50 ], + [ "amethyst_platinum_tiara", 50 ], + [ "sapphire_platinum_tiara", 50 ], + [ "aquamarine_platinum_tiara", 50 ], + [ "blue_topaz_platinum_tiara", 50 ], + [ "tourmaline_platinum_tiara", 50 ], + [ "alexandrite_platinum_tiara", 50 ], + [ "pearl_platinum_tiara", 50 ], + [ "opal_platinum_tiara", 50 ], + [ "ruby_platinum_tiara", 50 ], + [ "garnet_platinum_tiara", 50 ] + ] + }, + { + "id": "pendant_necklaces_silver", + "type": "item_group", + "items": [ + [ "silver_necklace", 50 ], + [ "citrine_silver_pendant_necklace", 50 ], + [ "diamond_silver_pendant_necklace", 50 ], + [ "emerald_silver_pendant_necklace", 50 ], + [ "peridot_silver_pendant_necklace", 50 ], + [ "amethyst_silver_pendant_necklace", 50 ], + [ "sapphire_silver_pendant_necklace", 50 ], + [ "aquamarine_silver_pendant_necklace", 50 ], + [ "blue_topaz_silver_pendant_necklace", 50 ], + [ "tourmaline_silver_pendant_necklace", 50 ], + [ "alexandrite_silver_pendant_necklace", 50 ], + [ "pearl_silver_pendant_necklace", 50 ], + [ "opal_silver_pendant_necklace", 50 ], + [ "ruby_silver_pendant_necklace", 50 ], + [ "garnet_silver_pendant_necklace", 50 ] + ] + }, + { + "id": "pendant_necklaces_gold", + "type": "item_group", + "items": [ + [ "gold_necklace", 50 ], + [ "citrine_gold_pendant_necklace", 50 ], + [ "diamond_gold_pendant_necklace", 50 ], + [ "emerald_gold_pendant_necklace", 50 ], + [ "peridot_gold_pendant_necklace", 50 ], + [ "amethyst_gold_pendant_necklace", 50 ], + [ "sapphire_gold_pendant_necklace", 50 ], + [ "aquamarine_gold_pendant_necklace", 50 ], + [ "blue_topaz_gold_pendant_necklace", 50 ], + [ "tourmaline_gold_pendant_necklace", 50 ], + [ "alexandrite_gold_pendant_necklace", 50 ], + [ "pearl_gold_pendant_necklace", 50 ], + [ "opal_gold_pendant_necklace", 50 ], + [ "ruby_gold_pendant_necklace", 50 ], + [ "garnet_gold_pendant_necklace", 50 ] + ] + }, + { + "id": "pendant_necklaces_platinum", + "type": "item_group", + "items": [ + [ "platinum_necklace", 50 ], + [ "citrine_platinum_pendant_necklace", 50 ], + [ "diamond_platinum_pendant_necklace", 50 ], + [ "emerald_platinum_pendant_necklace", 50 ], + [ "peridot_platinum_pendant_necklace", 50 ], + [ "amethyst_platinum_pendant_necklace", 50 ], + [ "sapphire_platinum_pendant_necklace", 50 ], + [ "aquamarine_platinum_pendant_necklace", 50 ], + [ "blue_topaz_platinum_pendant_necklace", 50 ], + [ "tourmaline_platinum_pendant_necklace", 50 ], + [ "alexandrite_platinum_pendant_necklace", 50 ], + [ "pearl_platinum_pendant_necklace", 50 ], + [ "opal_platinum_pendant_necklace", 50 ], + [ "ruby_platinum_pendant_necklace", 50 ], + [ "garnet_platinum_pendant_necklace", 50 ] + ] + }, + { + "id": "earrings_silver", + "type": "item_group", + "items": [ + [ "silver_ear", 50 ], + [ "citrine_silver_earring", 50 ], + [ "diamond_silver_earring", 50 ], + [ "emerald_silver_earring", 50 ], + [ "peridot_silver_earring", 50 ], + [ "amethyst_silver_earring", 50 ], + [ "sapphire_silver_earring", 50 ], + [ "aquamarine_silver_earring", 50 ], + [ "blue_topaz_silver_earring", 50 ], + [ "tourmaline_silver_earring", 50 ], + [ "alexandrite_silver_earring", 50 ], + [ "pearl_silver_earring", 50 ], + [ "opal_silver_earring", 50 ], + [ "ruby_silver_earring", 50 ], + [ "garnet_silver_earring", 50 ] + ] + }, + { + "id": "earrings_gold", + "type": "item_group", + "items": [ + [ "gold_ear", 50 ], + [ "citrine_gold_earring", 50 ], + [ "diamond_gold_earring", 50 ], + [ "emerald_gold_earring", 50 ], + [ "peridot_gold_earring", 50 ], + [ "amethyst_gold_earring", 50 ], + [ "sapphire_gold_earring", 50 ], + [ "aquamarine_gold_earring", 50 ], + [ "blue_topaz_gold_earring", 50 ], + [ "tourmaline_gold_earring", 50 ], + [ "alexandrite_gold_earring", 50 ], + [ "pearl_gold_earring", 50 ], + [ "opal_gold_earring", 50 ], + [ "ruby_gold_earring", 50 ], + [ "garnet_gold_earring", 50 ] + ] + }, + { + "id": "earrings_platinum", + "type": "item_group", + "items": [ + [ "platinum_ear", 50 ], + [ "citrine_platinum_earring", 50 ], + [ "diamond_platinum_earring", 50 ], + [ "emerald_platinum_earring", 50 ], + [ "peridot_platinum_earring", 50 ], + [ "amethyst_platinum_earring", 50 ], + [ "sapphire_platinum_earring", 50 ], + [ "aquamarine_platinum_earring", 50 ], + [ "blue_topaz_platinum_earring", 50 ], + [ "tourmaline_platinum_earring", 50 ], + [ "alexandrite_platinum_earring", 50 ], + [ "pearl_platinum_earring", 50 ], + [ "opal_platinum_earring", 50 ], + [ "ruby_platinum_earring", 50 ], + [ "garnet_platinum_earring", 50 ] + ] + }, + { + "id": "rings_silver", + "type": "item_group", + "items": [ + [ "silver_ring", 50 ], + [ "citrine_silver_ring", 50 ], + [ "diamond_silver_ring", 50 ], + [ "emerald_silver_ring", 50 ], + [ "peridot_silver_ring", 50 ], + [ "amethyst_silver_ring", 50 ], + [ "sapphire_silver_ring", 50 ], + [ "aquamarine_silver_ring", 50 ], + [ "blue_topaz_silver_ring", 50 ], + [ "tourmaline_silver_ring", 50 ], + [ "alexandrite_silver_ring", 50 ], + [ "pearl_silver_ring", 50 ], + [ "opal_silver_ring", 50 ], + [ "ruby_silver_ring", 50 ], + [ "garnet_silver_ring", 50 ] + ] + }, + { + "id": "rings_gold", + "type": "item_group", + "items": [ + [ "gold_ring", 50 ], + [ "citrine_gold_ring", 50 ], + [ "diamond_ring", 50 ], + [ "emerald_gold_ring", 50 ], + [ "peridot_gold_ring", 50 ], + [ "amethyst_gold_ring", 50 ], + [ "sapphire_gold_ring", 50 ], + [ "aquamarine_gold_ring", 50 ], + [ "blue_topaz_gold_ring", 50 ], + [ "tourmaline_gold_ring", 50 ], + [ "alexandrite_gold_ring", 50 ], + [ "pearl_gold_ring", 50 ], + [ "opal_gold_ring", 50 ], + [ "ruby_gold_ring", 50 ], + [ "garnet_gold_ring", 50 ] + ] + }, + { + "id": "rings_platinum", + "type": "item_group", + "items": [ + [ "platinum_ring", 50 ], + [ "citrine_platinum_ring", 50 ], + [ "diamond_platinum_ring", 50 ], + [ "emerald_platinum_ring", 50 ], + [ "peridot_platinum_ring", 50 ], + [ "amethyst_platinum_ring", 50 ], + [ "sapphire_platinum_ring", 50 ], + [ "aquamarine_platinum_ring", 50 ], + [ "blue_topaz_platinum_ring", 50 ], + [ "tourmaline_platinum_ring", 50 ], + [ "alexandrite_platinum_ring", 50 ], + [ "pearl_platinum_ring", 50 ], + [ "opal_platinum_ring", 50 ], + [ "ruby_platinum_ring", 50 ], + [ "garnet_platinum_ring", 50 ] + ] + }, + { + "id": "bracelets_silver", + "type": "item_group", + "items": [ + [ "silver_bracelet", 50 ], + [ "citrine_silver_bracelet", 50 ], + [ "diamond_silver_bracelet", 50 ], + [ "emerald_silver_bracelet", 50 ], + [ "peridot_silver_bracelet", 50 ], + [ "amethyst_silver_bracelet", 50 ], + [ "sapphire_silver_bracelet", 50 ], + [ "aquamarine_silver_bracelet", 50 ], + [ "blue_topaz_silver_bracelet", 50 ], + [ "tourmaline_silver_bracelet", 50 ], + [ "alexandrite_silver_bracelet", 50 ], + [ "pearl_silver_bracelet", 50 ], + [ "opal_silver_bracelet", 50 ], + [ "ruby_silver_bracelet", 50 ], + [ "garnet_silver_bracelet", 50 ] + ] + }, + { + "id": "bracelets_gold", + "type": "item_group", + "items": [ + [ "gold_bracelet", 50 ], + [ "citrine_gold_bracelet", 50 ], + [ "diamond_gold_bracelet", 50 ], + [ "emerald_gold_bracelet", 50 ], + [ "peridot_gold_bracelet", 50 ], + [ "amethyst_gold_bracelet", 50 ], + [ "sapphire_gold_bracelet", 50 ], + [ "aquamarine_gold_bracelet", 50 ], + [ "blue_topaz_gold_bracelet", 50 ], + [ "tourmaline_gold_bracelet", 50 ], + [ "alexandrite_gold_bracelet", 50 ], + [ "pearl_gold_bracelet", 50 ], + [ "opal_gold_bracelet", 50 ], + [ "ruby_gold_bracelet", 50 ], + [ "garnet_gold_bracelet", 50 ] + ] + }, + { + "id": "bracelets_platinum", + "type": "item_group", + "items": [ + [ "platinum_bracelet", 50 ], + [ "citrine_platinum_bracelet", 50 ], + [ "diamond_platinum_bracelet", 50 ], + [ "emerald_platinum_bracelet", 50 ], + [ "peridot_platinum_bracelet", 50 ], + [ "amethyst_platinum_bracelet", 50 ], + [ "sapphire_platinum_bracelet", 50 ], + [ "aquamarine_platinum_bracelet", 50 ], + [ "blue_topaz_platinum_bracelet", 50 ], + [ "tourmaline_platinum_bracelet", 50 ], + [ "alexandrite_platinum_bracelet", 50 ], + [ "pearl_platinum_bracelet", 50 ], + [ "opal_platinum_bracelet", 50 ], + [ "ruby_platinum_bracelet", 50 ], + [ "garnet_platinum_bracelet", 50 ] ] }, { @@ -709,6 +1118,7 @@ [ "snuggie", 5 ], [ "flyer", 10 ], [ "socks", 70 ], + [ "socks_ankle", 50 ], [ "socks_wool", 30 ], [ "pocketwatch", 5 ], [ "flask_hip", 2 ], @@ -754,6 +1164,7 @@ "items": [ [ "sneakers", 80 ], [ "socks", 70 ], + [ "socks_ankle", 50 ], [ "tights", 20 ], [ "stockings", 20 ], [ "knee_high_boots", 20 ], @@ -1041,7 +1452,7 @@ { "type": "item_group", "id": "shoestore_accessories", - "items": [ [ "socks", 100 ], [ "thermal_socks", 25 ], [ "socks_wool", 50 ], [ "string_36", 200 ] ] + "items": [ [ "socks", 100 ], [ "socks_ankle", 75 ], [ "thermal_socks", 25 ], [ "socks_wool", 50 ], [ "string_36", 200 ] ] }, { "type": "item_group", @@ -1945,26 +2356,6 @@ [ "survnote", 30 ] ] }, - { - "type": "item_group", - "id": "bio_op_face", - "items": [ [ "glasses_bal", 40 ], [ "mask_filter", 30 ], [ "mask_bal", 30 ], [ "mask_gas", 40 ] ] - }, - { - "type": "item_group", - "id": "bio_op_torso", - "items": [ [ "dragonskin", 50 ], [ "winter_jacket_army", 10 ], [ "modularvestceramic", 40 ], [ "modularvestkevlar", 20 ] ] - }, - { - "type": "item_group", - "id": "bio_op_boots", - "items": [ [ "boots_combat", 1 ] ] - }, - { - "type": "item_group", - "id": "bio_op_gloves", - "items": [ [ "gloves_tactical", 60 ], [ "gloves_fingerless", 40 ], [ "winter_gloves_army", 40 ] ] - }, { "type": "item_group", "id": "museum_armor", @@ -2165,6 +2556,7 @@ [ "boy_shorts", 25 ], [ "bra", 25 ], [ "socks", 45 ], + [ "socks_ankle", 30 ], [ "stockings", 20 ], [ "hat_cotton", 35 ], [ "copper_bracelet", 10 ], @@ -2364,7 +2756,12 @@ "type": "item_group", "//": "unisex socks", "subtype": "distribution", - "items": [ { "item": "socks", "prob": 70 }, { "item": "socks_wool", "prob": 30 }, { "item": "thermal_socks", "prob": 10 } ] + "items": [ + { "item": "socks", "prob": 70 }, + { "item": "socks_ankle", "prob": 50 }, + { "item": "socks_wool", "prob": 30 }, + { "item": "thermal_socks", "prob": 10 } + ] }, { "id": "scarfs_unisex", @@ -2831,6 +3228,127 @@ "subtype": "distribution", "items": [ { "item": "heels", "prob": 100 } ] }, + { + "id": "accessory_ring", + "type": "item_group", + "//": "decorative finger rings worn by people.", + "subtype": "distribution", + "items": [ + { "item": "ring_wedding", "prob": 50, "count": [ 1, 2 ] }, + { "item": "copper_ring", "prob": 80, "count": [ 1, 3 ] }, + { "item": "silver_ring", "prob": 50, "count": [ 1, 3 ] }, + { "item": "gold_ring", "prob": 40, "count": [ 1, 3 ] }, + { "item": "diamond_ring", "prob": 10 }, + { "item": "platinum_ring", "prob": 10 } + ] + }, + { + "id": "accessory_earring", + "type": "item_group", + "//": "decorative earrings and miscellaneous ear accessories worn by people.", + "subtype": "distribution", + "items": [ + { "group": "earrings_silver", "prob": 70 }, + { "group": "earrings_gold", "prob": 25 }, + { "group": "earrings_platinum", "prob": 5 } + ] + }, + { + "id": "accessory_bracelet", + "type": "item_group", + "//": "decorative bracelets worn by people.", + "subtype": "distribution", + "items": [ + { "item": "bead_bracelet", "prob": 80, "count": [ 1, 2 ] }, + { "item": "bracelet_friendship", "prob": 60, "count": [ 1, 2 ] }, + { "item": "copper_bracelet", "prob": 50, "count": [ 1, 2 ] }, + { "item": "silver_bracelet", "prob": 40, "count": [ 1, 2 ] }, + { "item": "gold_bracelet", "prob": 10, "count": [ 1, 2 ] }, + { "item": "platinum_bracelet", "prob": 10 } + ] + }, + { + "id": "accessory_teeth", + "type": "item_group", + "//": "decorative or functional teeth miscellany that may be present in people's mouths.", + "subtype": "distribution", + "items": [ + { "item": "gold_dental_grill", "prob": 50, "count": [ 1, 2 ] }, + { "item": "platinum_dental_grill", "prob": 30, "count": [ 1, 2 ] }, + { "item": "diamond_dental_grill", "prob": 10 } + ] + }, + { + "id": "accessory_necklace", + "type": "item_group", + "//": "decorative necklaces or neck accessories worn by people.", + "subtype": "distribution", + "items": [ + { "item": "bead_necklace", "prob": 80, "count": [ 1, 2 ] }, + { "item": "copper_necklace", "prob": 60, "count": [ 1, 2 ] }, + { "item": "silver_necklace", "prob": 40, "count": [ 1, 2 ] }, + { "item": "gold_necklace", "prob": 20, "count": [ 1, 2 ] }, + { "item": "platinum_necklace", "prob": 10, "count": [ 1, 2 ] }, + { "item": "copper_locket", "prob": 60, "count": [ 1, 2 ] }, + { "item": "silver_locket", "prob": 40, "count": [ 1, 2 ] }, + { "item": "gold_locket", "prob": 20, "count": [ 1, 2 ] }, + { "item": "platinum_locket", "prob": 10, "count": [ 1, 2 ] }, + { "item": "collarpin", "prob": 10 }, + { "item": "bronze_medal", "prob": 6 }, + { "item": "silver_medal", "prob": 4 }, + { "item": "gold_medal", "prob": 2 }, + { "item": "small_relic", "prob": 10 }, + { "item": "holy_symbol", "prob": 10 }, + { "item": "holy_symbol_wood", "prob": 10 } + ] + }, + { + "id": "accessory_cat", + "type": "item_group", + "//": "accessories that some say were the cause of the cataclysm.", + "subtype": "distribution", + "items": [ + { "item": "faux_fur_cat_ears", "prob": 80 }, + { "item": "leather_cat_ears", "prob": 50 }, + { "item": "fur_cat_ears", "prob": 10 }, + { "item": "faux_fur_cat_tail", "prob": 80 }, + { "item": "leather_cat_tail", "prob": 50 }, + { "item": "fur_cat_tail", "prob": 10 }, + { "item": "faux_fur_collar", "prob": 80 }, + { "item": "leather_collar", "prob": 50 }, + { "item": "fur_collar", "prob": 10 } + ] + }, + { + "id": "accessory_weaponcarry", + "type": "item_group", + "//": "clothing designed to hold a small weapon worn by people.", + "subtype": "distribution", + "items": [ + { "item": "bootstrap", "prob": 20 }, + { "item": "bootsheath", "prob": 50 }, + { "item": "sheath", "prob": 80 }, + { "item": "back_holster", "prob": 10 }, + { "item": "holster", "prob": 30 }, + { "item": "sholster", "prob": 10 }, + { "item": "bholster", "prob": 10 } + ] + }, + { + "id": "accessory_sportsgear", + "type": "item_group", + "//": "assorted sportsgear worn by people.", + "subtype": "distribution", + "items": [ + { "item": "elbow_pads", "prob": 50 }, + { "item": "knee_pads", "prob": 50 }, + { "item": "iggaak", "prob": 5 }, + { "item": "goggles_swim", "prob": 10 }, + { "item": "glasses_bal", "prob": 10 }, + { "item": "eclipse_glasses", "prob": 5 }, + { "item": "goggles_ski", "prob": 10 } + ] + }, { "id": "accesories_personal_unisex", "type": "item_group", @@ -2839,107 +3357,14 @@ "items": [ { "group": "clothing_glasses", "prob": 10 }, { "group": "clothing_watch", "prob": 10 }, - { - "distribution": [ - { "item": "ring_wedding", "prob": 50, "count": [ 1, 2 ] }, - { "item": "copper_ring", "prob": 80, "count": [ 1, 3 ] }, - { "item": "silver_ring", "prob": 50, "count": [ 1, 3 ] }, - { "item": "gold_ring", "prob": 40, "count": [ 1, 3 ] }, - { "item": "diamond_ring", "prob": 10 }, - { "item": "platinum_ring", "prob": 10 } - ], - "prob": 15 - }, - { - "distribution": [ - { "item": "ear_spool", "prob": 20, "count": [ 1, 2 ] }, - { "item": "bead_ear", "prob": 70, "count": [ 1, 2 ] }, - { "item": "copper_ear", "prob": 60, "count": [ 1, 2 ] }, - { "item": "silver_ear", "prob": 40, "count": [ 1, 2 ] }, - { "item": "gold_ear", "prob": 40, "count": [ 1, 2 ] }, - { "item": "platinum_ear", "prob": 10 }, - { "item": "ear_plugs", "prob": 40 }, - { "item": "attached_ear_plugs_off", "prob": 30 } - ] - }, - { - "distribution": [ - { "item": "bead_bracelet", "prob": 80, "count": [ 1, 2 ] }, - { "item": "bracelet_friendship", "prob": 60, "count": [ 1, 2 ] }, - { "item": "copper_bracelet", "prob": 50, "count": [ 1, 2 ] }, - { "item": "silver_bracelet", "prob": 40, "count": [ 1, 2 ] }, - { "item": "gold_bracelet", "prob": 10, "count": [ 1, 2 ] }, - { "item": "platinum_bracelet", "prob": 10 } - ], - "prob": 15 - }, - { - "distribution": [ - { "item": "gold_dental_grill", "prob": 50, "count": [ 1, 2 ] }, - { "item": "platinum_dental_grill", "prob": 30, "count": [ 1, 2 ] }, - { "item": "diamond_dental_grill", "prob": 10 } - ], - "prob": 15 - }, - { - "distribution": [ - { "item": "bead_necklace", "prob": 80, "count": [ 1, 2 ] }, - { "item": "copper_necklace", "prob": 60, "count": [ 1, 2 ] }, - { "item": "silver_necklace", "prob": 40, "count": [ 1, 2 ] }, - { "item": "gold_necklace", "prob": 20, "count": [ 1, 2 ] }, - { "item": "platinum_necklace", "prob": 10, "count": [ 1, 2 ] }, - { "item": "copper_locket", "prob": 60, "count": [ 1, 2 ] }, - { "item": "silver_locket", "prob": 40, "count": [ 1, 2 ] }, - { "item": "gold_locket", "prob": 20, "count": [ 1, 2 ] }, - { "item": "platinum_locket", "prob": 10, "count": [ 1, 2 ] }, - { "item": "collarpin", "prob": 10 }, - { "item": "bronze_medal", "prob": 6 }, - { "item": "silver_medal", "prob": 4 }, - { "item": "gold_medal", "prob": 2 }, - { "item": "small_relic", "prob": 10 }, - { "item": "holy_symbol", "prob": 10 }, - { "item": "holy_symbol_wood", "prob": 10 } - ], - "prob": 15 - }, - { - "distribution": [ - { "item": "faux_fur_cat_ears", "prob": 80 }, - { "item": "leather_cat_ears", "prob": 50 }, - { "item": "fur_cat_ears", "prob": 10 }, - { "item": "faux_fur_cat_tail", "prob": 80 }, - { "item": "leather_cat_tail", "prob": 50 }, - { "item": "fur_cat_tail", "prob": 10 }, - { "item": "faux_fur_collar", "prob": 80 }, - { "item": "leather_collar", "prob": 50 }, - { "item": "fur_collar", "prob": 10 } - ], - "prob": 15 - }, - { - "distribution": [ - { "item": "bootstrap", "prob": 20 }, - { "item": "bootsheath", "prob": 50 }, - { "item": "sheath", "prob": 80 }, - { "item": "back_holster", "prob": 10 }, - { "item": "holster", "prob": 30 }, - { "item": "sholster", "prob": 10 }, - { "item": "bholster", "prob": 10 } - ], - "prob": 15 - }, - { - "distribution": [ - { "item": "elbow_pads", "prob": 50 }, - { "item": "knee_pads", "prob": 50 }, - { "item": "iggaak", "prob": 5 }, - { "item": "goggles_swim", "prob": 10 }, - { "item": "glasses_bal", "prob": 10 }, - { "item": "eclipse_glasses", "prob": 5 }, - { "item": "goggles_ski", "prob": 10 } - ], - "prob": 15 - }, + { "group": "accessory_ring", "prob": 15 }, + { "group": "accessory_earring" }, + { "group": "accessory_bracelet", "prob": 15 }, + { "group": "accessory_teeth", "prob": 15 }, + { "group": "accessory_necklace", "prob": 15 }, + { "group": "accessory_cat", "prob": 15 }, + { "group": "accessory_weaponcarry", "prob": 15 }, + { "group": "accessory_sportsgear", "prob": 15 }, { "item": "folding_poncho", "prob": 10 }, { "item": "american_flag", "prob": 2 }, { "item": "tool_belt", "prob": 10 }, diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json index 55f7eb670dcd2..fda23b0c4e6e1 100644 --- a/data/json/itemgroups/food.json +++ b/data/json/itemgroups/food.json @@ -415,31 +415,139 @@ }, { "type": "item_group", - "id": "MRE", + "id": "snacks", + "items": [ + { "group": "candy_chocolate", "prob": 620 }, + { "group": "salty_snacks", "prob": 595 }, + [ "pemmican", 5 ], + [ "granola", 10 ], + [ "cookies", 80 ], + [ "tea_raw", 10 ], + [ "coffee_raw", 15 ], + [ "choco_coffee_beans", 10 ], + [ "salt", 10 ], + [ "pepper", 10 ], + [ "syrup", 10 ], + [ "coffee_syrup", 10 ], + [ "fruit_leather", 25 ], + [ "kernels", 25 ], + [ "pine_nuts", 5 ] + ] + }, + { + "type": "item_group", + "id": "snacks_fancy", + "items": [ + [ "water_mineral", 30 ], + [ "sandwich_cucumber", 25 ], + [ "juice", 20 ], + [ "granola", 15 ], + [ "mintpatties", 8 ], + [ "choco_coffee_beans", 8 ], + [ "fruit_leather", 15 ], + [ "pine_nuts", 4 ] + ] + }, + { + "type": "item_group", + "id": "fridgesnacks", + "items": [ + [ "water_clean", 90 ], + [ "water_mineral", 10 ], + [ "sandwich_deluxe", 20 ], + [ "sandwich_veggy", 30 ], + [ "sandwich_cucumber", 25 ], + [ "oj", 50 ], + [ "juice", 50 ], + [ "cranberry_juice", 50 ], + [ "sports_drink", 50 ], + [ "apple_cider", 50 ], + [ "lemonade", 50 ], + [ "energy_drink", 55 ], + [ "herbal_tea", 30 ], + [ "energy_drink_atomic", 4 ], + { "group": "softdrinks_canned", "prob": 460 }, + [ "milk", 50 ], + [ "yoghurt", 40 ], + [ "pudding", 50 ], + [ "V8", 15 ], + [ "sandwich_t", 30 ], + [ "sandwich_pb", 30 ], + [ "sandwich_pbj", 30 ], + [ "sandwich_pbh", 30 ], + [ "sandwich_pbm", 30 ], + [ "frozen_dinner", 50 ], + [ "junk_burrito", 60 ], + [ "dried_salad", 6 ], + [ "pizza_veggy", 8 ], + [ "pizza_cheese", 8 ], + [ "pizza_meat", 8 ], + [ "cheeseburger", 8 ], + [ "hamburger", 8 ], + [ "tofu_rice", 4 ], + [ "fish_fried", 8 ], + [ "fish_sandwich", 8 ], + [ "sloppyjoe", 8 ], + [ "hotdogs_frozen", 8 ], + [ "fries", 8 ], + [ "cheese_fries", 6 ], + [ "onion_rings", 8 ], + [ "bacon", 10 ], + [ "lunchmeat", 8 ], + [ "bologna", 6 ], + [ "fruit_leather", 15 ], + [ "protein_shake", 10 ], + [ "pie", 20 ], + [ "pie_veggy", 18 ], + [ "pie_meat", 18 ], + [ "pie_maple", 9 ] + ] + }, + { + "type": "item_group", + "id": "dessert", "items": [ - [ "mre_chilibeans_box", 45 ], - [ "mre_bbqbeef_box", 45 ], - [ "mre_chickennoodle_box", 45 ], - [ "mre_spaghetti_box", 45 ], - [ "mre_chicken_box", 45 ], - [ "mre_beeftaco_box", 45 ], - [ "mre_beef_box", 45 ], - [ "mre_meatball_box", 45 ], - [ "mre_beefstew_box", 45 ], - [ "mre_chilimac_box", 45 ], - [ "mre_veggy_box", 45 ], - [ "mre_macaronimarinara_box", 45 ], - [ "mre_cheesetort_box", 45 ], - [ "mre_mushroomfettuccine_box", 45 ], - [ "mre_mexicanchickenstew_box", 45 ], - [ "mre_maplesausage_box", 45 ], - [ "mre_ravioli_box", 45 ], - [ "mre_hashbrownbacon_box", 45 ], - [ "mre_lemontuna_box", 45 ], - [ "mre_asianbeef_box", 45 ], - [ "mre_chickenpesto_box", 45 ], - [ "mre_southwestbeef_box", 45 ], - [ "mre_hotdog_box", 45 ] + [ "milkshake", 15 ], + [ "milkshake_deluxe", 5 ], + [ "icecream", 10 ], + [ "icecream_candy", 8 ], + [ "icecream_custard", 4 ], + [ "icecream_sorbet", 4 ], + [ "icecream_gelato", 4 ], + [ "pie", 20 ], + [ "pie_veggy", 15 ], + [ "pie_meat", 15 ], + [ "pie_maple", 10 ] + ] + }, + { + "type": "item_group", + "id": "MRE", + "subtype": "distribution", + "entries": [ + { "item": "mre_chilibeans_box" }, + { "item": "mre_bbqbeef_box" }, + { "item": "mre_chickennoodle_box" }, + { "item": "mre_spaghetti_box" }, + { "item": "mre_chicken_box" }, + { "item": "mre_beeftaco_box" }, + { "item": "mre_beef_box" }, + { "item": "mre_meatball_box" }, + { "item": "mre_beefstew_box" }, + { "item": "mre_chilimac_box" }, + { "item": "mre_veggy_box" }, + { "item": "mre_macaronimarinara_box" }, + { "item": "mre_cheesetort_box" }, + { "item": "mre_mushroomfettuccine_box" }, + { "item": "mre_mexicanchickenstew_box" }, + { "item": "mre_maplesausage_box" }, + { "item": "mre_ravioli_box" }, + { "item": "mre_hashbrownbacon_box" }, + { "item": "mre_lemontuna_box" }, + { "item": "mre_asianbeef_box" }, + { "item": "mre_chickenpesto_box" }, + { "item": "mre_southwestbeef_box" }, + { "item": "mre_hotdog_box" } ] }, { diff --git a/data/json/itemgroups/gear.json b/data/json/itemgroups/gear.json index 96a124463f1fd..202b55dcc6f31 100644 --- a/data/json/itemgroups/gear.json +++ b/data/json/itemgroups/gear.json @@ -49,7 +49,9 @@ [ "pocket_firearms", 5 ], [ "newest_newspaper", 75 ], [ "flyer", 10 ], - [ "thermos", 5 ] + [ "thermos", 5 ], + [ "hairbrush", 25 ], + [ "comb_pocket", 50 ] ] }, { diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index fbcf51ce1d9a5..ec01d32cda91a 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -740,6 +740,7 @@ [ "tieclip", 3 ], [ "collarpin", 3 ], [ "socks", 70 ], + [ "socks_ankle", 50 ], [ "briefcase", 5 ], [ "mocassins", 5 ], [ "boots_western", 4 ], @@ -918,113 +919,6 @@ { "group": "tinware", "prob": 10 } ] }, - { - "type": "item_group", - "id": "snacks", - "items": [ - { "group": "candy_chocolate", "prob": 620 }, - { "group": "salty_snacks", "prob": 595 }, - [ "pemmican", 5 ], - [ "granola", 10 ], - [ "cookies", 80 ], - [ "tea_raw", 10 ], - [ "coffee_raw", 15 ], - [ "choco_coffee_beans", 10 ], - [ "salt", 10 ], - [ "pepper", 10 ], - [ "syrup", 10 ], - [ "coffee_syrup", 10 ], - [ "fruit_leather", 25 ], - [ "kernels", 25 ], - [ "pine_nuts", 5 ] - ] - }, - { - "type": "item_group", - "id": "snacks_fancy", - "items": [ - [ "water_mineral", 30 ], - [ "sandwich_cucumber", 25 ], - [ "juice", 20 ], - [ "granola", 15 ], - [ "mintpatties", 8 ], - [ "choco_coffee_beans", 8 ], - [ "fruit_leather", 15 ], - [ "pine_nuts", 4 ] - ] - }, - { - "type": "item_group", - "id": "fridgesnacks", - "items": [ - [ "water_clean", 90 ], - [ "water_mineral", 10 ], - [ "sandwich_deluxe", 20 ], - [ "sandwich_veggy", 30 ], - [ "sandwich_cucumber", 25 ], - [ "oj", 50 ], - [ "juice", 50 ], - [ "cranberry_juice", 50 ], - [ "sports_drink", 50 ], - [ "apple_cider", 50 ], - [ "lemonade", 50 ], - [ "energy_drink", 55 ], - [ "herbal_tea", 30 ], - [ "energy_drink_atomic", 4 ], - { "group": "softdrinks_canned", "prob": 460 }, - [ "milk", 50 ], - [ "yoghurt", 40 ], - [ "pudding", 50 ], - [ "V8", 15 ], - [ "sandwich_t", 30 ], - [ "sandwich_pb", 30 ], - [ "sandwich_pbj", 30 ], - [ "sandwich_pbh", 30 ], - [ "sandwich_pbm", 30 ], - [ "frozen_dinner", 50 ], - [ "junk_burrito", 60 ], - [ "dried_salad", 6 ], - [ "pizza_veggy", 8 ], - [ "pizza_cheese", 8 ], - [ "pizza_meat", 8 ], - [ "cheeseburger", 8 ], - [ "hamburger", 8 ], - [ "tofu_rice", 4 ], - [ "fish_fried", 8 ], - [ "fish_sandwich", 8 ], - [ "sloppyjoe", 8 ], - [ "hotdogs_frozen", 8 ], - [ "fries", 8 ], - [ "cheese_fries", 6 ], - [ "onion_rings", 8 ], - [ "bacon", 10 ], - [ "lunchmeat", 8 ], - [ "bologna", 6 ], - [ "fruit_leather", 15 ], - [ "protein_shake", 10 ], - [ "pie", 20 ], - [ "pie_veggy", 18 ], - [ "pie_meat", 18 ], - [ "pie_maple", 9 ] - ] - }, - { - "type": "item_group", - "id": "dessert", - "items": [ - [ "milkshake", 15 ], - [ "milkshake_deluxe", 5 ], - [ "icecream", 10 ], - [ "icecream_candy", 8 ], - [ "icecream_custard", 4 ], - [ "icecream_sorbet", 4 ], - [ "icecream_gelato", 4 ], - [ "pie", 20 ], - [ "pie_veggy", 15 ], - [ "pie_meat", 15 ], - [ "pie_maple", 10 ] - ] - }, { "type": "item_group", "id": "fast_food", @@ -1305,7 +1199,10 @@ [ "insecticide", 2 ], [ "soap", 80 ], [ "detergent", 80 ], - [ "chem_hydrogen_peroxide", 20 ] + [ "chem_hydrogen_peroxide", 20 ], + [ "plunger_toilet", 30 ], + [ "plunger_futuristic", 15 ], + [ "toilet_paper", 10 ] ] }, { @@ -1372,7 +1269,8 @@ [ "football_armor", 10 ], [ "helmet_football", 10 ], [ "sneakers", 80 ], - [ "socks", 70 ], + [ "socks", 50 ], + [ "socks_ankle", 70 ], [ "stockings", 20 ], [ "tshirt", 80 ], [ "longshirt", 70 ], @@ -1467,7 +1365,6 @@ [ "gauntlet_fencing_l", 1 ], [ "survnote", 1 ], [ "halter_top", 30 ], - [ "linuxtshirt", 10 ], [ "iceaxe", 30 ], [ "tourist_table", 30 ] ] @@ -1510,10 +1407,10 @@ [ "10gal_hat", 4 ], [ "bb", 8 ], [ "bolt_steel", 7 ], + [ "bolt_cf", 5 ], [ "bbgun", 10 ], [ "crossbow", 2 ], [ "mag_survival", 40 ], - [ "manual_survival", 2 ], [ "textbook_survival", 20 ], [ "modern_tanner", 8 ], [ "recipe_bows", 8 ], @@ -1645,197 +1542,39 @@ "ammo": 50, "magazine": 100, "items": [ - [ "aspirin", 85 ], - [ "daypack", 30 ], + { "group": "sports", "prob": 2290 }, + { "group": "camping", "prob": 1284 }, [ "ski_jacket", 5 ], [ "sports_drink", 20 ], - [ "bat", 60 ], - [ "bat_metal", 60 ], - [ "boxing_gloves", 40 ], - [ "inflatable_boat", 35 ], - [ "hand_pump", 10 ], - [ "baseball", 60 ], - [ "football_armor", 10 ], - [ "helmet_football", 10 ], - [ "football", 30 ], - [ "frisbee", 10 ], - [ "disc_golf", 10 ], - [ "basketball", 20 ], - [ "sneakers", 80 ], - [ "socks", 70 ], - [ "tshirt", 80 ], - [ "longshirt", 50 ], - [ "tank_top", 50 ], - [ "sports_bra", 30 ], - [ "trunks", 50 ], - [ "bikini_top", 50 ], - [ "towel", 40 ], - [ "gloves_fingerless", 20 ], - [ "glasses_safety", 40 ], - [ "goggles_swim", 50 ], - [ "armguard_soft", 40 ], - [ "armguard_hard", 20 ], - [ "legguard_hard", 15 ], [ "mag_firstaid", 15 ], [ "mag_throwing", 20 ], [ "mag_swimming", 20 ], [ "manual_swimming", 10 ], - [ "mag_bashing", 20 ], [ "manual_bashing", 1 ], [ "mag_cutting", 10 ], [ "mag_unarmed", 30 ], [ "mag_stabbing", 15 ], - [ "goggles_ski", 30 ], - [ "mask_ski", 30 ], - [ "hat_ball", 30 ], - [ "helmet_bike", 35 ], - [ "helmet_ball", 45 ], - [ "headgear", 40 ], [ "sunglasses", 20 ], [ "fitover_sunglasses", 10 ], - [ "mask_hockey", 25 ], - [ "hockey_stick", 35 ], - [ "jersey", 20 ], - [ "puck", 30 ], - [ "golf_club", 35 ], - [ "hat_golf", 30 ], - [ "gloves_golf", 25 ], - [ "golf_bag", 20 ], - [ "golf_tee", 30 ], - [ "golf_ball", 40 ], [ "scorecard", 10 ], - [ "manual_brawl", 30 ], - [ "manual_melee", 6 ], - [ "manual_throw", 12 ], - [ "rope_30", 35 ], - [ "hatchet", 10 ], - [ "mess_kit", 10 ], - [ "popcan_stove", 10 ], - [ "pot", 20 ], - [ "pot_copper", 5 ], - [ "bowl_pewter", 25 ], - [ "teapot", 15 ], - [ "pan", 20 ], - [ "waffleiron", 25 ], - [ "pastaextruder", 10 ], [ "can_sealer", 5 ], - [ "binoculars", 20 ], - [ "roller_blades", 20 ], - [ "rollerskates", 10 ], - [ "hotplate", 10 ], - [ "kukri", 2 ], - [ "knife_hunting", 12 ], - [ "knife_rambo", 20 ], [ "multitool", 12 ], [ "throwing_knife", 7 ], - [ "machete", 5 ], - [ "vest", 15 ], - [ "backpack", 38 ], - [ "backpack_leather", 18 ], - [ "backpack_hiking", 4 ], - [ "bigback", 2 ], - [ "travelpack", 9 ], [ "slingpack", 18 ], - [ "bb", 8 ], - [ "bolt_steel", 7 ], - [ "bbgun", 10 ], - [ "crossbow", 2 ], - [ "hybridbow", 2 ], - [ "mag_survival", 40 ], - [ "mag_rifle", 40 ], - [ "mag_shotgun", 20 ], - [ "mag_cutting", 10 ], [ "mag_stabbing", 20 ], [ "mag_melee", 10 ], [ "mag_traps", 10 ], - [ "hand_crossbow", 1 ], [ "manual_cutting", 12 ], - [ "manual_knives", 8 ], - [ "manual_gun", 8 ], - [ "manual_shotgun", 6 ], - [ "manual_pistol", 4 ], - [ "manual_smg", 2 ], [ "manual_launcher", 1 ], [ "recipe_bullets", 8 ], - [ "manual_first_aid", 40 ], - [ "manual_traps", 12 ], [ "howto_traps", 16 ], - [ "recipe_bows", 5 ], - [ "recipe_arrows", 5 ], - [ "lighter", 60 ], - [ "ref_lighter", 2 ], - [ "matches", 60 ], - [ "sewing_kit", 47 ], - [ "tailors_kit", 3 ], - [ "thread", 40 ], - [ "hammer", 35 ], - [ "flashlight", 40 ], - [ "heavy_flashlight", 20 ], - [ "water_purifier", 5 ], - [ "radio", 20 ], - [ "beartrap", 5 ], [ "extinguisher", 20 ], - [ "string_36", 40 ], - [ "longbow", 5 ], - [ "compbow", 1 ], - [ "bow_sight", 5 ], - [ "bow_stabilizer", 5 ], - [ "arrowrest", 5 ], - [ "compositebow", 3 ], - [ "shortbow", 5 ], - [ "recurbow", 2 ], - [ "reflexbow", 2 ], - [ "quiver", 3 ], [ "quiver_large", 1 ], - [ "arrow_wood", 7 ], - [ "arrow_cf", 5 ], - [ "rollmat", 40 ], - [ "tent_kit", 17 ], - [ "large_tent_kit", 17 ], - [ "foot_crank", 10 ], [ "mag_archery", 20 ], [ "manual_archery", 7 ], [ "book_archery", 12 ], - [ "heatpack", 60 ], - [ "flotation_vest", 3 ], - [ "fishing_waders", 5 ], - [ "fishing_rod_professional", 5 ], - [ "wetsuit", 10 ], - [ "wetsuit_spring", 10 ], - [ "wetsuit_gloves", 20 ], - [ "wetsuit_booties", 20 ], - [ "wetsuit_hood", 10 ], - [ "scuba_tank", 20 ], - [ "small_scuba_tank", 10 ], - [ "dive_bag", 10 ], - [ "rebreather", 2 ], - [ "rebreather_filter", 4 ], - [ "glowstick", 60 ], - [ "handflare", 40 ], - [ "folding_bicycle", 1 ], - [ "coat_rain", 5 ], - [ "hood_rain", 5 ], - [ "sleeveless_trenchcoat", 2 ], - [ "sleeveless_duster", 2 ], - [ "elbow_pads", 40 ], - [ "knee_pads", 40 ], - [ "boots_hiking", 10 ], - [ "runner_bag", 5 ], - [ "pur_tablets", 5 ], - { - "item": "protein_powder", - "prob": 12, - "container-item": "bottle_plastic_small", - "charges-min": 1, - "charges-max": 9 - }, [ "protein_shake", 15 ], - [ "knife_trench", 7 ], [ "sm_extinguisher", 10 ], - [ "flaregun", 10 ], - [ "signal_flare", 15 ], - [ "airhorn", 30 ], - [ "whistle", 30 ], [ "quikclot", 10 ], [ "bfipowder", 15 ], [ "speargun", 10 ], @@ -1845,43 +1584,12 @@ [ "fishspear", 12 ], [ "m_fishspear", 10 ], [ "c_fishspear", 10 ], - [ "swim_fins", 20 ], [ "diveknife", 12 ], - [ "mouthpiece", 15 ], [ "small_repairkit", 2 ], - [ "grapnel", 2 ], - [ "leathersandals", 15 ], - [ "bootsheath", 5 ], - [ "sheath", 5 ], - [ "fencing_jacket", 10 ], - [ "fencing_mask", 10 ], - [ "fencing_pants", 10 ], - [ "fencing_foil", 10 ], - [ "fencing_sabre", 10 ], - [ "fencing_epee", 10 ], - [ "lame_foil", 10 ], - [ "lame_saber", 10 ], - [ "plastron_cotton", 10 ], - [ "plastron_plastic", 10 ], - [ "gauntlet_fencing", 8 ], - [ "gauntlet_fencing_l", 2 ], - [ "survnote", 1 ], [ "slingshot", 10 ], [ "wristrocket", 5 ], - [ "iceaxe", 30 ], [ "powered_earmuffs", 80 ], - [ "bandolier_wrist", 100 ], - [ "tourist_table", 20 ], - [ "chem_hexamine", 5 ], - [ "flint_steel", 10 ], - [ "bottle_metal", 5 ], - [ "tinderbox", 5 ], - [ "canteen_wood", 5 ], - [ "whistle_multitool", 5 ], - [ "tarp", 10 ], - [ "esbit_stove", 10 ], - [ "bottle_folding", 5 ], - [ "mess_tin", 10 ] + [ "bandolier_wrist", 100 ] ] }, { @@ -1949,6 +1657,7 @@ [ "scorecard", 10 ], [ "talking_doll", 60 ], [ "marble", 65 ], + [ "handflare_dead", 3 ], [ "creepy_doll", 1 ], [ "straw_doll", 1 ], [ "striped_shirt", 1 ], @@ -2037,6 +1746,9 @@ [ "shavingkit", 30 ], [ "elec_hairtrimmer", 15 ], [ "razor_blade", 5 ], + [ "razor_shaving", 5 ], + [ "toothbrush_plain", 10 ], + [ "string_floss", 10 ], [ "kilt", 5 ], [ "hobo_stove", 1 ], [ "tinder", 1 ], @@ -2069,361 +1781,14 @@ [ "disinfectant", 35 ], [ "medical_gauze", 10 ], [ "medical_tape", 45 ], - [ "jar_glass", 20 ], - [ "jar_3l_glass", 15 ], - [ "oxygen_tank", 50 ], - [ "smoxygen_tank", 25 ], - [ "bfipowder", 15 ], - [ "quikclot", 10 ], - [ "anesthetic", 20 ], - [ "anesthetic_kit", 10 ] - ] - }, - { - "type": "item_group", - "id": "office", - "ammo": 75, - "magazine": 100, - "items": [ - { "group": "softdrinks_canned", "prob": 370 }, - [ "file", 90 ], - [ "mag_barter", 35 ], - [ "mag_computer", 35 ], - [ "mag_electronics", 5 ], - [ "mag_survival", 10 ], - [ "survival_book", 1 ], - [ "fun_survival", 5 ], - [ "mag_traps", 2 ], - [ "howto_traps", 10 ], - [ "mag_unarmed", 10 ], - [ "decoy_anarch", 8 ], - [ "recipe_augs", 8 ], - [ "aspirin", 85 ], - [ "junk_burrito", 25 ], - { "group": "tobacco_products", "prob": 31 }, - [ "glasses_eye", 90 ], - [ "contacts", 15 ], - [ "sunglasses", 90 ], - [ "fitover_sunglasses", 60 ], - [ "fancy_sunglasses", 5 ], - [ "glasses_reading", 90 ], - [ "glasses_bifocal", 90 ], - [ "briefcase", 40 ], - [ "purse", 40 ], - [ "mbag", 20 ], - { "group": "ammo_pocket_batteries", "prob": 50 }, - [ "mag_news", 35 ], - [ "manual_business", 40 ], - [ "textbook_business", 12 ], - [ "textbook_speech", 8 ], - [ "recipe_caseless", 1 ], - [ "lighter", 60 ], - [ "ref_lighter", 5 ], - [ "matches", 60 ], - [ "extinguisher", 20 ], - [ "flashlight", 40 ], - [ "radio", 20 ], - [ "bubblewrap", 50 ], - [ "coffee_raw", 15 ], - [ "usb_drive", 5 ], - [ "software_useless", 10 ], - [ "software_electronics_reference", 2 ], - [ "umbrella", 5 ], - [ "teleumbrella", 2 ], - [ "gum", 10 ], - [ "caff_gum", 6 ], - [ "nic_gum", 4 ], - [ "fan", 10 ], - [ "sm_extinguisher", 10 ], - [ "pocketwatch", 2 ], - [ "gold_watch", 2 ], - [ "sf_watch", 1 ], - [ "silver_watch", 5 ], - [ "survnote", 1 ], - [ "magnifying_glass", 8 ], - [ "camera_control", 2 ], - [ "eclipse_glasses", 1 ] - ] - }, - { - "type": "item_group", - "id": "cubical_office", - "items": [ - { "group": "softdrinks_canned", "prob": 560 }, - [ "file", 90 ], - [ "mag_barter", 15 ], - [ "mag_computer", 35 ], - [ "mag_electronics", 15 ], - [ "mag_survival", 20 ], - [ "glassblowing_book", 1 ], - [ "mag_traps", 3 ], - [ "trappers_companion", 1 ], - [ "mag_bashing", 10 ], - [ "manual_bashing", 1 ], - [ "mag_cutting", 10 ], - [ "mag_stabbing", 5 ], - [ "mag_unarmed", 20 ], - [ "textbook_speech", 6 ], - [ "survival_book", 4 ], - [ "fun_survival", 10 ], - [ "recipe_augs", 1 ], - [ "decoy_anarch", 10 ], - [ "aspirin", 85 ], - [ "maltballs", 30 ], - { "group": "tobacco_products", "prob": 151 }, - [ "glasses_eye", 90 ], - [ "contacts", 15 ], - [ "sunglasses", 90 ], - [ "fitover_sunglasses", 60 ], - [ "fancy_sunglasses", 5 ], - [ "glasses_reading", 90 ], - [ "glasses_bifocal", 90 ], - [ "fan", 10 ], - [ "briefcase", 40 ], - [ "purse", 40 ], - [ "mbag", 20 ], - { "group": "ammo_pocket_batteries", "prob": 50 }, - [ "mag_news", 35 ], - [ "manual_business", 40 ], - [ "textbook_business", 12 ], - [ "manual_computers", 20 ], - [ "howto_computer", 10 ], - [ "mag_fabrication", 12 ], - [ "textbook_computer", 8 ], - [ "computer_science", 8 ], - [ "howto_computer", 6 ], - [ "matches", 60 ], - [ "extinguisher", 20 ], - [ "flashlight", 40 ], - [ "radio", 20 ], - [ "bubblewrap", 50 ], - [ "coffee_raw", 15 ], - [ "usb_drive", 5 ], - [ "coat_rain", 50 ], - [ "hood_rain", 10 ], - [ "poncho", 15 ], - [ "folding_poncho", 5 ], - [ "mag_tv", 40 ], - [ "mag_dude", 40 ], - [ "mag_glam", 40 ], - [ "mag_beauty", 30 ], - [ "mag_news", 35 ], - [ "lighter", 60 ], - [ "ref_lighter", 5 ], - [ "matches", 60 ], - [ "extinguisher", 20 ], - [ "mp3", 18 ], - [ "portable_game", 8 ], - [ "game_watch", 2 ], - [ "umbrella", 5 ], - [ "teleumbrella", 2 ], - [ "mag_tailor", 5 ], - [ "gum", 20 ], - [ "caff_gum", 7 ], - [ "nic_gum", 5 ], - [ "sm_extinguisher", 10 ], - [ "pocketwatch", 2 ], - [ "knitting_needles", 1 ], - [ "survnote", 1 ], - [ "eclipse_glasses", 1 ] - ] - }, - { - "type": "item_group", - "id": "office_breakroom", - "items": [ - { "group": "softdrinks_canned", "prob": 900 }, - { "group": "candy_chocolate", "prob": 625 }, - [ "cookies", 60 ], - [ "brownie", 60 ], - [ "aspirin", 40 ], - { "group": "tobacco_products", "prob": 150 }, - [ "gum", 100 ], - [ "caff_gum", 20 ], - [ "nic_gum", 20 ], - [ "weed", 10 ], - [ "joint", 10 ], - [ "matches", 50 ], - [ "lighter", 50 ], - [ "glasses_eye", 30 ], - [ "contacts", 30 ], - [ "radio", 100 ], - { "group": "ammo_pocket_batteries_full", "prob": 50 }, - [ "umbrella", 50 ], - [ "teleumbrella", 20 ], - [ "mag_barter", 10 ], - [ "mag_computer", 10 ], - [ "mag_tv", 10 ], - [ "mag_dude", 10 ], - [ "mag_glam", 10 ], - [ "mag_beauty", 10 ], - [ "mag_news", 10 ], - [ "mag_traps", 10 ], - [ "mag_bashing", 10 ], - [ "mag_cutting", 10 ], - [ "mag_stabbing", 10 ], - [ "mag_unarmed", 10 ], - [ "weeks_old_newspaper", 80 ], - [ "newest_newspaper", 100 ], - [ "survnote", 1 ], - [ "dnd_handbook", 1 ] - ] - }, - { - "id": "school", - "type": "item_group", - "items": [ - { "group": "candy_chocolate", "prob": 292 }, - [ "glasses_reading", 90 ], - [ "purse", 40 ], - [ "mbag", 20 ], - { "group": "ammo_pocket_batteries_full", "prob": 50 }, - [ "mag_news", 35 ], - [ "file", 20 ], - [ "manual_computers", 20 ], - [ "howto_computer", 20 ], - [ "glassblowing_book", 4 ], - [ "mag_electronics", 35 ], - [ "manual_fabrication", 30 ], - [ "usb_drive", 5 ], - [ "mag_tv", 40 ], - [ "mag_dude", 40 ], - [ "mag_glam", 40 ], - [ "mag_beauty", 30 ], - [ "mask_hockey", 10 ], - [ "hockey_stick", 20 ], - [ "puck", 20 ], - [ "jersey", 40 ], - [ "baseball", 20 ], - [ "manual_mechanics", 35 ], - [ "manual_speech", 50 ], - [ "manual_business", 40 ], - [ "manual_first_aid", 40 ], - [ "manual_computers", 20 ], - [ "mag_tailor", 10 ], - [ "mag_animecon", 5 ], - [ "cookbook", 35 ], - [ "mask_guy_fawkes", 5 ], - [ "cookbook_italian", 25 ], - [ "manual_electronics", 20 ], - [ "decoy_elfa", 5 ], - [ "manual_tailor", 15 ], - [ "manual_carpentry", 10 ], - [ "101_carpentry", 10 ], - [ "mag_mechanics", 35 ], - [ "manual_driving", 20 ], - [ "textbook_speech", 12 ], - [ "novel_romance", 30 ], - [ "novel_spy", 28 ], - [ "novel_satire", 15 ], - [ "novel_sports", 22 ], - [ "novel_samurai", 22 ], - [ "novel_swash", 14 ], - [ "novel_western", 22 ], - [ "novel_war", 18 ], - [ "novel_war2", 18 ], - [ "atomic_survival", 1 ], - [ "novel_adventure", 14 ], - [ "novel_experimental", 1 ], - [ "novel_road", 10 ], - [ "novel_buddy", 12 ], - [ "novel_thriller", 18 ], - [ "novel_coa", 10 ], - [ "novel_coa2", 10 ], - [ "novel_crime", 20 ], - [ "novel_crime2", 20 ], - [ "novel_scifi", 20 ], - [ "novel_drama", 40 ], - [ "novel_mystery", 25 ], - [ "novel_fantasy", 20 ], - [ "novel_erotic", 4 ], - [ "poetry_book", 10 ], - [ "jewelry_book", 8 ], - [ "philosophy_book", 2 ], - [ "essay_book", 6 ], - [ "plays_book", 8 ], - [ "novel_horror", 18 ], - [ "novel_tragedy", 8 ], - [ "ZSG", 2 ], - [ "cookies", 50 ], - [ "backpack", 38 ], - [ "backpack_leather", 18 ], - [ "slingpack", 18 ], - [ "briefcase", 5 ], - [ "pockknife", 14 ], - [ "knife_swissarmy", 10 ], - [ "mag_comic", 20 ], - [ "umbrella", 5 ], - [ "teleumbrella", 2 ], - [ "frisbee", 10 ], - [ "disc_golf", 10 ], - [ "football_armor", 5 ], - [ "helmet_football", 5 ], - [ "mouthpiece", 5 ], - [ "football", 5 ], - [ "roller_blades", 20 ], - [ "rollerskates", 10 ], - [ "rollerskates", 10 ], - [ "roller_shoes_off", 10 ], - [ "survnote", 3 ], - [ "radio_car_box", 3 ], - [ "radiocontrol", 10 ], - [ "scots_cookbook", 1 ], - [ "eclipse_glasses", 1 ], - [ "dnd_handbook", 1 ], - [ "balloon", 5 ] - ] - }, - { - "type": "item_group", - "id": "vault", - "items": [ - { "group": "schematics", "prob": 5 }, - [ "recipe_mil_augs", 5 ], - [ "recipe_caseless", 5 ], - [ "recipe_labchem", 5 ], - [ "file", 20 ], - [ "platinum_small", 10 ], - [ "gold_small", 10 ], - [ "silver_small", 30 ], - [ "money_bundle", 50 ], - [ "pocketwatch", 11 ], - [ "gold_watch", 12 ], - [ "sf_watch", 10 ], - [ "platinum_watch", 1 ], - [ "survnote", 3 ], - [ "gold_ring", 10 ], - [ "diamond_ring", 10 ], - [ "gold_bracelet", 12 ], - [ "silver_bracelet", 14 ], - [ "copper_bracelet", 10 ], - [ "bead_bracelet", 5 ], - [ "pearl_collar", 10 ], - [ "silver_necklace", 14 ], - [ "bead_necklace", 5 ], - [ "silver_locket", 10 ], - [ "gold_ear", 12 ], - [ "silver_ear", 14 ], - [ "copper_ear", 10 ], - [ "jade_brooch", 10 ], - [ "diamond", 10 ], - [ "crown_golden", 5 ], - [ "diamond_dental_grill", 5 ], - [ "gold_dental_grill", 5 ], - [ "bio_time_freeze", 4 ], - [ "bio_teleport", 4 ], - [ "bio_probability_travel", 4 ], - [ "standard_template_construct", 4 ], - [ "briefcase", 4 ], - [ "small_relic", 3 ], - [ "holy_symbol", 3 ], - [ "holy_symbol_wood", 3 ], - [ "magic_8_ball", 2 ], - [ "coin_quarter", 2 ], - [ "straw_doll", 2 ], - [ "petrified_eye", 1 ], - [ "spiral_stone", 1 ], - [ "etched_skull", 1 ] + [ "jar_glass", 20 ], + [ "jar_3l_glass", 15 ], + [ "oxygen_tank", 50 ], + [ "smoxygen_tank", 25 ], + [ "bfipowder", 15 ], + [ "quikclot", 10 ], + [ "anesthetic", 20 ], + [ "anesthetic_kit", 10 ] ] }, { @@ -2562,246 +1927,6 @@ { "group": "tinware", "prob": 10 } ] }, - { - "type": "item_group", - "id": "shelter", - "items": [ - [ "daypack", 10 ], - [ "ski_jacket", 40 ], - [ "water_clean", 90 ], - [ "water_mineral", 5 ], - [ "soup_veggy", 15 ], - [ "soup_meat", 15 ], - [ "soup_chicken", 15 ], - [ "soup_mushroom", 15 ], - [ "inflatable_boat", 5 ], - [ "hand_pump", 5 ], - [ "soup_tomato", 15 ], - [ "soup_dumplings", 15 ], - [ "curry_veggy", 15 ], - [ "curry_meat", 15 ], - [ "chocolate", 50 ], - [ "ravioli", 25 ], - [ "can_beans", 40 ], - [ "pork_beans", 40 ], - [ "can_tomato", 40 ], - [ "cooked_pumpkin", 20 ], - [ "con_milk", 20 ], - [ "milk_evap", 15 ], - [ "milk_UHT", 10 ], - [ "can_spam", 30 ], - [ "can_tuna", 35 ], - [ "can_salmon", 25 ], - [ "can_chowder", 35 ], - [ "can_chicken", 40 ], - [ "neccowafers", 40 ], - [ "can_herring", 30 ], - [ "coffee_raw", 15 ], - [ "cheese_hard", 5 ], - [ "bandages", 50 ], - [ "cotton_ball", 50 ], - [ "1st_aid", 35 ], - [ "survival_kit", 35 ], - [ "saline", 10 ], - [ "vitamins", 75 ], - [ "gummy_vitamins", 25 ], - [ "calcium_tablet", 75 ], - [ "iodine", 5 ], - [ "prussian_blue", 5 ], - [ "dayquil", 70 ], - [ "screwdriver", 40 ], - [ "screwdriver_set", 10 ], - [ "boots", 70 ], - [ "boots_winter", 60 ], - [ "boots_hiking", 30 ], - [ "runner_bag", 5 ], - [ "socks_wool", 30 ], - [ "jeans", 90 ], - [ "pants_checkered", 5 ], - [ "shorts", 70 ], - [ "shorts_denim", 35 ], - [ "tshirt", 80 ], - [ "longshirt", 70 ], - [ "sweatshirt", 75 ], - [ "sweater", 75 ], - [ "coat_winter", 50 ], - [ "gloves_wool", 33 ], - [ "thermal_socks", 2 ], - [ "thermal_gloves", 2 ], - [ "thermal_suit", 2 ], - [ "thermal_mask", 2 ], - [ "thermal_outfit", 1 ], - [ "gloves_winter", 40 ], - [ "gloves_liner", 25 ], - [ "gloves_tactical", 5 ], - [ "glasses_bal", 5 ], - [ "hat_knit", 25 ], - [ "backpack", 38 ], - [ "backpack_leather", 8 ], - [ "backpack_tactical_large", 3 ], - [ "slingpack", 8 ], - { "group": "ammo_pocket_batteries_full", "prob": 50 }, - [ "novel_scifi", 20 ], - [ "novel_drama", 40 ], - [ "mag_dodge", 20 ], - [ "manual_dodge", 2 ], - [ "manual_first_aid", 40 ], - [ "manual_tailor", 15 ], - [ "textbook_tailor", 5 ], - [ "manual_carpentry", 10 ], - [ "manual_bashing", 1 ], - [ "mag_mechanics", 15 ], - [ "recipe_bows", 4 ], - [ "recipe_arrows", 4 ], - [ "child_book", 1 ], - [ "many_years_old_newspaper", 3 ], - [ "years_old_newspaper", 3 ], - [ "one_year_old_newspaper", 3 ], - [ "months_old_newspaper", 4 ], - [ "lighter", 60 ], - [ "ref_lighter", 5 ], - [ "matches", 60 ], - [ "sewing_kit", 47 ], - [ "tailors_kit", 3 ], - [ "thread", 40 ], - [ "hammer", 35 ], - [ "extinguisher", 20 ], - [ "flashlight", 40 ], - [ "heavy_flashlight", 5 ], - [ "mess_kit", 10 ], - [ "hotplate", 10 ], - [ "popcan_stove", 5 ], - [ "denat_alcohol", 5 ], - [ "water_purifier", 5 ], - [ "radio", 20 ], - [ "rollmat", 40 ], - [ "tent_kit", 17 ], - [ "large_tent_kit", 17 ], - [ "survival_kit", 10 ], - [ "canteen", 15 ], - [ "2lcanteen", 10 ], - [ "camelbak", 5 ], - [ "spray_can", 50 ], - [ "ax", 8 ], - [ "heatpack", 60 ], - [ "blanket", 20 ], - [ "down_blanket", 10 ], - [ "pillow", 20 ], - [ "down_pillow", 15 ], - [ "emer_blanket", 20 ], - [ "flyer", 10 ], - [ "gasoline_lantern", 5 ], - [ "electric_lantern", 8 ], - [ "oil_lamp", 5 ], - [ "lamp_oil", 5 ], - [ "flotation_vest", 1 ], - [ "vaccine_shot", 10 ], - [ "flu_shot", 1 ], - [ "coat_rain", 5 ], - [ "hood_rain", 5 ], - [ "umbrella", 7 ], - [ "teleumbrella", 3 ], - [ "apron_leather", 5 ], - [ "pocketwatch", 5 ], - [ "e_tool", 2 ], - [ "sm_extinguisher", 10 ], - [ "flaregun", 5 ], - [ "signal_flare", 10 ], - [ "survivormap", 1 ], - [ "pur_tablets", 5 ], - [ "razor_blade", 5 ], - [ "sheath", 5 ], - [ "bootsheath", 5 ], - [ "holster", 4 ], - [ "bandolier_shotgun", 3 ], - [ "survnote", 2 ], - [ "bodypillow", 1 ], - [ "flint_steel", 6 ], - [ "bottle_metal", 2 ], - [ "hobo_stove", 3 ], - [ "tinder", 3 ], - [ "tinderbox", 2 ], - [ "tarp", 15 ], - [ "chem_hexamine", 4 ], - [ "esbit_stove", 8 ], - [ "bottle_folding", 6 ], - [ "mess_tin", 8 ], - [ "metal_file", 5 ], - [ "pin_reamer", 3 ] - ] - }, - { - "type": "item_group", - "id": "chem_school", - "ammo": 50, - "magazine": 100, - "items": [ - [ "balance_small", 5 ], - [ "ph_meter", 5 ], - [ "voltmeter", 5 ], - [ "thermometer", 5 ], - [ "melting_point", 5 ], - [ "vortex", 5 ], - [ "microscope", 5 ], - [ "microscope_dissecting", 5 ], - [ "funnel_separation", 3 ], - [ "burette", 3 ], - [ "still_lab", 3 ], - [ "stopcock", 3 ], - [ "beaker", 5 ], - [ "gradcylinder", 5 ], - [ "rack_test_tube", 5 ], - [ "stand_ring", 5 ], - [ "stand_ring_clamps", 5 ], - [ "ether", 5 ], - [ "iodine", 5 ], - [ "prussian_blue", 5 ], - [ "pocket_firstaid", 2 ], - [ "file", 5 ], - [ "textbook_chemistry", 10 ], - [ "adv_chemistry", 2 ], - [ "decoy_elfa", 2 ], - [ "water_clean", 90 ], - [ "salt_water", 30 ], - { "item": "bleach", "prob": 10, "charges-min": 6 }, - { "item": "ammonia", "prob": 12, "charges-min": 6 }, - [ "mutagen", 1 ], - [ "purifier", 1 ], - [ "yeast", 3 ], - [ "royal_jelly", 4 ], - [ "superglue", 30 ], - [ "bottle_glass", 10 ], - [ "syringe", 1 ], - [ "adrenaline_injector", 1 ], - [ "1st_aid", 5 ], - [ "saline", 1 ], - [ "extinguisher", 25 ], - [ "hotplate", 15 ], - [ "funnel", 50 ], - [ "jar_glass", 20 ], - [ "jar_3l_glass", 15 ], - [ "apron_leather", 6 ], - [ "pur_tablets", 15 ], - [ "lye_powder", 10 ], - [ "oxy_powder", 12 ], - [ "chemistry_set", 8 ], - [ "sm_extinguisher", 20 ], - [ "eyedrops", 15 ], - [ "charcoal", 10 ], - [ "magnesium", 10 ], - [ "tin", 10 ], - [ "chem_hydrogen_peroxide", 10 ], - [ "chem_muriatic_acid", 5 ], - { "item": "chem_sulphur", "prob": 10, "charges-min": 100 }, - [ "chem_aluminium_powder", 5 ], - { "item": "chem_zinc_powder", "prob": 10, "charges-min": 100 }, - { "item": "chem_zinc", "prob": 5, "charges-min": 100 }, - { "item": "chem_manganese_dioxide", "prob": 10, "charges-min": 100 }, - [ "chem_saltpetre", 10 ], - { "item": "chem_carbide", "prob": 10, "charges-min": 100 }, - [ "denat_alcohol", 10 ] - ] - }, { "type": "item_group", "id": "chem_home", @@ -3001,155 +2126,6 @@ [ "solarpack", 10 ] ] }, - { - "type": "item_group", - "id": "lab_dorm", - "ammo": 50, - "magazine": 100, - "items": [ - [ "inhaler", 14 ], - [ "eyedrops", 20 ], - [ "clock", 10 ], - { "group": "tobacco_products", "prob": 151 }, - [ "weed", 10 ], - [ "joint", 10 ], - [ "seed_weed", 15 ], - [ "seed_tobacco", 5 ], - [ "rolling_paper", 5 ], - [ "pipe_glass", 5 ], - [ "coke", 8 ], - [ "meth", 2 ], - [ "heroin", 1 ], - [ "sneakers", 40 ], - [ "mask_hockey", 5 ], - [ "mask_guy_fawkes", 5 ], - [ "scarf_long", 15 ], - [ "jersey", 20 ], - [ "coat_lab", 40 ], - [ "boots_steel", 5 ], - [ "socks", 70 ], - [ "mocassins", 20 ], - [ "bandana", 35 ], - [ "glasses_eye", 90 ], - [ "sunglasses", 20 ], - [ "fancy_sunglasses", 5 ], - [ "fitover_sunglasses", 10 ], - [ "glasses_reading", 90 ], - [ "glasses_bifocal", 90 ], - [ "towel", 40 ], - [ "hat_ball", 30 ], - [ "briefcase", 50 ], - [ "purse", 40 ], - [ "mbag", 20 ], - [ "fanny", 10 ], - { "group": "ammo_pocket_batteries_full", "prob": 50 }, - [ "bb", 8 ], - [ "bbgun", 10 ], - [ "fan", 10 ], - [ "file", 30 ], - [ "mag_porn", 20 ], - [ "photo_album", 5 ], - [ "mag_tv", 40 ], - [ "mag_dude", 40 ], - [ "mag_glam", 40 ], - [ "mag_beauty", 30 ], - [ "mag_gaming", 20 ], - [ "mag_news", 35 ], - [ "mag_firstaid", 10 ], - [ "mag_comic", 20 ], - [ "novel_romance", 30 ], - [ "novel_drama", 40 ], - [ "novel_mystery", 25 ], - [ "ZSG", 5 ], - [ "manual_mechanics", 35 ], - [ "manual_fabrication", 12 ], - [ "manual_speech", 50 ], - [ "manual_business", 40 ], - [ "manual_computers", 20 ], - [ "novel_western", 16 ], - [ "novel_pulp", 16 ], - [ "tailor_portfolio", 1 ], - [ "recipe_alpha", 1 ], - [ "recipe_serum", 4 ], - [ "recipe_animal", 4 ], - [ "recipe_raptor", 1 ], - [ "recipe_labchem", 1 ], - [ "textbook_anarch", 1 ], - [ "recipe_caseless", 1 ], - [ "laptop", 30 ], - [ "atomic_light", 3 ], - [ "atomic_lamp", 3 ], - [ "smart_lamp", 5 ], - [ "cell_phone", 20 ], - [ "smart_phone", 40 ], - [ "eink_tablet_pc", 15 ], - [ "mobile_memory_card", 40 ], - [ "mobile_memory_card_science", 10 ], - [ "standard_template_construct", 5 ], - [ "camera", 15 ], - [ "camera_pro", 5 ], - [ "lighter", 50 ], - [ "ref_lighter", 4 ], - [ "matches", 60 ], - [ "sewing_kit", 47 ], - [ "tailors_kit", 3 ], - [ "thread", 40 ], - [ "scissors", 50 ], - [ "soldering_iron", 70 ], - [ "solder_wire", 70 ], - [ "radio", 20 ], - [ "syringe", 8 ], - [ "mp3", 18 ], - [ "portable_game", 8 ], - [ "game_watch", 2 ], - [ "vibrator", 6 ], - [ "usb_drive", 8 ], - [ "firecracker_pack", 1 ], - [ "firecracker", 1 ], - [ "fried_seeds", 10 ], - [ "chips", 65 ], - { "group": "softdrinks_canned", "prob": 90 }, - [ "choco_coffee_beans", 20 ], - [ "caffeine", 20 ], - [ "cola_meth", 1 ], - [ "picklocks", 10 ], - [ "wolfsuit", 4 ], - [ "dinosuit", 4 ], - [ "jedi_cloak", 4 ], - [ "glowstick", 60 ], - [ "blanket", 10 ], - [ "house_coat", 25 ], - [ "talking_doll", 5 ], - [ "marble", 5 ], - [ "creepy_doll", 1 ], - [ "straw_doll", 1 ], - [ "wristwatch", 15 ], - [ "pocketwatch", 5 ], - [ "lsd", 1 ], - [ "gum", 30 ], - [ "caff_gum", 20 ], - [ "nic_gum", 5 ], - [ "hairpin", 5 ], - [ "barrette", 3 ], - [ "clown_suit", 1 ], - [ "clownshoes", 1 ], - [ "bondage_suit", 5 ], - [ "bondage_mask", 5 ], - [ "flask_hip", 5 ], - [ "corset", 15 ], - [ "tieclip", 3 ], - { "group": "religious_books", "prob": 18 }, - [ "collarpin", 3 ], - [ "survnote", 1 ], - [ "magnifying_glass", 2 ], - [ "thermometer", 3 ], - [ "hygrometer", 3 ], - [ "barometer", 3 ], - [ "badge_doctor", 5 ], - [ "dnd_handbook", 2 ], - [ "bodypillow", 1 ] - ] - }, { "type": "item_group", "id": "monparts", @@ -3340,6 +2316,7 @@ [ "hat_boonie", 10 ], [ "helmet_riot", 25 ], [ "bolt_steel", 7 ], + [ "bolt_cf", 5 ], [ "shot_00", 8 ], [ "shot_flechette", 3 ], [ "20x66_shot", 4 ], @@ -4010,6 +2987,27 @@ "type": "item_group", "id": "jewelry_front", "items": [ + { "group": "tiaras_silver", "prob": 5, "count": [ 1, 3 ] }, + { "group": "tiaras_gold", "prob": 3, "count": [ 1, 3 ] }, + { "group": "tiaras_platinum", "prob": 1, "count": [ 1, 3 ] }, + { "group": "pendant_necklaces_silver", "prob": 30, "count": [ 1, 3 ] }, + { "group": "pendant_necklaces_gold", "prob": 10, "count": [ 1, 3 ] }, + { "group": "pendant_necklaces_platinum", "prob": 5, "count": [ 1, 3 ] }, + { "group": "earrings_silver", "prob": 30 }, + { "group": "earrings_gold", "prob": 10 }, + { "group": "earrings_platinum", "prob": 5 }, + { "group": "dental_grills", "prob": 10 }, + { "group": "bracelets_silver", "prob": 30 }, + { "group": "bracelets_gold", "prob": 10 }, + { "group": "bracelets_platinum", "prob": 5 }, + { "group": "rings_silver", "prob": 30 }, + { "group": "rings_gold", "prob": 10 }, + { "group": "rings_platinum", "prob": 5 }, + { "group": "dental_grills", "prob": 10 }, + { "group": "cufflinks_silver", "prob": 30, "count": [ 1, 3 ] }, + { "group": "cufflinks_gold", "prob": 10, "count": [ 1, 3 ] }, + { "group": "cufflinks_platinum", "prob": 5, "count": [ 1, 3 ] }, + { "group": "gemstones", "prob": 30 }, [ "gold_ring", 30 ], [ "gold_ear", 30 ], [ "gold_bracelet", 30 ], @@ -4117,7 +3115,34 @@ { "type": "item_group", "id": "jewelry_safe", - "items": [ [ "platinum_small", 80 ], [ "gold_small", 80 ], [ "silver_small", 85 ], [ "diamond", 75 ] ] + "items": [ + [ "platinum_small", 80 ], + [ "gold_small", 80 ], + [ "silver_small", 85 ], + [ "diamond", 75 ], + [ "diamond", 75 ], + { "group": "gemstones", "prob": 75 } + ] + }, + { + "id": "gemstones", + "type": "item_group", + "items": [ + [ "citrine", 50 ], + [ "diamond", 50 ], + [ "emerald", 50 ], + [ "peridot", 50 ], + [ "amethyst", 50 ], + [ "sapphire", 50 ], + [ "aquamarine", 50 ], + [ "blue_topaz", 50 ], + [ "tourmaline", 50 ], + [ "alexandrite", 50 ], + [ "pearl", 50 ], + [ "opal", 50 ], + [ "ruby", 50 ], + [ "garnet", 50 ] + ] }, { "type": "item_group", diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index b5a91a38beef1..952b9578a2682 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -2246,7 +2246,9 @@ [ "toolbox", 5 ], [ "apron_leather", 10 ], [ "bio_meteorologist", 10 ], - [ "chem_aluminium_sulphate", 20 ] + [ "chem_aluminium_sulphate", 20 ], + [ "plunger_toilet", 10 ], + [ "plunger_futuristic", 5 ] ] }, { @@ -2676,5 +2678,742 @@ [ "barometer", 3 ], [ "remotevehcontrol", 10 ] ] + }, + { + "type": "item_group", + "id": "lab_dorm", + "ammo": 50, + "magazine": 100, + "items": [ + [ "inhaler", 14 ], + [ "eyedrops", 20 ], + [ "clock", 10 ], + { "group": "tobacco_products", "prob": 151 }, + [ "weed", 10 ], + [ "joint", 10 ], + [ "seed_weed", 15 ], + [ "seed_tobacco", 5 ], + [ "rolling_paper", 5 ], + [ "pipe_glass", 5 ], + [ "coke", 8 ], + [ "meth", 2 ], + [ "heroin", 1 ], + [ "sneakers", 40 ], + [ "mask_hockey", 5 ], + [ "mask_guy_fawkes", 5 ], + [ "scarf_long", 15 ], + [ "jersey", 20 ], + [ "coat_lab", 40 ], + [ "boots_steel", 5 ], + [ "socks", 70 ], + [ "socks_ankle", 50 ], + [ "mocassins", 20 ], + [ "bandana", 35 ], + [ "glasses_eye", 90 ], + [ "sunglasses", 20 ], + [ "fancy_sunglasses", 5 ], + [ "fitover_sunglasses", 10 ], + [ "glasses_reading", 90 ], + [ "glasses_bifocal", 90 ], + [ "towel", 40 ], + [ "hat_ball", 30 ], + [ "briefcase", 50 ], + [ "purse", 40 ], + [ "mbag", 20 ], + [ "fanny", 10 ], + { "group": "ammo_pocket_batteries_full", "prob": 50 }, + [ "bb", 8 ], + [ "bbgun", 10 ], + [ "fan", 10 ], + [ "file", 30 ], + [ "mag_porn", 20 ], + [ "photo_album", 5 ], + [ "mag_tv", 40 ], + [ "mag_dude", 40 ], + [ "mag_glam", 40 ], + [ "mag_beauty", 30 ], + [ "mag_gaming", 20 ], + [ "mag_news", 35 ], + [ "mag_firstaid", 10 ], + [ "mag_comic", 20 ], + [ "novel_romance", 30 ], + [ "novel_drama", 40 ], + [ "novel_mystery", 25 ], + [ "ZSG", 5 ], + [ "manual_mechanics", 35 ], + [ "manual_fabrication", 12 ], + [ "manual_speech", 50 ], + [ "manual_business", 40 ], + [ "manual_computers", 20 ], + [ "novel_western", 16 ], + [ "novel_pulp", 16 ], + [ "tailor_portfolio", 1 ], + [ "recipe_alpha", 1 ], + [ "recipe_serum", 4 ], + [ "recipe_animal", 4 ], + [ "recipe_raptor", 1 ], + [ "recipe_labchem", 1 ], + [ "textbook_anarch", 1 ], + [ "recipe_caseless", 1 ], + [ "laptop", 30 ], + [ "atomic_light", 3 ], + [ "atomic_lamp", 3 ], + [ "smart_lamp", 5 ], + [ "cell_phone", 20 ], + [ "smart_phone", 40 ], + [ "eink_tablet_pc", 15 ], + [ "mobile_memory_card", 40 ], + [ "mobile_memory_card_science", 10 ], + [ "standard_template_construct", 5 ], + [ "camera", 15 ], + [ "camera_pro", 5 ], + [ "lighter", 50 ], + [ "ref_lighter", 4 ], + [ "matches", 60 ], + [ "sewing_kit", 47 ], + [ "tailors_kit", 3 ], + [ "thread", 40 ], + [ "scissors", 50 ], + [ "soldering_iron", 70 ], + [ "solder_wire", 70 ], + [ "radio", 20 ], + [ "syringe", 8 ], + [ "mp3", 18 ], + [ "portable_game", 8 ], + [ "game_watch", 2 ], + [ "vibrator", 6 ], + [ "usb_drive", 8 ], + [ "firecracker_pack", 1 ], + [ "firecracker", 1 ], + [ "fried_seeds", 10 ], + [ "chips", 65 ], + { "group": "softdrinks_canned", "prob": 90 }, + [ "choco_coffee_beans", 20 ], + [ "caffeine", 20 ], + [ "cola_meth", 1 ], + [ "picklocks", 10 ], + [ "wolfsuit", 4 ], + [ "dinosuit", 4 ], + [ "jedi_cloak", 4 ], + [ "glowstick", 60 ], + [ "blanket", 10 ], + [ "house_coat", 25 ], + [ "talking_doll", 5 ], + [ "marble", 5 ], + [ "creepy_doll", 1 ], + [ "straw_doll", 1 ], + [ "wristwatch", 15 ], + [ "pocketwatch", 5 ], + [ "lsd", 1 ], + [ "gum", 30 ], + [ "caff_gum", 20 ], + [ "nic_gum", 5 ], + [ "hairpin", 5 ], + [ "barrette", 3 ], + [ "clown_suit", 1 ], + [ "clownshoes", 1 ], + [ "bondage_suit", 5 ], + [ "bondage_mask", 5 ], + [ "flask_hip", 5 ], + [ "corset", 15 ], + [ "tieclip", 3 ], + { "group": "religious_books", "prob": 18 }, + [ "collarpin", 3 ], + [ "survnote", 1 ], + [ "magnifying_glass", 2 ], + [ "thermometer", 3 ], + [ "hygrometer", 3 ], + [ "barometer", 3 ], + [ "badge_doctor", 5 ], + [ "dnd_handbook", 2 ], + [ "bodypillow", 1 ] + ] + }, + { + "id": "school", + "type": "item_group", + "items": [ + { "group": "candy_chocolate", "prob": 292 }, + [ "glasses_reading", 90 ], + [ "purse", 40 ], + [ "mbag", 20 ], + { "group": "ammo_pocket_batteries_full", "prob": 50 }, + [ "mag_news", 35 ], + [ "file", 20 ], + [ "manual_computers", 20 ], + [ "howto_computer", 20 ], + [ "glassblowing_book", 4 ], + [ "mag_electronics", 35 ], + [ "manual_fabrication", 30 ], + [ "usb_drive", 5 ], + [ "mag_tv", 40 ], + [ "mag_dude", 40 ], + [ "mag_glam", 40 ], + [ "mag_beauty", 30 ], + [ "mask_hockey", 10 ], + [ "hockey_stick", 20 ], + [ "puck", 20 ], + [ "jersey", 40 ], + [ "baseball", 20 ], + [ "manual_mechanics", 35 ], + [ "manual_speech", 50 ], + [ "manual_business", 40 ], + [ "manual_first_aid", 40 ], + [ "manual_computers", 20 ], + [ "mag_tailor", 10 ], + [ "mag_animecon", 5 ], + [ "cookbook", 35 ], + [ "mask_guy_fawkes", 5 ], + [ "cookbook_italian", 25 ], + [ "manual_electronics", 20 ], + [ "decoy_elfa", 5 ], + [ "manual_tailor", 15 ], + [ "manual_carpentry", 10 ], + [ "101_carpentry", 10 ], + [ "mag_mechanics", 35 ], + [ "manual_driving", 20 ], + [ "textbook_speech", 12 ], + [ "novel_romance", 30 ], + [ "novel_spy", 28 ], + [ "novel_satire", 15 ], + [ "novel_sports", 22 ], + [ "novel_samurai", 22 ], + [ "novel_swash", 14 ], + [ "novel_western", 22 ], + [ "novel_war", 18 ], + [ "novel_war2", 18 ], + [ "atomic_survival", 1 ], + [ "novel_adventure", 14 ], + [ "novel_experimental", 1 ], + [ "novel_road", 10 ], + [ "novel_buddy", 12 ], + [ "novel_thriller", 18 ], + [ "novel_coa", 10 ], + [ "novel_coa2", 10 ], + [ "novel_crime", 20 ], + [ "novel_crime2", 20 ], + [ "novel_scifi", 20 ], + [ "novel_drama", 40 ], + [ "novel_mystery", 25 ], + [ "novel_fantasy", 20 ], + [ "novel_erotic", 4 ], + [ "poetry_book", 10 ], + [ "jewelry_book", 8 ], + [ "philosophy_book", 2 ], + [ "essay_book", 6 ], + [ "plays_book", 8 ], + [ "novel_horror", 18 ], + [ "novel_tragedy", 8 ], + [ "ZSG", 2 ], + [ "cookies", 50 ], + [ "backpack", 38 ], + [ "backpack_leather", 18 ], + [ "slingpack", 18 ], + [ "briefcase", 5 ], + [ "pockknife", 14 ], + [ "knife_swissarmy", 10 ], + [ "mag_comic", 20 ], + [ "umbrella", 5 ], + [ "teleumbrella", 2 ], + [ "frisbee", 10 ], + [ "disc_golf", 10 ], + [ "football_armor", 5 ], + [ "helmet_football", 5 ], + [ "mouthpiece", 5 ], + [ "football", 5 ], + [ "roller_blades", 20 ], + [ "rollerskates", 10 ], + [ "rollerskates", 10 ], + [ "roller_shoes_off", 10 ], + [ "survnote", 3 ], + [ "radio_car_box", 3 ], + [ "radiocontrol", 10 ], + [ "scots_cookbook", 1 ], + [ "eclipse_glasses", 1 ], + [ "dnd_handbook", 1 ], + [ "balloon", 5 ] + ] + }, + { + "type": "item_group", + "id": "chem_school", + "ammo": 50, + "magazine": 100, + "items": [ + [ "balance_small", 5 ], + [ "ph_meter", 5 ], + [ "voltmeter", 5 ], + [ "thermometer", 5 ], + [ "melting_point", 5 ], + [ "vortex", 5 ], + [ "microscope", 5 ], + [ "microscope_dissecting", 5 ], + [ "funnel_separation", 3 ], + [ "burette", 3 ], + [ "still_lab", 3 ], + [ "stopcock", 3 ], + [ "beaker", 5 ], + [ "gradcylinder", 5 ], + [ "rack_test_tube", 5 ], + [ "stand_ring", 5 ], + [ "stand_ring_clamps", 5 ], + [ "ether", 5 ], + [ "iodine", 5 ], + [ "prussian_blue", 5 ], + [ "pocket_firstaid", 2 ], + [ "file", 5 ], + [ "textbook_chemistry", 10 ], + [ "adv_chemistry", 2 ], + [ "decoy_elfa", 2 ], + [ "water_clean", 90 ], + [ "salt_water", 30 ], + { "item": "bleach", "prob": 10, "charges-min": 6 }, + { "item": "ammonia", "prob": 12, "charges-min": 6 }, + [ "mutagen", 1 ], + [ "purifier", 1 ], + [ "yeast", 3 ], + [ "royal_jelly", 4 ], + [ "superglue", 30 ], + [ "bottle_glass", 10 ], + [ "syringe", 1 ], + [ "adrenaline_injector", 1 ], + [ "1st_aid", 5 ], + [ "saline", 1 ], + [ "extinguisher", 25 ], + [ "hotplate", 15 ], + [ "funnel", 50 ], + [ "jar_glass", 20 ], + [ "jar_3l_glass", 15 ], + [ "apron_leather", 6 ], + [ "pur_tablets", 15 ], + [ "lye_powder", 10 ], + [ "oxy_powder", 12 ], + [ "chemistry_set", 8 ], + [ "sm_extinguisher", 20 ], + [ "eyedrops", 15 ], + [ "charcoal", 10 ], + [ "magnesium", 10 ], + [ "tin", 10 ], + [ "chem_hydrogen_peroxide", 10 ], + [ "chem_muriatic_acid", 5 ], + { "item": "chem_sulphur", "prob": 10, "charges-min": 100 }, + [ "chem_aluminium_powder", 5 ], + { "item": "chem_zinc_powder", "prob": 10, "charges-min": 100 }, + { "item": "chem_zinc", "prob": 5, "charges-min": 100 }, + { "item": "chem_manganese_dioxide", "prob": 10, "charges-min": 100 }, + [ "chem_saltpetre", 10 ], + { "item": "chem_carbide", "prob": 10, "charges-min": 100 }, + [ "denat_alcohol", 10 ] + ] + }, + { + "type": "item_group", + "id": "office", + "ammo": 75, + "magazine": 100, + "items": [ + { "group": "softdrinks_canned", "prob": 370 }, + [ "file", 90 ], + [ "mag_barter", 35 ], + [ "mag_computer", 35 ], + [ "mag_electronics", 5 ], + [ "mag_survival", 10 ], + [ "survival_book", 1 ], + [ "fun_survival", 5 ], + [ "mag_traps", 2 ], + [ "howto_traps", 10 ], + [ "mag_unarmed", 10 ], + [ "decoy_anarch", 8 ], + [ "recipe_augs", 8 ], + [ "aspirin", 85 ], + [ "junk_burrito", 25 ], + { "group": "tobacco_products", "prob": 31 }, + [ "glasses_eye", 90 ], + [ "contacts", 15 ], + [ "sunglasses", 90 ], + [ "fitover_sunglasses", 60 ], + [ "fancy_sunglasses", 5 ], + [ "glasses_reading", 90 ], + [ "glasses_bifocal", 90 ], + [ "briefcase", 40 ], + [ "purse", 40 ], + [ "mbag", 20 ], + { "group": "ammo_pocket_batteries", "prob": 50 }, + [ "mag_news", 35 ], + [ "manual_business", 40 ], + [ "textbook_business", 12 ], + [ "textbook_speech", 8 ], + [ "recipe_caseless", 1 ], + [ "lighter", 60 ], + [ "ref_lighter", 5 ], + [ "matches", 60 ], + [ "extinguisher", 20 ], + [ "flashlight", 40 ], + [ "radio", 20 ], + [ "bubblewrap", 50 ], + [ "coffee_raw", 15 ], + [ "usb_drive", 5 ], + [ "software_useless", 10 ], + [ "software_electronics_reference", 2 ], + [ "umbrella", 5 ], + [ "teleumbrella", 2 ], + [ "gum", 10 ], + [ "caff_gum", 6 ], + [ "nic_gum", 4 ], + [ "fan", 10 ], + [ "sm_extinguisher", 10 ], + [ "pocketwatch", 2 ], + [ "gold_watch", 2 ], + [ "sf_watch", 1 ], + [ "silver_watch", 5 ], + [ "survnote", 1 ], + [ "magnifying_glass", 8 ], + [ "camera_control", 2 ], + [ "eclipse_glasses", 1 ] + ] + }, + { + "type": "item_group", + "id": "cubical_office", + "items": [ + { "group": "softdrinks_canned", "prob": 560 }, + [ "file", 90 ], + [ "mag_barter", 15 ], + [ "mag_computer", 35 ], + [ "mag_electronics", 15 ], + [ "mag_survival", 20 ], + [ "glassblowing_book", 1 ], + [ "mag_traps", 3 ], + [ "trappers_companion", 1 ], + [ "mag_bashing", 10 ], + [ "manual_bashing", 1 ], + [ "mag_cutting", 10 ], + [ "mag_stabbing", 5 ], + [ "mag_unarmed", 20 ], + [ "textbook_speech", 6 ], + [ "survival_book", 4 ], + [ "fun_survival", 10 ], + [ "recipe_augs", 1 ], + [ "decoy_anarch", 10 ], + [ "aspirin", 85 ], + [ "maltballs", 30 ], + { "group": "tobacco_products", "prob": 151 }, + [ "glasses_eye", 90 ], + [ "contacts", 15 ], + [ "sunglasses", 90 ], + [ "fitover_sunglasses", 60 ], + [ "fancy_sunglasses", 5 ], + [ "glasses_reading", 90 ], + [ "glasses_bifocal", 90 ], + [ "fan", 10 ], + [ "briefcase", 40 ], + [ "purse", 40 ], + [ "mbag", 20 ], + { "group": "ammo_pocket_batteries", "prob": 50 }, + [ "mag_news", 35 ], + [ "manual_business", 40 ], + [ "textbook_business", 12 ], + [ "manual_computers", 20 ], + [ "howto_computer", 10 ], + [ "mag_fabrication", 12 ], + [ "textbook_computer", 8 ], + [ "computer_science", 8 ], + [ "howto_computer", 6 ], + [ "matches", 60 ], + [ "extinguisher", 20 ], + [ "flashlight", 40 ], + [ "radio", 20 ], + [ "bubblewrap", 50 ], + [ "coffee_raw", 15 ], + [ "usb_drive", 5 ], + [ "coat_rain", 50 ], + [ "hood_rain", 10 ], + [ "poncho", 15 ], + [ "folding_poncho", 5 ], + [ "mag_tv", 40 ], + [ "mag_dude", 40 ], + [ "mag_glam", 40 ], + [ "mag_beauty", 30 ], + [ "mag_news", 35 ], + [ "lighter", 60 ], + [ "ref_lighter", 5 ], + [ "matches", 60 ], + [ "extinguisher", 20 ], + [ "mp3", 18 ], + [ "portable_game", 8 ], + [ "game_watch", 2 ], + [ "umbrella", 5 ], + [ "teleumbrella", 2 ], + [ "mag_tailor", 5 ], + [ "gum", 20 ], + [ "caff_gum", 7 ], + [ "nic_gum", 5 ], + [ "sm_extinguisher", 10 ], + [ "pocketwatch", 2 ], + [ "knitting_needles", 1 ], + [ "survnote", 1 ], + [ "eclipse_glasses", 1 ] + ] + }, + { + "type": "item_group", + "id": "office_breakroom", + "items": [ + { "group": "softdrinks_canned", "prob": 900 }, + { "group": "candy_chocolate", "prob": 625 }, + [ "cookies", 60 ], + [ "brownie", 60 ], + [ "aspirin", 40 ], + { "group": "tobacco_products", "prob": 150 }, + [ "gum", 100 ], + [ "caff_gum", 20 ], + [ "nic_gum", 20 ], + [ "weed", 10 ], + [ "joint", 10 ], + [ "matches", 50 ], + [ "lighter", 50 ], + [ "glasses_eye", 30 ], + [ "contacts", 30 ], + [ "radio", 100 ], + { "group": "ammo_pocket_batteries_full", "prob": 50 }, + [ "umbrella", 50 ], + [ "teleumbrella", 20 ], + [ "mag_barter", 10 ], + [ "mag_computer", 10 ], + [ "mag_tv", 10 ], + [ "mag_dude", 10 ], + [ "mag_glam", 10 ], + [ "mag_beauty", 10 ], + [ "mag_news", 10 ], + [ "mag_traps", 10 ], + [ "mag_bashing", 10 ], + [ "mag_cutting", 10 ], + [ "mag_stabbing", 10 ], + [ "mag_unarmed", 10 ], + [ "weeks_old_newspaper", 80 ], + [ "newest_newspaper", 100 ], + [ "survnote", 1 ], + [ "dnd_handbook", 1 ] + ] + }, + { + "type": "item_group", + "id": "vault", + "items": [ + { "group": "schematics", "prob": 5 }, + [ "recipe_mil_augs", 5 ], + [ "recipe_caseless", 5 ], + [ "recipe_labchem", 5 ], + [ "file", 20 ], + [ "platinum_small", 10 ], + [ "gold_small", 10 ], + [ "silver_small", 30 ], + [ "money_bundle", 50 ], + [ "pocketwatch", 11 ], + [ "gold_watch", 12 ], + [ "sf_watch", 10 ], + [ "platinum_watch", 1 ], + [ "survnote", 3 ], + [ "gold_ring", 10 ], + [ "diamond_ring", 10 ], + [ "gold_bracelet", 12 ], + [ "silver_bracelet", 14 ], + [ "copper_bracelet", 10 ], + [ "bead_bracelet", 5 ], + [ "pearl_collar", 10 ], + [ "silver_necklace", 14 ], + [ "bead_necklace", 5 ], + [ "silver_locket", 10 ], + [ "gold_ear", 12 ], + [ "silver_ear", 14 ], + [ "copper_ear", 10 ], + [ "jade_brooch", 10 ], + [ "diamond", 10 ], + [ "crown_golden", 5 ], + [ "diamond_dental_grill", 5 ], + [ "gold_dental_grill", 5 ], + [ "bio_time_freeze", 4 ], + [ "bio_teleport", 4 ], + [ "bio_probability_travel", 4 ], + [ "standard_template_construct", 4 ], + [ "briefcase", 4 ], + [ "small_relic", 3 ], + [ "holy_symbol", 3 ], + [ "holy_symbol_wood", 3 ], + [ "magic_8_ball", 2 ], + [ "coin_quarter", 2 ], + [ "straw_doll", 2 ], + [ "petrified_eye", 1 ], + [ "spiral_stone", 1 ], + [ "etched_skull", 1 ] + ] + }, + { + "type": "item_group", + "id": "shelter", + "items": [ + [ "daypack", 10 ], + [ "ski_jacket", 40 ], + [ "water_clean", 90 ], + [ "water_mineral", 5 ], + [ "soup_veggy", 15 ], + [ "soup_meat", 15 ], + [ "soup_chicken", 15 ], + [ "soup_mushroom", 15 ], + [ "inflatable_boat", 5 ], + [ "hand_pump", 5 ], + [ "soup_tomato", 15 ], + [ "soup_dumplings", 15 ], + [ "curry_veggy", 15 ], + [ "curry_meat", 15 ], + [ "chocolate", 50 ], + [ "ravioli", 25 ], + [ "can_beans", 40 ], + [ "pork_beans", 40 ], + [ "can_tomato", 40 ], + [ "cooked_pumpkin", 20 ], + [ "con_milk", 20 ], + [ "milk_evap", 15 ], + [ "milk_UHT", 10 ], + [ "can_spam", 30 ], + [ "can_tuna", 35 ], + [ "can_salmon", 25 ], + [ "can_chowder", 35 ], + [ "can_chicken", 40 ], + [ "neccowafers", 40 ], + [ "can_herring", 30 ], + [ "coffee_raw", 15 ], + [ "cheese_hard", 5 ], + [ "bandages", 50 ], + [ "cotton_ball", 50 ], + [ "1st_aid", 35 ], + [ "survival_kit", 35 ], + [ "saline", 10 ], + [ "vitamins", 75 ], + [ "gummy_vitamins", 25 ], + [ "calcium_tablet", 75 ], + [ "iodine", 5 ], + [ "prussian_blue", 5 ], + [ "dayquil", 70 ], + [ "screwdriver", 40 ], + [ "screwdriver_set", 10 ], + [ "boots", 70 ], + [ "boots_winter", 60 ], + [ "boots_hiking", 30 ], + [ "runner_bag", 5 ], + [ "socks_wool", 30 ], + [ "jeans", 90 ], + [ "pants_checkered", 5 ], + [ "shorts", 70 ], + [ "shorts_denim", 35 ], + [ "tshirt", 80 ], + [ "longshirt", 70 ], + [ "sweatshirt", 75 ], + [ "sweater", 75 ], + [ "coat_winter", 50 ], + [ "gloves_wool", 33 ], + [ "thermal_socks", 2 ], + [ "thermal_gloves", 2 ], + [ "thermal_suit", 2 ], + [ "thermal_mask", 2 ], + [ "thermal_outfit", 1 ], + [ "gloves_winter", 40 ], + [ "gloves_liner", 25 ], + [ "gloves_tactical", 5 ], + [ "glasses_bal", 5 ], + [ "hat_knit", 25 ], + [ "backpack", 38 ], + [ "backpack_leather", 8 ], + [ "backpack_tactical_large", 3 ], + [ "slingpack", 8 ], + { "group": "ammo_pocket_batteries_full", "prob": 50 }, + [ "novel_scifi", 20 ], + [ "novel_drama", 40 ], + [ "mag_dodge", 20 ], + [ "manual_dodge", 2 ], + [ "manual_first_aid", 40 ], + [ "manual_tailor", 15 ], + [ "textbook_tailor", 5 ], + [ "manual_carpentry", 10 ], + [ "manual_bashing", 1 ], + [ "mag_mechanics", 15 ], + [ "recipe_bows", 4 ], + [ "recipe_arrows", 4 ], + [ "child_book", 1 ], + [ "many_years_old_newspaper", 3 ], + [ "years_old_newspaper", 3 ], + [ "one_year_old_newspaper", 3 ], + [ "months_old_newspaper", 4 ], + [ "lighter", 60 ], + [ "ref_lighter", 5 ], + [ "matches", 60 ], + [ "sewing_kit", 47 ], + [ "tailors_kit", 3 ], + [ "thread", 40 ], + [ "hammer", 35 ], + [ "extinguisher", 20 ], + [ "flashlight", 40 ], + [ "heavy_flashlight", 5 ], + [ "mess_kit", 10 ], + [ "hotplate", 10 ], + [ "popcan_stove", 5 ], + [ "denat_alcohol", 5 ], + [ "water_purifier", 5 ], + [ "radio", 20 ], + [ "rollmat", 40 ], + [ "tent_kit", 17 ], + [ "large_tent_kit", 17 ], + [ "survival_kit", 10 ], + [ "canteen", 15 ], + [ "2lcanteen", 10 ], + [ "camelbak", 5 ], + [ "spray_can", 50 ], + [ "ax", 8 ], + [ "heatpack", 60 ], + [ "blanket", 20 ], + [ "down_blanket", 10 ], + [ "pillow", 20 ], + [ "down_pillow", 15 ], + [ "emer_blanket", 20 ], + [ "flyer", 10 ], + [ "gasoline_lantern", 5 ], + [ "electric_lantern", 8 ], + [ "oil_lamp", 5 ], + [ "lamp_oil", 5 ], + [ "flotation_vest", 1 ], + [ "vaccine_shot", 10 ], + [ "flu_shot", 1 ], + [ "coat_rain", 5 ], + [ "hood_rain", 5 ], + [ "umbrella", 7 ], + [ "teleumbrella", 3 ], + [ "apron_leather", 5 ], + [ "pocketwatch", 5 ], + [ "e_tool", 2 ], + [ "sm_extinguisher", 10 ], + [ "flaregun", 5 ], + [ "signal_flare", 10 ], + [ "survivormap", 1 ], + [ "pur_tablets", 5 ], + [ "razor_blade", 5 ], + [ "sheath", 5 ], + [ "bootsheath", 5 ], + [ "holster", 4 ], + [ "bandolier_shotgun", 3 ], + [ "survnote", 2 ], + [ "bodypillow", 1 ], + [ "flint_steel", 6 ], + [ "bottle_metal", 2 ], + [ "hobo_stove", 3 ], + [ "tinder", 3 ], + [ "tinderbox", 2 ], + [ "tarp", 15 ], + [ "chem_hexamine", 4 ], + [ "esbit_stove", 8 ], + [ "bottle_folding", 6 ], + [ "mess_tin", 8 ], + [ "metal_file", 5 ], + [ "pin_reamer", 3 ] + ] } ] diff --git a/data/json/itemgroups/locations_commercial.json b/data/json/itemgroups/locations_commercial.json index 990b01d00c249..001bd8e8ba50d 100644 --- a/data/json/itemgroups/locations_commercial.json +++ b/data/json/itemgroups/locations_commercial.json @@ -43,6 +43,7 @@ "items": [ [ "rope_6", 20 ], [ "string_36", 25 ], + [ "toilet_paper", 10 ], [ "handflare", 15 ], [ "duct_tape", 25 ], [ "flashlight", 25 ], diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json index ed5a13cb02d33..68292fdaddb19 100644 --- a/data/json/itemgroups/main.json +++ b/data/json/itemgroups/main.json @@ -260,7 +260,8 @@ [ "arrow_field_point_fletched", 50 ], [ "arrow_cf", 100 ], [ "bolt_wood", 100 ], - [ "bolt_wood_bodkin", 50 ] + [ "bolt_wood_bodkin", 50 ], + [ "bolt_cf", 100 ] ] } ] diff --git a/data/json/itemgroups/mall_item_groups.json b/data/json/itemgroups/mall_item_groups.json index 934f64c980d13..f4b359e1cd303 100644 --- a/data/json/itemgroups/mall_item_groups.json +++ b/data/json/itemgroups/mall_item_groups.json @@ -283,7 +283,13 @@ [ "soap", 45 ], [ "tailors_kit", 25 ], [ "shavingkit", 20 ], - [ "elec_hairtrimmer", 20 ] + [ "elec_hairtrimmer", 20 ], + [ "razor_shaving", 20 ], + [ "curler_hair", 30 ], + [ "hair_dryer", 40 ], + [ "curling_iron", 40 ], + [ "comb_pocket", 10 ], + [ "hairbrush", 10 ] ] }, { diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json index b67896f52d3dd..34c5a75e4b944 100644 --- a/data/json/itemgroups/mansion.json +++ b/data/json/itemgroups/mansion.json @@ -976,6 +976,7 @@ [ "38_casing", 20 ], [ "45_casing", 20 ], [ "bone_tainted", 1 ], + [ "toothbrush_plain", 10 ], { "group": "corpse_mansion", "prob": 1 } ] }, @@ -1144,7 +1145,10 @@ [ "oxy_powder", 5 ], [ "fungicide", 5 ], [ "insecticide", 5 ], - { "item": "charcoal", "prob": 5, "container-item": "bag_canvas" } + { "item": "charcoal", "prob": 5, "container-item": "bag_canvas" }, + [ "toilet_paper", 30 ], + [ "plunger_toilet", 10 ], + [ "plunger_futuristic", 25 ] ] }, { @@ -1301,7 +1305,12 @@ [ "sewing_kit", 10 ], [ "mag_beauty", 10 ], [ "mag_glam", 10 ], - { "group": "harddrugs", "prob": 5 } + { "group": "harddrugs", "prob": 5 }, + [ "hairbrush", 30 ], + [ "comb_pocket", 15 ], + [ "curler_hair", 10 ], + [ "curling_iron", 15 ], + [ "brush_toilet", 15 ] ] }, { @@ -1333,7 +1342,9 @@ [ "nyquil", 5 ], { "group": "mansion_guns", "prob": 3 }, { "group": "harddrugs", "prob": 1 }, - [ "joint", 1 ] + [ "joint", 1 ], + [ "curler_hair", 10 ], + [ "hairbrush", 5 ] ] }, { diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 746e2675d5566..9346c012ffe11 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -1,4 +1,105 @@ [ + { + "type": "item_group", + "id": "military_standard_assault_rifles", + "subtype": "distribution", + "entries": [ + { "item": "m4a1", "prob": 88, "charges": [ 0, 30 ] }, + { "item": "m27iar", "prob": 10, "charges": [ 0, 30 ] }, + { "item": "m16a4", "prob": 2, "charges": [ 0, 30 ] } + ] + }, + { + "type": "item_group", + "id": "military_standard_shotguns", + "subtype": "distribution", + "entries": [ { "item": "m1014", "prob": 60, "charges": [ 0, 8 ] }, { "item": "mossberg_590", "prob": 40, "charges": [ 0, 9 ] } ] + }, + { + "type": "item_group", + "id": "military_standard_sniper_rifles", + "subtype": "distribution", + "entries": [ { "item": "m2010", "prob": 20, "charges": [ 0, 5 ] }, { "item": "m110a1", "prob": 80, "charges": [ 0, 20 ] } ] + }, + { + "type": "item_group", + "id": "military_standard_lmgs", + "subtype": "distribution", + "entries": [ { "item": "m249", "prob": 100, "charges": [ 0, 200 ] } ] + }, + { + "type": "item_group", + "id": "military_standard_pistols", + "subtype": "distribution", + "entries": [ + { "item": "m9", "prob": 30, "charges": [ 0, 15 ] }, + { "item": "m17", "prob": 65, "charges": [ 0, 17 ] }, + { "item": "glock_19", "prob": 3, "charges": [ 0, 15 ] }, + { "item": "m1911_MEU", "prob": 2, "charges": [ 0, 7 ] } + ] + }, + { + "type": "item_group", + "id": "military_standard_grenades", + "subtype": "distribution", + "entries": [ { "item": "grenade", "prob": 100 } ] + }, + { + "type": "item_group", + "id": "military_patrol_food", + "subtype": "collection", + "entries": [ + { "group": "MRE", "count": [ 1, 3 ], "prob": 70 }, + { "item": "chocolate", "prob": 20 }, + { "item": "neccowafers", "prob": 20 }, + { "item": "water_clean", "container-item": "canteen", "prob": 80, "charges": [ 0, 6 ] } + ] + }, + { + "type": "item_group", + "id": "infantry_common_gear", + "subtype": "collection", + "entries": [ + { "item": "e_tool", "prob": 60 }, + { "item": "mask_gas", "prob": 20 }, + { "item": "two_way_radio", "prob": 60 }, + { "item": "sheath", "contents-item": "knife_combat", "prob": 80 } + ] + }, + { + "type": "item_group", + "id": "infantry_officer_gear", + "subtype": "collection", + "entries": [ + { "item": "holster", "contents-group": "military_standard_pistols", "prob": 90 }, + { "item": "id_military", "prob": 90 } + ] + }, + { + "type": "item_group", + "id": "infantry_medical_gear", + "subtype": "collection", + "entries": [ + { "item": "1st_aid", "prob": 90 }, + { "item": "quikclot", "prob": 60 }, + { "collection": [ { "item": "morphine" }, { "item": "syringe" } ], "prob": 30 } + ] + }, + { + "type": "item_group", + "id": "sopmod", + "subtype": "collection", + "entries": [ + { + "distribution": [ { "item": "holo_sight", "prob": 50 }, { "item": "acog_scope", "prob": 30 }, { "item": "red_dot_sight", "prob": 20 } ] + }, + { "distribution": [ { "item": "grip", "prob": 70 }, { "item": "m203", "prob": 30 } ] }, + { "item": "offset_sights", "prob": 30 }, + { "item": "shoulder_strap", "prob": 70 }, + { "item": "rail_laser_sight", "prob": 30 }, + { "item": "suppressor", "prob": 70 } + ] + }, { "type": "item_group", "id": "military", diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 09466e08d9874..8b82da7eab8a3 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -4,7 +4,7 @@ "type": "item_group", "subtype": "collection", "//": "Smokable item and something to light it with", - "items": [ + "entries": [ { "distribution": [ { "item": "cig", "prob": 70, "charges": [ 1, 10 ] }, diff --git a/data/json/itemgroups/monster_drops_advtech.json b/data/json/itemgroups/monster_drops_advtech.json index 899a5234a9a66..809ca9705e7a2 100644 --- a/data/json/itemgroups/monster_drops_advtech.json +++ b/data/json/itemgroups/monster_drops_advtech.json @@ -66,53 +66,6 @@ "id": "molebot", "items": [ [ "spiked_plate", 15 ], [ "hard_plate", 30 ], [ "robot_controls", 5 ] ] }, - { - "type": "item_group", - "id": "tripod", - "items": [ - { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 }, - [ "kevlar_plate", 10 ], - [ "ceramic_armor", 15 ], - [ "alloy_plate", 10 ], - [ "robot_controls", 3 ] - ] - }, - { - "type": "item_group", - "id": "chickenbot", - "items": [ - [ "robot_controls", 5 ], - [ "ai_module", 5 ], - [ "sensor_module", 5 ], - [ "memory_module", 5 ], - [ "pathfinding_module", 5 ], - [ "identification_module", 5 ], - [ "reverse_jointed_legs", 40 ], - [ "chickenbot_chassis", 40 ], - [ "targeting_module", 5 ], - [ "gun_module", 30 ], - [ "mark19", 5 ], - [ "tazer", 5 ], - [ "m249", 5 ], - [ "storage_battery", 5 ], - [ "plut_cell", 5 ], - [ "mil_plate", 2 ] - ] - }, - { - "type": "item_group", - "id": "tankbot", - "items": [ - [ "tazer", 3 ], - { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 }, - [ "556", 8 ], - [ "alloy_plate", 10 ], - [ "kevlar_plate", 10 ], - [ "ceramic_armor", 10 ], - [ "hard_plate", 30 ], - [ "robot_controls", 5 ] - ] - }, { "type": "item_group", "id": "turret", diff --git a/data/json/itemgroups/obsolete.json b/data/json/itemgroups/obsolete.json index 32b5b44c2004d..800f7daf46b92 100644 --- a/data/json/itemgroups/obsolete.json +++ b/data/json/itemgroups/obsolete.json @@ -13,5 +13,52 @@ "id": "elec_parts", "type": "item_group", "items": [ { "group": "supplies_electronics", "prob": 100 } ] + }, + { + "type": "item_group", + "id": "chickenbot", + "items": [ + [ "robot_controls", 5 ], + [ "ai_module", 5 ], + [ "sensor_module", 5 ], + [ "memory_module", 5 ], + [ "pathfinding_module", 5 ], + [ "identification_module", 5 ], + [ "reverse_jointed_legs", 40 ], + [ "chickenbot_chassis", 40 ], + [ "targeting_module", 5 ], + [ "gun_module", 30 ], + [ "mark19", 5 ], + [ "tazer", 5 ], + [ "m249", 5 ], + [ "storage_battery", 5 ], + [ "plut_cell", 5 ], + [ "mil_plate", 2 ] + ] + }, + { + "type": "item_group", + "id": "tankbot", + "items": [ + [ "tazer", 3 ], + { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 }, + [ "556", 8 ], + [ "alloy_plate", 10 ], + [ "kevlar_plate", 10 ], + [ "ceramic_armor", 10 ], + [ "hard_plate", 30 ], + [ "robot_controls", 5 ] + ] + }, + { + "type": "item_group", + "id": "tripod", + "items": [ + { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 }, + [ "kevlar_plate", 10 ], + [ "ceramic_armor", 15 ], + [ "alloy_plate", 10 ], + [ "robot_controls", 3 ] + ] } ] diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index 0713a26dd4110..0d53fcb60660a 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/data/json/itemgroups/science_and_tech.json @@ -139,12 +139,9 @@ [ "schematics_eyebot", 50 ], [ "schematics_secubot", 50 ], [ "schematics_skitterbot", 50 ], - [ "schematics_chickenbot", 5 ], [ "schematics_hazmatbot", 50 ], [ "schematics_riotbot", 50 ], [ "schematics_sciencebot", 10 ], - [ "schematics_tankbot", 5 ], - [ "schematics_tripod", 5 ], [ "schematics_molebot", 20 ], [ "schematics_dispatch", 25 ], [ "schematics_dispatch_military", 20 ], diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index e0a18a99260c4..94a0e2f301fac 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -108,7 +108,9 @@ [ "pump_complex", 5 ], [ "well_pump", 5 ], [ "plastic_sheet", 20 ], - [ "recharge_station", 20 ] + [ "recharge_station", 20 ], + [ "plunger_toilet", 75 ], + [ "plunger_futuristic", 25 ] ] }, { @@ -128,7 +130,9 @@ [ "jerrycan", 10 ], [ "pump_complex", 10 ], [ "well_pump", 10 ], - { "item": "scrap_copper", "prob": 15, "count": [ 1, 10 ] } + { "item": "scrap_copper", "prob": 15, "count": [ 1, 10 ] }, + { "item": "plunger_toilet", "prob": 90, "count": [ 1, 2 ] }, + [ "plunger_futuristic", 50 ] ] }, { diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index fcdc7a39561b4..1fa7712c9e83a 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -16,7 +16,8 @@ [ "hand_drill", 20 ], [ "nailgun", 100 ], [ "chisel", 10 ], - [ "toolbox", 15 ] + [ "toolbox", 12 ], + [ "toolbox_workshop", 3 ] ] }, { @@ -30,7 +31,8 @@ [ "elec_jackhammer", 40 ], [ "metal_smoother", 90 ], [ "jackhammer", 40 ], - [ "toolbox", 25 ], + [ "toolbox", 20 ], + [ "toolbox_workshop", 5 ], [ "recharge_station", 10 ], [ "angular_grinder", 30 ] ] @@ -193,7 +195,8 @@ { "group": "tools_common", "prob": 100 }, { "group": "tools_lighting", "prob": 50 }, { "group": "tools_tailor", "prob": 50 }, - [ "toolbox", 5 ] + [ "toolbox", 4 ], + [ "toolbox_workshop", 1 ] ] }, { diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index b9b0370f9b004..56cabbb624e90 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -483,7 +483,7 @@ "id": "22_casing_new", "category": "spare_parts", "price": 100, - "name": "unused .22 casing", + "name": { "str": "unused .22 casing" }, "symbol": "=", "color": "yellow", "description": "An unfired, like-new .22 round casing, with the primer still intact.", @@ -792,7 +792,7 @@ "range": 45, "dispersion": 50, "recoil": 350, - "effects": [ "COOKOFF", "TRAIL", "NEVER_MISFIRES", "FRAG" ] + "effects": [ "COOKOFF", "NEVER_MISFIRES", "FRAG" ] }, { "type": "AMMO", diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json index cd8f9a9b51e76..441073c0b458c 100644 --- a/data/json/items/ammo/20x66mm.json +++ b/data/json/items/ammo/20x66mm.json @@ -3,7 +3,7 @@ "id": "20x66_beanbag", "copy-from": "20x66_shot", "type": "AMMO", - "name": "20x66mm beanbag", + "name": { "str": "20x66mm beanbag" }, "description": "20x66mm caseless shotgun rounds, sublethal beanbag type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "price": 8000, "price_postapoc": 25000, @@ -15,7 +15,7 @@ "id": "20x66_bootleg_flechette", "copy-from": "20x66_flechette", "type": "AMMO", - "name": "20x66mm flechette, handmade", + "name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" }, "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds. Being caseless rounds, these cannot be disassembled or reloaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -25,7 +25,7 @@ "id": "20x66_bootleg_shot", "copy-from": "20x66_shot", "type": "AMMO", - "name": "20x66mm buckshot, handmade", + "name": { "str": "20x66mm buckshot, handmade" }, "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds. Being caseless rounds, these cannot be disassembled or reloaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -35,7 +35,7 @@ "id": "20x66_bootleg_slug", "copy-from": "20x66_slug", "type": "AMMO", - "name": "20x66mm slug, handmade", + "name": { "str": "20x66mm slug, handmade", "str_pl": "20x66mm slugs, handmade" }, "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds. Being caseless rounds, these cannot be disassembled or reloaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -45,7 +45,7 @@ "id": "20x66_exp", "copy-from": "20x66_shot", "type": "AMMO", - "name": "20x66mm explosive", + "name": { "str": "20x66mm explosive" }, "description": "20x66mm caseless shotgun rounds, explosive projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "price": 10000, "price_postapoc": 80000, @@ -59,7 +59,7 @@ "id": "20x66_flare", "copy-from": "20x66_shot", "type": "AMMO", - "name": "20x66mm flare", + "name": { "str": "20x66mm flare" }, "description": "20x66mm caseless shotgun rounds, signal flare type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "price": 5000, "price_postapoc": 20000, @@ -75,7 +75,7 @@ "id": "20x66_flechette", "copy-from": "20x66_shot", "type": "AMMO", - "name": "20x66mm flechette", + "name": { "str": "20x66mm flechette" }, "description": "20x66mm caseless shotgun rounds, flechette type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "price": 4000, "price_postapoc": 55000, @@ -86,7 +86,7 @@ "id": "20x66_frag", "copy-from": "20x66_slug", "type": "AMMO", - "name": "20x66mm frag", + "name": { "str": "20x66mm frag" }, "description": "20x66mm caseless shotgun rounds, explosive fragmentation type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "price": 7800, "price_postapoc": 90000, @@ -98,7 +98,7 @@ "id": "20x66_inc", "copy-from": "20x66_shot", "type": "AMMO", - "name": "20x66mm incendiary", + "name": { "str": "20x66mm incendiary" }, "description": "20x66mm caseless shotgun rounds, incendiary type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "price": 10500, "price_postapoc": 100000, @@ -108,7 +108,7 @@ { "id": "20x66_shot", "type": "AMMO", - "name": "20x66mm buckshot", + "name": { "str": "20x66mm buckshot" }, "//": "2.5x the Generic Rate of $1/shot", "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "weight": "56 g", @@ -130,7 +130,7 @@ "id": "20x66_slug", "copy-from": "20x66_shot", "type": "AMMO", - "name": "20x66mm slug", + "name": { "str": "20x66mm slug" }, "description": "20x66mm caseless shotgun rounds, solid projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "price": 1500, "price_postapoc": 9000, diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json index c7956feb66841..cb7288309746d 100644 --- a/data/json/items/ammo/22.json +++ b/data/json/items/ammo/22.json @@ -3,7 +3,7 @@ "id": "22_cb", "copy-from": "22_lr", "type": "AMMO", - "name": ".22 CB", + "name": { "str": ".22 CB" }, "description": "The .22 Conical Ball is a variety of .22 ammunition that propels its bullet using a primer instead of gunpowder. The end result is a subsonic round that is so weak as to be nearly useless given your predicament.", "price": 100, "price_postapoc": 1800, @@ -17,14 +17,14 @@ "id": "22_fmj", "copy-from": "22_lr", "type": "AMMO", - "name": ".22 FMJ", + "name": { "str": ".22 FMJ" }, "description": ".22 Long Rifle ammunition with 30gr FMJ bullets. The .22LR round is extremely weak with very low stopping power, short range, and negligible recoil. It is most useful for rifle training, and hunting small animals.", "relative": { "damage": -1, "pierce": 2 } }, { "id": "22_lr", "type": "AMMO", - "name": ".22 LR", + "name": { "str": ".22 LR" }, "description": ".22 Long Rifle ammunition with 40gr unjacketed bullets. The .22LR round is extremely weak with very low stopping power, short range, and negligible recoil. It is most useful for rifle training, and hunting small animals.", "weight": "3 g", "volume": "250 ml", @@ -47,7 +47,7 @@ "id": "22_ratshot", "copy-from": "22_lr", "type": "AMMO", - "name": ".22 rat-shot", + "name": { "str": ".22 rat-shot" }, "description": "A .22 caliber cartridge loaded with very small pieces of shot contained within a fragmenting plastic capsule. It has an extremely short range and penetration ability, but it can hit targets with greater ease.", "count": 100, "dispersion": 0, diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json index 1fc70c2b873c5..1c86f3b30d2b9 100644 --- a/data/json/items/ammo/223.json +++ b/data/json/items/ammo/223.json @@ -2,7 +2,7 @@ { "id": "223", "type": "AMMO", - "name": ".223 Remington", + "name": { "str": ".223 Remington" }, "description": ".223 Remington ammunition with 36gr JHP bullets. The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons. It generates lower pressure than 5.56 NATO leading to slightly decreased accuracy and recoil.", "weight": "12 g", "volume": "250 ml", diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json index 2aba414b5f4d2..f2d4fe85bfbf8 100644 --- a/data/json/items/ammo/270win.json +++ b/data/json/items/ammo/270win.json @@ -2,7 +2,7 @@ { "id": "270win_jsp", "type": "AMMO", - "name": ".270 Winchester JSP", + "name": { "str": ".270 Winchester JSP" }, "description": ".270 Winchester ammunition with 130gr soft point bullets. The .270 round was not initially successful, but over a few decades it became one of the most popular rifle cartridges for hunting and silhouette shooting. It is a powerful round capable of taking down large targets with ease.", "weight": "20 g", "volume": "250 ml", diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json index d8de3d439abbd..cfbd5640fd075 100644 --- a/data/json/items/ammo/3006.json +++ b/data/json/items/ammo/3006.json @@ -2,7 +2,7 @@ { "id": "3006", "type": "AMMO", - "name": ".30-06 Springfield", + "name": { "str": ".30-06 Springfield" }, "description": ".30-06 Springfield rounds with 165gr soft point bullets. The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.", "weight": "20 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "3006_incendiary", "copy-from": "3006", "type": "AMMO", - "name": ".30-06 M14A1 tracer", + "name": { "str": ".30-06 M14A1 tracer" }, "description": "Armor piercing incendiary .30-06 M14A1 ammunition containing tracer rounds to help keep the weapon they are fired from on target. It penetrates all but the strongest body armor with ease.", "extend": { "effects": [ "INCENDIARY" ] } }, @@ -34,7 +34,7 @@ "id": "3006fmj", "copy-from": "3006", "type": "AMMO", - "name": ".30-06 M2 AP", + "name": { "str": ".30-06 M2 AP" }, "description": "Armor piercing .30-06 M2 ammunition with 168gr FMJ bullets. It is an extremely powerful and accurate cartridge but pays for its armor penetration abilities with lowered damage.", "relative": { "damage": -4, "pierce": 8 } }, diff --git a/data/json/items/ammo/shotpaper.json b/data/json/items/ammo/shotpaper.json index cbb196696c64e..8ba5ba25a6493 100644 --- a/data/json/items/ammo/shotpaper.json +++ b/data/json/items/ammo/shotpaper.json @@ -24,7 +24,7 @@ "type": "AMMO", "name": "buckshot paper cartridge", "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of 00 buckshot.", - "weight": 26, + "weight": "26 g", "volume": "250 ml", "material": [ "paper", "powder", "lead" ], "color": "white", diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json index 2ed1eeab0ec56..b630f4a4145d9 100644 --- a/data/json/items/ammo_types.json +++ b/data/json/items/ammo_types.json @@ -219,7 +219,7 @@ "type": "ammunition_type", "id": "223", "name": ".223", - "default": "223" + "default": "556" }, { "type": "ammunition_type", @@ -237,7 +237,7 @@ "type": "ammunition_type", "id": "308", "name": ".308", - "default": "308" + "default": "762_51" }, { "type": "ammunition_type", diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 5acf86f967097..3600d44c8f6df 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -455,6 +455,7 @@ "storage": "1 L", "warmth": 60, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY" ] }, { @@ -565,6 +566,7 @@ "storage": "20 L", "warmth": 40, "material_thickness": 5, + "valid_mods": [ "steel_padded" ], "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS" ] }, @@ -587,6 +589,7 @@ "storage": "12500 ml", "warmth": 10, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS" ] }, @@ -698,6 +701,7 @@ "storage": "20 L", "warmth": 40, "material_thickness": 5, + "valid_mods": [ "steel_padded" ], "environmental_protection": 2, "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF" ] }, @@ -741,6 +745,32 @@ "material_thickness": 1, "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT" ] }, + { + "id": "axe_ring", + "type": "ARMOR", + "name": "axe ring holster", + "description": "A combination of leather and a metal ring to hold an axe on your waist.", + "weight": "130 g", + "volume": "600 ml", + "price": 3000, + "material": [ "leather", "steel" ], + "symbol": "[", + "looks_like": "sheath", + "color": "brown", + "covers": [ "TORSO" ], + "coverage": 5, + "encumbrance": 2, + "material_thickness": 1, + "use_action": { + "type": "holster", + "holster_prompt": "Sheath axe", + "holster_msg": "You sheath your %s", + "max_volume": "3250 ml", + "draw_cost": 10, + "flags": [ "SHEATH_AXE" ] + }, + "flags": [ "NONCONDUCTIVE", "WAIST", "OVERSIZE", "WATER_FRIENDLY" ] + }, { "id": "b_shorts", "type": "ARMOR", @@ -862,28 +892,6 @@ "material_thickness": 2, "flags": [ "OVERSIZE", "RESTRICT_HANDS", "NO_SALVAGE" ] }, - { - "id": "beekeeping_gloves", - "type": "ARMOR", - "name": "pair of beekeeping gloves", - "name_plural": "pairs of beekeeping gloves", - "description": "A pair of white beekeeping gloves made out of smooth leather.", - "weight": "120 g", - "volume": "250 ml", - "price": 3000, - "to_hit": 1, - "material": [ "leather" ], - "symbol": "[", - "looks_like": "gloves_leather", - "color": "white", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 10, - "warmth": 30, - "material_thickness": 2, - "environmental_protection": 2, - "flags": [ "VARSIZE", "SKINTIGHT" ] - }, { "id": "beekeeping_hood", "type": "ARMOR", @@ -1093,6 +1101,7 @@ "storage": "500 ml", "warmth": 20, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "FANCY" ] }, { @@ -1314,28 +1323,6 @@ "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT" ] }, - { - "id": "boxing_gloves", - "type": "ARMOR", - "name": "pair of boxing gloves", - "name_plural": "pairs of boxing gloves", - "description": "A pair of big, red, 8 oz. boxing gloves. They make dexterous tasks near impossible, but provide ample protection.", - "weight": "453 g", - "volume": "1 L", - "price": 4000, - "to_hit": 1, - "material": [ "leather" ], - "symbol": "[", - "looks_like": "gloves_leather", - "color": "red", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 70, - "warmth": 20, - "material_thickness": 3, - "environmental_protection": 3, - "flags": [ "VARSIZE", "OVERSIZE", "STURDY" ] - }, { "id": "boy_shorts", "type": "ARMOR", @@ -1420,7 +1407,7 @@ "type": "ARMOR", "copy-from": "briefcase", "looks_like": "briefcase", - "name": "H&K operational briefcase (empty)", + "name": { "str": "H&K operational briefcase (empty)", "str_pl": "H&K operational briefcases (empty)" }, "description": "This is a plain, hard-sided black briefcase with a trigger in the handle and a concealed hole in the side. Squeezing the trigger would currently do nothing, as it is empty. Don't forget to put a suitable MP5 back inside before you try to pay any ransom fees with lead.", "storage": "14500 ml", "price": 2000, @@ -1492,6 +1479,7 @@ "storage": "2500 ml", "warmth": 30, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 6, "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] }, @@ -1517,6 +1505,7 @@ "storage": "1500 ml", "warmth": 30, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 6, "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF", "OUTER" ] }, @@ -1703,46 +1692,6 @@ "material_thickness": 4, "flags": [ "VARSIZE", "STURDY" ] }, - { - "id": "chainmail_feet", - "type": "ARMOR", - "category": "armor", - "name": "pair of chainmail chausses", - "name_plural": "pairs of chainmail chausses", - "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.", - "weight": "2006 g", - "volume": "500 ml", - "price": 5012, - "to_hit": -1, - "material": [ "iron", "cotton" ], - "symbol": "[", - "color": "light_red", - "covers": [ "FEET" ], - "coverage": 100, - "encumbrance": 20, - "material_thickness": 4, - "flags": [ "VARSIZE", "STURDY" ] - }, - { - "id": "chainmail_hands", - "type": "ARMOR", - "category": "armor", - "name": "pair of chainmail gloves", - "name_plural": "pairs of chainmail gloves", - "description": "Customized chainmail gloves. They fully enclose the fingers and provide excellent protection, but are somewhat cumbersome.", - "weight": "2006 g", - "volume": "500 ml", - "price": 5012, - "to_hit": -1, - "material": [ "iron", "cotton" ], - "symbol": "[", - "color": "light_red", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 30, - "material_thickness": 4, - "flags": [ "VARSIZE", "STURDY" ] - }, { "id": "chainmail_suit_faraday", "type": "ARMOR", @@ -2057,6 +2006,7 @@ "storage": "1 L", "warmth": 80, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 2, "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, @@ -2092,6 +2042,7 @@ "storage": "1250 ml", "warmth": 90, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 2, "flags": [ "VARSIZE", "POCKETS", "OUTER", "SUPER_FANCY" ] }, @@ -2176,6 +2127,7 @@ "storage": "3 L", "warmth": 70, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "OUTER" ] }, @@ -2330,7 +2282,7 @@ "symbol": "[", "looks_like": "backpack", "color": "red", - "weight": 411, + "weight": "411 g", "volume": "2 L", "//": "REI Co-op 22-liter daypack costs $54.95, so ballpark to $55", "price": 5500, @@ -2342,7 +2294,7 @@ "material_thickness": 1, "encumbrance": 2, "max_encumbrance": 18, - "storage": 96, + "storage": "24 L", "warmth": 5, "flags": [ "BELTED", "OVERSIZE", "STURDY" ] }, @@ -2409,6 +2361,7 @@ "encumbrance": 8, "warmth": 12, "material_thickness": 3, + "//": "Ceramic disks inside block addition of steel plating modification", "flags": [ "STURDY", "OUTER", "NO_REPAIR" ] }, { @@ -2577,6 +2530,7 @@ "storage": "6 L", "warmth": 50, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS", "OUTER", "WATERPROOF", "RAINPROOF" ] }, @@ -2635,6 +2589,7 @@ "storage": "9 L", "warmth": 10, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] }, @@ -2652,7 +2607,7 @@ "color": "light_gray", "coverage": 1, "material_thickness": 1, - "flags": [ "DEAF", "OVERSIZE" ] + "flags": [ "DEAF", "OVERSIZE", "POWERARMOR_COMPATIBLE" ] }, { "id": "eboshi", @@ -2788,12 +2743,13 @@ "encumbrance": 5, "warmth": 25, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "flags": [ "STURDY" ] }, { "id": "lame_foil", "type": "ARMOR", - "name": "lamé (foil)", + "name": { "str": "lamé (foil)", "str_pl": "lamés (foil)" }, "description": "A thin, lightweight conductive vest with the zipper on the back used by fencers for electronic scoring. Its outer layer is a woven mix of sturdy cotton and stainless steel strands.", "weight": "843 g", "volume": "2500 ml", @@ -2811,7 +2767,7 @@ { "id": "lame_saber", "type": "ARMOR", - "name": "lamé (saber)", + "name": { "str": "lamé (saber)", "str_pl": "lamés (saber)" }, "description": "A thin, lightweight conductive jacket used by fencers for electronic scoring. Its outer layer is a woven mix of sturdy cotton and stainless steel strands.", "weight": "1043 g", "volume": "2500 ml", @@ -2865,69 +2821,6 @@ "material_thickness": 2, "flags": [ "VARSIZE" ] }, - { - "id": "gauntlet_fencing", - "type": "ARMOR", - "name": "fencing gauntlet", - "description": "A single suede glove with sturdy cotton wrists, padded backs and well-fitting fingers.", - "weight": "175 g", - "volume": "250 ml", - "price": 6400, - "to_hit": -2, - "material": [ "leather", "cotton" ], - "symbol": "[", - "color": "white", - "covers": [ "HAND_R" ], - "encumbrance": 4, - "coverage": 100, - "warmth": 15, - "material_thickness": 3, - "environmental_protection": 1, - "flags": [ "STURDY" ] - }, - { - "id": "gauntlet_fencing_l", - "type": "ARMOR", - "name": "fencing gauntlet (left)", - "description": "A single suede glove with sturdy cotton wrists, padded backs and well-fitting fingers. This one is left-handed.", - "weight": "175 g", - "volume": "250 ml", - "price": 6400, - "to_hit": -2, - "material": [ "leather", "cotton" ], - "symbol": "[", - "color": "white", - "covers": [ "HAND_L" ], - "encumbrance": 4, - "coverage": 100, - "warmth": 15, - "material_thickness": 3, - "environmental_protection": 1, - "flags": [ "STURDY" ] - }, - { - "id": "fire_gauntlets", - "type": "ARMOR", - "category": "armor", - "name": "pair of fire gauntlets", - "name_plural": "pairs of fire gauntlets", - "description": "A heavy pair of gloves, used by firefighters and metalworkers for heat protection. Highly resistant to heat and flame, they provide excellent protection from injury.", - "weight": "572 g", - "volume": "1 L", - "price": 8200, - "to_hit": 2, - "material": [ "leather", "nomex" ], - "symbol": "[", - "looks_like": "gloves_leather", - "color": "dark_gray", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 50, - "warmth": 25, - "material_thickness": 4, - "environmental_protection": 6, - "flags": [ "VARSIZE", "STURDY", "WATERPROOF" ] - }, { "id": "firehelmet", "type": "ARMOR", @@ -3123,6 +3016,7 @@ "storage": "10 L", "warmth": 15, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 10, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY" ] }, @@ -3165,68 +3059,8 @@ "encumbrance": 15, "warmth": 30, "material_thickness": 5, - "flags": [ "VARSIZE", "STURDY" ] - }, - { - "id": "gauntlets_chitin", - "type": "ARMOR", - "category": "armor", - "name": "pair of chitinous gauntlets", - "name_plural": "pairs of chitinous gauntlets", - "description": "Gauntlets made from the exoskeletons of insects. Very light and durable.", - "weight": "760 g", - "volume": "1750 ml", - "price": 38000, - "to_hit": -2, - "bashing": 2, - "material": [ "chitin" ], - "symbol": "[", - "looks_like": "gauntlets_larmor", - "color": "green", - "covers": [ "HANDS" ], - "coverage": 95, - "encumbrance": 12, - "warmth": 20, - "material_thickness": 4, - "environmental_protection": 4, - "flags": [ "STURDY" ] - }, - { - "id": "gauntlets_acidchitin", - "copy-from": "gauntlets_chitin", - "looks_like": "gauntlets_chitin", - "type": "ARMOR", - "name": "pair of biosilicified chitin gauntlets", - "name_plural": "pairs of biosilicified chitin gauntlets", - "description": "Gauntlets crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant and very durable.", - "material": [ "acidchitin" ], - "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 }, - "relative": { "bashing": 1, "material_thickness": 1 } - }, - { - "id": "gauntlets_larmor", - "type": "ARMOR", - "category": "armor", - "name": "pair of leather armor gauntlets", - "name_plural": "pairs of leather armor gauntlets", - "description": "Heavy fingerless leather gloves. Very flexible and comfortable.", - "weight": "350 g", - "volume": "750 ml", - "price": 3400, - "to_hit": -2, - "bashing": 2, - "material": [ "leather" ], - "symbol": "[", - "looks_like": "gloves_leather", - "color": "brown", - "covers": [ "HANDS" ], - "coverage": 60, - "encumbrance": 4, - "warmth": 15, - "material_thickness": 3, - "environmental_protection": 1, "valid_mods": [ "steel_padded" ], - "flags": [ "VARSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS" ] + "flags": [ "VARSIZE", "STURDY" ] }, { "id": "glasses_bal", @@ -3374,592 +3208,9 @@ "coverage": 95, "encumbrance": 5, "warmth": 5, - "material_thickness": 2, - "environmental_protection": 1, - "flags": [ "WATER_FRIENDLY", "OUTER" ] - }, - { - "id": "glove_jackson", - "type": "ARMOR", - "name": "white glove", - "name_plural": "white gloves", - "description": "A single white glove covered with hundreds of rhinestones.", - "weight": "59 g", - "volume": "250 ml", - "price": 50000, - "to_hit": 1, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "gloves_leather", - "color": "white", - "covers": [ "HAND_R" ], - "coverage": 95, - "warmth": 20, - "material_thickness": 2, - "flags": [ "WATER_FRIENDLY", "FANCY" ] - }, - { - "id": "gloves_bag", - "type": "ARMOR", - "name": "pair of bag gloves", - "name_plural": "pairs of bag gloves", - "description": "A pair of disposable plastic bags, adapted to be used as gloves.", - "weight": "6 g", - "volume": "250 ml", - "price": 50, - "to_hit": -1, - "material": [ "plastic" ], - "symbol": "[", - "looks_like": "gloves_wraps", - "color": "light_blue", - "covers": [ "HANDS" ], - "coverage": 70, - "encumbrance": 7, - "material_thickness": 1, - "flags": [ "WATERPROOF", "OVERSIZE", "OUTER" ] - }, - { - "id": "gloves_fingerless", - "type": "ARMOR", - "name": "pair of fingerless gloves", - "name_plural": "pairs of fingerless gloves", - "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.", - "weight": "100 g", - "volume": "250 ml", - "price": 1400, - "to_hit": 2, - "material": [ "leather" ], - "symbol": "[", - "looks_like": "gloves_light", - "color": "dark_gray", - "covers": [ "HANDS" ], - "coverage": 50, - "warmth": 10, - "material_thickness": 1, - "flags": [ "VARSIZE", "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS" ] - }, - { - "id": "gloves_fingerless_mod", - "type": "ARMOR", - "category": "armor", - "name": "pair of armored fingerless gloves", - "name_plural": "pairs of armored fingerless gloves", - "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity. These have been crudely reinforced with steel guards across the back.", - "weight": "380 g", - "volume": "500 ml", - "price": 9000, - "to_hit": 2, - "material": [ "steel", "leather" ], - "symbol": "[", - "looks_like": "gloves_fingerless", - "color": "dark_gray", - "covers": [ "HANDS" ], - "coverage": 50, - "encumbrance": 3, - "warmth": 5, - "material_thickness": 1, - "flags": [ "VARSIZE", "ALLOWS_NATURAL_ATTACKS" ] - }, - { - "id": "gloves_fsurvivor", - "type": "ARMOR", - "category": "armor", - "name": "pair of survivor firegloves", - "name_plural": "pairs of survivor firegloves", - "description": "A pair of customized, Kevlar armored Nomex gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": "410 g", - "volume": "1 L", - "price": 18000, - "to_hit": 2, - "material": [ "kevlar", "nomex" ], - "symbol": "[", - "looks_like": "fire_gauntlets", - "color": "light_gray", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 30, - "warmth": 15, - "material_thickness": 3, - "environmental_protection": 10, - "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] - }, - { - "id": "gloves_fur", - "type": "ARMOR", - "name": "pair of fur gloves", - "name_plural": "pairs of fur gloves", - "description": "A pair of warm fur gloves. They are somewhat cumbersome.", - "weight": "410 g", - "volume": "1 L", - "price": 4000, - "to_hit": 1, - "material": [ "fur" ], - "symbol": "[", - "looks_like": "fire_gauntlets", - "color": "brown", - "covers": [ "HANDS" ], - "coverage": 95, - "encumbrance": 30, - "warmth": 70, - "material_thickness": 3 - }, - { - "id": "gloves_hsurvivor", - "type": "ARMOR", - "category": "armor", - "name": "pair of heavy survivor gloves", - "name_plural": "pairs of heavy survivor gloves", - "description": "A pair of heavily customized, steel-backed armored Kevlar gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": "380 g", - "volume": "1 L", - "price": 18000, - "to_hit": 2, - "material": [ "kevlar", "steel" ], - "symbol": "[", - "looks_like": "fire_gauntlets", - "color": "dark_gray", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 30, - "warmth": 15, - "material_thickness": 4, - "environmental_protection": 5, - "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] - }, - { - "id": "gloves_leather", - "type": "ARMOR", - "name": "pair of leather gloves", - "name_plural": "pairs of leather gloves", - "description": "A thin pair of black leather gloves.", - "weight": "160 g", - "volume": "250 ml", - "price": 4500, - "to_hit": 2, - "material": [ "leather" ], - "symbol": "[", - "looks_like": "gloves_light", - "color": "dark_gray", - "covers": [ "HANDS" ], - "coverage": 95, - "encumbrance": 10, - "warmth": 25, - "material_thickness": 1, - "valid_mods": [ "steel_padded" ], - "flags": [ "VARSIZE", "WATERPROOF" ] - }, - { - "id": "gloves_light", - "type": "ARMOR", - "name": "pair of light gloves", - "name_plural": "pairs of light gloves", - "description": "A pair of cotton gloves.", - "weight": "118 g", - "volume": "250 ml", - "price": 1100, - "to_hit": 1, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "gloves_leather", - "color": "light_blue", - "covers": [ "HANDS" ], - "coverage": 95, - "encumbrance": 2, - "warmth": 20, - "material_thickness": 2, - "flags": [ "WATER_FRIENDLY" ] - }, - { - "id": "gloves_liner", - "type": "ARMOR", - "name": "pair of glove liners", - "name_plural": "pairs of glove liners", - "description": "A pair of thin cotton gloves. Often used as a liner beneath other gloves.", - "weight": "63 g", - "volume": "250 ml", - "price": 600, - "to_hit": 1, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "gloves_light", - "color": "light_gray", - "covers": [ "HANDS" ], - "coverage": 95, - "encumbrance": 1, - "warmth": 15, - "material_thickness": 1, - "flags": [ "WATER_FRIENDLY", "SKINTIGHT" ] - }, - { - "id": "gloves_lsurvivor", - "type": "ARMOR", - "category": "armor", - "name": "pair of light survivor gloves", - "name_plural": "pairs of light survivor gloves", - "description": "A pair of customized, Kevlar armored cloth gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": "190 g", - "volume": "750 ml", - "price": 18000, - "to_hit": 2, - "material": [ "kevlar", "cotton" ], - "symbol": "[", - "looks_like": "gloves_survivor", - "color": "green", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 10, - "warmth": 15, - "material_thickness": 3, - "environmental_protection": 3, - "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] - }, - { - "id": "gloves_survivor_fingerless", - "type": "ARMOR", - "looks_like": "gloves_lsurvivor", - "category": "armor", - "name": "pair of fingerless survivor gloves", - "name_plural": "pairs of fingerless survivor gloves", - "description": "A pair of customized, Kevlar armored cloth gloves with no fingers, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": "160 g", - "volume": "700 ml", - "price": 16000, - "to_hit": 2, - "material": [ "kevlar", "cotton" ], - "symbol": "[", - "color": "green", - "covers": [ "HANDS" ], - "coverage": 85, - "encumbrance": 8, - "warmth": 12, - "material_thickness": 3, - "environmental_protection": 3, - "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "ALLOWS_NATURAL_ATTACKS" ] - }, - { - "id": "gloves_medical", - "type": "ARMOR", - "name": "pair of medical gloves", - "name_plural": "pairs of medical gloves", - "description": "A pair of thin latex gloves, designed to limit the spread of disease.", - "weight": "10 g", - "volume": 0, - "price": 1000, - "to_hit": 1, - "material": [ "plastic" ], - "symbol": "[", - "looks_like": "gloves_light", - "color": "white", - "covers": [ "HANDS" ], - "coverage": 90, - "encumbrance": 1, - "material_thickness": 1, - "environmental_protection": 6, - "flags": [ "WATER_FRIENDLY", "WATERPROOF", "SKINTIGHT" ] - }, - { - "id": "gloves_plate", - "type": "ARMOR", - "category": "armor", - "name": "pair of armored gauntlets", - "name_plural": "pairs of armored gauntlets", - "description": "An extremely heavy set of armor-plated leather gloves.", - "weight": "980 g", - "volume": "1500 ml", - "price": 40000, - "to_hit": -2, - "bashing": 7, - "material": [ "iron", "leather" ], - "symbol": "[", - "looks_like": "fire_gauntlets", - "color": "light_gray", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 20, - "warmth": 20, - "material_thickness": 4, - "environmental_protection": 1, - "flags": [ "VARSIZE", "STURDY" ] - }, - { - "id": "gloves_rubber", - "type": "ARMOR", - "name": "pair of rubber gloves", - "name_plural": "pairs of rubber gloves", - "description": "A pair of rubber gloves, often used while cleaning with caustic materials.", - "weight": "20 g", - "volume": "1 L", - "price": 1300, - "to_hit": 2, - "material": [ "plastic" ], - "symbol": "[", - "looks_like": "gloves_light", - "color": "yellow", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 40, - "warmth": 10, - "material_thickness": 3, - "environmental_protection": 8, - "flags": [ "WATERPROOF" ] - }, - { - "id": "gloves_survivor", - "type": "ARMOR", - "category": "armor", - "name": "pair of survivor gloves", - "name_plural": "pairs of survivor gloves", - "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": "230 g", - "volume": "750 ml", - "price": 18000, - "to_hit": 2, - "material": [ "kevlar", "leather" ], - "symbol": "[", - "looks_like": "fire_gauntlets", - "color": "brown", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 20, - "warmth": 15, - "material_thickness": 3, - "environmental_protection": 3, - "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] - }, - { - "id": "gloves_tactical", - "type": "ARMOR", - "category": "armor", - "name": "pair of tactical gloves", - "name_plural": "pairs of tactical gloves", - "description": "A pair of reinforced Kevlar tactical gloves. Commonly used by police and military units.", - "weight": "220 g", - "volume": "500 ml", - "price": 5200, - "to_hit": 2, - "material": [ "kevlar", "leather" ], - "symbol": "[", - "looks_like": "fire_gauntlets", - "color": "dark_gray", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 13, - "warmth": 20, - "material_thickness": 2, - "flags": [ "VARSIZE", "STURDY" ] - }, - { - "id": "gloves_winter", - "type": "ARMOR", - "name": "pair of winter gloves", - "name_plural": "pairs of winter gloves", - "description": "A pair of padded gloves. Cumbersome, but warm.", - "weight": "218 g", - "volume": "750 ml", - "price": 6500, - "to_hit": 1, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "gloves_leather", - "color": "light_blue", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 40, - "warmth": 70, - "material_thickness": 4 - }, - { - "id": "gloves_wool", - "type": "ARMOR", - "name": "pair of wool gloves", - "name_plural": "pairs of wool gloves", - "description": "A thick pair of wool gloves. Cumbersome, but warm.", - "weight": "240 g", - "volume": "250 ml", - "price": 3500, - "to_hit": 1, - "material": [ "wool" ], - "symbol": "[", - "looks_like": "gloves_winter", - "color": "blue", - "covers": [ "HANDS" ], - "coverage": 95, - "encumbrance": 20, - "warmth": 60, - "material_thickness": 3 - }, - { - "id": "gloves_work", - "type": "ARMOR", - "name": "pair of work gloves", - "name_plural": "pairs of work gloves", - "description": "A tough pair of gloves, for tough everyday work.", - "weight": "195 g", - "volume": "250 ml", - "price": 4500, - "to_hit": 2, - "material": [ "leather", "cotton" ], - "symbol": "[", - "looks_like": "gloves_leather", - "color": "brown", - "covers": [ "HANDS" ], - "coverage": 95, - "encumbrance": 20, - "warmth": 25, - "material_thickness": 3, - "environmental_protection": 5, - "flags": [ "WATERPROOF", "STURDY" ] - }, - { - "id": "gloves_cut_resistant", - "type": "ARMOR", - "name": "pair of cut resistant gloves", - "name_plural": "pairs of cut resistant gloves", - "description": "A pair of cut resistant gloves, useful when rapidly breaking down carcasses.", - "weight": "240 g", - "volume": "250 ml", - "price": 9000, - "to_hit": 2, - "material": [ "steel", "cotton" ], - "symbol": "[", - "looks_like": "gloves_work", - "color": "light_gray", - "covers": [ "HANDS" ], - "coverage": 95, - "encumbrance": 40, - "warmth": 10, - "material_thickness": 4, - "environmental_protection": 1, - "flags": [ "STURDY" ] - }, - { - "id": "gloves_wraps", - "type": "ARMOR", - "name": "pair of hand wraps", - "name_plural": "pairs of hand wraps", - "description": "Long pieces of cloth that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", - "weight": "100 g", - "volume": "250 ml", - "price": 500, - "to_hit": 2, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "gloves_light", - "color": "white", - "covers": [ "HANDS" ], - "coverage": 50, - "warmth": 5, - "material_thickness": 1, - "flags": [ "SKINTIGHT", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] - }, - { - "id": "gloves_wraps_fur", - "type": "ARMOR", - "name": "pair of fur hand wraps", - "name_plural": "pairs of fur hand wraps", - "description": "Pieces of animal pelt that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", - "weight": "250 g", - "volume": "500 ml", - "price": 700, - "to_hit": 2, - "material": [ "fur" ], - "symbol": "[", - "looks_like": "gloves_wraps", - "color": "white", - "covers": [ "HANDS" ], - "coverage": 50, - "encumbrance": 5, - "warmth": 20, - "material_thickness": 1, - "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] - }, - { - "id": "gloves_wraps_leather", - "type": "ARMOR", - "name": "pair of leather hand wraps", - "name_plural": "pairs of leather hand wraps", - "description": "Pieces of leather that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", - "weight": "200 g", - "volume": "500 ml", - "price": 525, - "to_hit": 2, - "material": [ "leather" ], - "symbol": "[", - "looks_like": "gloves_wraps", - "color": "white", - "covers": [ "HANDS" ], - "coverage": 50, - "encumbrance": 5, - "warmth": 10, - "material_thickness": 1, - "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] - }, - { - "id": "gloves_wraps_wool", - "type": "ARMOR", - "name": "pair of wool hand wraps", - "name_plural": "pairs of wool hand wraps", - "description": "Long pieces of wool that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", - "weight": "100 g", - "volume": "250 ml", - "price": 500, - "to_hit": 2, - "material": [ "wool" ], - "symbol": "[", - "looks_like": "gloves_wraps", - "color": "blue", - "covers": [ "HANDS" ], - "coverage": 50, - "encumbrance": 2, - "warmth": 15, - "material_thickness": 1, - "flags": [ "SKINTIGHT", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] - }, - { - "id": "gloves_wsurvivor", - "type": "ARMOR", - "category": "armor", - "name": "pair of winter survivor gloves", - "name_plural": "pairs of winter survivor gloves", - "description": "A pair of customized, Kevlar armored fur gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": "300 g", - "volume": "1250 ml", - "price": 18000, - "to_hit": 2, - "material": [ "kevlar", "fur" ], - "symbol": "[", - "looks_like": "gloves_winter", - "color": "light_gray", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 37, - "warmth": 75, - "material_thickness": 4, - "environmental_protection": 5, - "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] - }, - { - "id": "gloves_xlsurvivor", - "type": "ARMOR", - "category": "armor", - "name": "pair of XL survivor gloves", - "name_plural": "pairs of XL survivor gloves", - "description": "A massive pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": "480 g", - "volume": "1500 ml", - "price": 18000, - "to_hit": 2, - "material": [ "kevlar", "leather" ], - "symbol": "[", - "looks_like": "gloves_survivor", - "color": "brown", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 30, - "warmth": 15, - "material_thickness": 2, - "environmental_protection": 3, - "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ] + "material_thickness": 2, + "environmental_protection": 1, + "flags": [ "WATER_FRIENDLY", "OUTER" ] }, { "id": "gobag", @@ -4075,6 +3326,7 @@ "storage": "5500 ml", "warmth": 50, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS", "COLLAR", "OUTER" ] }, @@ -6191,26 +5443,6 @@ "material_thickness": 2, "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ] }, - { - "id": "leg_warmers_xlf", - "type": "ARMOR", - "name": "pair of fetlock furs", - "name_plural": "pairs of fetlock furs", - "description": "Snug fur sleeves to keep your fetlocks warm.", - "weight": "66 g", - "volume": "750 ml", - "price": 25000, - "material": [ "fur" ], - "symbol": "[", - "looks_like": "leg_warmers_xl", - "color": "light_gray", - "covers": [ "FEET" ], - "coverage": 60, - "encumbrance": 7, - "warmth": 40, - "material_thickness": 2, - "flags": [ "VARSIZE", "OVERSIZE" ] - }, { "id": "leggings", "type": "ARMOR", @@ -6502,26 +5734,6 @@ "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ] }, - { - "id": "long_glove_white", - "type": "ARMOR", - "name": "pair of extra long white gloves", - "name_plural": "pairs of extra long white gloves", - "description": "Long white costume gloves.", - "weight": "400 g", - "volume": "1 L", - "price": 1100, - "to_hit": 1, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "glove_light", - "color": "light_blue", - "covers": [ "HANDS", "ARMS" ], - "coverage": 60, - "warmth": 30, - "material_thickness": 2, - "flags": [ "VARSIZE" ] - }, { "id": "long_underpants", "type": "ARMOR", @@ -6813,27 +6025,6 @@ "environmental_protection": 1, "flags": [ "HELMET_COMPAT" ] }, - { - "id": "mittens", - "type": "ARMOR", - "name": "pair of mittens", - "name_plural": "pairs of mittens", - "description": "A pair of warm mittens. They are extremely cumbersome.", - "weight": "364 g", - "volume": "750 ml", - "price": 2500, - "to_hit": 1, - "material": [ "wool" ], - "symbol": "[", - "looks_like": "gloves_wool", - "color": "blue", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 80, - "warmth": 70, - "material_thickness": 4, - "flags": [ "OVERSIZE", "OUTER" ] - }, { "id": "motorbike_armor", "type": "ARMOR", @@ -6893,7 +6084,7 @@ "covers": [ "MOUTH" ], "coverage": 50, "material_thickness": 1, - "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SKINTIGHT" ] + "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ] }, { "id": "nanoskirt", @@ -6912,28 +6103,6 @@ "material_thickness": 1, "flags": [ "VARSIZE", "FANCY" ] }, - { - "id": "nomex_gloves", - "type": "ARMOR", - "name": "pair of flame-resistant gloves", - "name_plural": "pairs of flame-resistant gloves", - "description": "A snug fitting pair of gloves made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.", - "weight": "190 g", - "volume": "500 ml", - "price": 2000, - "to_hit": -5, - "material": [ "nomex" ], - "symbol": "[", - "looks_like": "gloves_light", - "color": "light_gray", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 6, - "warmth": 5, - "material_thickness": 2, - "environmental_protection": 2, - "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY" ] - }, { "id": "nomex_hood", "type": "ARMOR", @@ -6955,28 +6124,6 @@ "environmental_protection": 2, "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY" ] }, - { - "id": "nomex_socks", - "type": "ARMOR", - "name": "pair of flame-resistant socks", - "name_plural": "pairs of flame-resistant socks", - "description": "A snug fitting pair of stockings made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.", - "weight": "200 g", - "volume": "750 ml", - "price": 2000, - "to_hit": -5, - "material": [ "nomex" ], - "symbol": "[", - "looks_like": "socks", - "color": "light_gray", - "covers": [ "FEET" ], - "coverage": 100, - "encumbrance": 6, - "warmth": 5, - "material_thickness": 2, - "environmental_protection": 2, - "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY" ] - }, { "id": "nomex_suit", "type": "ARMOR", @@ -7181,6 +6328,7 @@ "storage": "1 L", "warmth": 80, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS" ] }, @@ -7189,6 +6337,7 @@ "type": "ARMOR", "copy-from": "pants_fur", "name": "faux fur pants", + "name_plural": "faux fur pants", "description": "A pair of long cotton pants lined with warm imitation fur.", "material": [ "faux_fur", "cotton" ], "covers": [ "LEGS" ], @@ -7259,6 +6408,7 @@ "storage": "3500 ml", "warmth": 15, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF" ] }, @@ -7281,6 +6431,7 @@ "storage": "2500 ml", "warmth": 50, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "POCKETS", "COLLAR", "OUTER", "FANCY" ] }, { @@ -7825,7 +6976,7 @@ "type": "ARMOR", "name": "ski jacket", "description": "An insulated, breathable hoodie made for alpine skiing. Very warm, and with sizable pockets.", - "weight": 1105, + "weight": "1105 g", "volume": "5 L", "price": 18000, "material": [ "cotton", "plastic" ], @@ -7835,9 +6986,10 @@ "covers": [ "TORSO", "ARMS" ], "coverage": 95, "encumbrance": 22, - "storage": 8, + "storage": "2 L", "warmth": 80, "material_thickness": 5, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "OUTER" ] }, @@ -8021,6 +7173,7 @@ "storage": "6 L", "warmth": 50, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS", "OUTER", "WATERPROOF", "RAINPROOF" ] }, @@ -8080,6 +7233,7 @@ "storage": "9 L", "warmth": 10, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] }, @@ -8126,6 +7280,7 @@ "storage": "6 L", "warmth": 50, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, @@ -8160,8 +7315,8 @@ "storage": "6 L", "warmth": 30, "material_thickness": 3, - "environmental_protection": 1, "valid_mods": [ "steel_padded" ], + "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, { @@ -8185,6 +7340,7 @@ "storage": "9 L", "warmth": 10, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] }, @@ -8229,101 +7385,6 @@ "environmental_protection": 1, "flags": [ "OVERSIZE", "OUTER" ] }, - { - "id": "sockmitts", - "type": "ARMOR", - "name": "pair of sock mitts", - "name_plural": "pairs of sock mitts", - "description": "A pair of improvised gloves made from socks with holes poked through them.", - "weight": "32 g", - "volume": "250 ml", - "price": 0, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "mittens", - "color": "white", - "covers": [ "HANDS" ], - "coverage": 40, - "warmth": 5, - "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT", "ALLOWS_NATURAL_ATTACKS" ] - }, - { - "id": "socks", - "type": "ARMOR", - "name": "pair of socks", - "name_plural": "pairs of socks", - "description": "Socks. Put 'em on your feet.", - "weight": "32 g", - "volume": "250 ml", - "price": 200, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "socks_wool", - "color": "white", - "covers": [ "FEET" ], - "coverage": 100, - "warmth": 5, - "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT" ] - }, - { - "id": "socks_bag", - "type": "ARMOR", - "name": "pair of bag socks", - "name_plural": "pairs of bag socks", - "description": "A pair of disposable plastic bags, adapted to be used as socks.", - "weight": "6 g", - "volume": "250 ml", - "price": 50, - "material": [ "plastic" ], - "symbol": "[", - "looks_like": "socks", - "color": "light_blue", - "covers": [ "FEET" ], - "coverage": 70, - "encumbrance": 3, - "material_thickness": 1, - "flags": [ "WATERPROOF", "OVERSIZE" ] - }, - { - "id": "socks_bowling", - "type": "ARMOR", - "name": "pair of disposable bowling socks", - "name_plural": "pairs of disposable bowling socks", - "description": "Cheap one time socks. Can keep your feet clean, but too thin to give any protection.", - "weight": "20 g", - "volume": "250 ml", - "price": 50, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "socks", - "color": "white", - "covers": [ "FEET" ], - "coverage": 80, - "warmth": 2, - "flags": [ "SKINTIGHT" ] - }, - { - "id": "socks_wool", - "type": "ARMOR", - "name": "pair of wool socks", - "name_plural": "pairs of wool socks", - "description": "Warm socks made of wool.", - "weight": "44 g", - "volume": "250 ml", - "price": 1200, - "material": [ "wool" ], - "symbol": "[", - "looks_like": "socks", - "color": "blue", - "covers": [ "FEET" ], - "coverage": 100, - "encumbrance": 5, - "warmth": 30, - "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT" ] - }, { "id": "sports_bra", "type": "ARMOR", @@ -8361,66 +7422,6 @@ "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT", "HOOD", "WATERPROOF", "SLOWS_THIRST", "SLOWS_MOVEMENT" ] }, - { - "id": "stockings", - "type": "ARMOR", - "name": "pair of stockings", - "name_plural": "pairs of stockings", - "description": "Long cotton socks that reach above the knees to help protect from the cold.", - "weight": "90 g", - "volume": "250 ml", - "price": 500, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "leg_warmers", - "color": "dark_gray", - "covers": [ "FEET", "LEGS" ], - "coverage": 75, - "encumbrance": 5, - "warmth": 10, - "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT" ] - }, - { - "id": "stockings_tent_arms", - "type": "ARMOR", - "name": "pair of tentacle sleeves", - "name_plural": "pairs of tentacle sleeves", - "description": "Long cotton tubes sized to fit over tentacles and help protect them from the cold.", - "weight": "360 g", - "volume": "1500 ml", - "price": 400, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "arm_warmers", - "color": "dark_gray", - "covers": [ "HANDS", "ARMS" ], - "coverage": 75, - "encumbrance": 10, - "warmth": 10, - "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ] - }, - { - "id": "stockings_tent_legs", - "type": "ARMOR", - "name": "pair of tentacle stockings", - "name_plural": "pairs of tentacle stockings", - "description": "Six long cotton tubes sized to fit over tentacles and help protect them from the cold.", - "weight": "270 g", - "volume": "1500 ml", - "price": 1200, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "leg_warmers", - "color": "dark_gray", - "covers": [ "FEET", "LEGS" ], - "coverage": 75, - "encumbrance": 10, - "warmth": 10, - "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ] - }, { "id": "straw_basket", "type": "ARMOR", @@ -8693,6 +7694,7 @@ "storage": "7 L", "warmth": 15, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] }, @@ -8738,6 +7740,7 @@ "storage": "5 L", "warmth": 35, "material_thickness": 7, + "valid_mods": [ "steel_padded" ], "environmental_protection": 4, "flags": [ "POCKETS", "STURDY" ] }, @@ -8758,6 +7761,7 @@ "encumbrance": 10, "warmth": 40, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE" ] }, { @@ -8777,46 +7781,9 @@ "encumbrance": 10, "warmth": 30, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE" ] }, - { - "id": "tabi_dress", - "type": "ARMOR", - "name": "pair of tabi", - "name_plural": "pairs of tabi", - "description": "A pair of black tabi, as worn with traditional Japanese clothes.", - "weight": "50 g", - "volume": "250 ml", - "price": 2500, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "socks", - "color": "dark_gray", - "covers": [ "FEET" ], - "coverage": 100, - "warmth": 5, - "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT" ] - }, - { - "id": "tabi_gi", - "type": "ARMOR", - "name": "pair of gi tabi", - "name_plural": "pairs of gi tabi", - "description": "A pair of white tabi, as used by martial arts practitioners.", - "weight": "50 g", - "volume": "250 ml", - "price": 2500, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "socks", - "color": "white", - "covers": [ "FEET" ], - "coverage": 100, - "warmth": 5, - "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT" ] - }, { "id": "tac_fullhelmet", "type": "ARMOR", @@ -9101,6 +8068,7 @@ "storage": "250 ml", "warmth": 25, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 2, "flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF" ] }, @@ -9145,6 +8113,7 @@ "storage": "6 L", "warmth": 50, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 1, "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, @@ -9202,6 +8171,7 @@ "storage": "9 L", "warmth": 10, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] }, @@ -9615,26 +8585,6 @@ "material_thickness": 1, "flags": [ "VARSIZE", "FANCY" ] }, - { - "id": "winter_gloves_army", - "type": "ARMOR", - "name": "pair of army winter gloves", - "name_plural": "pairs of army winter gloves", - "description": "A pair of padded gloves. Favored by the military.", - "weight": "218 g", - "volume": "750 ml", - "price": 8125, - "to_hit": 1, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "fire_gauntlets", - "color": "white", - "covers": [ "HANDS" ], - "coverage": 100, - "encumbrance": 20, - "warmth": 50, - "material_thickness": 4 - }, { "id": "winter_jacket_army", "type": "ARMOR", @@ -9654,6 +8604,7 @@ "storage": "3500 ml", "warmth": 50, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "POCKETS", "HOOD", "OUTER", "WATERPROOF" ] }, { @@ -9675,6 +8626,7 @@ "storage": "2500 ml", "warmth": 50, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "POCKETS" ] }, { @@ -9717,6 +8669,7 @@ "storage": "2250 ml", "warmth": 45, "material_thickness": 3, + "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "OUTER", "POCKETS", "HOOD" ] }, { @@ -9760,6 +8713,7 @@ "storage": "6 L", "warmth": 75, "material_thickness": 5, + "valid_mods": [ "steel_padded" ], "environmental_protection": 5, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] }, @@ -9784,6 +8738,7 @@ "storage": "8500 ml", "warmth": 15, "material_thickness": 4, + "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] }, @@ -9833,7 +8788,6 @@ "id": "case_violin", "type": "ARMOR", "name": "violin case", - "name_plural": "violin case", "description": "Useful to carry your precious musical instrument around protected from any harm.", "weight": "2800 g", "volume": "5 L", @@ -9933,27 +8887,6 @@ "environmental_protection": 20, "flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "STURDY", "OUTER" ] }, - { - "id": "gloves_golf", - "type": "ARMOR", - "name": "pair of golfing gloves", - "name_plural": "pairs of golfing gloves", - "description": "A thin pair of black leather golfing gloves.", - "weight": "150 g", - "volume": "250 ml", - "price": 4000, - "to_hit": 2, - "material": [ "leather" ], - "symbol": "[", - "looks_like": "gloves_light", - "color": "dark_gray", - "covers": [ "HANDS" ], - "coverage": 90, - "encumbrance": 5, - "warmth": 20, - "material_thickness": 1, - "flags": [ "VARSIZE", "WATERPROOF", "SKINTIGHT" ] - }, { "id": "hat_golf", "type": "ARMOR", diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index fbda446ccd05f..7a4270f2bea8c 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -1196,5 +1196,239 @@ "material_thickness": 2, "use_action": { "type": "transform", "target": "roller_shoes_off", "msg": "You pop the wheels back in.", "moves": 500 }, "flags": [ "VARSIZE", "ROLLER_ONE", "REQUIRES_BALANCE" ] + }, + { + "id": "chainmail_feet", + "type": "ARMOR", + "category": "armor", + "name": "pair of chainmail chausses", + "name_plural": "pairs of chainmail chausses", + "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.", + "weight": "2006 g", + "volume": "500 ml", + "price": 5012, + "to_hit": -1, + "material": [ "iron", "cotton" ], + "symbol": "[", + "color": "light_red", + "covers": [ "FEET" ], + "coverage": 100, + "encumbrance": 20, + "material_thickness": 4, + "flags": [ "VARSIZE", "STURDY" ] + }, + { + "id": "leg_warmers_xlf", + "type": "ARMOR", + "name": "pair of fetlock furs", + "name_plural": "pairs of fetlock furs", + "description": "Snug fur sleeves to keep your fetlocks warm.", + "weight": "66 g", + "volume": "750 ml", + "price": 25000, + "material": [ "fur" ], + "symbol": "[", + "looks_like": "leg_warmers_xl", + "color": "light_gray", + "covers": [ "FEET" ], + "coverage": 60, + "encumbrance": 7, + "warmth": 40, + "material_thickness": 2, + "flags": [ "VARSIZE", "OVERSIZE" ] + }, + { + "id": "nomex_socks", + "type": "ARMOR", + "name": "pair of flame-resistant socks", + "name_plural": "pairs of flame-resistant socks", + "description": "A snug fitting pair of stockings made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.", + "weight": "200 g", + "volume": "750 ml", + "price": 2000, + "to_hit": -5, + "material": [ "nomex" ], + "symbol": "[", + "looks_like": "socks", + "color": "light_gray", + "covers": [ "FEET" ], + "coverage": 100, + "encumbrance": 6, + "warmth": 5, + "material_thickness": 2, + "environmental_protection": 2, + "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY" ] + }, + { + "id": "socks", + "type": "ARMOR", + "name": "pair of socks", + "name_plural": "pairs of socks", + "description": "Socks. Put 'em on your feet.", + "weight": "32 g", + "volume": "250 ml", + "price": 200, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "socks_wool", + "color": "white", + "covers": [ "FEET" ], + "coverage": 100, + "warmth": 5, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT" ] + }, + { + "id": "socks_ankle", + "type": "ARMOR", + "name": "pair of ankle socks", + "name_plural": "pairs of ankle socks", + "description": "Short socks, commonly used for sports. These are designed to protect your feet from friction, not temperature", + "weight": "25 g", + "volume": "200 ml", + "price": 100, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "socks", + "color": "light_gray", + "covers": [ "FEET" ], + "coverage": 80, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT" ] + }, + { + "id": "socks_bag", + "type": "ARMOR", + "name": "pair of bag socks", + "name_plural": "pairs of bag socks", + "description": "A pair of disposable plastic bags, adapted to be used as socks.", + "weight": "6 g", + "volume": "250 ml", + "price": 50, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "socks", + "color": "light_blue", + "covers": [ "FEET" ], + "coverage": 70, + "encumbrance": 3, + "material_thickness": 1, + "flags": [ "WATERPROOF", "OVERSIZE" ] + }, + { + "id": "socks_bowling", + "type": "ARMOR", + "name": "pair of disposable bowling socks", + "name_plural": "pairs of disposable bowling socks", + "description": "Cheap one time socks. Can keep your feet clean, but too thin to give any protection.", + "weight": "20 g", + "volume": "250 ml", + "price": 50, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "socks", + "color": "white", + "covers": [ "FEET" ], + "coverage": 80, + "warmth": 2, + "flags": [ "SKINTIGHT" ] + }, + { + "id": "socks_wool", + "type": "ARMOR", + "name": "pair of wool socks", + "name_plural": "pairs of wool socks", + "description": "Warm socks made of wool.", + "weight": "44 g", + "volume": "250 ml", + "price": 1200, + "material": [ "wool" ], + "symbol": "[", + "looks_like": "socks", + "color": "blue", + "covers": [ "FEET" ], + "coverage": 100, + "encumbrance": 5, + "warmth": 30, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT" ] + }, + { + "id": "stockings", + "type": "ARMOR", + "name": "pair of stockings", + "name_plural": "pairs of stockings", + "description": "Long cotton socks that reach above the knees to help protect from the cold.", + "weight": "90 g", + "volume": "250 ml", + "price": 500, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "leg_warmers", + "color": "dark_gray", + "covers": [ "FEET", "LEGS" ], + "coverage": 75, + "encumbrance": 5, + "warmth": 10, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT" ] + }, + { + "id": "stockings_tent_legs", + "type": "ARMOR", + "name": "pair of tentacle stockings", + "name_plural": "pairs of tentacle stockings", + "description": "Six long cotton tubes sized to fit over tentacles and help protect them from the cold.", + "weight": "270 g", + "volume": "1500 ml", + "price": 1200, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "leg_warmers", + "color": "dark_gray", + "covers": [ "FEET", "LEGS" ], + "coverage": 75, + "encumbrance": 10, + "warmth": 10, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ] + }, + { + "id": "tabi_dress", + "type": "ARMOR", + "name": "pair of tabi", + "name_plural": "pairs of tabi", + "description": "A pair of black tabi, as worn with traditional Japanese clothes.", + "weight": "50 g", + "volume": "250 ml", + "price": 2500, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "socks", + "color": "dark_gray", + "covers": [ "FEET" ], + "coverage": 100, + "warmth": 5, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT" ] + }, + { + "id": "tabi_gi", + "type": "ARMOR", + "name": "pair of gi tabi", + "name_plural": "pairs of gi tabi", + "description": "A pair of white tabi, as used by martial arts practitioners.", + "weight": "50 g", + "volume": "250 ml", + "price": 2500, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "socks", + "color": "white", + "covers": [ "FEET" ], + "coverage": 100, + "warmth": 5, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT" ] } ] diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json new file mode 100644 index 0000000000000..3068b3db9ade6 --- /dev/null +++ b/data/json/items/armor/gloves.json @@ -0,0 +1,915 @@ +[ + { + "id": "beekeeping_gloves", + "type": "ARMOR", + "name": "pair of beekeeping gloves", + "name_plural": "pairs of beekeeping gloves", + "description": "A pair of white beekeeping gloves made out of smooth leather.", + "weight": "120 g", + "volume": "250 ml", + "price": 3000, + "to_hit": 1, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 10, + "warmth": 30, + "material_thickness": 2, + "environmental_protection": 2, + "flags": [ "VARSIZE", "SKINTIGHT" ] + }, + { + "id": "boxing_gloves", + "type": "ARMOR", + "name": "pair of boxing gloves", + "name_plural": "pairs of boxing gloves", + "description": "A pair of big, red, 8 oz. boxing gloves. They make dexterous tasks near impossible, but provide ample protection.", + "weight": "453 g", + "volume": "1 L", + "price": 4000, + "to_hit": 1, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "red", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 70, + "warmth": 20, + "material_thickness": 3, + "environmental_protection": 3, + "flags": [ "VARSIZE", "OVERSIZE", "STURDY" ] + }, + { + "id": "chainmail_hands", + "type": "ARMOR", + "category": "armor", + "name": "pair of chainmail gloves", + "name_plural": "pairs of chainmail gloves", + "description": "Customized chainmail gloves. They fully enclose the fingers and provide excellent protection, but are somewhat cumbersome.", + "weight": "2006 g", + "volume": "500 ml", + "price": 5012, + "to_hit": -1, + "material": [ "iron", "cotton" ], + "symbol": "[", + "color": "light_red", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 30, + "material_thickness": 4, + "flags": [ "VARSIZE", "STURDY" ] + }, + { + "id": "fire_gauntlets", + "type": "ARMOR", + "category": "armor", + "name": "pair of fire gauntlets", + "name_plural": "pairs of fire gauntlets", + "description": "A heavy pair of gloves, used by firefighters and metalworkers for heat protection. Highly resistant to heat and flame, they provide excellent protection from injury.", + "weight": "572 g", + "volume": "1 L", + "price": 8200, + "to_hit": 2, + "material": [ "leather", "nomex" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 50, + "warmth": 25, + "material_thickness": 4, + "environmental_protection": 6, + "flags": [ "VARSIZE", "STURDY", "WATERPROOF" ] + }, + { + "id": "gauntlets_chitin", + "type": "ARMOR", + "category": "armor", + "name": "pair of chitinous gauntlets", + "name_plural": "pairs of chitinous gauntlets", + "description": "Gauntlets made from the exoskeletons of insects. Very light and durable.", + "weight": "760 g", + "volume": "1750 ml", + "price": 38000, + "to_hit": -2, + "bashing": 2, + "material": [ "chitin" ], + "symbol": "[", + "looks_like": "gauntlets_larmor", + "color": "green", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 12, + "warmth": 20, + "material_thickness": 4, + "environmental_protection": 4, + "flags": [ "STURDY" ] + }, + { + "id": "gauntlets_acidchitin", + "copy-from": "gauntlets_chitin", + "looks_like": "gauntlets_chitin", + "type": "ARMOR", + "name": "pair of biosilicified chitin gauntlets", + "name_plural": "pairs of biosilicified chitin gauntlets", + "description": "Gauntlets crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant and very durable.", + "material": [ "acidchitin" ], + "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 }, + "relative": { "bashing": 1, "material_thickness": 1 } + }, + { + "id": "gauntlet_fencing", + "type": "ARMOR", + "name": "fencing gauntlet", + "description": "A single suede glove with sturdy cotton wrists, padded backs and well-fitting fingers.", + "weight": "175 g", + "volume": "250 ml", + "price": 6400, + "to_hit": -2, + "material": [ "leather", "cotton" ], + "symbol": "[", + "color": "white", + "covers": [ "HAND_R" ], + "encumbrance": 4, + "coverage": 100, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 1, + "flags": [ "STURDY" ] + }, + { + "id": "gauntlet_fencing_l", + "type": "ARMOR", + "name": { "str": "fencing gauntlet (left)", "str_pl": "fencing gauntlets (left)" }, + "description": "A single suede glove with sturdy cotton wrists, padded backs and well-fitting fingers. This one is left-handed.", + "weight": "175 g", + "volume": "250 ml", + "price": 6400, + "to_hit": -2, + "material": [ "leather", "cotton" ], + "symbol": "[", + "color": "white", + "covers": [ "HAND_L" ], + "encumbrance": 4, + "coverage": 100, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 1, + "flags": [ "STURDY" ] + }, + { + "id": "gauntlets_larmor", + "type": "ARMOR", + "category": "armor", + "name": "pair of leather armor gauntlets", + "name_plural": "pairs of leather armor gauntlets", + "description": "Heavy fingerless leather gloves. Very flexible and comfortable.", + "weight": "350 g", + "volume": "750 ml", + "price": 3400, + "to_hit": -2, + "bashing": 2, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 60, + "encumbrance": 4, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 1, + "flags": [ "VARSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_bag", + "type": "ARMOR", + "name": "pair of bag gloves", + "name_plural": "pairs of bag gloves", + "description": "A pair of disposable plastic bags, adapted to be used as gloves.", + "weight": "6 g", + "volume": "250 ml", + "price": 50, + "to_hit": -1, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "gloves_wraps", + "color": "light_blue", + "covers": [ "HANDS" ], + "coverage": 70, + "encumbrance": 7, + "material_thickness": 1, + "flags": [ "WATERPROOF", "OVERSIZE", "OUTER" ] + }, + { + "id": "gloves_fingerless", + "type": "ARMOR", + "name": "pair of fingerless gloves", + "name_plural": "pairs of fingerless gloves", + "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.", + "weight": "100 g", + "volume": "250 ml", + "price": 1400, + "to_hit": 2, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 50, + "warmth": 10, + "material_thickness": 1, + "flags": [ "VARSIZE", "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_fingerless_mod", + "type": "ARMOR", + "category": "armor", + "name": "pair of armored fingerless gloves", + "name_plural": "pairs of armored fingerless gloves", + "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity. These have been crudely reinforced with steel guards across the back.", + "weight": "380 g", + "volume": "500 ml", + "price": 9000, + "to_hit": 2, + "material": [ "steel", "leather" ], + "symbol": "[", + "looks_like": "gloves_fingerless", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 50, + "encumbrance": 3, + "warmth": 5, + "material_thickness": 1, + "flags": [ "VARSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_fsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of survivor firegloves", + "name_plural": "pairs of survivor firegloves", + "description": "A pair of customized, Kevlar armored Nomex gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "410 g", + "volume": "1 L", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar", "nomex" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 30, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 10, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_fur", + "type": "ARMOR", + "name": "pair of fur gloves", + "name_plural": "pairs of fur gloves", + "description": "A pair of warm fur gloves. They are somewhat cumbersome.", + "weight": "410 g", + "volume": "1 L", + "price": 4000, + "to_hit": 1, + "material": [ "fur" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 30, + "warmth": 70, + "material_thickness": 3 + }, + { + "id": "gloves_hsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of heavy survivor gloves", + "name_plural": "pairs of heavy survivor gloves", + "description": "A pair of heavily customized, steel-backed armored Kevlar gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "380 g", + "volume": "1 L", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar", "steel" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 30, + "warmth": 15, + "material_thickness": 4, + "environmental_protection": 5, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "glove_jackson", + "type": "ARMOR", + "name": "white glove", + "name_plural": "white gloves", + "description": "A single white glove covered with hundreds of rhinestones.", + "weight": "59 g", + "volume": "250 ml", + "price": 50000, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "white", + "covers": [ "HAND_R" ], + "coverage": 95, + "warmth": 20, + "material_thickness": 2, + "flags": [ "WATER_FRIENDLY", "FANCY" ] + }, + { + "id": "gloves_leather", + "type": "ARMOR", + "name": "pair of leather gloves", + "name_plural": "pairs of leather gloves", + "description": "A thin pair of black leather gloves.", + "weight": "160 g", + "volume": "250 ml", + "price": 4500, + "to_hit": 2, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 10, + "warmth": 25, + "material_thickness": 1, + "valid_mods": [ "steel_padded" ], + "flags": [ "VARSIZE", "WATERPROOF" ] + }, + { + "id": "gloves_light", + "type": "ARMOR", + "name": "pair of light gloves", + "name_plural": "pairs of light gloves", + "description": "A pair of cotton gloves.", + "weight": "118 g", + "volume": "250 ml", + "price": 1100, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "light_blue", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 2, + "warmth": 20, + "material_thickness": 2, + "flags": [ "WATER_FRIENDLY" ] + }, + { + "id": "gloves_liner", + "type": "ARMOR", + "name": "pair of glove liners", + "name_plural": "pairs of glove liners", + "description": "A pair of thin cotton gloves. Often used as a liner beneath other gloves.", + "weight": "63 g", + "volume": "250 ml", + "price": 600, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 1, + "warmth": 15, + "material_thickness": 1, + "flags": [ "WATER_FRIENDLY", "SKINTIGHT" ] + }, + { + "id": "gloves_lsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of light survivor gloves", + "name_plural": "pairs of light survivor gloves", + "description": "A pair of customized, Kevlar armored cloth gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "190 g", + "volume": "750 ml", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar", "cotton" ], + "symbol": "[", + "looks_like": "gloves_survivor", + "color": "green", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 10, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 3, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_survivor_fingerless", + "type": "ARMOR", + "looks_like": "gloves_lsurvivor", + "category": "armor", + "name": "pair of fingerless survivor gloves", + "name_plural": "pairs of fingerless survivor gloves", + "description": "A pair of customized, Kevlar armored cloth gloves with no fingers, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "160 g", + "volume": "700 ml", + "price": 16000, + "to_hit": 2, + "material": [ "kevlar", "cotton" ], + "symbol": "[", + "color": "green", + "covers": [ "HANDS" ], + "coverage": 85, + "encumbrance": 8, + "warmth": 12, + "material_thickness": 3, + "environmental_protection": 3, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_medical", + "type": "ARMOR", + "name": "pair of medical gloves", + "name_plural": "pairs of medical gloves", + "description": "A pair of thin latex gloves, designed to limit the spread of disease.", + "weight": "10 g", + "volume": 0, + "price": 1000, + "to_hit": 1, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 90, + "encumbrance": 1, + "material_thickness": 1, + "environmental_protection": 6, + "flags": [ "WATER_FRIENDLY", "WATERPROOF", "SKINTIGHT" ] + }, + { + "id": "gloves_plate", + "type": "ARMOR", + "category": "armor", + "name": "pair of armored gauntlets", + "name_plural": "pairs of armored gauntlets", + "description": "An extremely heavy set of armor-plated leather gloves.", + "weight": "980 g", + "volume": "1500 ml", + "price": 40000, + "to_hit": -2, + "bashing": 7, + "material": [ "iron", "leather" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 20, + "warmth": 20, + "material_thickness": 4, + "environmental_protection": 1, + "flags": [ "VARSIZE", "STURDY" ] + }, + { + "id": "gloves_rubber", + "type": "ARMOR", + "name": "pair of rubber gloves", + "name_plural": "pairs of rubber gloves", + "description": "A pair of rubber gloves, often used while cleaning with caustic materials.", + "weight": "20 g", + "volume": "1 L", + "price": 1300, + "to_hit": 2, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "yellow", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 40, + "warmth": 10, + "material_thickness": 3, + "environmental_protection": 8, + "flags": [ "WATERPROOF" ] + }, + { + "id": "gloves_survivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of survivor gloves", + "name_plural": "pairs of survivor gloves", + "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "230 g", + "volume": "750 ml", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar", "leather" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 20, + "warmth": 15, + "material_thickness": 3, + "environmental_protection": 3, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_tactical", + "type": "ARMOR", + "category": "armor", + "name": "pair of tactical gloves", + "name_plural": "pairs of tactical gloves", + "description": "A pair of reinforced Kevlar tactical gloves. Commonly used by police and military units.", + "weight": "220 g", + "volume": "500 ml", + "price": 5200, + "to_hit": 2, + "material": [ "kevlar", "leather" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 13, + "warmth": 20, + "material_thickness": 2, + "flags": [ "VARSIZE", "STURDY" ] + }, + { + "id": "gloves_winter", + "type": "ARMOR", + "name": "pair of winter gloves", + "name_plural": "pairs of winter gloves", + "description": "A pair of padded gloves. Cumbersome, but warm.", + "weight": "218 g", + "volume": "750 ml", + "price": 6500, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "light_blue", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 40, + "warmth": 70, + "material_thickness": 4 + }, + { + "id": "gloves_wool", + "type": "ARMOR", + "name": "pair of wool gloves", + "name_plural": "pairs of wool gloves", + "description": "A thick pair of wool gloves. Cumbersome, but warm.", + "weight": "240 g", + "volume": "250 ml", + "price": 3500, + "to_hit": 1, + "material": [ "wool" ], + "symbol": "[", + "looks_like": "gloves_winter", + "color": "blue", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 20, + "warmth": 60, + "material_thickness": 3 + }, + { + "id": "gloves_work", + "type": "ARMOR", + "name": "pair of work gloves", + "name_plural": "pairs of work gloves", + "description": "A tough pair of gloves, for tough everyday work.", + "weight": "195 g", + "volume": "250 ml", + "price": 4500, + "to_hit": 2, + "material": [ "leather", "cotton" ], + "symbol": "[", + "looks_like": "gloves_leather", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 20, + "warmth": 25, + "material_thickness": 3, + "environmental_protection": 5, + "flags": [ "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_cut_resistant", + "type": "ARMOR", + "name": "pair of cut resistant gloves", + "name_plural": "pairs of cut resistant gloves", + "description": "A pair of cut resistant gloves, useful when rapidly breaking down carcasses.", + "weight": "240 g", + "volume": "250 ml", + "price": 9000, + "to_hit": 2, + "material": [ "steel", "cotton" ], + "symbol": "[", + "looks_like": "gloves_work", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 95, + "encumbrance": 40, + "warmth": 10, + "material_thickness": 4, + "environmental_protection": 1, + "flags": [ "STURDY" ] + }, + { + "id": "gloves_wraps", + "type": "ARMOR", + "name": "pair of hand wraps", + "name_plural": "pairs of hand wraps", + "description": "Long pieces of cloth that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", + "weight": "100 g", + "volume": "250 ml", + "price": 500, + "to_hit": 2, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 50, + "warmth": 5, + "material_thickness": 1, + "flags": [ "SKINTIGHT", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_wraps_fur", + "type": "ARMOR", + "name": "pair of fur hand wraps", + "name_plural": "pairs of fur hand wraps", + "description": "Pieces of animal pelt that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", + "weight": "250 g", + "volume": "500 ml", + "price": 700, + "to_hit": 2, + "material": [ "fur" ], + "symbol": "[", + "looks_like": "gloves_wraps", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 50, + "encumbrance": 5, + "warmth": 20, + "material_thickness": 1, + "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_wraps_leather", + "type": "ARMOR", + "name": "pair of leather hand wraps", + "name_plural": "pairs of leather hand wraps", + "description": "Pieces of leather that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", + "weight": "200 g", + "volume": "500 ml", + "price": 525, + "to_hit": 2, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_wraps", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 50, + "encumbrance": 5, + "warmth": 10, + "material_thickness": 1, + "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_wraps_wool", + "type": "ARMOR", + "name": "pair of wool hand wraps", + "name_plural": "pairs of wool hand wraps", + "description": "Long pieces of wool that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", + "weight": "100 g", + "volume": "250 ml", + "price": 500, + "to_hit": 2, + "material": [ "wool" ], + "symbol": "[", + "looks_like": "gloves_wraps", + "color": "blue", + "covers": [ "HANDS" ], + "coverage": 50, + "encumbrance": 2, + "warmth": 15, + "material_thickness": 1, + "flags": [ "SKINTIGHT", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "gloves_wsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of winter survivor gloves", + "name_plural": "pairs of winter survivor gloves", + "description": "A pair of customized, Kevlar armored fur gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "300 g", + "volume": "1250 ml", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar", "fur" ], + "symbol": "[", + "looks_like": "gloves_winter", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 37, + "warmth": 75, + "material_thickness": 4, + "environmental_protection": 5, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "gloves_xlsurvivor", + "type": "ARMOR", + "category": "armor", + "name": "pair of XL survivor gloves", + "name_plural": "pairs of XL survivor gloves", + "description": "A massive pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", + "weight": "480 g", + "volume": "1500 ml", + "price": 18000, + "to_hit": 2, + "material": [ "kevlar", "leather" ], + "symbol": "[", + "looks_like": "gloves_survivor", + "color": "brown", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 30, + "warmth": 15, + "material_thickness": 2, + "environmental_protection": 3, + "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "long_glove_white", + "type": "ARMOR", + "name": "pair of extra long white gloves", + "name_plural": "pairs of extra long white gloves", + "description": "Long white costume gloves.", + "weight": "400 g", + "volume": "1 L", + "price": 1100, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "glove_light", + "color": "light_blue", + "covers": [ "HANDS", "ARMS" ], + "coverage": 60, + "warmth": 30, + "material_thickness": 2, + "flags": [ "VARSIZE" ] + }, + { + "id": "mittens", + "type": "ARMOR", + "name": "pair of mittens", + "name_plural": "pairs of mittens", + "description": "A pair of warm mittens. They are extremely cumbersome.", + "weight": "364 g", + "volume": "750 ml", + "price": 2500, + "to_hit": 1, + "material": [ "wool" ], + "symbol": "[", + "looks_like": "gloves_wool", + "color": "blue", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 80, + "warmth": 70, + "material_thickness": 4, + "flags": [ "OVERSIZE", "OUTER" ] + }, + { + "id": "nomex_gloves", + "type": "ARMOR", + "name": "pair of flame-resistant gloves", + "name_plural": "pairs of flame-resistant gloves", + "description": "A snug fitting pair of gloves made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.", + "weight": "190 g", + "volume": "500 ml", + "price": 2000, + "to_hit": -5, + "material": [ "nomex" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "light_gray", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 6, + "warmth": 5, + "material_thickness": 2, + "environmental_protection": 2, + "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY" ] + }, + { + "id": "sockmitts", + "type": "ARMOR", + "name": "pair of sock mitts", + "name_plural": "pairs of sock mitts", + "description": "A pair of improvised gloves made from socks with holes poked through them.", + "weight": "32 g", + "volume": "250 ml", + "price": 0, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "mittens", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 40, + "warmth": 5, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "stockings_tent_arms", + "type": "ARMOR", + "name": "pair of tentacle sleeves", + "name_plural": "pairs of tentacle sleeves", + "description": "Long cotton tubes sized to fit over tentacles and help protect them from the cold.", + "weight": "360 g", + "volume": "1500 ml", + "price": 400, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "arm_warmers", + "color": "dark_gray", + "covers": [ "HANDS", "ARMS" ], + "coverage": 75, + "encumbrance": 10, + "warmth": 10, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ] + }, + { + "id": "winter_gloves_army", + "type": "ARMOR", + "name": "pair of army winter gloves", + "name_plural": "pairs of army winter gloves", + "description": "A pair of padded gloves. Favored by the military.", + "weight": "218 g", + "volume": "750 ml", + "price": 8125, + "to_hit": 1, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "white", + "covers": [ "HANDS" ], + "coverage": 100, + "encumbrance": 20, + "warmth": 50, + "material_thickness": 4 + }, + { + "id": "gloves_golf", + "type": "ARMOR", + "name": "pair of golfing gloves", + "name_plural": "pairs of golfing gloves", + "description": "A thin pair of black leather golfing gloves.", + "weight": "150 g", + "volume": "250 ml", + "price": 4000, + "to_hit": 2, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "gloves_light", + "color": "dark_gray", + "covers": [ "HANDS" ], + "coverage": 90, + "encumbrance": 5, + "warmth": 20, + "material_thickness": 1, + "flags": [ "VARSIZE", "WATERPROOF", "SKINTIGHT" ] + } +] diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json index 1f3e4dd15d8e9..4a2581bf3ae82 100644 --- a/data/json/items/armor/jewelry.json +++ b/data/json/items/armor/jewelry.json @@ -27,7 +27,7 @@ "price_postapoc": 100, "material": [ "wood" ], "symbol": "[", - "looks_like": "earrings", + "looks_like": "gold_ear", "color": "brown" }, { @@ -79,7 +79,7 @@ { "id": "diamond_dental_grill", "type": "ARMOR", - "name": "diamond dental grill", + "name": { "str": "diamond dental grill" }, "description": "Fake teeth inlaid with diamonds, worn over the teeth. Fits horribly, but looks very shiny. For that high-class gangsta rap look.", "weight": "10 g", "volume": 0, @@ -95,10 +95,108 @@ "encumbrance": 10, "flags": [ "SUPER_FANCY", "SKINTIGHT" ] }, + { + "id": "garnet_dental_grill", + "type": "ARMOR", + "name": { "str": "garnet dental grill" }, + "description": "Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny.", + "weight": "10 g", + "volume": 0, + "price": 30000, + "price_postapoc": 500, + "bashing": 3, + "cutting": 3, + "material": [ "gold", "gemstone" ], + "symbol": "[", + "looks_like": "gold_dental_grill", + "color": "red", + "covers": [ "MOUTH" ], + "encumbrance": 10, + "flags": [ "FANCY", "SKINTIGHT" ] + }, + { + "id": "amethyst_dental_grill", + "type": "ARMOR", + "name": { "str": "amethyst dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny.", + "color": "blue" + }, + { + "id": "aquamarine_dental_grill", + "type": "ARMOR", + "name": { "str": "aquamarine dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with aquamarines, worn over the teeth. It looks very shiny.", + "color": "cyan" + }, + { + "id": "emerald_dental_grill", + "type": "ARMOR", + "name": { "str": "emerald dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny.", + "color": "green" + }, + { + "id": "alexandrite_dental_grill", + "type": "ARMOR", + "name": { "str": "alexandrite dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with alexandrites, worn over the teeth. It looks very shiny.", + "color": "green" + }, + { + "id": "ruby_dental_grill", + "type": "ARMOR", + "name": { "str": "ruby dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." + }, + { + "id": "peridot_dental_grill", + "type": "ARMOR", + "name": { "str": "peridot dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny.", + "color": "light_green" + }, + { + "id": "sapphire_dental_grill", + "type": "ARMOR", + "name": { "str": "sapphire dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny.", + "color": "blue" + }, + { + "id": "tourmaline_dental_grill", + "type": "ARMOR", + "name": { "str": "tourmaline dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with tourmaline, worn over the teeth. It looks very shiny.", + "color": "light_red" + }, + { + "id": "citrine_dental_grill", + "type": "ARMOR", + "name": { "str": "citrine dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny.", + "color": "yellow" + }, + { + "id": "blue_topaz_dental_grill", + "type": "ARMOR", + "name": { "str": "blue topaz dental grill" }, + "copy-from": "garnet_dental_grill", + "description": "Fake teeth inlaid with blue topaz, worn over the teeth. It looks very shiny.", + "color": "light_blue" + }, { "id": "diamond_ring", "type": "ARMOR", - "name": "diamond ring", + "name": { "str": "diamond and gold ring" }, "description": "A gold ring with a sparkling diamond mounted on top of it. Back in the old days this could be worth a fortune. You can wear it if you like, but it won't provide any effects.", "weight": "12 g", "volume": 0, @@ -171,7 +269,7 @@ "price_postapoc": 50, "material": [ "copper" ], "symbol": "[", - "looks_like": "earrings", + "looks_like": "gold_ear", "color": "brown" }, { @@ -233,7 +331,7 @@ { "id": "cufflinks", "type": "ARMOR", - "name": "cufflinks", + "name": { "str": "pair of cufflinks", "str_pl": "pairs of cufflinks" }, "description": "An unmarked, pair of silver cufflinks. Cufflinks are used to secure the cuffs of dress shirts - a must-have for men in formal wear. You can wear it if you like, but it won't provide any effects.", "weight": "15 g", "volume": 0, @@ -246,7 +344,7 @@ { "id": "cufflinks_intricate", "type": "ARMOR", - "name": "intricate cufflinks", + "name": { "str": "pair of intricate cufflinks", "str_pl": "pairs of intricate cufflinks" }, "description": "An expensive pair of silver cufflinks, stylized with detailed overlays of gold gears and fractal patterns. You can wear it if you like, but it won't provide any effects.", "weight": "21 g", "volume": 0, @@ -256,6 +354,363 @@ "symbol": "[", "color": "light_gray" }, + { + "id": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "garnet and gold cufflinks" }, + "description": "A pair of cufflinks with inset garnets.", + "weight": "15 g", + "volume": 0, + "price": 3500, + "price_postapoc": 100, + "material": [ "gold", "gemstone" ], + "looks_like": "cufflinks", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "diamond and gold cufflinks" }, + "description": "A pair of cufflinks with inset diamonds.", + "material": [ "gold", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "amethyst and gold cufflinks" }, + "description": "A pair of cufflinks with inset amethysts.", + "color": "blue" + }, + { + "id": "aquamarine_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "aquamarine and gold cufflinks" }, + "description": "A pair of cufflinks with inset aquamarines.", + "color": "light_blue" + }, + { + "id": "emerald_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "emerald and gold cufflinks" }, + "description": "A pair of cufflinks with inset emeralds.", + "color": "green" + }, + { + "id": "alexandrite_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "alexandrite and gold cufflinks" }, + "description": "A pair of cufflinks with inset alexandrites.", + "color": "green" + }, + { + "id": "ruby_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "ruby and gold cufflinks" }, + "description": "A pair of cufflinks with inset rubies." + }, + { + "id": "peridot_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "peridot and gold cufflinks" }, + "description": "A pair of cufflinks with inset peridots.", + "color": "light_green" + }, + { + "id": "sapphire_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "sapphire and gold cufflinks" }, + "description": "A pair of cufflinks with inset sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "tourmaline and gold cufflinks" }, + "description": "A pair of cufflinks with inset tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "citrine and gold cufflinks" }, + "description": "A pair of cufflinks with inset citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "blue topaz and gold cufflinks" }, + "description": "A pair of cufflinks with inset blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "opal and gold cufflinks" }, + "description": "A pair of cufflinks with inset opals.", + "color": "white" + }, + { + "id": "pearl_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "pearl and gold cufflinks" }, + "description": "A pair of cufflinks with inset pearls.", + "color": "white" + }, + { + "id": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "garnet and silver cufflinks" }, + "description": "A pair of cufflinks with inset garnets.", + "weight": "15 g", + "volume": 0, + "price": 3500, + "price_postapoc": 100, + "material": [ "silver", "gemstone" ], + "looks_like": "cufflinks", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "diamond and silver cufflinks" }, + "description": "A pair of cufflinks with inset diamonds.", + "material": [ "silver", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "amethyst and silver cufflinks" }, + "description": "A pair of cufflinks with inset amethysts.", + "color": "blue" + }, + { + "id": "aquamarine_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "aquamarine and silver cufflinks" }, + "description": "A pair of cufflinks with inset aquamarines.", + "color": "light_blue" + }, + { + "id": "emerald_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "emerald and silver cufflinks" }, + "description": "A pair of cufflinks with inset emeralds.", + "color": "green" + }, + { + "id": "alexandrite_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "alexandrite and silver cufflinks" }, + "description": "A pair of cufflinks with inset alexandrites.", + "color": "green" + }, + { + "id": "ruby_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "ruby and silver cufflinks" }, + "description": "A pair of cufflinks with inset rubies." + }, + { + "id": "peridot_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "peridot and silver cufflinks" }, + "description": "A pair of cufflinks with inset peridots.", + "color": "light_green" + }, + { + "id": "sapphire_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "sapphire and silver cufflinks" }, + "description": "A pair of cufflinks with inset sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "tourmaline and silver cufflinks" }, + "description": "A pair of cufflinks with inset tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "citrine and silver cufflinks" }, + "description": "A pair of cufflinks with inset citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "blue topaz and silver cufflinks" }, + "description": "A pair of cufflinks with inset blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "opal and silver cufflinks" }, + "description": "A pair of cufflinks with inset opals.", + "color": "white" + }, + { + "id": "pearl_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "pearl and silver cufflinks" }, + "description": "A pair of cufflinks with inset pearls.", + "color": "white" + }, + { + "id": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "garnet and platinum cufflinks" }, + "description": "A pair of cufflinks with inset garnets.", + "weight": "15 g", + "volume": 0, + "price": 3500, + "price_postapoc": 100, + "material": [ "platinum", "gemstone" ], + "looks_like": "cufflinks", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "diamond and platinum cufflinks" }, + "description": "A pair of cufflinks with inset diamonds.", + "material": [ "platinum", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "amethyst and platinum cufflinks" }, + "description": "A pair of cufflinks with inset amethysts.", + "color": "blue" + }, + { + "id": "aquamarine_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "aquamarine and platinum cufflinks" }, + "description": "A pair of cufflinks with inset aquamarines.", + "color": "light_blue" + }, + { + "id": "emerald_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "emerald and platinum cufflinks" }, + "description": "A pair of cufflinks with inset emeralds.", + "color": "green" + }, + { + "id": "alexandrite_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "alexandrite and platinum cufflinks" }, + "description": "A pair of cufflinks with inset alexandrites.", + "color": "green" + }, + { + "id": "ruby_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "ruby and platinum cufflinks" }, + "description": "A pair of cufflinks with inset rubies." + }, + { + "id": "peridot_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "peridot and platinum cufflinks" }, + "description": "A pair of cufflinks with inset peridots.", + "color": "light_green" + }, + { + "id": "sapphire_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "sapphire and platinum cufflinks" }, + "description": "A pair of cufflinks with inset sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "tourmaline and platinum cufflinks" }, + "description": "A pair of cufflinks with inset tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "citrine and platinum cufflinks" }, + "description": "A pair of cufflinks with inset citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "blue topaz and platinum cufflinks" }, + "description": "A pair of cufflinks with inset blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "opal and platinum cufflinks" }, + "description": "A pair of cufflinks with inset opals.", + "color": "white" + }, + { + "id": "pearl_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "pearl and platinum cufflinks" }, + "description": "A pair of cufflinks with inset pearls.", + "color": "white" + }, { "id": "ear_spool", "type": "ARMOR", @@ -1012,5 +1467,1809 @@ "symbol": "s", "color": "dark_gray", "flags": [ "FANCY" ] + }, + { + "id": "diamond_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of diamond and gold earrings", "str_pl": "pairs of diamond and gold earrings" }, + "description": "A pair of shiny diamond and gold earrings. You can wear it if you like, but it won't provide any effects.", + "price": 13000, + "price_postapoc": 500, + "material": [ "gold", "diamond" ], + "color": "white" + }, + { + "id": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of garnet and gold earrings", "str_pl": "pairs of garnet and gold earrings" }, + "description": "A pair of shiny garnet and gold earrings. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 10000, + "price_postapoc": 300, + "material": [ "gold", "gemstone" ], + "looks_like": "gold_ear", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of amethyst and gold earrings", "str_pl": "pairs of amethyst and gold earrings" }, + "description": "A pair of shiny amethyst and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of aquamarine and gold earrings", "str_pl": "pairs of aquamarine and gold earrings" }, + "description": "A pair of shiny aquamarine and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of emerald and gold earrings", "str_pl": "pairs of emerald and gold earrings" }, + "description": "A pair of shiny emerald and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of alexandrite and gold earrings", "str_pl": "pairs of alexandrite and gold earrings" }, + "description": "A pair of shiny alexandrite and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of ruby and gold earrings", "str_pl": "pairs of ruby and gold earrings" }, + "description": "A pair of shiny ruby and gold earrings. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of peridot and gold earrings", "str_pl": "pairs of peridot and gold earrings" }, + "description": "A pair of shiny peridot and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of sapphire and gold earrings", "str_pl": "pairs of sapphire and gold earrings" }, + "description": "A pair of shiny sapphire and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of tourmaline and gold earrings", "str_pl": "pairs of tourmaline and gold earrings" }, + "description": "A pair of shiny tourmaline and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of citrine and gold earrings", "str_pl": "pairs of citrine and gold earrings" }, + "description": "A pair of shiny citrine and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of blue topaz and gold earrings", "str_pl": "pairs of blue topaz and gold earrings" }, + "description": "A pair of shiny blue topaz and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of opal and gold earrings", "str_pl": "pairs of opal and gold earrings" }, + "description": "A pair of shiny opal and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_gold_earring", + "copy-from": "garnet_gold_earring", + "type": "ARMOR", + "name": { "str": "pair of pearl and gold earrings", "str_pl": "pairs of pearl and gold earrings" }, + "description": "A pair of shiny pearl and gold earrings. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "diamond_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of diamond and silver earrings", "str_pl": "pairs of diamond and silver earrings" }, + "description": "A pair of shiny diamond and silver earrings. You can wear it if you like, but it won't provide any effects.", + "price": 8000, + "price_postapoc": 2000, + "material": [ "silver", "diamond" ], + "color": "white" + }, + { + "id": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of garnet and silver earrings", "str_pl": "pairs of garnet and silver earrings" }, + "description": "A pair of shiny garnet and silver earrings. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 6000, + "price_postapoc": 1000, + "material": [ "silver", "gemstone" ], + "looks_like": "silver_ear", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of amethyst and silver earrings", "str_pl": "pairs of amethyst and silver earrings" }, + "description": "A pair of shiny amethyst and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of aquamarine and silver earrings", "str_pl": "pairs of aquamarine and silver earrings" }, + "description": "A pair of shiny aquamarine and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of emerald and silver earrings", "str_pl": "pairs of emerald and silver earrings" }, + "description": "A pair of shiny emerald and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of alexandrite and silver earrings", "str_pl": "pairs of alexandrite and silver earrings" }, + "description": "A pair of shiny alexandrite and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of ruby and silver earrings", "str_pl": "pairs of ruby and silver earrings" }, + "description": "A pair of shiny ruby and silver earrings. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of peridot and silver earrings", "str_pl": "pairs of peridot and silver earrings" }, + "description": "A pair of shiny peridot and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of sapphire and silver earrings", "str_pl": "pairs of sapphire and silver earrings" }, + "description": "A pair of shiny sapphire and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of tourmaline and silver earrings", "str_pl": "pairs of tourmaline and silver earrings" }, + "description": "A pair of shiny tourmaline and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of citrine and silver earrings", "str_pl": "pairs of citrine and silver earrings" }, + "description": "A pair of shiny citrine and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of blue topaz and silver earrings", "str_pl": "pairs of blue topaz and silver earrings" }, + "description": "A pair of shiny blue topaz and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of opal and silver earrings", "str_pl": "pairs of opal and silver earrings" }, + "description": "A pair of shiny opal and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_silver_earring", + "copy-from": "garnet_silver_earring", + "type": "ARMOR", + "name": { "str": "pair of pearl and silver earrings", "str_pl": "pairs of pearl and silver earrings" }, + "description": "A pair of shiny pearl and silver earrings. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "diamond_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of diamond and platinum earrings", "str_pl": "pairs of diamond and platinum earrings" }, + "description": "A pair of shiny diamond and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "price": 12000, + "price_postapoc": 2900, + "material": [ "platinum", "diamond" ], + "color": "white" + }, + { + "id": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of garnet and platinum earrings", "str_pl": "pairs of garnet and platinum earrings" }, + "description": "A pair of shiny garnet and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 10000, + "price_postapoc": 1800, + "material": [ "platinum", "gemstone" ], + "looks_like": "platinum_ear", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of amethyst and platinum earrings", "str_pl": "pairs of amethyst and platinum earrings" }, + "description": "A pair of shiny amethyst and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of aquamarine and platinum earrings", "str_pl": "pairs of aquamarine and platinum earrings" }, + "description": "A pair of shiny aquamarine and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of emerald and platinum earrings", "str_pl": "pairs of emerald and platinum earrings" }, + "description": "A pair of shiny emerald and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of alexandrite and platinum earrings", "str_pl": "pairs of alexandrite and platinum earrings" }, + "description": "A pair of shiny alexandrite and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of ruby and platinum earrings", "str_pl": "pairs of ruby and platinum earrings" }, + "description": "A pair of shiny ruby and platinum earrings. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of peridot and platinum earrings", "str_pl": "pairs of peridot and platinum earrings" }, + "description": "A pair of shiny peridot and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of sapphire and platinum earrings", "str_pl": "pairs of sapphire and platinum earrings" }, + "description": "A pair of shiny sapphire and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of tourmaline and platinum earrings", "str_pl": "pairs of tourmaline and platinum earrings" }, + "description": "A pair of shiny tourmaline and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of citrine and platinum earrings", "str_pl": "pairs of citrine and platinum earrings" }, + "description": "A pair of shiny citrine and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of blue topaz and platinum earrings", "str_pl": "pairs of blue topaz and platinum earrings" }, + "description": "A pair of shiny blue topaz and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of opal and platinum earrings", "str_pl": "pairs of opal and platinum earrings" }, + "description": "A pair of shiny opal and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_platinum_earring", + "copy-from": "garnet_platinum_earring", + "type": "ARMOR", + "name": { "str": "pair of pearl and platinum earrings", "str_pl": "pairs of pearl and platinum earrings" }, + "description": "A pair of shiny pearl and platinum earrings. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "garnet and gold ring" }, + "description": "A gold ring with a garnet mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 10000, + "price_postapoc": 1800, + "material": [ "gold", "gemstone" ], + "looks_like": "gold_ring", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "amethyst and gold ring" }, + "description": "A gold ring with a amethyst mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "aquamarine and gold ring" }, + "description": "A gold ring with a aquamarine mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "emerald and gold ring" }, + "description": "A gold ring with a emerald mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "alexandrite and gold ring" }, + "description": "A gold ring with a alexandrite mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "ruby and gold ring" }, + "description": "A gold ring with a ruby mounted on top of it. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "peridot and gold ring" }, + "description": "A gold ring with a peridot mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "sapphire and gold ring" }, + "description": "A gold ring with a sapphire mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "tourmaline and gold ring" }, + "description": "A gold ring with a tourmaline mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "citrine and gold ring" }, + "description": "A gold ring with a citrine mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "blue topaz and gold ring" }, + "description": "A gold ring with a blue topaz mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "opal and gold ring" }, + "description": "A gold ring with a opal mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_gold_ring", + "copy-from": "garnet_gold_ring", + "type": "ARMOR", + "name": { "str": "pearl and gold ring" }, + "description": "A gold ring with a pearl mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "diamond_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "diamond and silver ring" }, + "description": "A silver ring with a diamond mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "price": 12000, + "price_postapoc": 2900, + "material": [ "silver", "diamond" ], + "color": "white" + }, + { + "id": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "garnet and silver ring" }, + "description": "A silver ring with a garnet mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 10000, + "price_postapoc": 1800, + "material": [ "silver", "gemstone" ], + "looks_like": "silver_ring", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "amethyst and silver ring" }, + "description": "A silver ring with a amethyst mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "aquamarine and silver ring" }, + "description": "A silver ring with a aquamarine mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "emerald and silver ring" }, + "description": "A silver ring with a emerald mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "alexandrite and silver ring" }, + "description": "A silver ring with a alexandrite mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "ruby and silver ring" }, + "description": "A silver ring with a ruby mounted on top of it. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "peridot and silver ring" }, + "description": "A silver ring with a peridot mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "sapphire and silver ring" }, + "description": "A silver ring with a sapphire mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "tourmaline and silver ring" }, + "description": "A silver ring with a tourmaline mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "citrine and silver ring" }, + "description": "A silver ring with a citrine mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "blue topaz and silver ring" }, + "description": "A silver ring with a blue topaz mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "opal and silver ring" }, + "description": "A silver ring with a opal mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_silver_ring", + "copy-from": "garnet_silver_ring", + "type": "ARMOR", + "name": { "str": "pearl and silver ring" }, + "description": "A silver ring with a pearl mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "diamond_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "diamond and platinum ring" }, + "description": "A platinum ring with a diamond mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "price": 12000, + "price_postapoc": 2900, + "material": [ "platinum", "diamond" ], + "color": "white" + }, + { + "id": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "garnet and platinum ring" }, + "description": "A platinum ring with a garnet mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 10000, + "price_postapoc": 1800, + "material": [ "platinum", "gemstone" ], + "looks_like": "platinum_ring", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "amethyst and platinum ring" }, + "description": "A platinum ring with a amethyst mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "aquamarine and platinum ring" }, + "description": "A platinum ring with a aquamarine mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "emerald and platinum ring" }, + "description": "A platinum ring with a emerald mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "alexandrite and platinum ring" }, + "description": "A platinum ring with a alexandrite mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "ruby and platinum ring" }, + "description": "A platinum ring with a ruby mounted on top of it. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "peridot and platinum ring" }, + "description": "A platinum ring with a peridot mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "sapphire and platinum ring" }, + "description": "A platinum ring with a sapphire mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "tourmaline and platinum ring" }, + "description": "A platinum ring with a tourmaline mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "citrine and platinum ring" }, + "description": "A platinum ring with a citrine mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "blue topaz and platinum ring" }, + "description": "A platinum ring with a blue topaz mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "opal and platinum ring" }, + "description": "A platinum ring with a opal mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_platinum_ring", + "copy-from": "garnet_platinum_ring", + "type": "ARMOR", + "name": { "str": "pearl and platinum ring" }, + "description": "A platinum ring with a pearl mounted on top of it. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "diamond_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "diamond and gold bracelet" }, + "description": "A gold bracelet with sparkling diamonds. You can wear it if you like, but it won't provide any effects.", + "price": 200000, + "looks_like": "gold_bracelet", + "price_postapoc": 2000, + "material": [ "gold", "diamond" ], + "color": "white" + }, + { + "id": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "garnet and gold bracelet" }, + "description": "A gold bracelet with sparkling garnets. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 15000, + "price_postapoc": 1500, + "material": [ "gold", "gemstone" ], + "looks_like": "gold_bracelet", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "amethyst and gold bracelet" }, + "description": "A gold bracelet with sparkling amethysts. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "aquamarine and gold bracelet" }, + "description": "A gold bracelet with sparkling aquamarines. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "emerald and gold bracelet" }, + "description": "A gold bracelet with sparkling emeralds. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "alexandrite and gold bracelet" }, + "description": "A gold bracelet with sparkling alexandrites. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "ruby and gold bracelet" }, + "description": "A gold bracelet with sparkling rubies. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "peridot and gold bracelet" }, + "description": "A gold bracelet with sparkling peridots. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "sapphire and gold bracelet" }, + "description": "A gold bracelet with sparkling sapphires. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "tourmaline and gold bracelet" }, + "description": "A gold bracelet with sparkling tourmalines. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "citrine and gold bracelet" }, + "description": "A gold bracelet with sparkling citrines. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "blue topaz and gold bracelet" }, + "description": "A gold bracelet with sparkling blue topaz. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "opal and gold bracelet" }, + "description": "A gold bracelet with opals. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_gold_bracelet", + "copy-from": "garnet_gold_bracelet", + "type": "ARMOR", + "name": { "str": "pearl and gold bracelet" }, + "description": "A gold bracelet with pearls. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "diamond_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "diamond and silver bracelet" }, + "description": "A silver bracelet with sparkling diamonds. You can wear it if you like, but it won't provide any effects.", + "price": 200000, + "looks_like": "silver_bracelet", + "price_postapoc": 2000, + "material": [ "silver", "diamond" ], + "color": "white" + }, + { + "id": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "garnet and silver bracelet" }, + "description": "A silver bracelet with sparkling garnets. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 15000, + "price_postapoc": 1500, + "material": [ "silver", "gemstone" ], + "looks_like": "silver_bracelet", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "amethyst and silver bracelet" }, + "description": "A silver bracelet with sparkling amethysts. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "aquamarine and silver bracelet" }, + "description": "A silver bracelet with sparkling aquamarines. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "emerald and silver bracelet" }, + "description": "A silver bracelet with sparkling emeralds. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "alexandrite and silver bracelet" }, + "description": "A silver bracelet with sparkling alexandrites. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "ruby and silver bracelet" }, + "description": "A silver bracelet with sparkling rubies. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "peridot and silver bracelet" }, + "description": "A silver bracelet with sparkling peridots. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "sapphire and silver bracelet" }, + "description": "A silver bracelet with sparkling sapphires. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "tourmaline and silver bracelet" }, + "description": "A silver bracelet with sparkling tourmalines. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "citrine and silver bracelet" }, + "description": "A silver bracelet with sparkling citrines. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "blue topaz and silver bracelet" }, + "description": "A silver bracelet with sparkling blue topaz. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "opal and silver bracelet" }, + "description": "A silver bracelet with opals. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_silver_bracelet", + "copy-from": "garnet_silver_bracelet", + "type": "ARMOR", + "name": { "str": "pearl and silver bracelet" }, + "description": "A silver bracelet with pearls. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "diamond_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "diamond and platinum bracelet" }, + "description": "A platinum bracelet with sparkling diamonds. You can wear it if you like, but it won't provide any effects.", + "price": 200000, + "looks_like": "platinum_bracelet", + "price_postapoc": 2000, + "material": [ "platinum", "diamond" ], + "color": "white" + }, + { + "id": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "garnet and platinum bracelet" }, + "description": "A platinum bracelet with sparkling garnets. You can wear it if you like, but it won't provide any effects.", + "weight": "2700 mg", + "volume": 0, + "price": 15000, + "price_postapoc": 1500, + "material": [ "platinum", "gemstone" ], + "looks_like": "platinum_bracelet", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "amethyst_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "amethyst and platinum bracelet" }, + "description": "A platinum bracelet with sparkling amethysts. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "aquamarine and platinum bracelet" }, + "description": "A platinum bracelet with sparkling aquamarines. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "emerald and platinum bracelet" }, + "description": "A platinum bracelet with sparkling emeralds. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "alexandrite and platinum bracelet" }, + "description": "A platinum bracelet with sparkling alexandrites. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "ruby and platinum bracelet" }, + "description": "A platinum bracelet with sparkling rubies. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "peridot and platinum bracelet" }, + "description": "A platinum bracelet with sparkling peridots. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "sapphire and platinum bracelet" }, + "description": "A platinum bracelet with sparkling sapphires. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "tourmaline and platinum bracelet" }, + "description": "A platinum bracelet with sparkling tourmalines. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "citrine and platinum bracelet" }, + "description": "A platinum bracelet with sparkling citrines. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "blue topaz and platinum bracelet" }, + "description": "A platinum bracelet with sparkling blue topaz. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "opal and platinum bracelet" }, + "description": "A platinum bracelet with opals. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_platinum_bracelet", + "copy-from": "garnet_platinum_bracelet", + "type": "ARMOR", + "name": { "str": "pearl and platinum bracelet" }, + "description": "A platinum bracelet with pearls. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "garnet and gold necklace" }, + "description": "A shiny, gold necklace adorned with a garnet pendant. You can wear it if you like, but it won't provide any effects.", + "weight": "70 g", + "volume": 0, + "price": 50000, + "price_postapoc": 6000, + "material": [ "gold", "gemstone" ], + "looks_like": "gold_necklace", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "diamond and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a diamond pendant. You can wear it if you like, but it won't provide any effects.", + "material": [ "gold", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "amethyst and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a amethyst pendant. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "aquamarine and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a aquamarine pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "emerald and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a emerald pendant. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "alexandrite and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a alexandrite pendant. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "ruby and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a ruby pendant. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "peridot and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a peridot pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "sapphire and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a sapphire pendant. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "tourmaline and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a tourmaline pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "citrine and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a citrine pendant. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "blue topaz and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a blue topaz pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "opal and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a opal pendant. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_gold_pendant_necklace", + "copy-from": "garnet_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "pearl and gold pendant necklace" }, + "description": "A shiny, gold necklace adorned with a pearl pendant. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "garnet and silver necklace" }, + "description": "A shiny, silver necklace adorned with a garnet pendant. You can wear it if you like, but it won't provide any effects.", + "weight": "70 g", + "volume": 0, + "price": 50000, + "price_postapoc": 6000, + "material": [ "silver", "gemstone" ], + "looks_like": "silver_necklace", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "diamond and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a diamond pendant. You can wear it if you like, but it won't provide any effects.", + "material": [ "silver", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "amethyst and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a amethyst pendant. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "aquamarine and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a aquamarine pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "emerald and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a emerald pendant. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "alexandrite and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a alexandrite pendant. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "ruby and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a ruby pendant. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "peridot and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a peridot pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "sapphire and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a sapphire pendant. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "tourmaline and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a tourmaline pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "citrine and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a citrine pendant. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "blue topaz and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a blue topaz pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "opal and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a opal pendant. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_silver_pendant_necklace", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "pearl and silver pendant necklace" }, + "description": "A shiny, silver necklace adorned with a pearl pendant. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "garnet and platinum necklace" }, + "description": "A shiny, platinum necklace adorned with a garnet pendant. You can wear it if you like, but it won't provide any effects.", + "weight": "70 g", + "volume": 0, + "price": 50000, + "price_postapoc": 6000, + "material": [ "platinum", "gemstone" ], + "looks_like": "platinum_necklace", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "diamond and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a diamond pendant. You can wear it if you like, but it won't provide any effects.", + "material": [ "platinum", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "amethyst and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a amethyst pendant. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "aquamarine_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "aquamarine and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a aquamarine pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "emerald_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "emerald and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a emerald pendant. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "alexandrite_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "alexandrite and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a alexandrite pendant. You can wear it if you like, but it won't provide any effects.", + "color": "green" + }, + { + "id": "ruby_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "ruby and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a ruby pendant. You can wear it if you like, but it won't provide any effects." + }, + { + "id": "peridot_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "peridot and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a peridot pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_green" + }, + { + "id": "sapphire_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "sapphire and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a sapphire pendant. You can wear it if you like, but it won't provide any effects.", + "color": "blue" + }, + { + "id": "tourmaline_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "tourmaline and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a tourmaline pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_red" + }, + { + "id": "citrine_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "citrine and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a citrine pendant. You can wear it if you like, but it won't provide any effects.", + "color": "yellow" + }, + { + "id": "blue_topaz_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "blue topaz and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a blue topaz pendant. You can wear it if you like, but it won't provide any effects.", + "color": "light_blue" + }, + { + "id": "opal_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "opal and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a opal pendant. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "pearl_platinum_pendant_necklace", + "copy-from": "garnet_platinum_pendant_necklace", + "type": "ARMOR", + "name": { "str": "pearl and platinum pendant necklace" }, + "description": "A shiny, platinum necklace adorned with a pearl pendant. You can wear it if you like, but it won't provide any effects.", + "color": "white" + }, + { + "id": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "garnet and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with garnets.", + "weight": "100 g", + "volume": "100 ml", + "price": 500000, + "price_postapoc": 8000, + "material": [ "platinum", "gemstone" ], + "looks_like": "crown_golden", + "symbol": "[", + "color": "red", + "coverage": 5, + "encumbrance": 1, + "material_thickness": 1, + "flags": [ "SUPER_FANCY" ] + }, + { + "id": "diamond_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "diamond and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with diamonds.", + "material": [ "platinum", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "amethyst and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with amethyst.", + "color": "blue" + }, + { + "id": "aquamarine_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "aquamarine and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with aquamarine.", + "color": "light_blue" + }, + { + "id": "emerald_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "emerald and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with emeralds.", + "color": "green" + }, + { + "id": "alexandrite_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "alexandrite and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with alexandrites.", + "color": "green" + }, + { + "id": "ruby_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "ruby and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with rubies." + }, + { + "id": "peridot_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "peridot and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with peridots.", + "color": "light_green" + }, + { + "id": "sapphire_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "sapphire and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "tourmaline and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "citrine and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "blue topaz and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "opal and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with opals.", + "color": "white" + }, + { + "id": "pearl_platinum_tiara", + "copy-from": "garnet_platinum_tiara", + "type": "ARMOR", + "name": { "str": "pearl and platinum tiara" }, + "description": "A shiny, platinum tiara adorned with pearls.", + "color": "white" + }, + { + "id": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "garnet and gold tiara" }, + "description": "A shiny, gold tiara adorned with garnets.", + "weight": "100 g", + "volume": "100 ml", + "price": 400000, + "price_postapoc": 6000, + "material": [ "gold", "gemstone" ], + "looks_like": "crown_golden", + "symbol": "[", + "color": "red", + "coverage": 5, + "encumbrance": 1, + "material_thickness": 1, + "flags": [ "SUPER_FANCY" ] + }, + { + "id": "diamond_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "diamond and gold tiara" }, + "description": "A shiny, gold tiara adorned with diamonds.", + "material": [ "gold", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "amethyst and gold tiara" }, + "description": "A shiny, gold tiara adorned with amethyst.", + "color": "blue" + }, + { + "id": "aquamarine_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "aquamarine and gold tiara" }, + "description": "A shiny, gold tiara adorned with aquamarine.", + "color": "light_blue" + }, + { + "id": "emerald_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "emerald and gold tiara" }, + "description": "A shiny, gold tiara adorned with emeralds.", + "color": "green" + }, + { + "id": "alexandrite_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "alexandrite and gold tiara" }, + "description": "A shiny, gold tiara adorned with alexandrites.", + "color": "green" + }, + { + "id": "ruby_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "ruby and gold tiara" }, + "description": "A shiny, gold tiara adorned with rubies." + }, + { + "id": "peridot_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "peridot and gold tiara" }, + "description": "A shiny, gold tiara adorned with peridots.", + "color": "light_green" + }, + { + "id": "sapphire_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "sapphire and gold tiara" }, + "description": "A shiny, gold tiara adorned with sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "tourmaline and gold tiara" }, + "description": "A shiny, gold tiara adorned with tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "citrine and gold tiara" }, + "description": "A shiny, gold tiara adorned with citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "blue topaz and gold tiara" }, + "description": "A shiny, gold tiara adorned with blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "opal and gold tiara" }, + "description": "A shiny, gold tiara adorned with opals.", + "color": "white" + }, + { + "id": "pearl_gold_tiara", + "copy-from": "garnet_gold_tiara", + "type": "ARMOR", + "name": { "str": "pearl and gold tiara" }, + "description": "A shiny, gold tiara adorned with pearls.", + "color": "white" + }, + { + "id": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "garnet and silver tiara" }, + "description": "A shiny, silver tiara adorned with garnets.", + "weight": "100 g", + "volume": "100 ml", + "price": 200000, + "price_postapoc": 2000, + "material": [ "silver", "gemstone" ], + "looks_like": "crown_golden", + "symbol": "[", + "color": "red", + "coverage": 5, + "encumbrance": 1, + "material_thickness": 1, + "flags": [ "SUPER_FANCY" ] + }, + { + "id": "diamond_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "diamond and silver tiara" }, + "description": "A shiny, silver tiara adorned with diamonds.", + "material": [ "silver", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "amethyst and silver tiara" }, + "description": "A shiny, silver tiara adorned with amethyst.", + "color": "blue" + }, + { + "id": "aquamarine_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "aquamarine and silver tiara" }, + "description": "A shiny, silver tiara adorned with aquamarine.", + "color": "light_blue" + }, + { + "id": "emerald_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "emerald and silver tiara" }, + "description": "A shiny, silver tiara adorned with emeralds.", + "color": "green" + }, + { + "id": "alexandrite_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "alexandrite and silver tiara" }, + "description": "A shiny, silver tiara adorned with alexandrites.", + "color": "green" + }, + { + "id": "ruby_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "ruby and silver tiara" }, + "description": "A shiny, silver tiara adorned with rubies." + }, + { + "id": "peridot_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "peridot and silver tiara" }, + "description": "A shiny, silver tiara adorned with peridots.", + "color": "light_green" + }, + { + "id": "sapphire_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "sapphire and silver tiara" }, + "description": "A shiny, silver tiara adorned with sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "tourmaline and silver tiara" }, + "description": "A shiny, silver tiara adorned with tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "citrine and silver tiara" }, + "description": "A shiny, silver tiara adorned with citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "blue topaz and silver tiara" }, + "description": "A shiny, silver tiara adorned with blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "opal and silver tiara" }, + "description": "A shiny, silver tiara adorned with opals.", + "color": "white" + }, + { + "id": "pearl_silver_tiara", + "copy-from": "garnet_silver_tiara", + "type": "ARMOR", + "name": { "str": "pearl and silver tiara" }, + "description": "A shiny, silver tiara adorned with pearls.", + "color": "white" } ] diff --git a/data/json/items/armor/pets_horse_armor.json b/data/json/items/armor/pets_horse_armor.json index c4640b3106bd2..6e68706090474 100644 --- a/data/json/items/armor/pets_horse_armor.json +++ b/data/json/items/armor/pets_horse_armor.json @@ -99,7 +99,7 @@ "type": "PET_ARMOR", "id": "leatherbone_armor_horse", "copy-from": "leather_armor_horse", - "name": "boiled leather horse barding with bones", + "name": { "str": "boiled leather horse barding with bones", "str_pl": "boiled leather horse bardings with bones" }, "description": "Decorative bones affixed to leather horse barding to invoke fear in bandits and raiders and traders all! You could put this on a friendly horse.", "relative": { "price": 1500, "price_postapoc": 150, "weight": 500 }, "material": [ "bone", "leather" ] @@ -129,7 +129,7 @@ { "id": "saddlebag", "type": "ARMOR", - "name": "saddle bags", + "name": { "str": "pair of saddle bags", "str_pl": "pairs of saddle bags" }, "description": "A pair of covered pouches laid across the back of a horse behind the saddle.", "weight": "1000 g", "volume": "7500 ml", diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json index 596a5348984e0..26e58bd1dc69e 100644 --- a/data/json/items/bionics.json +++ b/data/json/items/bionics.json @@ -19,7 +19,7 @@ "abstract": "bionic_general_npc_usable", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "abstract bionic module (npc usable)", + "name": { "str": "abstract bionic module (npc usable)", "str_pl": "abstract bionic modules (npc usable)" }, "extend": { "flags": [ "BIONIC_NPC_USABLE" ] } }, { @@ -748,7 +748,7 @@ "looks_like": "bio_int_enhancer", "description": "A small gasoline fuel cell able to convert gasoline to bionic power. It's connected to a diffuse network of bio-plastic bladders able to hold up to 500 ml of gasoline.", "price": 450000, - "weight": 600, + "weight": "600 g", "difficulty": 7 }, { diff --git a/data/json/items/book/archery.json b/data/json/items/book/archery.json index ed857dfb03b06..0f28f9d046a8e 100644 --- a/data/json/items/book/archery.json +++ b/data/json/items/book/archery.json @@ -2,8 +2,7 @@ { "id": "book_archery", "type": "BOOK", - "name": "Lessons for the Novice Bowhunter", - "name_plural": "Lessons for the Novice Bowhunter", + "name": { "str": "Lessons for the Novice Bowhunter", "str_pl": "copies of Lessons for the Novice Bowhunter" }, "description": "This hefty paperback book contains all the information needed for novice archers to get started hunting with a variety of bows and crossbows.", "weight": "932 g", "volume": "1250 ml", @@ -20,8 +19,7 @@ { "id": "mag_archery", "type": "BOOK", - "name": "Archery for Kids", - "name_plural": "Archery for Kids", + "name": { "str": "Archery for Kids", "str_pl": "issues of Archery for Kids" }, "description": "Will you be able to place the arrow right into the bullseye? It is not that easy, but once you know how it's done, you will have a lot of fun with archery.", "weight": "60 g", "volume": "250 ml", @@ -39,8 +37,7 @@ { "id": "manual_archery", "type": "BOOK", - "name": "Zen and the Art of Archery", - "name_plural": "Zen and the Art of Archery", + "name": { "str": "Zen and the Art of Archery", "str_pl": "copies of Zen and the Art of Archery" }, "description": "This massive book contains a wealth of vital information for the novice archer.", "weight": "1454 g", "volume": "1250 ml", diff --git a/data/json/items/book/barter.json b/data/json/items/book/barter.json index d5d04d686add3..3748b0e412fde 100644 --- a/data/json/items/book/barter.json +++ b/data/json/items/book/barter.json @@ -19,8 +19,7 @@ { "id": "manual_business", "type": "BOOK", - "name": "How to Succeed in Business", - "name_plural": "How to Succeed in Business", + "name": { "str": "How to Succeed in Business", "str_pl": "copies of How to Succeed in Business" }, "description": "Useful if you want to get a good deal when purchasing goods.", "weight": "454 g", "volume": "750 ml", @@ -38,8 +37,7 @@ { "id": "textbook_business", "type": "BOOK", - "name": "Advanced Economics", - "name_plural": "Advanced Economics", + "name": { "str": "Advanced Economics", "str_pl": "copies of Advanced Economics" }, "//": "Biz majors can afford it. Surely you're gonna make US$60K/yr out of school, and twice that in five years?", "description": "A college textbook on economics.", "weight": "1587 g", diff --git a/data/json/items/book/bashing.json b/data/json/items/book/bashing.json index fb65d3412d78f..d75d249d200d3 100644 --- a/data/json/items/book/bashing.json +++ b/data/json/items/book/bashing.json @@ -2,8 +2,7 @@ { "id": "mag_bashing", "type": "BOOK", - "name": "Batter Up!", - "name_plural": "Batter Up!", + "name": { "str": "Batter Up!", "str_pl": "issues of Batter Up!" }, "description": "A baseball magazine that focuses on batting tips. There are lots of colorful, full-page photos of skilled athletes demonstrating proper form and technique.", "weight": "80 g", "volume": "250 ml", diff --git a/data/json/items/book/computer.json b/data/json/items/book/computer.json index 3050c8c90b1ad..8cae867a0877e 100644 --- a/data/json/items/book/computer.json +++ b/data/json/items/book/computer.json @@ -2,7 +2,7 @@ { "id": "SICP", "type": "BOOK", - "name": "SICP", + "name": { "str": "SICP", "str_pl": "copies of SICP" }, "description": "A classic text, \"The Structure and Interpretation of Computer Programs.\" Written with examples in LISP, but applicable to any language.", "weight": "1587 g", "volume": "1500 ml", @@ -22,8 +22,7 @@ { "id": "computer_science", "type": "BOOK", - "name": "Computer Science 301", - "name_plural": "Computer Science 301", + "name": { "str": "Computer Science 301", "str_pl": "copies of Computer Science 301" }, "description": "A college textbook on computer science.", "weight": "1587 g", "volume": "1750 ml", @@ -43,8 +42,7 @@ { "id": "howto_computer", "type": "BOOK", - "name": "How to Browse the Web", - "name_plural": "How to Browse the Web", + "name": { "str": "How to Browse the Web", "str_pl": "copies of How to Browse the Web" }, "description": "Very beginner-level information about computers.", "weight": "454 g", "volume": "750 ml", @@ -61,8 +59,7 @@ { "id": "mag_computer", "type": "BOOK", - "name": "Computer World", - "name_plural": "Computer World", + "name": { "str": "Computer World", "str_pl": "issues of Computer World" }, "description": "An informative magazine all about computers, both hardware and software.", "weight": "80 g", "volume": "250 ml", @@ -79,8 +76,7 @@ { "id": "manual_computers", "type": "BOOK", - "name": "Computer Science 101", - "name_plural": "Computer Science 101", + "name": { "str": "Computer Science 101", "str_pl": "copies of Computer Science 101" }, "//": "College-level textbooks are Cheap at $60.", "description": "An entry-level textbook about computers.", "weight": "462 g", @@ -98,8 +94,7 @@ { "id": "textbook_computer", "type": "BOOK", - "name": "Principles of Advanced Programming", - "name_plural": "Principles of Advanced Programming", + "name": { "str": "Principles of Advanced Programming", "str_pl": "copies of Principles of Advanced Programming" }, "description": "A heavy textbook dedicated to advanced-level software design, written for several different programming languages.", "weight": "2206 g", "volume": "1750 ml", diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index dea59b662c498..a04ac25028b5c 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -2,8 +2,7 @@ { "id": "adv_chemistry", "type": "BOOK", - "name": "Advanced Physical Chemistry", - "name_plural": "Advanced Physical Chemistry", + "name": { "str": "Advanced Physical Chemistry", "str_pl": "copies of Advanced Physical Chemistry" }, "description": "A university-level textbook on advanced principles of chemistry, both organic and inorganic.", "weight": "1712 g", "volume": "2 L", @@ -23,7 +22,7 @@ { "id": "brewing_cookbook", "type": "BOOK", - "name": "The Homebrewer's Bible", + "name": { "str": "The Homebrewer's Bible", "str_pl": "copies of The Homebrewer's Bible" }, "description": "A book full of easy-to-follow recipes and useful advice on homebrewing, malting, and fermenting. It even smells faintly of booze.", "weight": "1587 g", "volume": "1500 ml", @@ -43,7 +42,7 @@ { "id": "cookbook", "type": "BOOK", - "name": "Cooking on a Budget", + "name": { "str": "Cooking on a Budget", "str_pl": "copies of Cooking on a Budget" }, "description": "A nice cook book that goes beyond recipes and into the chemistry of food.", "weight": "454 g", "volume": "1 L", @@ -60,8 +59,7 @@ { "id": "cookbook_human", "type": "BOOK", - "name": "To Serve Man", - "name_plural": "To Serve Man", + "name": { "str": "To Serve Man", "str_pl": "copies of To Serve Man" }, "//": "Wasn't commercially traded. ('Parody' only covers so much.) Should get a serious price modifier for non-Cannibals.", "description": "It's… it's a cookbook!", "weight": "454 g", @@ -81,8 +79,7 @@ { "id": "cookbook_italian", "type": "BOOK", - "name": "Cucina Italiana", - "name_plural": "Cucina Italiana", + "name": { "str": "Cucina Italiana", "str_pl": "copies of Cucina Italiana" }, "description": "This cookbook is written in Italian, but handily illustrated with step by step photo instructions.", "weight": "454 g", "volume": "1 L", @@ -100,8 +97,7 @@ { "id": "cookbook_sushi", "type": "BOOK", - "name": "Sushi Made Easy", - "name_plural": "copies of Sushi Made Easy", + "name": { "str": "Sushi Made Easy", "str_pl": "copies of Sushi Made Easy" }, "description": "A simple text for the aspiring sushi lover, this easy to read guide is filled with lots of helpful illustrations for everything from basic rice preparation to setting a proper Japanese table.", "weight": "921 g", "volume": "750 ml", @@ -140,8 +136,7 @@ { "id": "mag_cooking", "type": "BOOK", - "name": "Bon Appetit", - "name_plural": "Bon Appetit", + "name": { "str": "Bon Appetit", "str_pl": "issues of Bon Appetit" }, "description": "Exciting recipes and restaurant reviews. Full of handy tips about cooking.", "weight": "60 g", "volume": "250 ml", @@ -159,7 +154,7 @@ { "id": "mag_glam", "type": "BOOK", - "name": "Glamopolitan", + "name": { "str": "Glamopolitan", "str_pl": "issues of Glamopolitan" }, "description": "This is a full-size glossy women's magazine. There are a few unoriginal recipes and some simple cooking tips somewhere in between the fashion photos and the sex advice columns.", "weight": "160 g", "volume": "500 ml", @@ -177,8 +172,7 @@ { "id": "modern_tanner", "type": "BOOK", - "name": "The Modern Tanner", - "name_plural": "copies of The Modern Tanner", + "name": { "str": "The Modern Tanner", "str_pl": "copies of The Modern Tanner" }, "description": "A in-depth and easy to read guide that details a very modern take on the ancient art of leather tanning.", "weight": "568 g", "volume": "750 ml", @@ -196,8 +190,7 @@ { "id": "recipe_alpha", "type": "BOOK", - "name": "PE050 \"Alpha\": Preliminary Report", - "name_plural": "PE050 \"Alpha\": Preliminary Report", + "name": { "str": "PE050 \"Alpha\": Preliminary Report", "str_pl": "copies of PE050 \"Alpha\": Preliminary Report" }, "description": "This sheaf of papers-dated two weeks before all this started-describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"…", "weight": "50 g", "volume": "500 ml", @@ -216,8 +209,7 @@ { "id": "recipe_animal", "type": "BOOK", - "name": "lab journal-Dionne", - "name_plural": "lab journals-Dionne", + "name": { "str": "lab journal-Dionne", "str_pl": "lab journals-Dionne" }, "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from various Earth fauna. The team seems quite enthusiastic--if not eager--about their results.", "weight": "1700 g", "volume": "500 ml", @@ -236,8 +228,7 @@ { "id": "recipe_chimera", "type": "BOOK", - "name": "PE065 \"Chimera\": Best Practices", - "name_plural": "PE065 \"Chimera\": Best Practices", + "name": { "str": "PE065 \"Chimera\": Best Practices", "str_pl": "copies of PE065 \"Chimera\": Best Practices" }, "description": "This sheaf of papers describes a new chemical formula in detail and supplies instructions for its use as some sort of… crowd-control catalyst? That can't be right…", "weight": "50 g", "volume": "500 ml", @@ -256,8 +247,7 @@ { "id": "recipe_creepy", "type": "BOOK", - "name": "lab journal-Smythe", - "name_plural": "lab journals-Smythe", + "name": { "str": "lab journal-Smythe", "str_pl": "lab journals-Smythe" }, "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from flesh contaminated with XE037. The results look promising but the procurement methods seem awfully vague…", "weight": "1700 g", "volume": "500 ml", @@ -295,8 +285,7 @@ { "id": "recipe_labchem", "type": "BOOK", - "name": "chemical reference-CLASSIFIED", - "name_plural": "chemical references-CLASSIFIED", + "name": { "str": "chemical reference-CLASSIFIED", "str_pl": "chemical references-CLASSIFIED" }, "description": "This somewhat technical binder has several intimidating security warnings on the cover, yet guarantees unauthorized readers \"permanent employment, for life\". It contains useful information on \"basic\" chemical projects like methamphetamine and heroin, along with briefing on things called \"XE037\" and \"PE012\".", "weight": "2000 g", "volume": "500 ml", @@ -315,8 +304,7 @@ { "id": "recipe_maiar", "type": "BOOK", - "name": "lab journal-x-|xp", - "name_plural": "lab journals-x-|xp", + "name": { "str": "lab journal-x-|xp", "str_pl": "lab journals-x-|xp" }, "description": "This damaged team logbook lacks (deliberately?) any identifying information, but still contains useful information on several types of mutagen and their development.", "weight": "1700 g", "volume": "500 ml", @@ -335,8 +323,10 @@ { "id": "recipe_medicalmut", "type": "BOOK", - "name": "PE023 \"Medical\": Application and Findings", - "name_plural": "PE023 \"Medical\": Application and Findings", + "name": { + "str": "PE023 \"Medical\": Application and Findings", + "str_pl": "copies of PE023 \"Medical\": Application and Findings" + }, "description": "This binder of highly technical papers describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"…", "weight": "1934 g", "volume": "1750 ml", @@ -356,8 +346,7 @@ { "id": "recipe_raptor", "type": "BOOK", - "name": "PE070 \"Raptor\": Proposal", - "name_plural": "PE070 \"Raptor\": Proposal", + "name": { "str": "PE070 \"Raptor\": Proposal", "str_pl": "copies of PE070 \"Raptor\": Proposal" }, "description": "This sheaf of papers is a highly speculative proposal for focusing \"PE065\". Scribbled notes throughout seem to think that it might work, but that there's no time.", "weight": "50 g", "volume": "500 ml", @@ -376,8 +365,7 @@ { "id": "recipe_serum", "type": "BOOK", - "name": "Best Practices for Compound Delivery", - "name_plural": "Best Practices for Compound Delivery", + "name": { "str": "Best Practices for Compound Delivery", "str_pl": "copies of Best Practices for Compound Delivery" }, "description": "This internal manual details several varieties of mutagenic experiments, as well as describing the protocols used to concentrate mutagens for quicker results. The authors recommend that researchers ensure that their subjects are well-fed and in good health, as the concentrated serums draw heavily on subjects' bodies.", "weight": "1700 g", "volume": "500 ml", @@ -396,10 +384,9 @@ { "id": "reference_cooking", "type": "BOOK", - "name": "CRC-Merck handbook, 4th edition", - "name_plural": "copies of the CRC-Merck handbook, 4th edition", + "name": { "str": "CRC-Merck Handbook, 4th edition", "str_pl": "copies of CRC-Merck Handbook, 4th edition" }, "description": "This huge hardbound book is a collection of reference data and formulae pertinent to many technical disciplines. If poring over tables of chemical and physical data is your thing, this is the book for you.", - "weight": 5790, + "weight": "5790 g", "volume": "1750 ml", "price": 9000, "price_postapoc": 30000, @@ -414,9 +401,11 @@ { "id": "scots_cookbook", "type": "BOOK", - "name": "Ye Scots Beuk o Cuikery", - "name_plural": "copies of Ye Scots Beuk o Cuikery", - "//": "That would translate out to The Scottish Book of Cookery, or The Scottish Cookbook.", + "name": { + "//~": "That would translate out to The Scottish Book of Cookery, or The Scottish Cookbook.", + "str": "Ye Scots Beuk o Cuikery", + "str_pl": "copies of Ye Scots Beuk o Cuikery" + }, "description": "A semi-translated cookbook from thirteenth century Scotland. While a bit difficult to read, as there are a disquieting number of illustrations of people stabbing each other mixed amongst the recipes, it provides insights into medieval Scottish culture and fashion as well as new uses for oatmeal, fish, and sheep liver.", "weight": "1887 g", "volume": "1250 ml", diff --git a/data/json/items/book/cutting.json b/data/json/items/book/cutting.json index 8ba1131f47f9b..1d835f80c9d78 100644 --- a/data/json/items/book/cutting.json +++ b/data/json/items/book/cutting.json @@ -2,8 +2,7 @@ { "id": "mag_cutting", "type": "BOOK", - "name": "All About Swords", - "name_plural": "All About Swords", + "name": { "str": "All About Swords", "str_pl": "issues of All About Swords" }, "description": "An interesting magazine that contains information about swords and sword fighting techniques from all across the world.", "weight": "80 g", "volume": "250 ml", @@ -21,8 +20,7 @@ { "id": "manual_cutting", "type": "BOOK", - "name": "knife fighter's notes", - "name_plural": "knife fighter's notes", + "name": { "str": "knife fighter's notes", "str_pl": "knife fighter's notes" }, "description": "It seems to be a guide to edged weapon combat, poorly photocopied and released on spiral- bound paper. Still, there are lots of useful tips for beginners.", "weight": "454 g", "volume": "250 ml", @@ -39,8 +37,7 @@ { "id": "manual_knives", "type": "BOOK", - "name": "Spetsnaz Knife Techniques", - "name_plural": "Spetsnaz Knife Techniques", + "name": { "str": "Spetsnaz Knife Techniques", "str_pl": "copies of Spetsnaz Knife Techniques" }, "description": "A classic Soviet text on the art of attacking with a blade.", "weight": "454 g", "volume": "250 ml", diff --git a/data/json/items/book/dodge.json b/data/json/items/book/dodge.json index f12cb67e9074c..4d87ea352c5cc 100644 --- a/data/json/items/book/dodge.json +++ b/data/json/items/book/dodge.json @@ -2,8 +2,7 @@ { "id": "mag_dodge", "type": "BOOK", - "name": "Dance Dance Dance!", - "name_plural": "Dance Dance Dance!", + "name": { "str": "Dance Dance Dance!", "str_pl": "issues of Dance Dance Dance!" }, "description": "Learn the moves of the trendiest dances right now.", "weight": "60 g", "volume": "250 ml", @@ -21,8 +20,7 @@ { "id": "manual_dodge", "type": "BOOK", - "name": "The Book of Dances", - "name_plural": "Books of Dances", + "name": { "str": "The Book of Dances", "str_pl": "copies of The Book of Dances" }, "description": "This massive antique book documents dances from all around the world in great detail. A perceptive reader could learn a lot about defensive footwork from some of the war dances.", "weight": "2330 g", "volume": "1250 ml", @@ -39,8 +37,7 @@ { "id": "manual_dodge_kid", "type": "BOOK", - "name": "Break a Leg!", - "name_plural": "Break a Leg!", + "name": { "str": "Break a Leg!", "str_pl": "copies of Break a Leg!" }, "description": "The Kids' Guide to Acting and Stagecraft.", "weight": "72 g", "volume": "250 ml", diff --git a/data/json/items/book/driving.json b/data/json/items/book/driving.json index bd4225196c532..b03f8c89770f5 100644 --- a/data/json/items/book/driving.json +++ b/data/json/items/book/driving.json @@ -2,8 +2,7 @@ { "id": "decoy_anarch", "type": "BOOK", - "name": "AAA Guide", - "name_plural": "AAA Guide", + "name": { "str": "AAA Guide", "str_pl": "copies of AAA Guide" }, "description": "A tourist-centric guide to points of interest throughout the country. Though it focuses on the north-central US, the driving sections contain some practical tips on proper driving techniques.", "weight": "220 g", "volume": "500 ml", @@ -39,8 +38,7 @@ { "id": "manual_driving", "type": "BOOK", - "name": "The Rules of the Road", - "name_plural": "The Rules of the Road", + "name": { "str": "The Rules of the Road", "str_pl": "copies of The Rules of the Road" }, "description": "A thick textbook for beginning drivers. It contains chapters on laws, safe vehicle operation, and defensive driving concepts.", "weight": "404 g", "volume": "500 ml", @@ -57,8 +55,7 @@ { "id": "textbook_anarch", "type": "BOOK", - "name": "AAA Guide", - "name_plural": "AAA Guide", + "name": { "str": "AAA Guide", "str_pl": "copies of AAA Guide" }, "description": "A tourist-centric guide to points of interest throughout the country. This particular copy is apparently the Anonymous Anarchist's Annual: the cover conceals a wealth of ways to help stick it to The Man, along with plenty of advice for avoiding police.", "weight": "223 g", "volume": "500 ml", diff --git a/data/json/items/book/electronics.json b/data/json/items/book/electronics.json index d7ff922f69fee..12a2e587f3225 100644 --- a/data/json/items/book/electronics.json +++ b/data/json/items/book/electronics.json @@ -2,8 +2,7 @@ { "id": "advanced_electronics", "type": "BOOK", - "name": "Advanced Electronics", - "name_plural": "Advanced Electronics", + "name": { "str": "Advanced Electronics", "str_pl": "copies of Advanced Electronics" }, "description": "A college textbook on circuit design.", "weight": "1587 g", "volume": "1750 ml", @@ -23,8 +22,7 @@ { "id": "mag_electronics", "type": "BOOK", - "name": "Ham Radio Illustrated", - "name_plural": "Ham Radio Illustrated", + "name": { "str": "Ham Radio Illustrated", "str_pl": "issues of Ham Radio Illustrated" }, "description": "An amusing magazine about ham radio, with lots of diagrams and illustrations for making your own electronic devices.", "weight": "45 g", "volume": "250 ml", @@ -42,8 +40,7 @@ { "id": "manual_electronics", "type": "BOOK", - "name": "What's a Transistor?", - "name_plural": "What's a Transistor?", + "name": { "str": "What's a Transistor?", "str_pl": "copies of What's a Transistor?" }, "description": "A basic manual of electronics and circuit design.", "weight": "454 g", "volume": "750 ml", @@ -60,8 +57,7 @@ { "id": "radio_book", "type": "BOOK", - "name": "Amateur Home Radio for Enthusiasts", - "name_plural": "Amateur Home Radio for Enthusiasts", + "name": { "str": "Amateur Home Radio for Enthusiasts", "str_pl": "copies of Amateur Home Radio for Enthusiasts" }, "description": "A book about ham radio and citizen's band radio. It contains numerous diagrams and illustrations explaining the science behind the electronics.", "weight": "1587 g", "volume": "1750 ml", @@ -100,8 +96,7 @@ { "id": "recipe_augs", "type": "BOOK", - "name": "Augmentative Tech Review", - "name_plural": "Augmentative Tech Review", + "name": { "str": "Augmentative Tech Review", "str_pl": "issues of Augmentative Tech Review" }, "description": "This annual publication covers the various ways in which people use technology to improve their bodies. There are a few in-depth and thoroughly illustrated articles on bionic systems, though they tend to use too much jargon.", "weight": "1909 g", "volume": "500 ml", @@ -120,8 +115,7 @@ { "id": "recipe_lab_elec", "type": "BOOK", - "name": "lab journal-Herrera", - "name_plural": "lab journals-Herrera", + "name": { "str": "lab journal-Herrera", "str_pl": "lab journals-Herrera" }, "description": "This hefty binder contains a multitude of diagrams and technical specifications for various electronic materials. Some of the diagrams use symbols you've not seen before…", "weight": "2000 g", "volume": "500 ml", @@ -140,8 +134,7 @@ { "id": "recipe_mil_augs", "type": "BOOK", - "name": "2XI design binder-CLASSIFIED", - "name_plural": "2XI design binders-CLASSIFIED", + "name": { "str": "2XI design binder-CLASSIFIED", "str_pl": "2XI design binders-CLASSIFIED" }, "description": "This Doubletech Industries binder has several intimidating security warnings on the cover. Probably because it contains complete design specs, technical drawings, and test results for their military-grade bionic implants.", "weight": "1409 g", "volume": "500 ml", @@ -160,8 +153,7 @@ { "id": "repeater_mod_guide", "type": "BOOK", - "name": "plans for a radio repeater mod", - "name_plural": "plans for a radio repeater mod", + "name": { "str": "plans for a radio repeater mod", "str_pl": "plans for a radio repeater mod" }, "description": "Instructions on how to create a mod for a radio station terminal which converts the entire system into a repeater.", "weight": "5 g", "volume": "250 ml", @@ -180,8 +172,7 @@ { "id": "textbook_electronics", "type": "BOOK", - "name": "Electronic Circuit Theory", - "name_plural": "Electronic Circuit Theory", + "name": { "str": "Electronic Circuit Theory", "str_pl": "copies of Electronic Circuit Theory" }, "description": "An advanced college textbook on circuit theory, design, and organization.", "weight": "1587 g", "volume": "1750 ml", @@ -201,8 +192,7 @@ { "id": "textbook_robots", "type": "BOOK", - "name": "Robots for Fun & Profit", - "name_plural": "Robots for Fun & Profit", + "name": { "str": "Robots for Fun & Profit", "str_pl": "copies of Robots for Fun & Profit" }, "description": "A rare book on the design of robots, with lots of helpful step-by-step guides.", "weight": "2063 g", "volume": "2 L", @@ -222,7 +212,7 @@ { "abstract": "schematics_generic", "type": "BOOK", - "name": "schematics generic", + "name": { "str": "schematics", "str_pl": "schematics" }, "description": "seeing this is a bug", "weight": "30 g", "volume": "250 ml", @@ -241,136 +231,98 @@ { "id": "schematics_nursebot", "type": "BOOK", - "name": "nurse bot schematics", - "name_plural": "nurse bot schematics", + "name": { "str": "nurse bot schematics", "str_pl": "nurse bot schematics" }, "description": "Bearing the logo of Uncanny, those are assembly plans, design specs, and technical drawings for the nurse bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_grocerybot", "type": "BOOK", - "name": "grocery bot schematics", - "name_plural": "grocery bot schematics", + "name": { "str": "grocery bot schematics", "str_pl": "grocery bot schematics" }, "description": "Bearing the logo of Uncanny, those are assembly plans, design specs, and technical drawings for the grocery bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_copbot", "type": "BOOK", - "name": "police bot schematics", - "name_plural": "police bot schematics", + "name": { "str": "police bot schematics", "str_pl": "police bot schematics" }, "description": "Assembly plans, design specs, and technical drawings for the police bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_eyebot", "type": "BOOK", - "name": "eyebot schematics", - "name_plural": "eyebot schematics", + "name": { "str": "eyebot schematics", "str_pl": "eyebot schematics" }, "description": "Assembly plans, design specs, and technical drawings for the eyebot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_secubot", "type": "BOOK", - "name": "security bot schematics", - "name_plural": "security bot schematics", + "name": { "str": "security bot schematics", "str_pl": "security bot schematics" }, "description": "Assembly plans, design specs, and technical drawings for the security bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_skitterbot", "type": "BOOK", - "name": "skitterbot schematics", - "name_plural": "skitterbot schematics", + "name": { "str": "skitterbot schematics", "str_pl": "skitterbot schematics" }, "description": "Assembly plans, design specs, and technical drawings for the skitterbot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, - { - "id": "schematics_chickenbot", - "type": "BOOK", - "name": "chicken walker schematics", - "name_plural": "chicken walker schematics", - "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the chicken walker. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", - "copy-from": "schematics_generic" - }, { "id": "schematics_hazmatbot", "type": "BOOK", - "name": "cleaner bot schematics", - "name_plural": "cleaner bot schematics", + "name": { "str": "cleaner bot schematics", "str_pl": "cleaner bot schematics" }, "description": "Assembly plans, design specs, and technical drawings for the cleaner bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_molebot", "type": "BOOK", - "name": "miner bot schematics", - "name_plural": "miner bot schematics", + "name": { "str": "miner bot schematics", "str_pl": "miner bot schematics" }, "description": "Assembly plans, design specs, and technical drawings for the miner bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_riotbot", "type": "BOOK", - "name": "riot control bot schematics", - "name_plural": "riot control bot schematics", + "name": { "str": "riot control bot schematics", "str_pl": "riot control bot schematics" }, "description": "Assembly plans, design specs, and technical drawings for the riot control bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_sciencebot", "type": "BOOK", - "name": "lab defense bot schematics", - "name_plural": "lab defense bot schematics", + "name": { "str": "lab defense bot schematics", "str_pl": "lab defense bot schematics" }, "description": "Assembly plans, design specs, and technical drawings for the lab defense bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, - { - "id": "schematics_tankbot", - "type": "BOOK", - "name": "tank drone schematics", - "name_plural": "tank drone schematics", - "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the tank drone. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", - "copy-from": "schematics_generic" - }, - { - "id": "schematics_tripod", - "type": "BOOK", - "name": "tripod schematics", - "name_plural": "tripod schematics", - "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", - "copy-from": "schematics_generic" - }, { "id": "schematics_dispatch", "type": "BOOK", - "name": "dispatch schematics", - "name_plural": "dispatch schematics", + "name": { "str": "dispatch schematics", "str_pl": "dispatch schematics" }, "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the dispatch. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_dispatch_military", "type": "BOOK", - "name": "military dispatch schematics", - "name_plural": "military dispatch schematics", + "name": { "str": "military dispatch schematics", "str_pl": "military dispatch schematics" }, "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the military dispatch. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_antimateriel", "type": "BOOK", - "name": "anti-materiel turret schematics", - "name_plural": "anti-materiel turret schematics", + "name": { "str": "anti-materiel turret schematics", "str_pl": "anti-materiel turret schematics" }, "description": "Assembly plans, design specs, and technical drawings for the anti-materiel turret. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_searchlight", "type": "BOOK", - "name": "milspec searchlight schematics", - "name_plural": "milspec searchlight schematics", + "name": { "str": "milspec searchlight schematics", "str_pl": "milspec searchlight schematics" }, "description": "Assembly plans, design specs, and technical drawings for the milspec searchlight. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" } diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json index 4b99daf6ff33c..c8fc6477f7451 100644 --- a/data/json/items/book/fabrication.json +++ b/data/json/items/book/fabrication.json @@ -2,8 +2,7 @@ { "id": "glassblowing_book", "type": "BOOK", - "name": "The Art of Glassblowing", - "name_plural": "The Art of Glassblowing", + "name": { "str": "The Art of Glassblowing", "str_pl": "copies of The Art of Glassblowing" }, "description": "A textbook that illustrates the science and technique of the ancient art of glassblowing.", "weight": "1620 g", "volume": "1250 ml", @@ -22,8 +21,7 @@ { "id": "jewelry_book", "type": "BOOK", - "name": "Antique Adornments", - "name_plural": "Antique Adornments", + "name": { "str": "Antique Adornments", "str_pl": "copies of Antique Adornments" }, "description": "A comprehensive and illustrated history of crown, bracelet, necklace and others.", "weight": "600 g", "volume": "1250 ml", @@ -41,8 +39,7 @@ { "id": "mag_fabrication", "type": "BOOK", - "name": "Crafty Crafter's Quarterly", - "name_plural": "Crafty Crafter's Quarterly", + "name": { "str": "Crafty Crafter's Quarterly", "str_pl": "Crafty Crafter's Quarterlies" }, "description": "A fun quarterly magazine all about macaroni art and things you can make by supergluing found objects together.", "weight": "60 g", "volume": "250 ml", @@ -60,8 +57,7 @@ { "id": "manual_fabrication", "type": "BOOK", - "name": "101 Crafts for Beginners", - "name_plural": "101 Crafts for Beginners", + "name": { "str": "101 Crafts for Beginners", "str_pl": "copies of 101 Crafts for Beginners" }, "description": "A large, paperback book detailing a hundred and one beginner's projects in fabrication.", "weight": "510 g", "volume": "750 ml", @@ -79,8 +75,7 @@ { "id": "recipe_arrows", "type": "BOOK", - "name": "The Fletcher's Friend", - "name_plural": "The Fletcher's Friend", + "name": { "str": "The Fletcher's Friend", "str_pl": "copies of The Fletcher's Friend" }, "description": "This hefty book is devoted to folks looking to handcraft their own arrows. It starts with a hip and snappy disclaimer about the risks, both physical and legal, of using explosives and flammable materials. Look for its companion, \"The Bowyer's Buddy\"!", "weight": "1454 g", "volume": "1250 ml", @@ -98,8 +93,7 @@ { "id": "recipe_bows", "type": "BOOK", - "name": "The Bowyer's Buddy", - "name_plural": "The Bowyer's Buddy", + "name": { "str": "The Bowyer's Buddy", "str_pl": "copies of The Bowyer's Buddy" }, "description": "This hefty book is dedicated to craftsfolk and outdoors-y types looking to make their own bows. It recommends its companion volume \"The Fletcher's Friend\" for instructions on producing their ammunition.", "weight": "1454 g", "volume": "1250 ml", @@ -117,8 +111,7 @@ { "id": "recipe_bullets", "type": "BOOK", - "name": "The Handloader's Helper", - "name_plural": "The Handloader's Helper", + "name": { "str": "The Handloader's Helper", "str_pl": "copies of The Handloader's Helper" }, "description": "Everything you could ever want to know about handloading ammunition, sealed with a… childproof cover. Apparently a liability thing, because the chapter on explosive rounds covers them in excellent detail too.", "weight": "1454 g", "volume": "1500 ml", @@ -155,8 +148,7 @@ { "id": "recipe_lab_cvd", "type": "BOOK", - "name": "lab journal-Gustav", - "name_plural": "lab journals-Gustav", + "name": { "str": "lab journal-Gustav", "str_pl": "lab journals-Gustav" }, "description": "This paper notebook is mostly full of boring logs, experimental observations and notes. Mixed in, however, are musings on how to use the lab's vapor deposition machine to deposit amorphous carbon in a diamond-like form onto common metals. The author's intended goal was a better non-stick frying pan, but you can think of a couple of better uses for it.", "weight": "2000 g", "volume": "500 ml", @@ -175,7 +167,7 @@ { "id": "recipe_melee", "type": "BOOK", - "name": "The Streetfighter's Sidekick", + "name": { "str": "The Streetfighter's Sidekick", "str_pl": "copies of The Streetfighter's Sidekick" }, "description": "A sizable how-to guide for making hand-to-hand combat weapons. Though the processes are thoroughly detailed and several illustrations are provided, they rely heavily on technical jargon. More for machinists-turned-weaponsmiths than streetfighters, really.", "weight": "954 g", "volume": "1500 ml", @@ -193,8 +185,7 @@ { "id": "recipe_mininuke_launch", "type": "BOOK", - "name": "238-NK: Practicality Enhancement", - "name_plural": "238-NK: Practicality Enhancement", + "name": { "str": "238-NK: Practicality Enhancement", "str_pl": "copies of 238-NK: Practicality Enhancement" }, "description": "The authors of this thoroughly researched and documented proposal make a very persuasive case for the adoption of spring-driven nuclear shells. It's stamped \"DENIED\".", "weight": "854 g", "volume": "1500 ml", @@ -212,8 +203,7 @@ { "id": "textbook_armeast", "type": "BOOK", - "name": "The Art of Japanese Armormaking", - "name_plural": "The Art of Japanese Armormaking", + "name": { "str": "The Art of Japanese Armormaking", "str_pl": "copies of The Art of Japanese Armormaking" }, "description": "This in-depth and technical text details various forms of ancient Japanese armor crafting, and is well illustrated with lots of photos.", "weight": "654 g", "volume": "1250 ml", @@ -232,8 +222,7 @@ { "id": "textbook_armschina", "type": "BOOK", - "name": "Arms and Armor of Imperial China", - "name_plural": "Arms and Armor of Imperial China", + "name": { "str": "Arms and Armor of Imperial China", "str_pl": "copies of Arms and Armor of Imperial China" }, "description": "This textbook details the military history of ancient China, with a particular focus on the nature of historical arms and armor. It also details some of the equipment used by other cultures that came into conflict with the empire over various dynasties.", "weight": "654 g", "volume": "1250 ml", @@ -252,8 +241,7 @@ { "id": "textbook_armwest", "type": "BOOK", - "name": "Studies in Historic Armorsmithing", - "name_plural": "Studies in Historic Armorsmithing", + "name": { "str": "Studies in Historic Armorsmithing", "str_pl": "copies of Studies in Historic Armorsmithing" }, "description": "This in-depth and technical text details various forms of ancient European armor crafting, and is well illustrated with lots of photos.", "weight": "654 g", "volume": "1250 ml", @@ -272,7 +260,7 @@ { "id": "textbook_fabrication", "type": "BOOK", - "name": "DIY Compendium", + "name": { "str": "DIY Compendium", "str_pl": "copies of DIY Compendium" }, "description": "A thick, hardbound book detailing countless projects for inventions that claim to improve all aspects of life.", "weight": "2100 g", "volume": "1750 ml", @@ -291,8 +279,7 @@ { "id": "textbook_fireman", "type": "BOOK", - "name": "A History of Firefighting", - "name_plural": "A History of Firefighting", + "name": { "str": "A History of Firefighting", "str_pl": "copies of A History of Firefighting" }, "description": "This in-depth and technical text details the history of firefighting from ancient times into the modern era, with a focus on the technology used to save lives.", "weight": "528 g", "volume": "1 L", @@ -310,8 +297,7 @@ { "id": "textbook_gaswarfare", "type": "BOOK", - "name": "Art and Science of Chemical Warfare", - "name_plural": "Art and Science of Chemical Warfare", + "name": { "str": "Art and Science of Chemical Warfare", "str_pl": "copies of Art and Science of Chemical Warfare" }, "description": "This in-depth and technical text covers the design, development, dissemination of, and defenses against various chemical weapons throughout the centuries. The photographs the author chose make it a difficult read at times, though the information is top-notch.", "weight": "854 g", "volume": "1500 ml", @@ -330,8 +316,7 @@ { "id": "textbook_weapeast", "type": "BOOK", - "name": "The Swords of the Samurai", - "name_plural": "The Swords of the Samurai", + "name": { "str": "The Swords of the Samurai", "str_pl": "copies of The Swords of the Samurai" }, "description": "This in-depth and technical text details various forms of ancient Japanese sword smithing, and is well illustrated with step by step photo instructions.", "weight": "654 g", "volume": "1250 ml", @@ -350,8 +335,7 @@ { "id": "textbook_weapwest", "type": "BOOK", - "name": "The Historic Weaponsmith", - "name_plural": "The Historic Weaponsmith", + "name": { "str": "The Historic Weaponsmith", "str_pl": "copies of The Historic Weaponsmith" }, "description": "This in-depth and technical text details various forms of ancient European weapon smithing, and is well illustrated with step by step photo instructions.", "weight": "654 g", "volume": "1250 ml", @@ -370,8 +354,7 @@ { "id": "welding_book", "type": "BOOK", - "name": "Welding and Metallurgy", - "name_plural": "Welding and Metallurgy", + "name": { "str": "Welding and Metallurgy", "str_pl": "copies of Welding and Metallurgy" }, "description": "A rather technical textbook that illustrates the science and technique of becoming a better welder.", "weight": "2100 g", "volume": "1750 ml", @@ -390,8 +373,7 @@ { "id": "101_carpentry", "type": "BOOK", - "name": "101 Home Repairs", - "name_plural": "101 Home Repairs", + "name": { "str": "101 Home Repairs", "str_pl": "copies of 101 Home Repairs" }, "description": "A paperback book detailing 101 home repair projects the novice carpenter.", "weight": "454 g", "volume": "500 ml", @@ -408,8 +390,7 @@ { "id": "carpentry_book", "type": "BOOK", - "name": "The Complete Home Repair Guide", - "name_plural": "Complete Home Repair Guides", + "name": { "str": "The Complete Home Repair Guide", "str_pl": "copies of The Complete Home Repair Guide" }, "description": "A massive book that details virtually every aspect of remodeling and repairing a home, with concise terminology aimed at experienced carpenters.", "weight": "2490 g", "volume": "2 L", @@ -429,8 +410,7 @@ { "id": "mag_carpentry", "type": "BOOK", - "name": "Birdhouse Monthly", - "name_plural": "Birdhouse Monthlies", + "name": { "str": "Birdhouse Monthly", "str_pl": "Birdhouse Monthlies" }, "description": "A riveting periodical all about birdhouses and their construction.", "weight": "60 g", "volume": "250 ml", @@ -448,8 +428,7 @@ { "id": "manual_carpentry", "type": "BOOK", - "name": "Building for Beginners", - "name_plural": "Building for Beginners", + "name": { "str": "Building for Beginners", "str_pl": "copies of Building for Beginners" }, "description": "A large, paperback book detailing several beginner's projects in construction.", "weight": "454 g", "volume": "500 ml", @@ -466,8 +445,7 @@ { "id": "textbook_carpentry", "type": "BOOK", - "name": "Engineering 301", - "name_plural": "Engineering 301", + "name": { "str": "Engineering 301", "str_pl": "copies of Engineering 301" }, "description": "A textbook on civil engineering and construction.", "weight": "1587 g", "volume": "1500 ml", @@ -487,10 +465,9 @@ { "id": "reference_fabrication1", "type": "BOOK", - "name": "Machinery's Handbook", - "name_plural": "copies of Machinery's Handbook", + "name": { "str": "Machinery's Handbook", "str_pl": "copies of Machinery's Handbook" }, "description": "This classic reference work contains extensive, dense chapters and tables on materials, metrology, toolmaking, gears, threading and more. This recent edition includes extensive data on what was the latest techniques in additive manufacturing. If you need to know how best complete a certain machining operation, the answer lies somewhere in these pages.", - "weight": 454, + "weight": "454 g", "volume": "500 ml", "price": 8000, "price_postapoc": 50000, diff --git a/data/json/items/book/firstaid.json b/data/json/items/book/firstaid.json index 1d30126d7d212..d377313f3d07e 100644 --- a/data/json/items/book/firstaid.json +++ b/data/json/items/book/firstaid.json @@ -2,8 +2,7 @@ { "id": "emergency_book", "type": "BOOK", - "name": "Guide to Advanced Emergency Care", - "name_plural": "Guides to Advanced Emergency Care", + "name": { "str": "Guide to Advanced Emergency Care", "str_pl": "copies of Guide to Advanced Emergency Care" }, "description": "A thick textbook for paramedics describing advanced lifesaving procedures and field-expedient care methods.", "weight": "2063 g", "volume": "2 L", @@ -23,8 +22,7 @@ { "id": "mag_firstaid", "type": "BOOK", - "name": "Paramedics", - "name_plural": "Paramedics", + "name": { "str": "Paramedics", "str_pl": "issues of Paramedics" }, "description": "An educational magazine for EMTs.", "weight": "60 g", "volume": "250 ml", @@ -42,8 +40,7 @@ { "id": "manual_first_aid", "type": "BOOK", - "name": "The Big Book of First Aid", - "name_plural": "Big Books of First Aid", + "name": { "str": "The Big Book of First Aid", "str_pl": "copies of The Big Book of First Aid" }, "description": "It's big and heavy, but full of great information about first aid.", "weight": "454 g", "volume": "1250 ml", @@ -60,8 +57,7 @@ { "id": "pocket_firstaid", "type": "BOOK", - "name": "Pocket Guide to First Aid", - "name_plural": "Pocket Guides to First Aid", + "name": { "str": "Pocket Guide to First Aid", "str_pl": "copies of Pocket Guide to First Aid" }, "description": "This pocket-sized leather-bound guide to first aid combines a wealth of concise information with simple to follow instructions and easy to read illustrations.", "weight": "192 g", "volume": "250 ml", @@ -78,7 +74,7 @@ { "id": "textbook_firstaid", "type": "BOOK", - "name": "First Responder Handbook", + "name": { "str": "First Responder Handbook", "str_pl": "copies of First Responder Handbook" }, "//": "College-level textbooks are Cheap at $60. Med book is likely more expensive.", "description": "A hardbound book detailing advanced first aid techniques and field-expedient medical care.", "weight": "1360 g", @@ -98,8 +94,7 @@ { "id": "booklet_firstaid", "type": "BOOK", - "name": "First Aid Kit Instruction Booklet", - "name_plural": "First Aid Kit Instruction Booklets", + "name": { "str": "First Aid Kit Instruction Booklet", "str_pl": "copies of First Aid Kit Instruction Booklet" }, "description": "Illustrated how-to guide for your first aid kit.", "weight": "60 g", "volume": "250 ml", @@ -116,10 +111,9 @@ { "id": "reference_firstaid1", "type": "BOOK", - "name": "Physicians' Desk Reference", - "name_plural": "copies of the Physicians' Desk Reference", + "name": { "str": "Physicians' Desk Reference", "str_pl": "copies of Physicians' Desk Reference" }, "description": "This hefty volume contains all the legally mandated information relevant to physicians for writing prescriptions, generously supported by the efforts and contributions of major pharmaceutical companies. For the most part, it provides information identical to what is available on that of medication packaging inserts, and cannot match the completeness of digital pharmaceutical references like Medisoft. At least it doesn't need power to be used.", - "weight": 2268, + "weight": "2268 g", "volume": "500 ml", "price": 10000, "price_postapoc": 190000, @@ -134,10 +128,9 @@ { "id": "reference_firstaid2", "type": "BOOK", - "name": "Merck Veterinary Manual", - "name_plural": "copies of The Merck Veterinary Manual", + "name": { "str": "Merck Veterinary Manual", "str_pl": "copies of Merck Veterinary Manual" }, "description": "This expansive text covers 'all domestic species and diseases in veterinary medicine worldwide'. Should you need information regarding zoonotic diseases, off-label use of medication for animals, common dysfunctions and diseases of animals, or any other veterinary reference info, this is your book. There are some interesting new chapters on animal cloning in this edition.", - "weight": 5790, + "weight": "5790 g", "volume": "500 ml", "price": 8000, "price_postapoc": 50000, diff --git a/data/json/items/book/gun.json b/data/json/items/book/gun.json index 09cd27cf309c8..c6dc427b66eb0 100644 --- a/data/json/items/book/gun.json +++ b/data/json/items/book/gun.json @@ -2,8 +2,7 @@ { "id": "mag_guns", "type": "BOOK", - "name": "Guns n Ammo", - "name_plural": "Guns n Ammo", + "name": { "str": "Guns n Ammo", "str_pl": "issues of Guns n Ammo" }, "description": "Reviews of firearms, and various useful tips about their use.", "weight": "60 g", "volume": "250 ml", @@ -21,7 +20,7 @@ { "id": "manual_gun", "type": "BOOK", - "name": "The Gun Owner's Handbook", + "name": { "str": "The Gun Owner's Handbook", "str_pl": "copies of The Gun Owner's Handbook" }, "description": "A thick soft-cover book that claims to be a complete guide to safely operating, maintaining, and repairing firearms.", "weight": "462 g", "volume": "500 ml", @@ -38,8 +37,7 @@ { "id": "pocket_firearms", "type": "BOOK", - "name": "Pocket Guide to Firearm Safety", - "name_plural": "Pocket Guides to Firearm Safety", + "name": { "str": "Pocket Guide to Firearm Safety", "str_pl": "copies of Pocket Guide to Firearm Safety" }, "description": "This pocket-sized leather-bound guide to firearm safety combines a wealth of concise information with simple to follow instructions and easy to read illustrations.", "weight": "226 g", "volume": "250 ml", diff --git a/data/json/items/book/launcher.json b/data/json/items/book/launcher.json index 40c26ba624071..a8ac9ee8d3ef6 100644 --- a/data/json/items/book/launcher.json +++ b/data/json/items/book/launcher.json @@ -2,8 +2,7 @@ { "id": "mag_launcher", "type": "BOOK", - "name": "High Explosives Quarterly", - "name_plural": "High Explosives Quarterlies", + "name": { "str": "High Explosives Quarterly", "str_pl": "High Explosives Quarterlies" }, "description": "An interesting quarterly report about rocket launchers and recoilless rifles. There are lots of large, exciting photos of explosions and weaponry.", "weight": "90 g", "volume": "250 ml", @@ -21,8 +20,7 @@ { "id": "manual_launcher", "type": "BOOK", - "name": "Jane's Mortars and Rocket Launchers", - "name_plural": "copies of Jane's Mortars and Rocket Launchers", + "name": { "str": "Jane's Mortars and Rocket Launchers", "str_pl": "copies of Jane's Mortars and Rocket Launchers" }, "description": "An incredibly detailed guide to modern rockets, mortars, grenade launchers, and recoilless weaponry. Lavishly illustrated with color photographs, it contains a wealth of information.", "weight": "734 g", "volume": "250 ml", diff --git a/data/json/items/book/mechanics.json b/data/json/items/book/mechanics.json index bc404e925683d..5669d96a9aaf9 100644 --- a/data/json/items/book/mechanics.json +++ b/data/json/items/book/mechanics.json @@ -2,8 +2,7 @@ { "id": "book_icef", "type": "BOOK", - "name": "Internal Combustion Fundamentals", - "name_plural": "Internal Combustion Fundamentals", + "name": { "str": "Internal Combustion Fundamentals", "str_pl": "copies of Internal Combustion Fundamentals" }, "description": "A college-level textbook that details the operation, maintenance, and repair of internal combustion engines.", "weight": "1587 g", "volume": "1500 ml", @@ -24,16 +23,14 @@ "id": "mag_fieldrepair", "copy-from": "book_magazine", "type": "BOOK", - "name": "army improvised field repairs", - "name_plural": "army improvised field repairs", + "name": "army improvised field repairs manual", "description": "A compact manual with faded print detailing a number of improvised field repairs that can be made to vehicles.", "skill": "mechanics" }, { "id": "mag_mechanics", "type": "BOOK", - "name": "Popular Mechanics", - "name_plural": "Popular Mechanics", + "name": { "str": "Popular Mechanics", "str_pl": "issues of Popular Mechanics" }, "description": "A magazine about mechanical innovations. Full of entertaining articles and advertisements for esoteric gadgets.", "weight": "70 g", "volume": "250 ml", @@ -51,7 +48,7 @@ { "id": "manual_mechanics", "type": "BOOK", - "name": "Under the Hood", + "name": { "str": "Under the Hood", "str_pl": "copies of Under the Hood" }, "description": "An advanced mechanics manual, covering all sorts of topics.", "weight": "454 g", "volume": "750 ml", @@ -69,8 +66,7 @@ "id": "textbook_atomic_lab", "type": "BOOK", "copy-from": "recipe_lab_cvd", - "name": "lab journal-Curie", - "name_plural": "lab journals-Curie", + "name": { "str": "lab journal-Curie", "str_pl": "lab journals-Curie" }, "description": "This lab notebook is filled with the collective discoveries and refinements of a research team dedicated to nuclear energy. You don't think you're ready to start a second Cataclysm, but the general information provided might be useful…", "skill": "mechanics", "required_level": 6 @@ -78,8 +74,7 @@ { "id": "textbook_biodiesel", "type": "BOOK", - "name": "Biodiesel: Renewable Fuel Resource", - "name_plural": "Biodiesel: Renewable Fuel Resource", + "name": { "str": "Biodiesel: Renewable Fuel Resource", "str_pl": "copies of Biodiesel: Renewable Fuel Resource" }, "description": "A large textbook for college students about biodiesel.", "weight": "1200 g", "volume": "2 L", @@ -98,8 +93,7 @@ { "id": "textbook_mechanics", "type": "BOOK", - "name": "Mechanical Mastery", - "name_plural": "Mechanical Mastery", + "name": { "str": "Mechanical Mastery", "str_pl": "copies of Mechanical Mastery" }, "description": "An advanced guide on mechanics and welding, covering topics like \"Grinding off rust\" and \"Making cursive E's\".", "weight": "1587 g", "volume": "1500 ml", diff --git a/data/json/items/book/melee.json b/data/json/items/book/melee.json index ad4781bd29931..d04e6eee75e83 100644 --- a/data/json/items/book/melee.json +++ b/data/json/items/book/melee.json @@ -2,8 +2,7 @@ { "id": "mag_melee", "type": "BOOK", - "name": "CQB Monthly", - "name_plural": "CQB Monthlies", + "name": { "str": "CQB Monthly", "str_pl": "CQB Monthlies" }, "description": "An in-depth look at various styles of close quarters fighting. There's an amusing essay about dirty tricks in the front section.", "weight": "70 g", "volume": "250 ml", @@ -21,7 +20,7 @@ { "id": "manual_melee", "type": "BOOK", - "name": "Close Quarter Fighting Manual", + "name": { "str": "Close Quarter Fighting Manual", "str_pl": "copies of Close Quarter Fighting Manual" }, "description": "A well-thumbed hardbound book which illustrates simple strategies and techniques for close quarters combat encounters.", "weight": "564 g", "volume": "250 ml", diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json index 626e171e2dd21..696ec8657e82e 100644 --- a/data/json/items/book/misc.json +++ b/data/json/items/book/misc.json @@ -2,7 +2,7 @@ { "id": "ZSG", "type": "BOOK", - "name": "Zombie Survival Guide", + "name": { "str": "Zombie Survival Guide", "str_pl": "copies of Zombie Survival Guide" }, "description": "While this seems like it would be very useful in this situation, the sheer amount of misinformation present makes it practically useless.", "weight": "227 g", "volume": "1 L", @@ -53,8 +53,7 @@ { "id": "commune_prospectus", "type": "BOOK", - "name": "Ranch Prospectus", - "name_plural": "Ranch Prospectus", + "name": { "str": "Ranch Prospectus", "str_pl": "Ranch Prospectus" }, "description": "A short paper of the economic viability of constructing an agricultural outpost.", "weight": "1 g", "volume": "250 ml", @@ -86,8 +85,7 @@ { "id": "essay_book", "type": "BOOK", - "name": "book of essays", - "name_plural": "books of essays", + "name": { "str": "book of essays", "str_pl": "books of essays" }, "description": "A collection of essays by various authors from around the world, including works by Churchill, Mailer, Eco, and Voltaire.", "weight": "700 g", "volume": "750 ml", @@ -104,8 +102,7 @@ { "id": "fairy_tales", "type": "BOOK", - "name": "book of fairy tales", - "name_plural": "books of fairy tales", + "name": { "str": "book of fairy tales", "str_pl": "books of fairy tales" }, "description": "An amusing collection of folklore featuring the usual cast of fairies, goblins, and trolls.", "weight": "410 g", "volume": "750 ml", @@ -117,13 +114,89 @@ "intelligence": 6, "time": "18 m", "chapters": 24, - "fun": 3 + "fun": 3, + "//": "The ids below represent the Aarne-Thompson System of folklore classification. Do not change.", + "snippet_category": [ + { + "id": "fairyat_41", + "text": "This fairy tale is about a wolf who eats so much salted meat she becomes trapped in the butcher's cellar." + }, + { + "id": "fairyat_50", + "text": "In this traditional story of beastly intrigue a clever fox convinces an elderly lion to kill a derogatory wolf." + }, + { + "id": "fairyat_111", + "text": "This is an illustrated fairy tale book about a conversation between a mouse and a cat." + }, + { + "id": "fairyat_171", + "text": "An amusing collection of stories featuring \"Goldilocks and The Three Bears\" on the cover." + }, + { + "id": "fairyat_222", + "text": "This is a well illustrated fairy tale about a war between the birds and the beasts, with particulars on the wartime conduct and eventual fate of the bat." + }, + { + "id": "fairyat_285", + "text": "This book, titled \"The Rattlesnake's Vengeance\" is a collection of Cherokee myths and legends. \"285D\" is hand-written in pencil on the title page." + }, + { "id": "fairyat_328", "text": "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" }, + { + "id": "fairyat_333", + "text": "This fairy tale book is entitled \"Little Red Cap\". It details a red-cloaked child's various encounters with talking wolves." + }, + { + "id": "fairyat_366", + "text": "A collection of ghost stories warning about the dangers of stealing from the dead." + }, + { + "id": "fairyat_408", + "text": "A book of Italian fairy tales translated in English. The cover features an orange fairy juggling a lemon, a lime, and a tangerine." + }, + { "id": "fairyat_451", "text": "A book of fables about people who change into birds." }, + { + "id": "fairyat_475", + "text": "This compendium of amusing folk tales about the devil is titled \"Hell's Kettle: Legends of the Devil.\"" + }, + { + "id": "fairyat_530", + "text": "This charming book of Swedish fables is titled, \"The Glass Mountain and the Princess.\"" + }, + { + "id": "fairyat_555", + "text": "This is a collection of fairy tale stories warning against the consequences of extreme greed." + }, + { "id": "fairyat_591", "text": "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" }, + { "id": "fairyat_653", "text": "This is a book of legends collected by Traveller Johnny Cassidy in the 1960s." }, + { "id": "fairyat_758", "text": "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" }, + { "id": "fairyat_766", "text": "This book of fables expands upon the legend of the Seven Sleepers of Ephesus." }, + { + "id": "fairyat_1060", + "text": "In this fairy tale a strong man frightens an ogre by squeezing water out of a stone." + }, + { + "id": "fairyat_1084", + "text": "This book of rustic folk tales bears the title: \"How to Shout Down the Devil.\"" + }, + { + "id": "fairyat_1287", + "text": "The title of this book is \"Village Folk-tales of Ceylon.\" It includes fables about logical errors and foolish misjudgements of the Kadambawa men." + }, + { + "id": "fairyat_1461", + "text": "This book of folk tales is titled, \"The Girl with the Ugly Name, and Other Stories.\"" + }, + { + "id": "fairyat_2025", + "text": "Titled \"The Fleeing Pancake\", this collection of silly folk tales is suitable for small children." + } + ] }, { "id": "guidebook", "type": "BOOK", - "name": "The Hitchhiker's Guide to the Cataclysm", - "name_plural": "Hitchhiker's Guides to the Cataclysm", + "name": { "str": "The Hitchhiker's Guide to the Cataclysm", "str_pl": "copies of The Hitchhiker's Guide to the Cataclysm" }, "description": "Inscribed on the cover in large, friendly letters, is the message \"Don't Panic\".", "weight": "1764 g", "volume": "1 L", @@ -139,7 +212,7 @@ { "id": "mycenacean_hymns", "type": "BOOK", - "name": "Mycenacean Hymns", + "name": { "str": "Mycenacean Hymns", "str_pl": "copies of Mycenacean Hymns" }, "description": "A vellum book containing the hymns central to Marloss faith. As the verses lead to each other, the text sings of unity and promised paradise.", "weight": "368 g", "volume": "1 L", @@ -156,7 +229,7 @@ { "id": "holybook_bible1", "type": "BOOK", - "name": "King James Bible", + "name": { "str": "King James Bible", "str_pl": "copies of King James Bible" }, "description": "An English translation of the Christian Bible, which originated in England in the early 1600s.", "weight": "368 g", "volume": "1 L", @@ -173,7 +246,7 @@ { "id": "holybook_bible2", "type": "BOOK", - "name": "Eastern Orthodox Bible", + "name": { "str": "Eastern Orthodox Bible", "str_pl": "copies of Eastern Orthodox Bible" }, "description": "An English copy of the Eastern Orthodox translation of The Holy Bible.", "weight": "428 g", "volume": "1250 ml", @@ -190,7 +263,7 @@ { "id": "holybook_bible3", "type": "BOOK", - "name": "Gideon Bible", + "name": { "str": "Gideon Bible", "str_pl": "copies of Gideon Bible" }, "description": "An English translation of the Christian Bible, distributed free of charge by Gideons International.", "weight": "368 g", "volume": "1 L", @@ -207,8 +280,7 @@ { "id": "holybook_granth", "type": "BOOK", - "name": "The Guru Granth Sahib", - "name_plural": "copies of The Guru Granth Sahib", + "name": { "str": "The Guru Granth Sahib", "str_pl": "copies of The Guru Granth Sahib" }, "description": "A single-volume copy of the central religious texts of Sikhism.", "weight": "590 g", "volume": "1 L", @@ -225,7 +297,7 @@ { "id": "holybook_hadith", "type": "BOOK", - "name": "Hadith", + "name": { "str": "Hadith", "str_pl": "copies of Hadith" }, "description": "A Muslim religious text containing an account of the sayings and actions of the prophet Muhammad.", "weight": "398 g", "volume": "1 L", @@ -242,8 +314,7 @@ { "id": "holybook_kallisti", "type": "BOOK", - "name": "Principia Discordia", - "name_plural": "copies of Principia Discordia", + "name": { "str": "Principia Discordia", "str_pl": "copies of Principia Discordia" }, "description": "A book that embodies the main beliefs of Discordianism. It seems to primarily concern chaos, and features a card in the back which informs you that you are now a 'genuine and authorized Pope of Discordia'.", "weight": "292 g", "volume": "1 L", @@ -260,8 +331,7 @@ { "id": "holybook_kojiki", "type": "BOOK", - "name": "The Kojiki", - "name_plural": "copies of The Kojiki", + "name": { "str": "The Kojiki", "str_pl": "copies of The Kojiki" }, "description": "The oldest extant chronicle of Japan's myths and history, the stories contained in the Kojiki are part of the inspiration behind Shinto practices.", "weight": "368 g", "volume": "1 L", @@ -278,8 +348,7 @@ { "id": "holybook_mormon", "type": "BOOK", - "name": "The Book of Mormon", - "name_plural": "copies of The Book of Mormon", + "name": { "str": "The Book of Mormon", "str_pl": "copies of The Book of Mormon" }, "description": "The sacred text of the Latter Day Saint movement of Christianity, originally published in 1830 by Joseph Smith.", "weight": "368 g", "volume": "1 L", @@ -296,8 +365,10 @@ { "id": "holybook_pastafarian", "type": "BOOK", - "name": "The Gospel of the Flying Spaghetti Monster", - "name_plural": "copies of The Gospel of the Flying Spaghetti Monster", + "name": { + "str": "The Gospel of the Flying Spaghetti Monster", + "str_pl": "copies of The Gospel of the Flying Spaghetti Monster" + }, "description": "A book that embodies the main beliefs of the Church of the Flying Spaghetti Monster. It seems to involve a lot of pirates and some sort of invisible drunken monster made of pasta.", "weight": "292 g", "volume": "1 L", @@ -314,7 +385,7 @@ { "id": "holybook_quran", "type": "BOOK", - "name": "Quran", + "name": { "str": "Quran", "str_pl": "copies of Quran" }, "description": "An English translation of the Muslim book of holy scriptures, with explanatory notes and commentaries to aid in understanding.", "weight": "412 g", "volume": "1 L", @@ -331,8 +402,7 @@ { "id": "holybook_scientology", "type": "BOOK", - "name": "Dianetics", - "name_plural": "copies of Dianetics", + "name": { "str": "Dianetics", "str_pl": "copies of Dianetics" }, "description": "This book is the canonical text of Scientology. Written by a science fiction author, it contains self-improvement techniques and musings on psychology called Dianetics.", "weight": "486 g", "volume": "1 L", @@ -349,8 +419,7 @@ { "id": "holybook_slack", "type": "BOOK", - "name": "The Book of the SubGenius", - "name_plural": "copies of The Book of the SubGenius", + "name": { "str": "The Book of the SubGenius", "str_pl": "copies of The Book of the SubGenius" }, "description": "A book about the Church of the SubGenius. It seems to involve a salesman named J. R. \"Bob\" Dobbs and a concept called 'slack'.", "weight": "292 g", "volume": "1 L", @@ -367,8 +436,7 @@ { "id": "holybook_sutras", "type": "BOOK", - "name": "The Sutras of the Buddha", - "name_plural": "copies of The Sutras of the Buddha", + "name": { "str": "The Sutras of the Buddha", "str_pl": "copies of The Sutras of the Buddha" }, "description": "A collection of discourses attributed to the Buddha and his close disciples.", "weight": "496 g", "volume": "1 L", @@ -385,7 +453,7 @@ { "id": "holybook_talmud", "type": "BOOK", - "name": "Talmud", + "name": { "str": "Talmud", "str_pl": "copies of Talmud" }, "description": "One of the central texts of Rabbinic Judaism, the Talmud expounds upon the Hebrew Bible with teachings and opinions of thousands of rabbis.", "weight": "460 g", "volume": "1 L", @@ -402,7 +470,7 @@ { "id": "holybook_tanakh", "type": "BOOK", - "name": "Tanakh", + "name": { "str": "Tanakh", "str_pl": "copies of Tanakh" }, "description": "A single-volume book containing the complete canon of the Jewish Bible.", "weight": "512 g", "volume": "1 L", @@ -419,8 +487,7 @@ { "id": "holybook_tripitaka", "type": "BOOK", - "name": "The Tripitaka", - "name_plural": "copies of the Tripitaka", + "name": { "str": "The Tripitaka", "str_pl": "copies of The Tripitaka" }, "description": "A collection of sacred Buddhist writings describing their canons of scriptures.", "weight": "513 g", "volume": "1 L", @@ -437,8 +504,7 @@ { "id": "holybook_upanishads", "type": "BOOK", - "name": "The Upanishads", - "name_plural": "copies of The Upanishads", + "name": { "str": "The Upanishads", "str_pl": "copies of The Upanishads" }, "description": "A collection of sacred Hindu writings regarding the nature of reality and describing the character and form of human salvation.", "weight": "482 g", "volume": "1 L", @@ -455,8 +521,7 @@ { "id": "holybook_vedas", "type": "BOOK", - "name": "The Four Vedas", - "name_plural": "copies of The Four Vedas", + "name": { "str": "The Four Vedas", "str_pl": "copies of The Four Vedas" }, "description": "A single volume containing all four Vedas, which are the oldest scriptures of Hinduism.", "weight": "540 g", "volume": "1 L", @@ -488,7 +553,7 @@ { "id": "mag_gaming", "type": "BOOK", - "name": "Computer Gaming", + "name": { "str": "Computer Gaming", "str_pl": "issues of Computer Gaming" }, "description": "Reviews of recently released computer games and previews of upcoming titles.", "weight": "60 g", "volume": "250 ml", @@ -520,7 +585,7 @@ { "id": "mag_porn", "type": "BOOK", - "name": "Playboy", + "name": { "str": "Playboy", "str_pl": "issues of Playboy" }, "description": "You can read it for the articles. Or not.", "weight": "60 g", "volume": "250 ml", @@ -537,7 +602,6 @@ "id": "necropolis_freq", "type": "BOOK", "name": "frequency list", - "name_plural": "frequency lists", "description": "A notepad with a number of frequencies scribbled on it.", "weight": "1 g", "volume": "250 ml", @@ -553,7 +617,7 @@ { "id": "news_regional", "type": "BOOK", - "name": "Rural Digest-Examiner", + "name": { "str": "Rural Digest-Examiner", "str_pl": "issues of Rural Digest-Examiner" }, "description": "A newsweekly covering regional events. There is an article on the winter's snowstorms and several letters to the editor concerning the community response.", "weight": "80 g", "volume": "250 ml", @@ -1128,8 +1192,7 @@ { "id": "philosophy_book", "type": "BOOK", - "name": "book of philosophy", - "name_plural": "books of philosophy", + "name": { "str": "book of philosophy", "str_pl": "books of philosophy" }, "description": "A deep discussion of morality with an emphasis on epistemology and logic.", "snippet_category": [ { @@ -1296,7 +1359,6 @@ "id": "phonebook", "type": "BOOK", "name": "phone book", - "name_plural": "phone books", "description": "This hefty volume contains the telephone numbers of individuals, businesses, and utilities in the nearby area, pretty useless during the apocalypse and all.", "weight": "854 g", "volume": "2500 ml", @@ -1331,8 +1393,7 @@ { "id": "plays_book", "type": "BOOK", - "name": "book of plays", - "name_plural": "books of plays", + "name": { "str": "book of plays", "str_pl": "books of plays" }, "description": "A collection of plays by various authors from around the world, including scripts by Wilde, Beckett, Checkov, and Shakespeare.", "weight": "700 g", "volume": "750 ml", @@ -1349,8 +1410,7 @@ { "id": "poetry_book", "type": "BOOK", - "name": "book of poetry", - "name_plural": "books of poetry", + "name": { "str": "book of poetry", "str_pl": "books of poetry" }, "description": "A collection of poetry by various authors from around the world, including writings by Dickinson, Goethe, Thoreau, and Yeats.", "weight": "400 g", "volume": "500 ml", @@ -1367,8 +1427,7 @@ { "id": "priest_diary", "type": "BOOK", - "name": "priest's diary", - "name_plural": "priest's diaries", + "name": { "str": "priest's diary", "str_pl": "priests' diaries" }, "description": "A small book filled with journal entries in Latin.", "weight": "340 g", "volume": "750 ml", @@ -1403,8 +1462,7 @@ { "id": "record_patient", "type": "BOOK", - "name": "patient treatment records", - "name_plural": "patient treatment records", + "name": { "str": "patient treatment records", "str_pl": "patient treatment records" }, "description": "A massive stack of medical records that contain every gory detail.", "weight": "680 g", "volume": "1500 ml", @@ -1421,8 +1479,7 @@ { "id": "record_weather", "type": "BOOK", - "name": "national weather transcripts", - "name_plural": "national weather transcripts", + "name": { "str": "national weather transcripts", "str_pl": "national weather transcripts" }, "description": "Old weather records are about as interesting as a rock.", "weight": "454 g", "volume": "1750 ml", @@ -1439,8 +1496,7 @@ { "id": "story_book", "type": "BOOK", - "name": "big book of short stories", - "name_plural": "big books of short stories", + "name": { "str": "big book of short stories", "str_pl": "big books of short stories" }, "description": "This humongous volume contains a vast collection of short stories by different authors, spanning a wide variety of topics and genres.", "weight": "1720 g", "volume": "1 L", @@ -1457,8 +1513,7 @@ { "id": "tall_tales", "type": "BOOK", - "name": "book of tall tales", - "name_plural": "books of tall tales", + "name": { "str": "book of tall tales", "str_pl": "books of tall tales" }, "description": "An entertaining collection of early American folklore, featuring tales of larger than life individuals and their amazing adventures.", "weight": "360 g", "volume": "750 ml", @@ -1475,8 +1530,7 @@ { "id": "visions_solitude", "type": "BOOK", - "name": "Visions in Solitude", - "name_plural": "Visions in Solitude", + "name": { "str": "Visions in Solitude", "str_pl": "copies of Visions in Solitude" }, "description": "A small book detailing 'visions' a prisoner had on death row.", "weight": "227 g", "volume": "750 ml", @@ -1494,8 +1548,7 @@ { "id": "holybook_havamal", "type": "BOOK", - "name": "Hávamál", - "name_plural": "copies of Hávamál", + "name": { "str": "Hávamál", "str_pl": "copies of Hávamál" }, "description": "An English translation of several Old Norse poems. The poems contain proverbs and stories attributed to the god Odin, many transcribed from oral history.", "weight": "292 g", "volume": "750 ml", @@ -1512,8 +1565,7 @@ { "type": "BOOK", "id": "classic_literature", - "name": "book of classic literature", - "name_plural": "books of classic literature", + "name": { "str": "book of classic literature", "str_pl": "books of classic literature" }, "description": "A book of classic literature, timeless and enjoyable but a bit dense to read.", "snippet_category": [ { "id": "classic1", "text": "This is a copy of Dickens' \"Bleak House\"." }, @@ -1629,8 +1681,7 @@ { "type": "BOOK", "id": "collector_book", - "name": "collector's edition book", - "name_plural": "collector's edition book", + "name": { "str": "collector's edition book", "str_pl": "collector's edition books" }, "description": "A unique, valuable book that has been kept as a collector's item.", "snippet_category": [ { "id": "fancy1", "text": "This is a high-quality leather bound copy of Charles Dickens' \"A Tale of Two Cities\"." }, diff --git a/data/json/items/book/pistol.json b/data/json/items/book/pistol.json index fef628353557d..fd430f258c2c5 100644 --- a/data/json/items/book/pistol.json +++ b/data/json/items/book/pistol.json @@ -2,7 +2,7 @@ { "id": "mag_pistol", "type": "BOOK", - "name": "Tactical Handgun Digest", + "name": { "str": "Tactical Handgun Digest", "str_pl": "issues of Tactical Handgun Digest" }, "description": "A glossy magazine all about handguns and shooting. There is a good article about proper sighting near the middle.", "weight": "90 g", "volume": "250 ml", @@ -20,8 +20,7 @@ { "id": "manual_pistol", "type": "BOOK", - "name": "The Tao of the Handgun", - "name_plural": "copies of The Tao of the Handgun", + "name": { "str": "The Tao of the Handgun", "str_pl": "copies of The Tao of the Handgun" }, "description": "This introspective volume covers proper usage of handguns, from safety and stance, to maintenance and proper sighting technique.", "weight": "440 g", "volume": "500 ml", diff --git a/data/json/items/book/rifle.json b/data/json/items/book/rifle.json index 1cbb9a5d5a524..ea8152753836f 100644 --- a/data/json/items/book/rifle.json +++ b/data/json/items/book/rifle.json @@ -2,8 +2,7 @@ { "id": "mag_rifle", "type": "BOOK", - "name": "Modern Rifleman", - "name_plural": "Modern Rifleman", + "name": { "str": "Modern Rifleman", "str_pl": "issues of Modern Rifleman" }, "description": "An informative magazine all about rifles and shooting. There is an excellent article about proper maintenance in this issue.", "weight": "100 g", "volume": "250 ml", diff --git a/data/json/items/book/shotgun.json b/data/json/items/book/shotgun.json index c1c70b3f9c50f..bfab71b29a5a4 100644 --- a/data/json/items/book/shotgun.json +++ b/data/json/items/book/shotgun.json @@ -2,8 +2,7 @@ { "id": "mag_shotgun", "type": "BOOK", - "name": "Trap and Field", - "name_plural": "Trap and Field", + "name": { "str": "Trap and Field", "str_pl": "issues of Trap and Field" }, "description": "An in-depth magazine all about shotguns and shooting. There is an informative article about proper shooting stance in the back pages.", "weight": "90 g", "volume": "250 ml", @@ -21,8 +20,7 @@ { "id": "manual_shotgun", "type": "BOOK", - "name": "Shotguns: The art and science", - "name_plural": "Shotguns: The art and science", + "name": { "str": "Shotguns: The Art and Science", "str_pl": "copies of Shotguns: The Art and Science" }, "description": "This book claims to address every problem the shotgunner is likely to face, and offers solutions to ensure that shooters can make every shot count.", "weight": "400 g", "volume": "500 ml", diff --git a/data/json/items/book/smg.json b/data/json/items/book/smg.json index 00bba565cc233..4a3cd54499fbe 100644 --- a/data/json/items/book/smg.json +++ b/data/json/items/book/smg.json @@ -2,8 +2,7 @@ { "id": "mag_smg", "type": "BOOK", - "name": "Submachine Gun Enthusiast", - "name_plural": "Submachine Gun Enthusiast", + "name": { "str": "Submachine Gun Enthusiast", "str_pl": "issues of Submachine Gun Enthusiast" }, "description": "An in-depth magazine about submachine guns and shooting. There is an exhaustive article about close quarter combat techniques in the front.", "weight": "90 g", "volume": "250 ml", @@ -21,7 +20,7 @@ { "id": "manual_smg", "type": "BOOK", - "name": "The Submachine Gun Handbook", + "name": { "str": "The Submachine Gun Handbook", "str_pl": "copies of The Submachine Gun Handbook" }, "description": "This concise guide details the proper care and operation of most forms of machine pistols and submachine guns currently used by regular armed and reserve forces as well as several obsolete weapons.", "weight": "362 g", "volume": "500 ml", diff --git a/data/json/items/book/speech.json b/data/json/items/book/speech.json index 93d0aa259ed82..6028c789af9ff 100644 --- a/data/json/items/book/speech.json +++ b/data/json/items/book/speech.json @@ -2,8 +2,7 @@ { "id": "mag_tv", "type": "BOOK", - "name": "US Weekly", - "name_plural": "US Weeklies", + "name": { "str": "US Weekly", "str_pl": "US Weeklies" }, "description": "Weekly news about a bunch of famous people who're all (un)dead now.", "weight": "60 g", "volume": "250 ml", @@ -21,8 +20,7 @@ { "id": "manual_speech", "type": "BOOK", - "name": "Self-Esteem for Dummies", - "name_plural": "Self-Esteem for Dummies", + "name": { "str": "Self-Esteem for Dummies", "str_pl": "copies of Self-Esteem for Dummies" }, "description": "Full of useful tips for showing confidence in your speech.", "weight": "454 g", "volume": "750 ml", @@ -39,8 +37,7 @@ { "id": "textbook_speech", "type": "BOOK", - "name": "Principles of Effective Communication", - "name_plural": "Principles of Effective Communication", + "name": { "str": "Principles of Effective Communication", "str_pl": "copies of Principles of Effective Communication" }, "description": "A hardbound book devoted to being an effective and persuasive speaker.", "weight": "1120 g", "volume": "2 L", @@ -59,8 +56,7 @@ { "id": "dnd_handbook", "type": "BOOK", - "name": "Dungeon Master's Guide: 6th Edition", - "name_plural": "Dungeon Master's Guide: 6th Editions", + "name": { "str": "Dungeon Master's Guide: 6th Edition", "str_pl": "copies of Dungeon Master's Guide: 6th Edition" }, "description": "A thick, hardcover volume with everything needed to weave legendary stories. It's full of information, but finding the things you're looking for can be a chore.", "weight": "2267 g", "volume": "2500 ml", diff --git a/data/json/items/book/survival.json b/data/json/items/book/survival.json index 6cf0ce17727c6..11a7761052785 100644 --- a/data/json/items/book/survival.json +++ b/data/json/items/book/survival.json @@ -2,8 +2,7 @@ { "id": "atomic_survival", "type": "BOOK", - "name": "Survival Under Atomic Attack", - "name_plural": "copies of Survival Under Atomic Attack", + "name": { "str": "Survival Under Atomic Attack", "str_pl": "copies of Survival Under Atomic Attack" }, "description": "A wordy and intricate guide to wilderness and urban survival in a worst case scenario. While filled with loads of useful information, the madman who wrote this was a terrible writer, and gleaning knowledge from the rants is a chore.", "weight": "1920 g", "volume": "2 L", @@ -23,8 +22,7 @@ { "id": "fun_survival", "type": "BOOK", - "name": "Through the Lens", - "name_plural": "Through the Lens", + "name": { "str": "Through the Lens", "str_pl": "copies of Through the Lens" }, "description": "A colorful digest devoted to backpacking and wilderness photography. The photos are beautiful, though the terminology in the sections on survivalcraft assume some proficiency.", "weight": "440 g", "volume": "250 ml", @@ -43,8 +41,7 @@ { "id": "mag_dude", "type": "BOOK", - "name": "Alpha Male Quarterly", - "name_plural": "Alpha Male Quarterlies", + "name": { "str": "Alpha Male Quarterly", "str_pl": "Alpha Male Quarterlies" }, "description": "This is a full-size glossy men's magazine. There's a brief article about hiking and a list of simple wilderness survival tips somewhere in between the photos of bikini-clad women and the gadget advertisements.", "weight": "180 g", "volume": "500 ml", @@ -62,8 +59,7 @@ { "id": "mag_survival", "type": "BOOK", - "name": "Outdoor Adventures", - "name_plural": "Outdoor Adventures", + "name": { "str": "Outdoor Adventures", "str_pl": "issues of Outdoor Adventures" }, "description": "A glossy magazine about surviving and hunting in the wilderness. There's an exciting article about a bear attack in the back pages.", "weight": "80 g", "volume": "250 ml", @@ -81,8 +77,7 @@ { "id": "manual_survival", "type": "BOOK", - "name": "Pitching a Tent", - "name_plural": "copies of Pitching a Tent", + "name": { "str": "Pitching a Tent", "str_pl": "copies of Pitching a Tent" }, "description": "A guide detailing the basics of woodsmanship and outdoor survival.", "weight": "454 g", "volume": "750 ml", @@ -99,7 +94,7 @@ { "id": "pocket_survival", "type": "BOOK", - "name": "Pocket Survival Guide", + "name": { "str": "Pocket Survival Guide", "str_pl": "copies of Pocket Survival Guide" }, "description": "This pocket-sized leather-bound survival guide combines a wealth of concise information with simple to follow instructions and easy to read illustrations.", "weight": "212 g", "volume": "250 ml", @@ -116,8 +111,7 @@ { "id": "survival_book", "type": "BOOK", - "name": "Autobiography of a Mountain Man", - "name_plural": "Autobiography of a Mountain Man", + "name": { "str": "Autobiography of a Mountain Man", "str_pl": "copies of Autobiography of a Mountain Man" }, "//": "Since it's a novel, price point is much more reasonable.", "description": "An amusing historical novel filled with detailed descriptions of surviving in the wild, potentially containing great insights for an experienced outdoorsman.", "weight": "1920 g", @@ -138,7 +132,7 @@ { "id": "textbook_survival", "type": "BOOK", - "name": "Outdoor Survival Guide", + "name": { "str": "Outdoor Survival Guide", "str_pl": "copies of Outdoor Survival Guide" }, "description": "A thick soft-cover book filled with vital information about surviving in the wild, aimed at the experienced backpacker.", "weight": "910 g", "volume": "2 L", @@ -157,10 +151,9 @@ { "id": "isherwood_herbal_remedies", "type": "BOOK", - "name": "Natural Remedies of New England", - "name_plural": "copies of Natural Remedies of New England", + "name": { "str": "Natural Remedies of New England", "str_pl": "copies of Natural Remedies of New England" }, "description": "A leather bound manuscript, it features native herbal remedies with hand colored illustrations of each plant.", - "weight": 400, + "weight": "400 g", "volume": "1250 ml", "price": 50000, "price_postapoc": 50000, diff --git a/data/json/items/book/swimming.json b/data/json/items/book/swimming.json index b119956fadb85..4a8a1596655e7 100644 --- a/data/json/items/book/swimming.json +++ b/data/json/items/book/swimming.json @@ -2,8 +2,7 @@ { "id": "mag_swimming", "type": "BOOK", - "name": "Swim Planet", - "name_plural": "Swim Planet", + "name": { "str": "Swim Planet", "str_pl": "issues of Swim Planet" }, "description": "The world's leading resource about aquatic sports.", "weight": "60 g", "volume": "250 ml", @@ -21,7 +20,7 @@ { "id": "manual_swimming", "type": "BOOK", - "name": "Water Survival Training Field Manual", + "name": { "str": "Water Survival Training Field Manual", "str_pl": "copies of Water Survival Training Field Manual" }, "description": "A commercially produced survival guide that details swimming and deep water survival techniques tailored to emergency scenarios.", "weight": "400 g", "volume": "500 ml", diff --git a/data/json/items/book/tailor.json b/data/json/items/book/tailor.json index f86593db8e171..eab063753efe9 100644 --- a/data/json/items/book/tailor.json +++ b/data/json/items/book/tailor.json @@ -28,8 +28,7 @@ { "id": "mag_tailor", "type": "BOOK", - "name": "Sew Awesome Monthly", - "name_plural": "Sew Awesome Monthlies", + "name": { "str": "Sew Awesome Monthly", "str_pl": "Sew Awesome Monthlies" }, "description": "A well presented monthly magazine all about knitting, crocheting, and needlepoint. Filled with ideas and project patterns.", "weight": "75 g", "volume": "250 ml", @@ -47,8 +46,7 @@ { "id": "manual_tailor", "type": "BOOK", - "name": "Sew What? Clothing!", - "name_plural": "Sew What? Clothing!", + "name": { "str": "Sew What? Clothing!", "str_pl": "copies of Sew What? Clothing!" }, "description": "A colorful book about tailoring.", "weight": "454 g", "volume": "750 ml", @@ -85,7 +83,7 @@ { "id": "tailor_japanese", "type": "BOOK", - "name": "Traditional Japanese Kimono", + "name": { "str": "Traditional Japanese Kimono", "str_pl": "copies of Traditional Japanese Kimono" }, "description": "An illustrated textbook on the crafting of Japanese traditional garb.", "weight": "2400 g", "volume": "1500 ml", @@ -104,7 +102,7 @@ { "id": "recipe_fauxfur", "type": "BOOK", - "name": "Friendly, Humane Fashion", + "name": { "str": "Friendly, Humane Fashion", "str_pl": "copies of Friendly, Humane Fashion" }, "description": "An educational book detailing the uses of fake fur, as well as its benefits and disadvantages. The prose is rather passionate, and a disclaimer on the cover proudly states that the book is printed and distributed by the Gryphon Animal Rights Organization.", "weight": "2267 g", "volume": "1 L", @@ -124,8 +122,7 @@ { "id": "textbook_tailor", "type": "BOOK", - "name": "Sewing Techniques for Designers", - "name_plural": "Sewing Techniques for Designers", + "name": { "str": "Sewing Techniques for Designers", "str_pl": "copies of Sewing Techniques for Designers" }, "description": "A massive, hardbound book full of a wealth of information for the professional clothing designer.", "weight": "2600 g", "volume": "2 L", diff --git a/data/json/items/book/throw.json b/data/json/items/book/throw.json index a4eb75df873e9..f3a8a616a10d0 100644 --- a/data/json/items/book/throw.json +++ b/data/json/items/book/throw.json @@ -2,8 +2,7 @@ { "id": "mag_throwing", "type": "BOOK", - "name": "Diskobolus", - "name_plural": "Diskobolus", + "name": { "str": "Diskobolus", "str_pl": "issues of Diskobolus" }, "description": "A biannual magazine devoted to the art and science of discus-throwing.", "weight": "60 g", "volume": "250 ml", @@ -21,8 +20,7 @@ { "id": "manual_throw", "type": "BOOK", - "name": "The Complete Guide to Pitching", - "name_plural": "Complete Guides to Pitching", + "name": { "str": "The Complete Guide to Pitching", "str_pl": "copies of The Complete Guide to Pitching" }, "description": "A detailed guide for baseball pitchers that combines time-tested techniques and information mixed with a common sense approach to pitching.", "weight": "400 g", "volume": "500 ml", diff --git a/data/json/items/book/traps.json b/data/json/items/book/traps.json index 1df564da152b8..0fa13913ddd1f 100644 --- a/data/json/items/book/traps.json +++ b/data/json/items/book/traps.json @@ -2,8 +2,7 @@ { "id": "howto_traps", "type": "BOOK", - "name": "How to Trap Anything", - "name_plural": "How to Trap Anything", + "name": { "str": "How to Trap Anything", "str_pl": "copies of How to Trap Anything" }, "description": "A worn manual that describes how to set and disarm a wide variety of traps.", "weight": "454 g", "volume": "500 ml", @@ -20,8 +19,7 @@ { "id": "mag_traps", "type": "BOOK", - "name": "Trapper's Life", - "name_plural": "Trapper's Life", + "name": { "str": "Trapper's Life", "str_pl": "issues of Trapper's Life" }, "description": "An in-depth magazine about trapping game. There are lots of articles and diagrams that explain simple trap designs.", "weight": "80 g", "volume": "250 ml", @@ -38,7 +36,7 @@ { "id": "manual_traps", "type": "BOOK", - "name": "The Modern Trapper", + "name": { "str": "The Modern Trapper", "str_pl": "copies of The Modern Trapper" }, "description": "An extensive volume that details numerous methods of trapping game.", "weight": "422 g", "volume": "500 ml", @@ -55,9 +53,11 @@ { "id": "textbook_traps", "type": "BOOK", - "name": "The Compleat Trapper", - "name_plural": "The Compleat Trapper", - "//": "The spelling is intentionally archaic, as this form is commonly used in the titles of books.", + "name": { + "//~": "The spelling is intentionally archaic, as this form is commonly used in the titles of books.", + "str": "The Compleat Trapper", + "str_pl": "copies of The Compleat Trapper" + }, "description": "An in-depth book about trapping game animals, covering methods both modern and ancient.", "weight": "1100 g", "volume": "2 L", @@ -76,8 +76,7 @@ { "id": "trappers_companion", "type": "BOOK", - "name": "The Trapper's Companion", - "name_plural": "copies of The Trapper's Companion", + "name": { "str": "The Trapper's Companion", "str_pl": "copies of The Trapper's Companion" }, "description": "A folksy guide to trapping wild game using time-tested methods. A bit in-depth for the beginner, it can provide a wealth of information to a knowledgeable trapper.", "weight": "1920 g", "volume": "2 L", diff --git a/data/json/items/book/unarmed.json b/data/json/items/book/unarmed.json index 792e6e829224b..0e8852e9f3113 100644 --- a/data/json/items/book/unarmed.json +++ b/data/json/items/book/unarmed.json @@ -2,8 +2,7 @@ { "id": "mag_unarmed", "type": "BOOK", - "name": "Boxing Monthly", - "name_plural": "Boxing Monthlies", + "name": { "str": "Boxing Monthly", "str_pl": "Boxing Monthlies" }, "description": "An exciting monthly magazine about boxing. There are lots of large, colorful photos of pugilistic exploits.", "weight": "90 g", "volume": "250 ml", @@ -21,8 +20,7 @@ { "id": "manual_brawl", "type": "BOOK", - "name": "101 Wrestling Moves", - "name_plural": "101 Wrestling Moves", + "name": { "str": "101 Wrestling Moves", "str_pl": "copies of 101 Wrestling Moves" }, "description": "It seems to be a wrestling manual, poorly photocopied and released on spiral- bound paper. Still, there are lots of useful tips for unarmed combat.", "weight": "227 g", "volume": "500 ml", diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index f6fcdf94cca0c..cb5246679b4b8 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -612,7 +612,7 @@ "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ], "description": "Hydrochloric acid, also known as muriatic acid. It is a strong acid that has a distinctive smell, important and frequently used ever since its discovery. It still has a vast multitude of uses.", "volume": "250 ml", - "weight": 460, + "weight": "460 g", "bashing": 1, "ammo_type": "components", "phase": "liquid", diff --git a/data/json/items/classes/book.json b/data/json/items/classes/book.json index ebc75337944d6..5d9e91c829537 100644 --- a/data/json/items/classes/book.json +++ b/data/json/items/classes/book.json @@ -2,7 +2,7 @@ { "abstract": "book_magazine", "type": "BOOK", - "name": "Readable magazine", + "name": "readable magazine", "weight": "70 g", "volume": "250 ml", "material": "paper", @@ -17,7 +17,7 @@ "abstract": "book_martial", "type": "GENERIC", "category": "books", - "name": "Martial art manual", + "name": "martial art manual", "weight": "150 g", "volume": "250 ml", "price": 20000, diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json index e46fc93f7cf2a..64c8503cf63a2 100644 --- a/data/json/items/classes/gun.json +++ b/data/json/items/classes/gun.json @@ -206,7 +206,7 @@ "copy-from": "shotgun_pump", "type": "GUN", "//": "Anything that has the right pin arrangement for a speedloader chute", - "name": "base race shotgun, pump", + "name": { "str": "base race shotgun, pump", "str_pl": "base race shotguns, pump" }, "valid_mod_locations": [ [ "accessories", 4 ], [ "barrel", 1 ], diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index f7c0c6a66b11d..6178bd53d7619 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -4,7 +4,7 @@ "type": "COMESTIBLE", "name": "donut holes", "name_plural": "donut holes", - "weight": 226, + "weight": "226 g", "color": "yellow", "spoils_in": "10 days", "comestible_type": "FOOD", diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 46ff3c932d530..56a002e66981e 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -500,7 +500,7 @@ "color": "brown", "healthy": -8, "quench": -5, - "calories": "54", + "calories": 54, "vitamins": [ [ "vitA", 6 ], [ "vitC", 2 ], [ "calcium", 0 ], [ "iron", 8 ], [ "vitB", 155 ] ] }, { @@ -881,6 +881,14 @@ "price": 0, "flags": [ "NO_SALVAGE" ] }, + { + "type": "COMESTIBLE", + "id": "raw_hfur", + "copy-from": "raw_fur", + "name": "raw human pelt", + "description": "A carefully folded raw skin harvested from a fur-bearing mutant human. It still has the fur attached. You can cure it for storage and tanning, or eat it if you're desperate enough.", + "material": [ "fur", "hflesh" ] + }, { "type": "COMESTIBLE", "comestible_type": "FOOD", diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index a1a9363de8fc8..e3e3de982c868 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -937,7 +937,8 @@ "name": "clean water", "name_plural": "clean water", "description": "Fresh, clean water. Truly the best thing to quench your thirst.", - "color": "light_cyan" + "color": "light_cyan", + "use_action": [ ] }, { "id": "water_mineral", @@ -948,6 +949,7 @@ "description": "Fancy mineral water, so fancy it makes you feel fancy just holding it.", "container": "bottle_plastic", "proportional": { "quench": 1.2 }, - "relative": { "fun": 1 } + "relative": { "fun": 1 }, + "use_action": [ ] } ] diff --git a/data/json/items/comestibles/mre.json b/data/json/items/comestibles/mre.json index 8326c0a6c5d73..84d4ac85fc7fb 100644 --- a/data/json/items/comestibles/mre.json +++ b/data/json/items/comestibles/mre.json @@ -19,7 +19,7 @@ "type": "GENERIC", "symbol": ")", "color": "brown", - "name": "MRE small box", + "name": { "str": "MRE small box", "str_pl": "MRE small boxes" }, "category": "food", "description": "A generic small MRE box, you shouldn't see this", "price": 500, diff --git a/data/json/items/containers.json b/data/json/items/containers.json index 94ffcc51e4eb0..45c7e36feed1b 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -1182,9 +1182,9 @@ "id": "survival_kit_box", "type": "CONTAINER", "category": "container", - "name": "survival kit box", + "name": { "str": "survival kit box", "str_pl": "survival kit boxes" }, "description": "An aluminum box that used to contain a small survival kit. Can hold 1 liter of liquid.", - "weight": 200, + "weight": "200 g", "volume": "1 L", "price": 0, "material": "aluminum", diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index bdce86cf6b1f7..b11bc4a1154cc 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -269,6 +269,28 @@ "skill2": "computer" } }, + { + "id": "bot_turret_riot", + "type": "TOOL", + "name": "inactive riot control turret", + "description": "This is an inactive riot control turret. Using this item involves loading the unit with the 40x46mm M1006 sponge rounds in your inventory (if you wish to divide your ammunition, set aside whatever beanbag rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its riot control gun.", + "weight": "125000 g", + "volume": "60 L", + "price": 200500, + "to_hit": -3, + "bashing": 8, + "material": [ "steel", "plastic" ], + "symbol": ";", + "color": "red", + "use_action": { + "type": "place_monster", + "monster_id": "mon_turret_riot", + "difficulty": 6, + "moves": 100, + "skill1": "electronics", + "skill2": "computer" + } + }, { "id": "bot_turret", "type": "TOOL", @@ -463,31 +485,6 @@ "skill2": "computer" } }, - { - "id": "bot_chickenbot", - "type": "TOOL", - "name": "inactive chicken walker", - "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", - "weight": "120000 g", - "volume": "92500 ml", - "price": 50000000, - "to_hit": -3, - "bashing": 8, - "material": [ "steel" ], - "symbol": ";", - "color": "light_green", - "use_action": { - "type": "place_monster", - "monster_id": "mon_chickenbot", - "friendly_msg": "The chicken walker rises to its feet, sways away from you and begins surveying the area.", - "hostile_msg": "The chicken walker whirrs and aims directly at you. Take cover!", - "//": "Milspec, but was deployed in active service implying a reliable IFF", - "difficulty": 9, - "moves": 250, - "skill1": "electronics", - "skill2": "computer" - } - }, { "id": "bot_copbot", "looks_like": "broken_copbot", @@ -669,59 +666,6 @@ "skill2": "computer" } }, - { - "id": "bot_tankbot", - "looks_like": "broken_tankbot", - "type": "TOOL", - "name": "inactive tank drone", - "description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", - "weight": "200000 g", - "//": "cheating a bit with the volume due to lack of proper vehicle storage options", - "volume": "250 L", - "price": 100000000, - "to_hit": -3, - "bashing": 8, - "material": [ "steel" ], - "symbol": ";", - "color": "light_green", - "use_action": { - "type": "place_monster", - "monster_id": "mon_tankbot", - "friendly_msg": "The tank drone rolls out and begins acquiring targets.", - "hostile_msg": "The tank drone swivels its turret and aims directly at you. Don your brown pants!", - "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a robo-tank?", - "difficulty": 10, - "moves": 500, - "skill1": "electronics", - "skill2": "computer" - } - }, - { - "id": "bot_tripod", - "looks_like": "broken_tripod", - "type": "TOOL", - "name": "inactive tripod", - "description": "This is an inactive Honda Regnal. Using this item involves placing it on the ground, wondering how it fuels its flamethrower and turning it on. If reprogrammed and rewired successfully the tribot will then identify you as an ally, roam around or follow you, and impale hostiles with its spiked cable weapons.", - "weight": "120000 g", - "volume": "92500 ml", - "price": 100000000, - "to_hit": -3, - "bashing": 8, - "material": [ "steel" ], - "symbol": ";", - "color": "light_green", - "use_action": { - "type": "place_monster", - "monster_id": "mon_tripod", - "friendly_msg": "The tribot rises to its feet and scans the area for contaminants.", - "hostile_msg": "The tribot glowers down at you and ignites its flamethrower. Turns out you hate the smell of napalm.", - "//": "No observed open deployment, likely a prototype or secret project", - "difficulty": 15, - "moves": 500, - "skill1": "electronics", - "skill2": "computer" - } - }, { "id": "bot_turret_searchlight", "type": "TOOL", @@ -750,7 +694,7 @@ { "id": "bot_dispatch", "type": "TOOL", - "name": "inactive dispatch", + "name": { "str": "inactive dispatch", "str_pl": "inactive dispatches" }, "description": "An inactive Northrop Dispatch, guard model, serving as a mobile assembler and deployer of kamikaze manhacks for defense. Activate it to place it onto the ground; due to a one-way switch triggered during deactivation, however, it will be nonaggressive, and serves only as a distraction.", "volume": "95 L", "weight": "250 kg", @@ -775,7 +719,7 @@ { "id": "bot_dispatch_military", "type": "TOOL", - "name": "inactive military dispatch", + "name": { "str": "inactive military dispatch", "str_pl": "inactive military dispatches" }, "description": "An inactive Northrop Dispatch, military model, serving as a mobile assembler and deployer of lethal manhacks for combat situations. Activate it to place it onto the ground; due to a one-way switch triggered during deactivation, however, it will be nonaggressive, and serves only as a distraction.", "volume": "95 L", "weight": "300 kg", diff --git a/data/json/items/crossbows.json b/data/json/items/crossbows.json index cdd1f20007dc9..06ce4388ebe0f 100644 --- a/data/json/items/crossbows.json +++ b/data/json/items/crossbows.json @@ -219,6 +219,28 @@ "count": 10, "effects": [ "RECOVER_45", "NOGIB" ] }, + { + "type": "AMMO", + "id": "bolt_cf", + "price": 2000, + "name": "carbon fiber hunting bolt", + "symbol": "=", + "color": "green", + "looks_like": "bolt_steel", + "description": "A fletched carbon fiber crossbow bolt shaft with an expanding broadhead tip. Deals impressive damage to targets. Stands a good chance of remaining intact once fired.", + "material": [ "kevlar_rigid", "steel" ], + "volume": "250 ml", + "weight": "30 g", + "bashing": 1, + "ammo_type": "bolt", + "prop_damage": 1.35, + "range": 4, + "dispersion": 50, + "loudness": 0, + "count": 10, + "stack_size": 10, + "effects": [ "RECOVER_30" ] + }, { "type": "AMMO", "id": "bolt_explosive", diff --git a/data/json/items/fake.json b/data/json/items/fake.json index 7a8866283bb54..129c3a737ca04 100644 --- a/data/json/items/fake.json +++ b/data/json/items/fake.json @@ -17,7 +17,7 @@ "id": "fake_burrowing", "copy-from": "fake_item", "type": "TOOL", - "name": "teeth and claws", + "name": { "str": "teeth and claws", "str_pl": "teeth and claws" }, "flags": "TRADER_AVOID", "use_action": [ "BURROW" ], "qualities": [ [ "DIG", 3 ] ] @@ -58,7 +58,7 @@ "id": "bio_scalpel", "copy-from": "fake_item", "type": "TOOL", - "name": "autonomous surgical scalpels", + "name": { "str": "autonomous surgical scalpels", "str_pl": "autonomous surgical scalpels" }, "flags": [ "TRADER_AVOID" ], "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 5 ], [ "BUTCHER", 50 ] ] }, diff --git a/data/json/items/generic.json b/data/json/items/generic.json index aa79018eea7e0..5409521be1f0e 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -492,65 +492,6 @@ "volume": 0, "to_hit": -3 }, - { - "id": "golf_tee", - "type": "GENERIC", - "category": "other", - "name": "golf tee", - "description": "A pin shaped piece of wood meant for holding a golf ball slightly off the ground.", - "weight": "3 g", - "volume": "250 ml", - "price": 1000, - "material": "wood", - "symbol": "-", - "color": "white" - }, - { - "id": "golf_ball", - "type": "GENERIC", - "category": "other", - "name": "golf ball", - "description": "A small ball with round indentations on it.", - "weight": "50 g", - "volume": "250 ml", - "price": 2000, - "material": "plastic", - "symbol": "*", - "color": "white", - "bashing": 5, - "to_hit": -3 - }, - { - "type": "GENERIC", - "id": "pool_ball", - "symbol": "*", - "color": "blue", - "name": "pool ball", - "description": "A colorful, hard ball. Essentially a rock.", - "category": "other", - "price": 3000, - "price_postapoc": 0, - "material": "plastic", - "weight": "170 g", - "volume": "250 ml", - "bashing": 8, - "to_hit": -3 - }, - { - "type": "GENERIC", - "id": "bowling_ball", - "symbol": "*", - "color": "blue", - "name": "bowling ball", - "description": "A large, heavy ball. Before the apocalypse, its main purpose was to be rolled along waxed floors.", - "category": "other", - "price": 30, - "material": "ceramic", - "weight": "2000 g", - "volume": "2500 ml", - "bashing": 16, - "to_hit": -2 - }, { "type": "GENERIC", "id": "candlestick", @@ -666,7 +607,7 @@ "id": "wire_mesh", "symbol": ";", "color": "light_gray", - "name": "steel mesh", + "name": { "str": "steel mesh", "str_pl": "steel meshes" }, "description": "A mat of woven fine steel wire, useful for dryer lint traps and reusable coffee filter baskets. You could put these on a window to keep mosquitoes and other bugs out, but chainlink fencing will do these days.", "category": "spare_parts", "weight": "318 g", @@ -1106,40 +1047,6 @@ "to_hit": -3, "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, - { - "type": "GENERIC", - "id": "broken_tripod", - "symbol": ",", - "color": "green", - "name": "broken tribot", - "category": "other", - "description": "A broken tribot. Now that its legs lie broken and immobile, the world seems a little less threatening. Could be gutted for parts.", - "price": 1000, - "material": [ "steel", "plastic" ], - "weight": "430000 g", - "volume": "187500 ml", - "bashing": 10, - "cutting": 6, - "to_hit": -2, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ] - }, - { - "type": "GENERIC", - "id": "broken_tankbot", - "symbol": ",", - "color": "green", - "name": "broken tank drone", - "category": "other", - "description": "A broken tank drone. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", - "price": 1000, - "material": [ "steel", "plastic" ], - "weight": "1223850 g", - "volume": "875 L", - "bashing": 20, - "cutting": 15, - "to_hit": -3, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ] - }, { "type": "GENERIC", "id": "broken_mech_recon", @@ -1190,7 +1097,7 @@ "id": "broken_dispatch", "symbol": ",", "color": "yellow", - "name": "broken riot dispatch", + "name": { "str": "broken riot dispatch", "str_pl": "broken riot dispatches" }, "category": "other", "description": "A broken riot dispatch, with its mesh midsection filled with fried manhacks and its motor limp and still. Could be gutted for parts.", "price": 1000, @@ -1207,7 +1114,7 @@ "id": "broken_dispatch_military", "symbol": ",", "color": "green", - "name": "broken military dispatch", + "name": { "str": "broken military dispatch", "str_pl": "broken military dispatches" }, "category": "other", "description": "A broken military dispatch. Though the scratched, disarmed manhacks visible in its belly are disarmed, their destructive potential still inspires a spark of fear, even now. Could be gutted for parts.", "price": 1000, @@ -1539,7 +1446,7 @@ "id": "template_photonics", "copy-from": "standard_template_construct", "color": "yellow", - "name": "nanofabricator template (silicon photonics)", + "name": { "str": "nanofabricator template (silicon photonics)", "str_pl": "nanofabricator templates (silicon photonics)" }, "description": "A state-of-the-art optical storage system, containing the instruction set required for the fabrication of complex silicon photonic circuitry. The data within was once clearly worth millions, but now, you are not sure if it's anything more than a fancy, high-tech paperweight.", "price": 200000000, "//": "actually worth millions", @@ -2127,10 +2034,120 @@ "price": 1000000, "price_postapoc": 100, "material": "diamond", - "weight": "120 g", - "volume": "250 ml", + "weight": "200 mg", + "volume": "6 ml", + "to_hit": -5 + }, + { + "type": "GENERIC", + "id": "garnet", + "symbol": "*", + "color": "red", + "name": "garnet", + "description": "A sparkling garnet.", + "price": 800000, + "price_postapoc": 80, + "material": "gemstone", + "weight": "200 mg", + "volume": "6 ml", "to_hit": -5 }, + { + "type": "GENERIC", + "id": "amethyst", + "copy-from": "garnet", + "color": "blue", + "name": "amethyst", + "description": "A sparkling amethyst." + }, + { + "type": "GENERIC", + "id": "aquamarine", + "copy-from": "garnet", + "color": "cyan", + "name": "aquamarine", + "description": "A sparkling aquamarine." + }, + { + "type": "GENERIC", + "id": "emerald", + "copy-from": "garnet", + "color": "green", + "name": "emerald", + "description": "A sparkling emerald." + }, + { + "type": "GENERIC", + "id": "alexandrite", + "copy-from": "garnet", + "color": "green", + "name": "alexandrite", + "description": "A sparkling alexandrite." + }, + { + "type": "GENERIC", + "id": "pearl", + "copy-from": "garnet", + "color": "white", + "name": "pearl", + "description": "A lustrous pearl." + }, + { + "type": "GENERIC", + "id": "ruby", + "copy-from": "garnet", + "color": "red", + "name": { "str": "ruby", "str_pl": "rubies" }, + "description": "A sparkling ruby." + }, + { + "type": "GENERIC", + "id": "peridot", + "copy-from": "garnet", + "color": "green", + "name": "peridot", + "description": "A sparkling peridot." + }, + { + "type": "GENERIC", + "id": "sapphire", + "copy-from": "garnet", + "color": "blue", + "name": "sapphire", + "description": "A sparkling sapphire." + }, + { + "type": "GENERIC", + "id": "opal", + "copy-from": "garnet", + "color": "white", + "name": "opal", + "description": "A lustrous opal." + }, + { + "type": "GENERIC", + "id": "tourmaline", + "copy-from": "garnet", + "color": "light_red", + "name": "tourmaline", + "description": "A sparkling tourmaline." + }, + { + "type": "GENERIC", + "id": "citrine", + "copy-from": "garnet", + "color": "yellow", + "name": "citrine", + "description": "A sparkling citrine." + }, + { + "type": "GENERIC", + "id": "blue_topaz", + "copy-from": "garnet", + "color": "light_blue", + "name": "topaz", + "description": "A sparkling blue topaz." + }, { "type": "GENERIC", "id": "cured_hide", @@ -2276,6 +2293,19 @@ "volume": "750 ml", "flags": [ "SLEEP_AID" ] }, + { + "type": "GENERIC", + "id": "teddy_bear", + "symbol": "o", + "color": "brown", + "name": "teddy bear", + "description": "A mass produced plush teddy bear. It is wearing a little red tshirt but no pants.", + "price": 200, + "material": [ "cotton" ], + "weight": "444 g", + "volume": "850 ml", + "flags": [ "SLEEP_AID" ] + }, { "type": "GENERIC", "id": "money_bundle", @@ -2832,20 +2862,29 @@ "description": "A broken turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": "62650 g", + "weight": "72650 g", "volume": "30 L", "bashing": 4, "cutting": 4, "to_hit": -3, "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, + { + "type": "GENERIC", + "id": "broken_turret_riot", + "symbol": ",", + "color": "blue", + "name": "broken riot control turret", + "description": "A broken riot control turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.", + "copy-from": "broken_turret" + }, { "type": "GENERIC", "id": "broken_turret_rifle", "symbol": ",", "color": "green", "name": "broken M249 autonomous CROWS II", - "weight": "70000 g", + "weight": "75 kg", "copy-from": "broken_turret" }, { @@ -2854,7 +2893,7 @@ "symbol": ",", "color": "green", "name": "broken M240 autonomous CROWS II", - "weight": "70000 g", + "weight": "75 kg", "copy-from": "broken_turret" }, { @@ -2863,7 +2902,7 @@ "symbol": ",", "color": "green", "name": "broken M2 autonomous CROWS II", - "weight": "100000 g", + "weight": "100 kg", "copy-from": "broken_turret" }, { @@ -2872,7 +2911,7 @@ "symbol": ",", "color": "green", "name": "broken laser turret", - "weight": "110000 g", + "weight": "110 kg", "copy-from": "broken_turret" }, { @@ -2885,8 +2924,8 @@ "description": "A broken secubot, with its casing broken and fluid drained. Could be gutted for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": "100000 g", - "volume": "65000 ml", + "weight": "100 kg", + "volume": "65 L", "bashing": 4, "cutting": 4, "to_hit": -3, @@ -2902,8 +2941,8 @@ "description": "A broken TALON UGV, with its casing broken and fluid drained. Could be gutted for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": "100000 g", - "volume": "65000 ml", + "weight": "100 kg", + "volume": "65 L", "bashing": 4, "cutting": 4, "to_hit": -3, @@ -2931,7 +2970,7 @@ "category": "tools", "name": "survival kit", "description": "A small box filled with tools and items to help you survive in case of an emergency. Disassemble to get its content.", - "weight": 1612, + "weight": "1612 g", "volume": "1 L", "price": 5000, "material": "aluminum", diff --git a/data/json/items/generic/bathroom_house.json b/data/json/items/generic/bathroom_house.json index b106ccc324974..a7b99e53777a8 100644 --- a/data/json/items/generic/bathroom_house.json +++ b/data/json/items/generic/bathroom_house.json @@ -8,7 +8,7 @@ "color": "blue", "price": 200, "price_postapoc": 0, - "weight": 100, + "weight": "100 g", "volume": "50 ml", "material": "plastic", "bashing": 1, @@ -32,7 +32,7 @@ "price": 800, "price_postapoc": 1200, "//": "the end of the world doesn't mean everyone is okay with having ZZ Top beards. disposable razors are a hot commodity. The razor also loses the Cutting 1 quality. Don't ask how we confirmed this.", - "weight": 110, + "weight": "110 g", "material": [ "plastic", "steel" ], "cutting": 2 }, @@ -87,7 +87,7 @@ "description": "A soft plastic cylinder you can wrap a lock of your hair around to curl it.", "copy-from": "base_toiletries", "symbol": ",", - "weight": 20, + "weight": "20 g", "volume": "25 ml", "container": "box_small" }, @@ -126,7 +126,7 @@ "color": "red", "price": 800, "price_postapoc": 50, - "weight": 590, + "weight": "590 g", "volume": "2100 ml", "//": "the volume is pretty bulky, but this is an old fashioned model.", "material": [ "wood", "plastic" ], @@ -142,7 +142,7 @@ "color": "black", "price": 1590, "price_postapoc": 10, - "weight": 680, + "weight": "680 g", "volume": "2400 ml", "material": "plastic", "bashing": 2, @@ -158,8 +158,8 @@ "container": "box_medium", "price": 89, "price_postapoc": 180, - "weight": 227, - "volume": 1, + "volume": "250 ml", + "weight": "227 g", "material": "paper", "to_hit": -2, "snippet_category": [ @@ -188,8 +188,8 @@ "color": "black", "price": 2100, "price_postapoc": 0, - "weight": 680, - "volume": 2, + "volume": "500 ml", + "weight": "680 g", "material": [ "plastic", "steel" ], "bashing": 3, "to_hit": -1 @@ -203,8 +203,8 @@ "color": "magenta", "price": 2500, "price_postapoc": 0, - "weight": 590, - "volume": 1, + "volume": "250 ml", + "weight": "590 g", "material": [ "ceramic", "steel" ], "bashing": 3, "to_hit": 1 @@ -218,8 +218,8 @@ "color": "white", "price": 1700, "price_postapoc": 0, - "weight": 160, - "volume": 2, + "volume": "500 ml", + "weight": "160 g", "material": [ "steel", "plastic" ], "bashing": 3, "to_hit": 1 diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json index 026a0ae40ccdd..f11865e156157 100644 --- a/data/json/items/generic/dining_kitchen.json +++ b/data/json/items/generic/dining_kitchen.json @@ -49,7 +49,7 @@ }, { "id": "base_ceramic_dish", - "name": "generic dish", + "name": { "str": "generic dish", "str_pl": "generic dishes" }, "description": "generic item template", "type": "GENERIC", "symbol": ")", @@ -64,7 +64,7 @@ }, { "id": "base_glass_dish", - "name": "generic dish", + "name": { "str": "generic dish", "str_pl": "generic dishes" }, "description": "generic item template", "type": "GENERIC", "symbol": ")", @@ -79,7 +79,7 @@ }, { "id": "base_tin_dish", - "name": "generic dish", + "name": { "str": "generic dish", "str_pl": "generic dishes" }, "description": "generic item template", "type": "GENERIC", "symbol": ")", @@ -94,7 +94,7 @@ }, { "id": "base_plastic_dish", - "name": "generic dish", + "name": { "str": "generic dish", "str_pl": "generic dishes" }, "description": "generic item template", "type": "GENERIC", "symbol": ")", @@ -808,8 +808,8 @@ "category": "other", "description": "A stainless steel mesh colander, for washing rice, vegetables or straining liquid off from noodles or other foods.", "type": "GENERIC", - "volume": 2, - "weight": 318, + "volume": "500 ml", + "weight": "318 g", "symbol": ")", "price": 600, "price_postapoc": 5 @@ -819,8 +819,8 @@ "name": "splatter guard", "description": "A stainless steel mesh screen for preventing flying oil from getting all over your nice counters (or you) when frying.", "type": "GENERIC", - "volume": 2, - "weight": 357, + "volume": "500 ml", + "weight": "357 g", "symbol": ")", "price": 600, "price_postapoc": 5 diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json index b28140f1c4e9d..680a704c873c1 100644 --- a/data/json/items/generic/toys_and_sports.json +++ b/data/json/items/generic/toys_and_sports.json @@ -63,6 +63,65 @@ ], "magazine_well": 1 }, + { + "id": "golf_tee", + "type": "GENERIC", + "category": "other", + "name": "golf tee", + "description": "A pin shaped piece of wood meant for holding a golf ball slightly off the ground.", + "weight": "3 g", + "volume": "250 ml", + "price": 1000, + "material": "wood", + "symbol": "-", + "color": "white" + }, + { + "id": "golf_ball", + "type": "GENERIC", + "category": "other", + "name": "golf ball", + "description": "A small ball with round indentations on it.", + "weight": "50 g", + "volume": "250 ml", + "price": 2000, + "material": "plastic", + "symbol": "*", + "color": "white", + "bashing": 5, + "to_hit": -3 + }, + { + "type": "GENERIC", + "id": "pool_ball", + "symbol": "*", + "color": "blue", + "name": "pool ball", + "description": "A colorful, hard ball. Essentially a rock.", + "category": "other", + "price": 3000, + "price_postapoc": 0, + "material": "plastic", + "weight": "170 g", + "volume": "250 ml", + "bashing": 8, + "to_hit": -3 + }, + { + "type": "GENERIC", + "id": "bowling_ball", + "symbol": "*", + "color": "blue", + "name": "bowling ball", + "description": "A large, heavy ball. Before the apocalypse, its main purpose was to be rolled along waxed floors.", + "category": "other", + "price": 30, + "material": "ceramic", + "weight": "2000 g", + "volume": "2500 ml", + "bashing": 16, + "to_hit": -2 + }, { "type": "GENERIC", "id": "baseball", diff --git a/data/json/items/grenades.json b/data/json/items/grenades.json index f245a4b7080da..dfc92d1119f1a 100644 --- a/data/json/items/grenades.json +++ b/data/json/items/grenades.json @@ -285,7 +285,8 @@ "category": "weapons", "name": "pipe bomb", "description": "This is a section of a pipe filled with explosive materials. Use this item to light the fuse, which gives you five turns to get away from it before it detonates. You'll need a lighter or some matches to use it.", - "weight": "1298 g", + "weight": "730 g", + "//": "Only one third (410 g) of a whole pipe is being used", "volume": "500 ml", "price": 1500, "to_hit": 1, diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index dddea2ae55977..1bc6e5e48784b 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -7,7 +7,7 @@ "name": "American-180", "name_plural": "American-180", "description": "The American-180 is a submachine gun developed in the 1960's that fires .22 LR, unusual for an SMG. Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon.", - "weight": "1840 g", + "weight": "2600 g", "volume": "1250 ml", "price": 163000, "to_hit": -2, @@ -89,7 +89,7 @@ "name": "Mossberg Brownie", "name_plural": "Mossberg Brownie", "description": "The first gun produced by O.F. Mossberg & Sons. A small pocket pistol, marketed to trappers during the early 20th century. Its four barrels can accept .22 Short and .22 LR cartridges.", - "weight": "130 g", + "weight": "280 g", "volume": "137ml", "price": 110000, "to_hit": -1, @@ -201,7 +201,7 @@ "name": "Ruger 10/22", "name_plural": "Ruger 10/22", "description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters. Even though it fires the weak .22 round, it's perfectly capable of killing.", - "weight": "2220 g", + "weight": "2270 g", "volume": "2500 ml", "price": 27000, "to_hit": -1, @@ -241,6 +241,7 @@ "type": "GUN", "name": "Ruger LCR .22", "name_plural": "Ruger LCR .22", + "weight": "420 g", "ammo": "22", "clip_size": 8, "magazines": [ [ "22", [ "22_speedloader8" ] ] ] @@ -253,7 +254,7 @@ "name": "SIG Mosquito", "name_plural": "SIG Mosquito", "description": "A popular, small .22 LR pistol. One of the many polymer frame pistols produced during the latter 20th-early 21st centuries; it has an underbarrel rail.", - "weight": "640 g", + "weight": "700 g", "volume": "250 ml", "price": 36000, "to_hit": -2, @@ -292,7 +293,7 @@ "name": "S&W 22A", "name_plural": "S&W 22A", "description": "A popular .22 pistol.", - "weight": "900 g", + "weight": "1000 g", "volume": "500 ml", "price": 35000, "to_hit": -2, @@ -313,7 +314,7 @@ "type": "GUN", "name": "Jennings J-22", "description": "One of the quintessential 'saturday night specials', the Jennings J-22 was very affordably priced with its injection molded zinc slide and frame. Intended to fill the void left after small pocket pistols were banned from import, these were more commonly used by criminals unfazed by their glaring safety issues.", - "weight": "340 g", + "weight": "370 g", "volume": "123ml", "price": 7000, "to_hit": -3, @@ -334,7 +335,7 @@ "type": "GUN", "name": "Walther P22", "description": "The Walther P22 is a blowback operated semi-automatic pistol. It is about half the size of most Walthers. It is made mostly with plastic, with the slide and key components being made of die-cast zinc alloy", - "weight": "480 g", + "weight": "450 g", "volume": "263 ml", "price": 8500, "to_hit": -3, diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index f7a50127d2914..f860b767ee070 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -6,7 +6,7 @@ "type": "GUN", "name": "Remington ACR", "description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing .223 carbines.", - "weight": "3495 g", + "weight": "3590 g", "volume": "2 L", "price": 234300, "to_hit": -1, @@ -31,7 +31,7 @@ "name": "AR-15", "//": "This is assumed to be the standard model matching the (currently not in-game) M16. Tileset whitelist for rifles", "description": "This ubiquitous rifle is the forefather of M16 rifle series. It is lightweight and accurate, but will malfunction if not properly maintained. This one is a semi automatic civilian version.", - "weight": "2815 g", + "weight": "3500 g", "volume": "2 L", "price": 125000, "to_hit": -1, @@ -53,7 +53,7 @@ "name": "HK416 A5", "//": "*Current* milspec gear is now ridiculously overpriced, as seen with the M2010 IRL.", "description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable.", - "weight": "1920 g", + "weight": "3490 g", "volume": "1750 ml", "price": 540000, "to_hit": -1, @@ -76,7 +76,7 @@ "type": "GUN", "name": "H&K G36", "description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.", - "weight": "3270 g", + "weight": "3630 g", "volume": "2500 ml", "price": 210000, "to_hit": -1, @@ -240,7 +240,7 @@ "type": "GUN", "name": "M249", "description": "The M249 is a mountable machine gun used by the US military and SWAT teams. Quite inaccurate and difficult to control, the M249 is designed to fire many rounds very quickly.", - "weight": "6400 g", + "weight": "7330 g", "volume": "3 L", "price": 750000, "to_hit": -1, @@ -276,7 +276,7 @@ "type": "GUN", "name": "M27 IAR", "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.", - "weight": "3495 g", + "weight": "3710 g", "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ], "relative": { "ranged_damage": 1, "durability": 1 } @@ -288,7 +288,7 @@ "type": "GUN", "name": "M4A1", "description": "A popular carbine, long used by the US military. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.", - "weight": "2520 g", + "weight": "3160 g", "volume": "1750 ml", "price": 240000, "to_hit": -1, @@ -311,7 +311,7 @@ "type": "GUN", "name": "M16A4", "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It is a gas operated, rotating bolt rifle known for its accuracy and controllable recoil.", - "weight": "2890 g", + "weight": "3510 g", "volume": "1750 ml", "price": 240000, "to_hit": -1, @@ -372,7 +372,7 @@ "type": "GUN", "name": "Ruger Mini-14", "description": "A small, lightweight semi-auto carbine designed for civilian and police use. Its superb accuracy and low recoil makes it more suitable than full-auto rifles for some situations.", - "weight": "2800 g", + "weight": "3180 g", "volume": "2 L", "price": 92100, "to_hit": -1, @@ -409,7 +409,7 @@ "type": "GUN", "name": "FN SCAR-L", "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command. The 'L' in its name stands for light, as it uses the lightweight .223 round.", - "weight": "2960 g", + "weight": "3300 g", "volume": "2250 ml", "price": 280000, "to_hit": -1, @@ -432,7 +432,7 @@ "type": "GUN", "name": "SIG 552", "description": "A compact selective fire automatic rifle designed for the Swiss military. It features a three-round burst mode and an integrated folding stock.", - "weight": "3200 g", + "weight": "3000 g", "volume": "1750 ml", "price": 320000, "to_hit": -1, @@ -453,7 +453,7 @@ "type": "GUN", "name": "Steyr AUG", "description": "The Steyr AUG is an Austrian assault rifle that uses a bullpup design. It is used in the armed forces and police forces of many nations, and enjoys low recoil and high accuracy.", - "weight": "3184 g", + "weight": "3500 g", "volume": "1500 ml", "price": 490000, "to_hit": -1, diff --git a/data/json/items/gun/270win.json b/data/json/items/gun/270win.json index c064656d5dda4..6624a26cdbd8c 100644 --- a/data/json/items/gun/270win.json +++ b/data/json/items/gun/270win.json @@ -6,7 +6,7 @@ "type": "GUN", "name": "Remington 700", "description": "A classic bolt action rifle chambered for .270 Winchester, very polular among hunters. This is a CDL SF model with a forged, fluted, 416 stainless steel barrel threaded into the receiver and a recessed bolt face. It has checkered walnut furniture and a recoil pad to reduce perceived recoil.", - "weight": "4080 g", + "weight": "3410 g", "volume": "3 L", "price": 112600, "to_hit": -1, diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json index 89c19811439e8..8e39f3dcf759e 100644 --- a/data/json/items/gun/300.json +++ b/data/json/items/gun/300.json @@ -8,7 +8,7 @@ "name_plural": "M2010 ESR", "//": "http://www.guns.com/2012/05/17/remington-xm2010-army-sniper-system-esr-now-in-stores/.", "description": "A bolt-action, box-magazine-fed, sniper rifle chambered in the powerful .300 Winchester Magnum round. The M2010 had completely replaced the M24 rifle series by 2017.", - "weight": "4002 g", + "weight": "5500 g", "volume": "2750 ml", "price": 1701000, "to_hit": -1, @@ -31,7 +31,7 @@ "name_plural": "Weatherby Mark V", "//": "MSRP, believe it or not.", "description": "The Weatherby Mark V is one of the finest bolt action rifles. Designed in 1955 by Roy Weatherby and Fred Jennie, it has a strong action designed to safely fire high-pressure cartridges. These rifles were presented to celebrities as part of a marketing campaign.", - "weight": "4200 g", + "weight": "3730 g", "volume": "3 L", "price": 259500, "to_hit": -1, @@ -54,7 +54,7 @@ "name": "Winchester Model 70", "name_plural": "Winchester Model 70", "description": "The Winchester Model 70 is a bolt action sporting rifle. It has an iconic place in American sporting culture and has been held in high regard by shooters since it was introduced in 1936.", - "weight": "4100 g", + "weight": "3520 g", "volume": "3 L", "price": 46000, "to_hit": -1, diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 993ddb3df9221..a6eab50cbf6b6 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -7,7 +7,7 @@ "name": "Browning BLR", "name_plural": "Browning BLR", "description": "A highly accurate lever-action hunting rifle chambered for the powerful .30-06 round. Notable for using a detachable magazine instead of a traditional tube.", - "weight": "3135 g", + "weight": "3300 g", "volume": "3 L", "price": 85000, "to_hit": -1, @@ -85,7 +85,7 @@ "type": "GUN", "name": "M1903 Springfield", "description": "A powerful military rifle chambered in .30-06, developed to replace the US Army's older Krag rifle. Served as the main American rifle in World War I, was used alongside the M1 Garand in World War II, and was used as a sniper rifle as late as the Vietnam War.", - "weight": "4080 g", + "weight": "3910 g", "volume": "3 L", "price": 80000, "to_hit": -1, @@ -122,7 +122,7 @@ "reload_noise_volume": 10, "name": "Browning Automatic Rifle", "description": "Designed near the end of World War I, the BAR provided fire support for the US Army from World War II all the way to the Vietnam War. Too much firepower to serve as a battle rifle, but not enough to be an ideal light machine gun, it still found a niche on the battlefield.", - "weight": "7050 g", + "weight": "8820 g", "volume": "2500 ml", "price": 350000, "to_hit": -1, @@ -162,7 +162,7 @@ "name": "Remington 700", "name_plural": "Remington 700", "description": "A very popular and durable hunting or sniping rifle. Popular among SWAT and US Marine snipers. Highly damaging, but perhaps not as accurate as the competing Browning BLR.", - "weight": "4080 g", + "weight": "3410 g", "volume": "3 L", "price": 87000, "to_hit": -1, diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json index 95459c058ae58..0caba1547b4c4 100644 --- a/data/json/items/gun/300BLK.json +++ b/data/json/items/gun/300BLK.json @@ -6,7 +6,7 @@ "type": "GUN", "name": "Remington ACR .300BLK", "description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing carbines. This version is chambered for the .300 AAC Blackout round.", - "weight": "3495 g", + "weight": "3590 g", "volume": "2 L", "price": 234300, "to_hit": -1, @@ -31,7 +31,7 @@ "type": "GUN", "name": "IWI Tavor X95 .300BLK", "description": "The IWI Tavor X95 (also called Micro-Tavor or MTAR) is an Israeli bullpup assault rifle designed and produced by Israel Weapon Industries. This is the civilian version chambered for .300 AAC Blackout.", - "weight": "3400 g", + "weight": "3610 g", "volume": "1500 ml", "price": 490000, "to_hit": -1, diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index d60040b8aaebd..919d1f8c725df 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -7,7 +7,7 @@ "name": "FN FAL", "name_plural": "FN FAL", "description": "Originally designed during the Cold War, the FN FAL is probably the most successful battle rifle ever designed. Even though often labeled as obsolete, its high rate of fire and powerful ammunition make it perfectly capable of holding its ground against modern competitors.", - "weight": "3840 g", + "weight": "4250 g", "volume": "2 L", "price": 350000, "to_hit": -1, @@ -32,7 +32,7 @@ "name": "H&K G3", "name_plural": "H&K G3", "description": "An early battle rifle developed after the end of WWII. The G3 is designed to unload large amounts of deadly ammunition, but it is less suitable over long ranges.", - "weight": "3980 g", + "weight": "4380 g", "volume": "2 L", "price": 205000, "to_hit": -1, @@ -55,7 +55,7 @@ "reload_noise_volume": 10, "name": "M134D-H Minigun", "description": "The M134D-H Minigun is a (relatively) lightweight heavy rotary machine gun. Its six barrels are rotated by an electric motor, powered by UPS or vehicle. If you could find enough ammo for it, it would become a devastating weapon. It must be mounted on a vehicle before use.", - "weight": "19500 g", + "weight": "19770 g", "volume": "6 L", "price": 5500000, "to_hit": -4, @@ -84,7 +84,7 @@ "name": "M14 EBR-RI", "name_plural": "M14 EBR-RI", "description": "A highly modified version of the M14 rifle designed to cover both CQB and designated marksman roles. A very powerful and versatile rifle, if somewhat heavy.", - "weight": "4820 g", + "weight": "5070 g", "price": 195000, "material": [ "steel", "plastic" ], "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], @@ -111,7 +111,7 @@ "name": "M1A", "name_plural": "M1A", "description": "The child of the M1 Garand World War 2 rifle, the M1A is a semi-automatic variant of the M14, favored for its accuracy and modular use.", - "weight": "3940 g", + "weight": "4230 g", "volume": "2250 ml", "price": 130000, "to_hit": -1, @@ -148,7 +148,7 @@ "type": "GUN", "name": "M240", "description": "The M240 is a medium machine gun used by the US military, replacing the older M60. Quite inaccurate and difficult to control, the M240 is designed to fire many rounds very quickly.", - "weight": "8800 g", + "weight": "12400 g", "volume": "3 L", "price": 1000000, "to_hit": -1, @@ -185,7 +185,7 @@ "type": "GUN", "name": "M60", "description": "The M60 is a general-purpose machine gun developed to replace the .30-caliber M1918 and M1919. Heavy and difficult to handle fired from the shoulder, as most people aren't action-movie heroes.", - "weight": "8300 g", + "weight": "10500 g", "volume": "3 L", "price": 1000000, "to_hit": -1, @@ -288,6 +288,7 @@ "name": "FN SCAR-H", "name_plural": "FN SCAR-H", "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command. The 'H' in its name stands for heavy, as it uses the powerful .308 round.", + "weight": "3640 g", "ammo": "308", "ranged_damage": -3, "min_cycle_recoil": 2700, @@ -302,7 +303,7 @@ "name": "M24", "name_plural": "M24", "description": "The M24 Sniper is the military and police version of the Remington Model 700 rifle, M24 being the model name assigned by the United States Army after adoption as their standard sniper rifle in 1988. The M24 is referred to as a 'weapon system' because it consists of not only a rifle, but also a detachable telescopic sight and other accessories.", - "weight": "4500 g", + "weight": "5000 g", "volume": "2750 ml", "price": 350000, "to_hit": -1, @@ -340,7 +341,7 @@ "type": "GUN", "name": "HK417 A2", "description": "A German battle rifle with a 13\" barrel and telescopic stock. It is a gas operated, rotating bolt rifle with a short-stroke piston design similar to that of the G36.", - "weight": "3870 g", + "weight": "4220 g", "volume": "1750 ml", "price": 320000, "to_hit": -1, @@ -364,7 +365,7 @@ "type": "GUN", "name": "M110A1", "description": "A derivative of H&K's G28 with an aluminium upper reciever to meet US Army weight requirements. It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.", - "weight": "3800 g", + "weight": "4330 g", "volume": "2 L", "price": 320000, "to_hit": -1, diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json index 1667b4d01f7c5..3c01b063ddc6f 100644 --- a/data/json/items/gun/32.json +++ b/data/json/items/gun/32.json @@ -45,7 +45,7 @@ "name": "Skorpion Vz. 61", "//": "Total unloaded weight of gun 1301.81 grams, rounded to 1302. Current weight of folding stock 200 grams.", "description": "The Skorpion Vz. 61 is a Czechoslovak submachine gun from the 1950s, chambered in .32 ACP.", - "weight": "1102 g", + "weight": "1300 g", "volume": "750 ml", "price": 150000, "to_hit": -2, @@ -85,7 +85,7 @@ "name": "Walther PPK", "name_plural": "Walther PPK", "description": "One of the most famous handguns of the 20th century. Your name is not Bond, but you might find this little gun still useful.", - "weight": "525 g", + "weight": "540 g", "volume": "250 ml", "price": 45000, "to_hit": -1, diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json index 15dfae8dc94f8..8987be3569345 100644 --- a/data/json/items/gun/357sig.json +++ b/data/json/items/gun/357sig.json @@ -6,7 +6,7 @@ "type": "GUN", "name": "SIG P226", "description": "A SIG Sauer P226 chambered for .357 SIG. The P226 is a DA/SA, short-recoil operated semi-automatic pistol.", - "weight": "800 g", + "weight": "960 g", "volume": "500 ml", "price": 50000, "to_hit": -1, @@ -26,6 +26,7 @@ "type": "GUN", "name": "Glock 31", "description": "A full size .357 SIG Glock pistol. It is extremely similar to the Glock 22, and could be converted to fire .40 S&W by switching the barrel.", + "weight": "660 g", "ammo": [ "357sig" ], "magazines": [ [ "357sig", [ "glock40mag", "glock40bigmag" ] ] ] }, @@ -36,7 +37,7 @@ "type": "GUN", "name": "SIG P320", "description": "The P320 is a semi automatic, short recoil operated pistol. This one is chambered for .357 SIG.", - "weight": "800 g", + "weight": "751 g", "volume": "500 ml", "price": 69000, "to_hit": -2, diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index e7c09fd00c44e..dac2a1ef0d441 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -41,7 +41,7 @@ "type": "GUN", "name": "COP .357 Derringer", "description": "A small, chubby derringer pistol bearing a slight resemblance to the Mossberg Brownie. It uses a rotating firing pin to fire the individual hammers of the four barrels arranged in a square formation.", - "weight": "857 g", + "weight": "800 g", "volume": "399ml", "price": 120000, "to_hit": -1, diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json index 1650d4c0c0f2d..e0acdf714ab7a 100644 --- a/data/json/items/gun/380.json +++ b/data/json/items/gun/380.json @@ -21,7 +21,7 @@ "type": "GUN", "name": "Kel-Tec P3AT", "description": "Essentially a slightly scaled up Kel-tec P32 in .380 ACP, the ever popular P3AT offers better ballistics in a small, concealable lightweight package. Handling leaves something to be desired due to snappier recoil and diminuitive controls.", - "weight": "240 g", + "weight": "220 g", "volume": "231ml", "price": 25000, "ammo": "380", @@ -35,7 +35,7 @@ "type": "GUN", "name": "FN 1910 .380", "description": "Made infamous in Sarajevo in 1914, the FN1910 was a popular pocket pistol, albeit in .32 ACP. Collectors value the .380 model for its notoriety and more modern terminal performance. If such a humble firearm could start a world war, could it perhaps protect you from the undead?", - "weight": "680 g", + "weight": "590 g", "volume": "186ml", "price": 75000, "to_hit": -3, @@ -75,7 +75,7 @@ "type": "GUN", "name": "Hi-Point CF-380", "description": "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.", - "weight": "709 g", + "weight": "820 g", "volume": "539 ml", "price": 7500, "to_hit": -2, diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index 61d8c08b3a157..b4b58f0e27b59 100644 --- a/data/json/items/gun/38super.json +++ b/data/json/items/gun/38super.json @@ -44,7 +44,7 @@ "type": "GUN", "name": "M1911A1", "description": "The M1911A1 is an extremely popular pistol known for its reliability. This one is chambered for .38 Super.", - "weight": "1035 g", + "weight": "1110 g", "volume": "500 ml", "price": 78400, "to_hit": -2, diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index afd179307586a..2cad78a994ae0 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -7,7 +7,7 @@ "name": "Glock 22", "name_plural": "Glock 22", "description": "A .40 S&W variant of the popular Glock 17 pistol. The standard-issue firearm of the FBI and of countless other law enforcement agencies worldwide.", - "weight": "440 g", + "weight": "650 g", "volume": "500 ml", "price": 69000, "to_hit": -2, @@ -85,7 +85,7 @@ "name": "SIG Pro .40", "name_plural": "SIG Pro .40", "description": "Originally marketed as a lightweight and compact alternative to older SIG handguns, the Pro .40 is popular among European police forces.", - "weight": "680 g", + "weight": "820 g", "volume": "500 ml", "price": 75000, "to_hit": -2, @@ -200,7 +200,7 @@ "name": "S&W 610", "name_plural": "S&W 610", "description": "The Smith and Wesson 610 is a classic six-shooter revolver chambered for 10mm rounds, or for S&W's own .40 round.", - "weight": "1133 g", + "weight": "1200 g", "volume": "500 ml", "price": 74000, "to_hit": -2, @@ -272,7 +272,7 @@ "type": "GUN", "name": "Hi-Point Model JCP", "description": "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.", - "weight": "800 g", + "weight": "990 g", "volume": "703 ml", "price": 7500, "to_hit": -2, diff --git a/data/json/items/gun/40x46mm.json b/data/json/items/gun/40x46mm.json index 719fdc01c7942..ffab267ece3c2 100644 --- a/data/json/items/gun/40x46mm.json +++ b/data/json/items/gun/40x46mm.json @@ -148,5 +148,28 @@ "clip_size": 3, "modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ], [ "MULTI", "multi", 3, [ "NPC_AVOID", "SIMULTANEOUS" ] ] ], "proportional": { "weight": 1.5, "volume": 1.8, "price": 2 } + }, + { + "id": "pseudo_m203", + "copy-from": "launcher_base", + "looks_like": "m203", + "type": "GUN", + "name": "M203 array", + "description": "An array of six M203 grenade launchers for use on the TALON UGV platform.", + "weight": "8200 g", + "volume": "4 L", + "price": 250000, + "to_hit": -1, + "bashing": 14, + "material": "steel", + "ammo": "40x46mm", + "range": 30, + "ranged_damage": 1, + "dispersion": 300, + "durability": 10, + "reload": 400, + "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ], + "clip_size": 6, + "flags": [ "MOUNTED_GUN" ] } ] diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json index c9ed0c8127ebf..17901b169636d 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -6,7 +6,7 @@ "type": "GUN", "name": "Saiga-410", "description": "The Saiga-410 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK47 rifle. It reloads with a magazine, rather than one shell at a time like most shotguns.", - "weight": "3550 g", + "weight": "3400 g", "volume": "2750 ml", "price": 189000, "to_hit": -1, diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index d5287ee4b4216..162da16e8edff 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -7,7 +7,7 @@ "name": "Desert Eagle .44", "name_plural": "Desert Eagle .44", "description": "One of the most recognizable handguns due to its popularity in movies and video games, the Desert Eagle is better known for its menacing appearance than its performance. It's a large pistol, but its heavy weight reduces recoil.", - "weight": "1800 g", + "weight": "1700 g", "volume": "750 ml", "price": 87500, "to_hit": -2, @@ -154,7 +154,7 @@ "name": "S&W 629", "name_plural": "S&W 629", "description": "A stainless steel, six-shot, double-action revolver with a matte black plastic handle manufactured by Smith & Wesson. Though hardly the most powerful handgun in the world any more, it could still blow a zombie's head clean off.", - "weight": "1276 g", + "weight": "1267 g", "volume": "750 ml", "price": 86100, "bashing": 10, diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json index ea204275beebc..05f9b27b4f78c 100644 --- a/data/json/items/gun/44paper.json +++ b/data/json/items/gun/44paper.json @@ -7,7 +7,7 @@ "name": "Colt M1860 Army", "name_plural": "Colt M1860 Army", "description": "The Colt Army Model 1860 is a cap & ball .44-caliber revolver. It was used during the American Civil War, and made by Colt's Manufacturing Company.", - "weight": "1220 g", + "weight": "1200 g", "volume": "750 ml", "price": 43000, "to_hit": -1, @@ -26,7 +26,7 @@ "type": "GUN", "name": "LeMat revolver", "description": "A Pietta reproduction of the civil war era LeMat revolver, a rare and unusual cap & ball .44-caliber revolver. While its original non-standard .42 or .35 caliber curbed its usefulness for the CSA army, this reproduction is offered in more prevalent .44 caliber. Despite modern quality materials, the design is still rather delicate.", - "weight": 1295, + "weight": "1410 g", "volume": "851 ml", "price": 120000, "bashing": 4, diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json index cf4537e2b832e..488353a01e8e8 100644 --- a/data/json/items/gun/45.json +++ b/data/json/items/gun/45.json @@ -6,7 +6,7 @@ "reload_noise_volume": 10, "name": "TDI Vector", "description": "The TDI Vector is a submachine gun with a unique, in-line design that makes recoil very manageable, even in the powerful .45 caliber.", - "weight": "2600 g", + "weight": "3100 g", "volume": "1750 ml", "price": 310000, "to_hit": -2, @@ -85,7 +85,7 @@ "name": "M1911", "//": "You can get 'em for over US$1K if you want. This is a fairly cheap remake.", "description": "The M1911 was the US Military standard-issue sidearm for most of the 20th Century. It remains one of the most popular .45 pistols today.", - "weight": "1035 g", + "weight": "1120 g", "volume": "500 ml", "price": 78400, "to_hit": -2, @@ -108,7 +108,7 @@ "type": "GUN", "name": "M45A1", "description": "The M45A1 supplanted earlier M45 MEUSOC pistols in use by Force Recon elements of Marine Expeditionary Units. Where the original M45 pistols were gutted M1911A1's hand-fitted by USMC armorers, the updated M45A1's are hardly different from any other commercial 1911 design save for their dual recoil springs. Most were replaced in 2016 with Glock 19's due to logistics issues.", - "weight": 1105, + "weight": "1105 g", "price": 169900, "color": "brown_yellow", "dispersion": 420, @@ -121,7 +121,7 @@ "reload_noise_volume": 10, "name": "MAC-10", "description": "The MAC-10 is a popular machine pistol originally designed for military use. For many years they were the most inexpensive automatic weapon in the US, and enjoyed great popularity among criminals less concerned with quality firearms.", - "weight": "2630 g", + "weight": "2840 g", "volume": "750 ml", "price": 180000, "to_hit": -2, @@ -264,7 +264,7 @@ "reload_noise_volume": 10, "name": "Thompson submachine gun", "description": "An American-made submachine gun developed during the very end of World War I, too late to see action. Infamous during the 1920s for its use by gangsters, and was used during World War II before being mostly replaced with less-expensive alternatives.", - "weight": "4630 g", + "weight": "5910 g", "volume": "2 L", "price": 450000, "to_hit": -2, @@ -302,6 +302,7 @@ "copy-from": "usp_9mm", "type": "GUN", "name": "USP .45", + "weight": "930 g", "ammo": "45", "ranged_damage": 0, "built_in_mods": [ "match_trigger" ], @@ -313,7 +314,7 @@ "type": "GUN", "name": "MK 23 MOD 0", "description": "Jokingly referred to as \"The World's Only Crew-Served Pistol\", this massive pistol was designed as a primary weapon for select \"special operators\". Its cumbersome nature, the introduction of the derivative HK USP series and the logistics of getting .45 ACP ammunition in theater doomed this behemoth to US SOCOM armories. Like the USP, the Mk 23 is a remarkably reliable gun; someone could probably take out a nuclear equipped walking tank with this in their holster.", - "weight": 1200, + "weight": "1120 g", "volume": "1607 ml", "default_mods": [ "suppressor", "laser_sight" ], "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] @@ -344,7 +345,7 @@ "type": "GUN", "name": "Hi-Point Model JHP", "description": "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.", - "weight": "800 g", + "weight": "990 g", "volume": "720 ml", "price": 7500, "to_hit": -2, diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json index 6ae2c40fabafd..7398e6764dd45 100644 --- a/data/json/items/gun/454.json +++ b/data/json/items/gun/454.json @@ -7,7 +7,7 @@ "name": "Taurus Raging Bull", "name_plural": "Taurus Raging Bull", "description": "The Taurus Raging Bull is a 5-shot revolver chambered in .454 Casull. It has impressive stopping power.", - "weight": "1700 g", + "weight": "1790 g", "volume": "750 ml", "price": 64100, "to_hit": -2, @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": [ "454", "45colt" ], + "ammo": [ "454", "410shot", "45colt" ], "dispersion": 280, "durability": 8, "blackpowder_tolerance": 56, diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json index 10f8df2560f8a..3047760e6add6 100644 --- a/data/json/items/gun/4570.json +++ b/data/json/items/gun/4570.json @@ -71,7 +71,7 @@ "name": "1874 Sharps", "name_plural": "1874 Sharps", "description": "A reproduction of an antique single-shot .45-70 rifle once used to hunt buffalo and other large game in the late 19th Century. Highly accurate and powerful for the time, this one is made to handle modern smokeless ammunition.", - "weight": "5500 g", + "weight": "5000 g", "volume": "3250 ml", "price": 210000, "to_hit": 1, diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index 98626235ae7f3..5a940b86ce696 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -64,7 +64,7 @@ "name": "Uberti Cattleman", "name_plural": "Uberti Cattleman", "description": "This 7.5\" barreled Uberti Cattleman is a modern reproduction of the legendary Colt Single Action Army, or Colt Peacemaker, one of the first revolvers to use a modern self-contained cartridge. Made famous by westerns, it is still in demand for Cowboy Action Shooting, reenactors and collectors. Unlike modern revolvers, the cylinder cannot swing out for loading, and spent brass must be ejected one at a time.", - "weight": 1048, + "weight": "1048 g", "volume": "500 ml", "price": 47900, "to_hit": -1, diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json index 45dac19c34820..426a883d17e4c 100644 --- a/data/json/items/gun/46.json +++ b/data/json/items/gun/46.json @@ -6,7 +6,7 @@ "reload_noise_volume": 10, "name": "H&K MP7A2", "description": "Designed as a personal defense weapon, the MP7 fires the high powered 4.6x30mm round while being lightweight, compact in size, and practically recoil free.", - "weight": "1780 g", + "weight": "1800 g", "volume": "2034 ml", "price": 175000, "to_hit": -2, diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index b8fceecbb9950..8a94e4a05488c 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -95,7 +95,7 @@ "type": "GUN", "name": "AI AS50", "description": ".50 caliber anti-materiel rifle made by Accuracy International. With high accuracy for long range target and high fire rate, this weapon is still being used by Greek national guard.", - "weight": "14000 g", + "weight": "13330 g", "volume": "3500 ml", "price": 1500000, "to_hit": -1, @@ -120,7 +120,7 @@ "type": "GUN", "name": "McMillan TAC-50", "description": "A long-range anti-materiel and anti-personnel sniper rifle made by McMillan Firearms, serving the Canadian Army since 2000 as the C15, and the Navy Seals as the Mk 15 Mod 0. This .50 caliber bolt-action rifle is capable of defeating light vehicles, radar installations and crew served weapons at extreme distances. It notably holds the longest range confirmed sniper kill, as well as the 4th and 5th longest.", - "weight": "11800 g", + "weight": "11020 g", "volume": "3127 ml", "price": 870000, "to_hit": -1, @@ -145,7 +145,7 @@ "type": "GUN", "name": "Serbu BFG-50", "description": "A single-shot, bolt-action rifle made by Serbu Firearms, the BFG-50 is a very affordable firearm for those wishing to shoot .50 BMG.", - "weight": "8504 g", + "weight": "8144 g", "volume": "1387 ml", "price": 239500, "to_hit": -1, diff --git a/data/json/items/gun/500.json b/data/json/items/gun/500.json index 6f3f6694b60f0..acc3f00276d54 100644 --- a/data/json/items/gun/500.json +++ b/data/json/items/gun/500.json @@ -43,7 +43,7 @@ "name": "S&W 500", "name_plural": "S&W 500", "description": "The 5-shot Smith and Wesson 500 revolver fires the comparably-named .500 S&W Magnum. It's an impressive weapon.", - "weight": "2055 g", + "weight": "1960 g", "volume": "750 ml", "price": 90000, "to_hit": -2, diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json index 8f3fac8ea789c..845deed0a4758 100644 --- a/data/json/items/gun/545x39.json +++ b/data/json/items/gun/545x39.json @@ -7,7 +7,7 @@ "name": "AK-74M", "//": "AKs likewise aren't commercially traded in the US, plus this is newer.", "description": "The successor to the well-known AK-47 rifle. It combines the reliability of the AK series with the high-velocity, lightweight 5.45x39mm cartridge.", - "weight": "3170 g", + "weight": "3400 g", "volume": "1750 ml", "price": 390000, "to_hit": -1, @@ -45,7 +45,7 @@ "reload_noise_volume": 10, "name": "AN-94", "description": "Intended to replace the AK-74, this rifle uses a sophisticated mechanism to delay felt recoil, along with a very fast two-round burst mode. While its increased complexity prevented it from being adopted by the Russian military, it has seen service among their special forces.", - "weight": "3620 g", + "weight": "3850 g", "volume": "1750 ml", "price": 420000, "to_hit": -1, diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json index 0c2e2d8b7edd8..eb396fdaff1cd 100644 --- a/data/json/items/gun/57.json +++ b/data/json/items/gun/57.json @@ -6,7 +6,7 @@ "reload_noise_volume": 10, "name": "FN Five-Seven", "description": "Designed to work with FN's proprietary 5.7x28mm round, the Five-Seven is a lightweight pistol with a very high capacity, best used against armored opponents.", - "weight": "490 g", + "weight": "600 g", "volume": "500 ml", "price": 124900, "to_hit": -2, @@ -43,7 +43,7 @@ "reload_noise_volume": 10, "name": "FN P90", "description": "The first in a new genre of guns, termed \"personal defense weapons.\" FN designed the P90 to use their proprietary 5.7x28mm ammunition. It is made for firing bursts manageably.", - "weight": "2300 g", + "weight": "2640 g", "volume": "1500 ml", "price": 350000, "to_hit": -2, diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index 745915174ea58..f99818dbc6bb1 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -6,7 +6,7 @@ "reload_noise_volume": 10, "name": "AKM", "description": "One of the most recognizable assault rifles ever made, the AKM is renowned for its durability even under the worst conditions.", - "weight": "2710 g", + "weight": "3300 g", "volume": "1750 ml", "price": 290000, "to_hit": -1, @@ -46,7 +46,7 @@ "name_plural": "Beretta ARX-160", "//": "Total unloaded weight of gun 3000 grams. Current weight of folding stock 200 grams.", "description": "The Beretta ARX-160 was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine. It failed to replace it, but it is widely used by military all around the world. This version is chambered for 7.62x39mm.", - "weight": "2800 g", + "weight": "3450 g", "volume": "1750 ml", "price": 450000, "to_hit": -1, diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json index 1ad817a62305d..7a9dc055a6545 100644 --- a/data/json/items/gun/762R.json +++ b/data/json/items/gun/762R.json @@ -6,8 +6,9 @@ "name": "Mosin-Nagant M44", "name_plural": "Mosin-Nagant M44", "description": "The Model 44 is the carbine sized variant of the standard 1891/30. It has a shorter barrel, therefore it is weaker than the 1891/30, but easier to carry.", + "weight": "4100 g", "price": 23000, - "relative": { "weight": -500, "volume": -2, "range": -6, "ranged_damage": -3, "dispersion": 60, "barrel_length": -2 } + "relative": { "volume": -2, "range": -6, "ranged_damage": -3, "dispersion": 60, "barrel_length": -2 } }, { "id": "mosin44_ebr", @@ -16,6 +17,7 @@ "name": "Mosin-Nagant M44-EBR", "name_plural": "Mosin-Nagant M44-EBR", "description": "This carbine packs the classic Mosin-Nagant model 44 action in a modern-day stock capable of accepting modifications.", + "weight": "4330 g", "material": [ "steel", "plastic" ], "color": "light_gray", "valid_mod_locations": [ @@ -73,6 +75,7 @@ "name": "Mosin-Nagant 1891/30-EBR", "name_plural": "Mosin-Nagant 1891/30-EBR", "description": "This Mosin-Nagant has exchanged the classic wooden stock for a modern synthetic model, carefully balanced to the same weight and handling yet offering support for modern accessories.", + "weight": "4230 g", "material": [ "steel", "plastic" ], "color": "light_gray", "valid_mod_locations": [ diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json index 7b3aad011a54b..b2a196d0ac7b0 100644 --- a/data/json/items/gun/762x25.json +++ b/data/json/items/gun/762x25.json @@ -48,7 +48,7 @@ "name_plural": "Tokarev TT-33", "//": "And it's therefore expensive.", "description": "The Tokarev TT-33 is an antique Russian semiautomatic pistol, famous for its durability, accuracy, and uncomfortable grip angle. It was chambered for the 7.62x25mm due to the popularity of the C96 pistol among Russian revolutionaries.", - "weight": "798 g", + "weight": "870 g", "volume": "500 ml", "price": 100000, "to_hit": -2, diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 274a0b74924df..6db4ec28df1d3 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -8,7 +8,7 @@ "name_plural": "Calico M960", "//": "Automatic variant. Cyclic fire rate: 750 rpm", "description": "The Calico M960 is an automatic carbine with a unique circular magazine that allows for high capacities and reduced recoil.", - "weight": "1680 g", + "weight": "2270 g", "volume": "1 L", "price": 240000, "to_hit": -2, @@ -48,7 +48,7 @@ "reload_noise_volume": 10, "name": "Cx4 Storm", "description": "A small pistol caliber carbine designed for police use and civilian self-defense, the Cx4 Storm uses magazines that are interchangeable with other Beretta 9x19mm handguns.", - "weight": "2300 g", + "weight": "2580 g", "volume": "1500 ml", "price": 90000, "to_hit": -1, @@ -89,7 +89,7 @@ "type": "GUN", "name": "Glock 19", "description": "Possibly the most popular pistol in existence. The Glock 19 is often derided for its plastic construction, but it is easy to shoot.", - "weight": "595 g", + "weight": "600 g", "volume": "500 ml", "price": 69000, "to_hit": -2, @@ -113,7 +113,7 @@ "reload_noise_volume": 10, "name": "H&K MP5A2", "description": "The Heckler & Koch MP5 is one of the most widely-used submachine guns in the world, and has been adopted by special police forces and militaries alike. Its high degree of accuracy and low recoil are universally praised.", - "weight": "2550 g", + "weight": "2730 g", "volume": "2894 ml", "price": 280000, "to_hit": -2, @@ -152,6 +152,7 @@ "type": "GUN", "name": "H&K MP5SD", "description": "The H&K MP5SD offers subsonic performance in almost the same footprint as the H&K MP5, retaining its handiness. The large suppressor cuts down on muzzle flash greatly, aiding in night operations. It has also seen some popularity with SWAT teams, as it lowers the risk of fire and explosions in illegal laboratories. With body armor in more common use, the MP5SD has waned in popularity among special forces due to its decreased terminal performance.", + "weight": "3230 g", "price": 3000000, "valid_mod_locations": [ [ "accessories", 3 ], @@ -175,6 +176,7 @@ "copy-from": "hk_mp5", "name": "H&K MP5K-PDW", "description": "The Heckler & Koch MP5 is one of the most widely-used submachine guns in the world, and has been adopted by special police forces and militaries alike. Its high degree of accuracy and low recoil are universally praised. The MP5K-PDW model features a shorter barrel, a built in foregrip, and a side folding stock for vehicle or aircraft crew use.", + "weight": "2360 g", "volume": "1753 ml", "bashing": 8, "dispersion": 270, @@ -201,7 +203,7 @@ "copy-from": "hk_mp5", "name": "PTR 603", "description": "The PTR 603 is a semi-automatic copy of the famous MP5 series, domestically produced for the US market on original Heckler and Koch tooling by PTR Industries. Like the MP5, its roller delayed blowback action offers smooth shooting and precision, setting it apart from other submachine guns and pistol caliber carbines. This model is configured as a pistol to avoid inconvenient and costly NFA regulations. A welded on section of M1913 rail offers convenient mounting for aftermarket optics, but precludes the use of claw mounts.", - "relative": { "weight": -300, "volume": "-500 ml", "handling_modifier": -6 }, + "relative": { "weight": -550, "volume": "-500 ml", "handling_modifier": -6 }, "//": "Attach a pistol stock and you get a semi MP5 again.", "modes": [ [ "DEFAULT", "semi-auto", 1 ] ], "bashing": 7, @@ -228,7 +230,7 @@ "type": "GUN", "name": "H&K operational briefcase", "description": "This is a hard-sided briefcase with a trigger in the handle and a concealed hole in the side. To fire the internally mounted MP5K-PDW, one braces the briefcase at the waist, ensures the briefcase is pointed at the enemy, and squeezes the trigger. Precision and handling are severely hampered all around, however if you need to 'hand over the goods' or look low profile while bodyguarding, this is your gun. When the briefcase is open the MP5 may be reloaded or dismounted.", - "weight": "3500 g", + "weight": "3570 g", "volume": "15 L", "price": 480000, "bashing": 15, @@ -247,7 +249,7 @@ "name": "Kel-Tec SUB-2000", "name_plural": "Kel-Tec SUB-2000", "description": "A uniquely designed pistol caliber carbine with an integral folding stock and that makes use of 9x19mm Glock magazines.", - "weight": "1985 g", + "weight": "1930 g", "volume": "1750 ml", "price": 75000, "to_hit": -1, @@ -344,20 +346,20 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Beretta M9", - "description": "A very popular 9x19mm pistol, the M9 has been the standard issue sidearm of the US army since 1985.", - "weight": "590 g", - "volume": "500 ml", + "name": "Beretta M9A1", + "description": "An iconic 9x19mm pistol, the M9 was the standard issue sidearm of US armed force from 1985 only until recently. It was formerly popular amongst law enforcement before the advent of commercially available polymer-framed handguns and the FBI's adoption of .40S&W.", + "weight": "961 g", + "volume": "528 ml", "price": 65000, "to_hit": -2, "bashing": 8, - "material": [ "steel", "plastic" ], + "material": [ "steel", "aluminum" ], "symbol": "(", "color": "dark_gray", "ammo": "9mm", "range": 1, "dispersion": 480, - "durability": 6, + "durability": 7, "min_cycle_recoil": 450, "magazine_well": 1, "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ] @@ -449,7 +451,7 @@ "reload_noise_volume": 10, "name": "STEN", "description": "A British submachine gun developed during World War II, to make up for shortages of supplies. Designed to be made using unskilled labor and not known for reliability, its main advantages were low cost and being able to use German 9mm ammunition.", - "weight": "2945 g", + "weight": "3200 g", "volume": "1750 ml", "price": 40000, "bashing": 10, @@ -485,7 +487,7 @@ "name": "TEC-9", "name_plural": "TEC-9", "description": "The TEC-9 is a machine pistol made of cheap polymers and machine stamped parts. Its rise in popularity among criminals is largely due to its intimidating looks and low cost.", - "weight": "1080 g", + "weight": "1400 g", "volume": "500 ml", "price": 125000, "to_hit": -2, @@ -525,7 +527,7 @@ "name": "USP 9mm", "name_plural": "USP 9mm", "description": "A popular pistol, widely used among law enforcement. Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.", - "weight": "520 g", + "weight": "770 g", "volume": "500 ml", "price": 68000, "to_hit": -2, @@ -551,7 +553,7 @@ "name_plural": "Uzi 9mm", "//": "SMGs aren't as commercially traded as rifles/handguns/SGs, so no cite for price points. Total weight of gun 3500 grams. Current weight of folding stock 200 grams.", "description": "The Uzi 9x19mm has enjoyed immense popularity, selling more units than any other submachine gun. It is widely used as a personal defense weapon, or as a primary weapon by elite frontline forces.", - "weight": "3300 g", + "weight": "2700 g", "volume": "1250 ml", "price": 208000, "to_hit": -2, @@ -589,7 +591,7 @@ "type": "GUN", "name": "Glock 17", "description": "Designed for all shooters, the Glock 17 is marketed towards law-enforcement and military.", - "weight": "595 g", + "weight": "630 g", "volume": "500 ml", "price": 69000, "to_hit": -2, @@ -612,6 +614,7 @@ "type": "GUN", "name": "Glock 18C", "description": "A selective fire variation on the Glock 17, originally designed for Austria's EKO Cobra unit. It has compensator cuts along its barrel to make recoil more manageable.", + "weight": "620 g", "price": 100000, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ], "built_in_mods": [ "barrel_ported" ] @@ -638,7 +641,7 @@ "type": "GUN", "name": "M17", "description": "The M17 is a semi automatic, short recoil operated pistol derived from the SIG Sauer P320.", - "weight": "800 g", + "weight": "840 g", "volume": "500 ml", "price": 69000, "to_hit": -2, @@ -679,7 +682,7 @@ "type": "GUN", "name": "Walther P38", "description": "The Walther P38 is a semi-automatic handgun adopted shortly before the second world war. Developed due to the high production costs of its predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. This early DA/SA locked-breech design would introduce features later seen on more modern firearms such as the Beretta 92 series, and served Germany until 2004.", - "weight": "950 g", + "weight": "800 g", "volume": "547 ml", "price": 39000, "to_hit": -2, @@ -718,7 +721,7 @@ "type": "GUN", "name": "Hi-Point C-9", "description": "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.", - "weight": "709 g", + "weight": "820 g", "volume": "539 ml", "price": 7500, "to_hit": -2, @@ -738,7 +741,7 @@ "type": "GUN", "name": "CZ-75", "description": "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one of the original wonder nines. Though designed for export to western countries, it was declared a state secret; lack of international patent protection meant that many clones and variants were produced and distributed around the world, with Česká zbrojovka only joining in the 90's. This pistol remains wildly popular among competition shooters.", - "weight": "1120 g", + "weight": "1000 g", "volume": "526 ml", "price": 10000, "to_hit": -2, @@ -758,7 +761,7 @@ "type": "GUN", "name": "Walther CCP", "description": "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for the concealed carry consumer market. Internally, it is nearly identical to the cult classic H&K P7. Its fixed barrel design makes it potentially more accurate than many other pistols, though this may difficult to realize with its average trigger and short sight radius.", - "weight": "633 g", + "weight": "570 g", "volume": "318 ml", "price": 12500, "to_hit": -2, diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json index 6a3fd5e7c56a2..7a23a072d4faa 100644 --- a/data/json/items/gun/9x18.json +++ b/data/json/items/gun/9x18.json @@ -42,7 +42,7 @@ "name": "Skorpion Vz. 82", "//": "Total unloaded weight of gun 1451.496 grams, rounded to 1451. Current weight of folding stock 200 grams.", "description": "A version of the Skorpion submachine gun chambered in 9x18mm Makarov, with a slightly longer barrel than the original design.", - "weight": "1251 g", + "weight": "1440 g", "ammo": "9x18", "min_cycle_recoil": 270, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index d9466e90d208e..6e2a1db29ef91 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -115,8 +115,8 @@ "name": "M1014 shotgun", "name_plural": "M1014 shotguns", "description": "Benelli's first gas-operated shotgun, featuring dual pistons for enhanced reliability with various loads and a collapsible buttstock that reduces length by almost 8 inches. Adopted in 1999 as the M1014 Joint Service Combat Shotgun, the Benelli M4 is one of the finest combat shotguns available.", - "weight": "3820 g", - "volume": "2069 ml", + "weight": "3550 g", + "volume": "2500 ml", "price": 169900, "to_hit": -1, "bashing": 12, @@ -127,6 +127,7 @@ "clip_size": 8, "valid_mod_locations": [ [ "accessories", 2 ], + [ "mechanism", 4 ], [ "sling", 1 ], [ "barrel", 1 ], [ "rail mount", 1 ], @@ -145,8 +146,8 @@ "name": "Mossberg 500 Field", "name_plural": "Mossberg 500 Field", "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use. It is noted for its high durability and low recoil. This one is fitted with a 28 inch barrel with sight rib.", - "weight": "3401 g", - "volume": "2942 ml", + "weight": "3180 g", + "volume": "2500 ml", "price": 53800, "to_hit": -1, "bashing": 13, @@ -209,9 +210,12 @@ [ "accessories", 2 ], [ "sling", 1 ], [ "barrel", 1 ], + [ "grip mount", 1 ], + [ "stock mount", 1 ], [ "rail mount", 1 ], [ "loading port", 1 ], [ "brass catcher", 1 ], + [ "mechanism", 4 ], [ "sights", 1 ], [ "underbarrel mount", 1 ] ], @@ -297,7 +301,7 @@ "copy-from": "remington_870", "type": "GUN", "name": "Remington 870 MCS", - "description": "This Remington 870 Modular Combat system shotgun is currently setup for breaching operations, with a 10 inch barrel and no stock. It is small enough to carry as a secondary weapon, specifically to pop open any pesky doors you might come across. The grip's design makes for controllable yet unpleasant recoil, and the barrel lacks any sights.", + "description": "This Remington 870 Modular Combat System shotgun is currently setup for breaching operations, with a 10 inch barrel and no stock. It is small enough to carry as a secondary weapon, specifically to pop open any pesky doors you might come across. The grip's design makes for controllable yet unpleasant recoil, and the barrel lacks any sights.", "weight": "2812 g", "volume": "1427 ml", "looks_like": "remington_870", @@ -316,7 +320,6 @@ [ "bore", 1 ], [ "brass catcher", 1 ], [ "grip", 1 ], - [ "grip mount", 1 ], [ "loading port", 1 ], [ "mechanism", 4 ], [ "rail mount", 1 ], @@ -330,7 +333,7 @@ "id": "remington_870_express", "copy-from": "remington_870", "type": "GUN", - "name": "Remington 870 express", + "name": { "str": "Remington 870 express", "str_pl": "Remington 870 expresses" }, "description": "With over 10 million made, the Remington 870 is one of the most popular shotguns on the market, and finds use with hunters and law enforcement agencies alike thanks to its high accuracy and muzzle velocity. This one is an 18.5 inch barreled defensive model.", "weight": "3402 g", "volume": "2696 ml", @@ -364,6 +367,8 @@ [ "sling", 1 ], [ "brass catcher", 1 ], [ "barrel", 1 ], + [ "stock", 1 ], + [ "mechanism", 4 ], [ "rail mount", 1 ], [ "loading port", 1 ], [ "sights mount", 1 ], @@ -408,9 +413,9 @@ "type": "GUN", "name": "Saiga-12", "description": "The Saiga-12 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK47 rifle. It reloads with a magazine, rather than one shell at a time like most shotguns. It is one of the last designs of Mikhail Kalashnikov, and was popular in open division shotgun competitions prior to its ban from import via executive order.", - "weight": "3550 g", - "volume": "3279 ml", - "price": 75000, + "weight": "3600 g", + "volume": "2750 ml", + "price": 189000, "to_hit": -1, "bashing": 12, "material": [ "steel", "plastic" ], diff --git a/data/json/items/gunmod/grip.json b/data/json/items/gunmod/grip.json index 32eae74d5fa27..f32743265640d 100644 --- a/data/json/items/gunmod/grip.json +++ b/data/json/items/gunmod/grip.json @@ -15,7 +15,8 @@ "mod_targets": [ "pistol", "smg", "rifle", "shotgun", "crossbow", "launcher" ], "handling_modifier": -2, "min_skills": [ [ "weapon", 3 ] ], - "flags": [ "REDUCED_WEIGHT", "REDUCED_BASHING" ] + "weight_multiplier": 0.75, + "flags": [ "REDUCED_BASHING" ] }, { "id": "pistol_grip", diff --git a/data/json/items/gunmod/laser_gunmods.json b/data/json/items/gunmod/laser_gunmods.json index 1d44d81c4b3c2..91651a8f41c8c 100644 --- a/data/json/items/gunmod/laser_gunmods.json +++ b/data/json/items/gunmod/laser_gunmods.json @@ -20,7 +20,7 @@ { "id": "focusing_lens", "type": "GUNMOD", - "name": "focusing lens", + "name": { "str": "focusing lens", "str_pl": "focusing lenses" }, "description": "A set of optics to concentrate the laser beam on a smaller focus point. This increases range and damage output, but complicates targeting.", "weight": "380 g", "volume": "250 ml", diff --git a/data/json/items/items_holiday.json b/data/json/items/items_holiday.json index 84507be637bd9..a8d7f1ca215fc 100644 --- a/data/json/items/items_holiday.json +++ b/data/json/items/items_holiday.json @@ -49,5 +49,20 @@ "menu_text": "Extinguish" }, "flags": [ "LIGHT_6", "TRADER_AVOID" ] + }, + { + "id": "decorative_wreath", + "type": "TOOL", + "name": "yule wreath", + "description": "This decorative wreath can be deployed as furniture to decorate for the winter holidays.", + "weight": "1814 g", + "volume": "4 L", + "price": 100, + "to_hit": -2, + "material": "wood", + "symbol": "0", + "color": "green", + "looks_like": "plate", + "use_action": { "type": "deploy_furn", "furn_type": "f_winter_wreath" } } ] diff --git a/data/json/items/melee.json b/data/json/items/melee.json index 2eecb98fd47b4..144c9e295d29e 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -63,7 +63,7 @@ "volume": "1 L", "bashing": 13, "cutting": 7, - "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE" ], + "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ], "to_hit": 1, "category": "weapons", "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ] @@ -541,7 +541,7 @@ "price": 1050, "price_postapoc": 300, "material": [ "aluminum", "wood" ], - "flags": "NONCONDUCTIVE", + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], "weight": "2068 g", "volume": "3250 ml", @@ -563,7 +563,7 @@ "volume": "2500 ml", "bashing": 16, "cutting": 24, - "flags": [ "NONCONDUCTIVE" ], + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], "to_hit": 1, "category": "weapons", @@ -619,7 +619,7 @@ "color": "dark_gray", "qualities": [ [ "DIG", 2 ], [ "AXE", 1 ], [ "CUT", 1 ], [ "BUTCHER", -11 ], [ "COOK", 1 ] ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], - "flags": [ "NEEDS_UNFOLD", "BELT_CLIP" ] + "flags": [ "NEEDS_UNFOLD", "BELT_CLIP", "SHEATH_AXE" ] }, { "id": "tazer", @@ -664,7 +664,7 @@ "color": "light_gray", "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -20 ] ], - "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ] + "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_AXE" ] }, { "id": "ax", @@ -682,6 +682,6 @@ "color": "light_gray", "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -36 ] ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], - "flags": [ "NONCONDUCTIVE" ] + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ] } ] diff --git a/data/json/items/melee/knives_kitchen.json b/data/json/items/melee/knives_kitchen.json index 08bf943232987..03be51eec5b49 100644 --- a/data/json/items/melee/knives_kitchen.json +++ b/data/json/items/melee/knives_kitchen.json @@ -1,7 +1,7 @@ [ { "id": "base_kitchen_knife", - "name": "generic kitchen knife", + "name": { "str": "generic kitchen knife", "str_pl": "generic kitchen knives" }, "description": "generic item template", "type": "TOOL", "material": "steel", diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index b4020bee00c43..9d277916da7da 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -431,7 +431,7 @@ "reload_noise_volume": 10, "name": "homemade laser pistol", "description": "This laser pistol was based on the V29 laser pistol designed in the mid-21st century. While little more than duct tape and electronics, it runs on a standard UPS.", - "weight": 540, + "weight": "540 g", "volume": "2 L", "price": 500000, "to_hit": -2, @@ -765,7 +765,7 @@ { "type": "GENERIC", "id": "lily_flower", - "name": "lily", + "name": { "str": "lily", "str_pl": "lilies" }, "description": "A lily stalk with some petals.", "weight": "40 g", "to_hit": -3, @@ -791,7 +791,7 @@ { "type": "GENERIC", "id": "lotus_flower", - "name": "lotus", + "name": { "str": "lotus", "str_pl": "lotuses" }, "description": "A lotus stalk with some petals.", "weight": "40 g", "to_hit": -3, @@ -1006,5 +1006,263 @@ "damage": 130, "recoil": 875, "extend": { "effects": [ "LARGE_BEANBAG" ] } + }, + { + "id": "schematics_chickenbot", + "type": "BOOK", + "name": "chicken walker schematics", + "name_plural": "chicken walker schematics", + "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the chicken walker. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" + }, + { + "id": "schematics_tankbot", + "type": "BOOK", + "name": "tank drone schematics", + "name_plural": "tank drone schematics", + "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the tank drone. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" + }, + { + "id": "schematics_tripod", + "type": "BOOK", + "name": "tripod schematics", + "name_plural": "tripod schematics", + "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" + }, + { + "id": "bot_chickenbot", + "type": "TOOL", + "name": "inactive chicken walker", + "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "120000 g", + "volume": "92500 ml", + "price": 50000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_chickenbot", + "friendly_msg": "The chicken walker rises to its feet, sways away from you and begins surveying the area.", + "hostile_msg": "The chicken walker whirrs and aims directly at you. Take cover!", + "//": "Milspec, but was deployed in active service implying a reliable IFF", + "difficulty": 9, + "moves": 250, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "bot_tankbot", + "looks_like": "broken_tankbot", + "type": "TOOL", + "name": "inactive tank drone", + "description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "200000 g", + "//": "cheating a bit with the volume due to lack of proper vehicle storage options", + "volume": "250 L", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_tankbot", + "friendly_msg": "The tank drone rolls out and begins acquiring targets.", + "hostile_msg": "The tank drone swivels its turret and aims directly at you. Don your brown pants!", + "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a robo-tank?", + "difficulty": 10, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "broken_chickenbot", + "looks_like": "broken_tripod", + "type": "TOOL", + "name": "inactive chicken walker", + "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "190000 g", + "//": "cheating a bit with the volume due to lack of proper vehicle storage options", + "volume": "250 L", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_chickenbot", + "friendly_msg": "The chicken bot rolls out and begins acquiring targets.", + "hostile_msg": "The chicken bot swivels its turret and aims directly at you. Don your brown pants!", + "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a chicken walker?", + "difficulty": 10, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "bot_tripod", + "looks_like": "broken_tripod", + "type": "TOOL", + "name": "inactive tripod", + "description": "This is an inactive Honda Regnal. Using this item involves placing it on the ground, wondering how it fuels its flamethrower and turning it on. If reprogrammed and rewired successfully the tribot will then identify you as an ally, roam around or follow you, and impale hostiles with its spiked cable weapons.", + "weight": "120000 g", + "volume": "92500 ml", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_tripod", + "friendly_msg": "The tribot rises to its feet and scans the area for contaminants.", + "hostile_msg": "The tribot glowers down at you and ignites its flamethrower. Turns out you hate the smell of napalm.", + "//": "No observed open deployment, likely a prototype or secret project", + "difficulty": 15, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "type": "GENERIC", + "id": "broken_tripod", + "symbol": ",", + "color": "green", + "name": "broken tribot", + "category": "other", + "description": "A broken tribot. Now that its legs lie broken and immobile, the world seems a little less threatening. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "430000 g", + "volume": "187500 ml", + "bashing": 10, + "cutting": 6, + "to_hit": -2, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "broken_tankbot", + "symbol": ",", + "color": "green", + "name": "broken tank drone", + "category": "other", + "description": "A broken tank drone. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "1223850 g", + "volume": "875 L", + "bashing": 20, + "cutting": 15, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "broken_chickenbot", + "symbol": ",", + "color": "green", + "name": "broken chickenbot", + "category": "other", + "description": "A broken chicken walker. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "1023850 g", + "volume": "1100 L", + "bashing": 20, + "cutting": 15, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "tripod_chassis", + "name": "tripod chassis", + "name_plural": "tripod chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the tripod.", + "symbol": "c", + "color": "light_gray", + "weight": "40000 g", + "volume": "70000 ml", + "price": 200000, + "material": [ "steel" ], + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "chickenbot_chassis", + "name": "chicken walker chassis", + "name_plural": "chicken walker chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the chicken walker.", + "symbol": "c", + "color": "light_gray", + "weight": "60000 g", + "volume": "80000 ml", + "price": 300000, + "material": [ "steel" ], + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "tankbot_chassis", + "name": "Beagle chassis", + "name_plural": "Beagle chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Beagle tank.", + "symbol": "c", + "color": "light_gray", + "weight": "150000 g", + "volume": "575000 ml", + "price": 1000000, + "material": [ "steel" ], + "category": "spare_parts" + }, + { + "id": "TANK", + "looks_like": "m79", + "type": "GUN", + "symbol": "(", + "color": "green", + "name": "Tankbot Main Gun", + "name_plural": "Tankbot Main Gun", + "description": "The 120mm cannon from a tankbot. If you have this, you'd best be debugging!", + "price": 99999999, + "material": "steel", + "skill": "launcher", + "ammo": "120mm", + "weight": "2500 g", + "volume": "2500 ml", + "bashing": 6, + "to_hit": -3, + "dispersion": 60, + "durability": 9, + "clip_size": 1, + "loudness": 300 + }, + { + "type": "GENERIC", + "id": "spidery_legs_big", + "name": "set of spidery legs", + "name_plural": "sets of spidery legs", + "description": "A set of big pointy legs, like the ones found under a tripod.", + "symbol": "W", + "color": "light_gray", + "weight": "40000 g", + "volume": "20 L", + "price": 200000, + "material": "steel", + "category": "spare_parts" } ] diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index f176c72a8eb4b..3da285fbdbe4e 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -203,28 +203,6 @@ [ "underbarrel mount", 1 ] ] }, - { - "id": "TANK", - "looks_like": "m79", - "type": "GUN", - "symbol": "(", - "color": "green", - "name": "Tankbot Main Gun", - "name_plural": "Tankbot Main Gun", - "description": "The 120mm cannon from a tankbot. If you have this, you'd best be debugging!", - "price": 99999999, - "material": "steel", - "skill": "launcher", - "ammo": "120mm", - "weight": "2500 g", - "volume": "2500 ml", - "bashing": 6, - "to_hit": -3, - "dispersion": 60, - "durability": 9, - "clip_size": 1, - "loudness": 300 - }, { "id": "plasma_rifle", "looks_like": "ar15", diff --git a/data/json/items/resources/fasteners.json b/data/json/items/resources/fasteners.json index 9d442a606f0bf..45bd9b2dfff88 100644 --- a/data/json/items/resources/fasteners.json +++ b/data/json/items/resources/fasteners.json @@ -81,7 +81,7 @@ "category": "spare_parts", "name": "short plastic zipper", "description": "A short zipper made from plastic, usually found on footwear or clothing pockets.", - "weight": 4, + "weight": "4 g", "volume": "4 ml", "price": 100, "material": [ "plastic", "cotton" ], diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 797a67967be8b..120f4d8efe35d 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -148,7 +148,7 @@ "name": "zinc", "name_plural": "zinc", "description": "A slightly brittle metal. Apart from being an essential mineral that the body needs, it reacts readily with acids, alkalis and other non-metals. It can be crushed to make zinc powder, used in the production of batteries, among other things.", - "weight": 7, + "weight": "7 g", "volume": "50ml", "price": 3000, "price_postapoc": 75, diff --git a/data/json/items/robot_parts.json b/data/json/items/robot_parts.json index 37d22cda8344e..e4038e17414b4 100644 --- a/data/json/items/robot_parts.json +++ b/data/json/items/robot_parts.json @@ -50,7 +50,7 @@ { "type": "GENERIC", "id": "self_monitoring_module", - "name": "self monitoring sensors", + "name": { "str": "self monitoring sensors", "str_pl": "self monitoring sensors" }, "description": "A array of sensors and diagnostic modules allowing the robot to perceive itself.", "copy-from": "robot_module_abstract" }, @@ -83,20 +83,6 @@ "description": "This system can operate most conventional weapons.", "copy-from": "robot_module_abstract" }, - { - "type": "GENERIC", - "id": "spidery_legs_big", - "name": "set of spidery legs", - "name_plural": "sets of spidery legs", - "description": "A set of big pointy legs, like the ones found under a tripod.", - "symbol": "W", - "color": "light_gray", - "weight": "40000 g", - "volume": "20 L", - "price": 200000, - "material": "steel", - "category": "spare_parts" - }, { "type": "GENERIC", "id": "spidery_legs_small", @@ -209,34 +195,6 @@ "material": [ "steel", "plastic" ], "category": "spare_parts" }, - { - "type": "GENERIC", - "id": "tripod_chassis", - "name": "tripod chassis", - "name_plural": "tripod chassis", - "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the tripod.", - "symbol": "c", - "color": "light_gray", - "weight": "40000 g", - "volume": "70000 ml", - "price": 200000, - "material": [ "steel" ], - "category": "spare_parts" - }, - { - "type": "GENERIC", - "id": "chickenbot_chassis", - "name": "chicken walker chassis", - "name_plural": "chicken walker chassis", - "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the chicken walker.", - "symbol": "c", - "color": "light_gray", - "weight": "60000 g", - "volume": "80000 ml", - "price": 300000, - "material": [ "steel" ], - "category": "spare_parts" - }, { "type": "GENERIC", "id": "copbot_chassis", @@ -263,19 +221,5 @@ "price": 100000, "material": [ "steel", "plastic" ], "category": "spare_parts" - }, - { - "type": "GENERIC", - "id": "tankbot_chassis", - "name": "Beagle chassis", - "name_plural": "Beagle chassis", - "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Beagle tank.", - "symbol": "c", - "color": "light_gray", - "weight": "150000 g", - "volume": "575000 ml", - "price": 1000000, - "material": [ "steel" ], - "category": "spare_parts" } ] diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json index 545a15cfd1fae..bc74b04e9482b 100644 --- a/data/json/items/tool/deployable.json +++ b/data/json/items/tool/deployable.json @@ -173,7 +173,7 @@ "to_hit": -4, "bashing": 7, "material": [ "wood" ], - "looks_like": [ "f_wood_keg" ], + "looks_like": "f_wood_keg", "symbol": "u", "color": "light_gray", "use_action": { "type": "deploy_furn", "furn_type": "f_butter_churn" }, diff --git a/data/json/items/tool/handloading.json b/data/json/items/tool/handloading.json index 0ddb9a3d90fc5..cd64a3f65a18a 100644 --- a/data/json/items/tool/handloading.json +++ b/data/json/items/tool/handloading.json @@ -2,9 +2,9 @@ { "id": "press", "type": "TOOL", - "name": "hand press", + "name": { "str": "hand press", "str_pl": "hand presses" }, "description": "This is a small hand press for hand loading firearm ammunition. It comes with everything you need to start hand loading your own munitions.", - "weight": 6350, + "weight": "6350 g", "volume": "500 ml", "price": 10000, "to_hit": -2, @@ -16,9 +16,9 @@ { "id": "press_dowel", "type": "TOOL", - "name": "makeshift shotshell 'press'", + "name": { "str": "makeshift shotshell 'press'", "str_pl": "makeshift shotshell 'presses'" }, "description": "This is a collection of items improvised for field reloading of shotshells. A plank with a hole cut in the center, a medium sized nail, and a whittled dowel are used to seat wads, decap primers, and reprime (carefully!) hulls. Powder and shot are measured with a cut down fired shotshell. The opposite side of the plank has been shaped to allow for roll crimping of the plastic hulls. There's no provision for resizing, so reloaded hulls will fire best in the firearm they were fired from.", - "weight": 348, + "weight": "348 g", "volume": "250 ml", "price": 600, "to_hit": -2, @@ -33,7 +33,7 @@ "type": "TOOL", "name": "kinetic bullet puller", "description": "This is a tool used for properly disassembling firearm ammunition.", - "weight": 489, + "weight": "489 g", "volume": "250 ml", "price": 1000, "bashing": 5, diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index c44998f2aeb70..91f065b64932f 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -65,7 +65,7 @@ "type": "ARMOR", "name": "welding mask", "description": "A plastic mask with a very dark visor, meant to protect the entire face while welding. It also serves as somewhat good armor, but makes it hard to see. Activate it to push it up your head.", - "weight": 1000, + "weight": "1 kg", "volume": "4 L", "price": 1400, "to_hit": -3, @@ -86,7 +86,7 @@ "type": "ARMOR", "name": "crude welding mask", "description": "A crude welding mask made from shaped steel. It's less dark than a proper welding mask, and therefore less difficult to see in, but also less protective when welding. Activate it to push it up your head.", - "weight": 4000, + "weight": "4 kg", "volume": "4 L", "price": 1000, "to_hit": -3, @@ -113,7 +113,7 @@ "name": "crude welding mask (raised)", "name_plural": "crude welding masks (raised)", "description": "A crude welding mask made from shaped steel. It's less dark than a proper welding mask, and therefore less difficult to see in, but also less protective when welding. Activate it to lower it over your face.", - "weight": 4000, + "weight": "4 kg", "volume": "4 L", "price": 1000, "to_hit": -3, @@ -138,7 +138,7 @@ "name": "welding mask (raised)", "name_plural": "welding masks (raised)", "description": "A plastic mask with a very dark visor, meant to protect the entire face while welding. It also serves as somewhat good armor, but makes it hard to see. Activate it to lower it over your face.", - "weight": 1000, + "weight": "1 kg", "volume": "4 L", "price": 1400, "to_hit": -3, @@ -2736,7 +2736,7 @@ "id": "scuba_tank_on", "type": "TOOL_ARMOR", "category": "other", - "name": "scuba tank (on)", + "name": { "str": "scuba tank (on)", "str_pl": "scuba tanks (on)" }, "description": "This is a high-pressure 232 bar diving tank that can contain up to 12L of compressed mixture of oxygen and nitrogen. It is equipped with a on-demand regulator and a mouthpiece designed mostly for underwater use.", "looks_like": "oxygen_tank", "weight": "16000 g", @@ -2791,7 +2791,7 @@ "id": "small_scuba_tank_on", "type": "TOOL_ARMOR", "category": "other", - "name": "small scuba tank (on)", + "name": { "str": "small scuba tank (on)", "str_pl": "small scuba tanks (on)" }, "description": "This is a small high-pressure 200 bar backup diving tank, that can contain 4L of compressed mixture of oxygen and nitrogen. It is equipped with a on-demand regulator and a mouthpiece designed mostly for underwater use.", "looks_like": "smoxygen_tank", "weight": "7000 g", diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 40f6faf56e58f..772ffb8685549 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -883,8 +883,8 @@ "category": "tools", "name": "sieve", "description": "This is no mere strainer for noodles; it's a sieve used to separate particles of certain sizes. You could use this to do a really good job sifting flour, remove dust and soil from grain, or perhaps conduct gradiation tests for any civil engineers you might know. This one has been constructed from steel mesh.", - "weight": 318, - "volume": 2, + "volume": "500 ml", + "weight": "318 g", "price": 700, "bashing": 2, "material": [ "steel" ], @@ -897,7 +897,7 @@ "category": "tools", "name": "wicker sieve", "description": "This is a primitive sieve constructed from woven strips of plant material. Early sieves like this were used to sift grain, though the openings on this one are too small for that.", - "weight": 50, + "weight": "50 g", "volume": "500 ml", "price": 300, "bashing": 1, @@ -1466,7 +1466,7 @@ "color": "brown", "qualities": [ [ "AXE", 1 ], [ "BUTCHER", -44 ] ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], - "flags": [ "NONCONDUCTIVE" ] + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ] }, { "id": "copper_knife", @@ -1577,7 +1577,7 @@ "volume": "1 L", "bashing": 13, "cutting": 7, - "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE" ], + "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ], "to_hit": 1, "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "PRY", 2 ], [ "BUTCHER", 16 ] ] }, @@ -1814,7 +1814,7 @@ { "id": "tindalos_whistle", "type": "TOOL", - "name": "Whistle of Tindalos", + "name": { "str": "Whistle of Tindalos", "str_pl": "Whistles of Tindalos" }, "description": "Who is this Tindalos guy?", "weight": "22 g", "volume": 0, @@ -2270,7 +2270,7 @@ "color": "light_gray", "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], "qualities": [ [ "AXE", 2 ], [ "PRY", 3 ], [ "BUTCHER", -30 ] ], - "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "BELT_CLIP" ], + "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "BELT_CLIP", "SHEATH_AXE" ], "use_action": "CROWBAR" }, { @@ -3244,7 +3244,7 @@ "techniques": [ "WBLOCK_1" ], "qualities": [ [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "PRY", 2 ] ], "use_action": "CROWBAR", - "flags": [ "DURABLE_MELEE", "BELT_CLIP" ] + "flags": [ "DURABLE_MELEE", "BELT_CLIP", "SHEATH_AXE" ] }, { "id": "jackhammer", @@ -3647,9 +3647,9 @@ "id": "makeshift_crowbar", "type": "TOOL", "name": "makeshift crowbar", - "description": "This is a pipe whose ends have been bent and hammered flat to resemble a crowbar. Use it to open locked doors without destroying them, or to lift manhole covers. You could also wield it to fight with, in a pinch.", - "weight": "762 g", - "volume": "1500 ml", + "description": "This is a pipe whose ends have been bent and hammered flat to resemble a crowbar. Use it to open locked crates without destroying them, or to lift manhole covers. You could also wield it to fight with, in a pinch.", + "weight": "1250 g", + "volume": "1 L", "price": 0, "to_hit": 2, "bashing": 12, @@ -3657,7 +3657,7 @@ "material": "steel", "symbol": ";", "color": "dark_gray", - "qualities": [ [ "PRY", 2 ], [ "HAMMER", 1 ] ], + "qualities": [ [ "PRY", 1 ], [ "HAMMER", 1 ] ], "use_action": "CROWBAR", "techniques": [ "WBLOCK_1" ], "flags": [ "BELT_CLIP" ] @@ -4026,7 +4026,7 @@ { "id": "brush", "type": "TOOL", - "name": "scrub brush", + "name": { "str": "scrub brush", "str_pl": "scrub brushes" }, "description": "This is a simple scrub brush.", "weight": "70 g", "volume": "250 ml", @@ -4526,7 +4526,7 @@ "color": "dark_gray", "use_action": "PICKAXE", "techniques": [ "WBLOCK_1" ], - "flags": [ "SPEAR", "DURABLE_MELEE", "NONCONDUCTIVE", "DIG_TOOL" ] + "flags": [ "SPEAR", "DURABLE_MELEE", "NONCONDUCTIVE", "DIG_TOOL", "SHEATH_AXE" ] }, { "id": "picklocks", @@ -4772,7 +4772,7 @@ "symbol": "/", "color": "light_gray", "qualities": [ [ "AXE", 1 ], [ "BUTCHER", -70 ] ], - "flags": [ "BELT_CLIP" ] + "flags": [ "BELT_CLIP", "SHEATH_AXE" ] }, { "id": "primitive_hammer", @@ -6271,7 +6271,7 @@ "id": "tool_rocket_candy", "type": "TOOL", "category": "weapons", - "name": "rocket candy", + "name": { "str": "rocket candy", "str_pl": "rocket candies" }, "description": "A pear-shaped chunk of rocket candy obtained by heating saltpeter with sugar and casting the obtained liquid. Can serve as a rocket fuel, but also as a smokescreen - if you lit the narrow end, you should be able to throw it before the flame reaches the broad end.", "weight": "250 g", "volume": "250 ml", @@ -6295,7 +6295,7 @@ "id": "tool_rocket_candy_act", "type": "TOOL", "category": "weapons", - "name": "burning rocket candy", + "name": { "str": "burning rocket candy", "str_pl": "burning rocket candies" }, "description": "This is a chunk of rocket candy that has been lit on fire and burns with a loud hiss, spewing forth large amounts of smoke.", "weight": "250 g", "volume": "250 ml", @@ -6335,6 +6335,38 @@ "material": "steel", "symbol": ";", "color": "red", + "qualities": [ + [ "CUT", 1 ], + [ "HAMMER", 3 ], + [ "SAW_M", 2 ], + [ "SAW_W", 2 ], + [ "AXE", 1 ], + [ "WRENCH", 2 ], + [ "SCREW", 1 ], + [ "PRY", 1 ], + [ "HAMMER_FINE", 1 ], + [ "SAW_M_FINE", 1 ], + [ "WRENCH_FINE", 1 ], + [ "SCREW_FINE", 1 ], + [ "BUTCHER", 11 ] + ], + "use_action": [ "HAMMER", "CROWBAR" ] + }, + { + "id": "toolbox_workshop", + "type": "TOOL", + "name": "workshop toolbox", + "name_plural": "workshop toolboxes", + "description": "This is a stout metal box containing a complete tool kit suitable for most household maintenance and construction activities, as well as additional tools used in workshops for advanced fabrication jobs.", + "looks_like": "toolbox", + "weight": "3994 g", + "volume": "2500 ml", + "price": 14099, + "to_hit": -2, + "bashing": 8, + "material": "steel", + "symbol": ";", + "color": "red", "qualities": [ [ "CUT", 1 ], [ "HAMMER", 3 ], @@ -7277,7 +7309,8 @@ "material": "stone", "symbol": ";", "color": "light_gray", - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ], [ "SAW_W", 1 ], [ "AXE", 1 ], [ "HAMMER", 1 ] ] + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ], [ "SAW_W", 1 ], [ "AXE", 1 ], [ "HAMMER", 1 ] ], + "flags": [ "SHEATH_AXE" ] }, { "id": "makeshift_axe", @@ -7285,7 +7318,8 @@ "type": "TOOL", "name": "metal hand axe", "description": "This is a chunk of steel with one edge hammered down to something resembling a cutting edge. It works passably well as an axe but really can't compare to a proper axe.", - "material": "steel" + "material": "steel", + "flags": [ "SHEATH_AXE" ] }, { "id": "pin_reamer", @@ -7394,7 +7428,8 @@ "to_hit": -2, "bashing": 6, "material": "steel", - "use_action": { "type": "weigh_self", "max_weight": 150000 } + "use_action": { "type": "weigh_self", "max_weight": 150000 }, + "flags": [ "ALLOWS_REMOTE_USE" ] }, { "id": "acetylene_machine", diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json index 7d768c047c106..4bc739945d5c4 100644 --- a/data/json/items/vehicle/battery.json +++ b/data/json/items/vehicle/battery.json @@ -50,7 +50,7 @@ "name": "large storage battery", "name_plural": "large storage batteries", "description": "A huge storage battery containing many lithium ion cells. Holds a tremendous amount of energy. Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.", - "weight": 400000, + "weight": "400 kg", "volume": "50 L", "price": 400000, "price_postapoc": 50000, diff --git a/data/json/items/vehicle/lights.json b/data/json/items/vehicle/lights.json index 5ebd6fe306491..02f39326aad75 100644 --- a/data/json/items/vehicle/lights.json +++ b/data/json/items/vehicle/lights.json @@ -52,7 +52,7 @@ "id": "wide_headlight_reinforced", "name": "reinforced wide-angle headlight", "description": "A wide-angle vehicle headlight with a cage built around it to protect it from damage without reducing its effectiveness.", - "weight": "1400 g", + "weight": "4800 g", "volume": "1250 ml", "copy-from": "headlight_reinforced" }, diff --git a/data/json/items/vehicle/tables.json b/data/json/items/vehicle/tables.json index 97b028be904e5..52c76358d6f90 100644 --- a/data/json/items/vehicle/tables.json +++ b/data/json/items/vehicle/tables.json @@ -26,7 +26,7 @@ { "type": "GENERIC", "id": "workbench", - "name": "workbench", + "name": { "str": "workbench", "str_pl": "workbenches" }, "description": "A sturdy workbench built out of metal. It is perfect for crafting large and heavy things.", "weight": "23000 g", "material": [ "steel" ], diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json index 5d756050043d5..4b9654a0b14cc 100644 --- a/data/json/items/vehicle/wheel.json +++ b/data/json/items/vehicle/wheel.json @@ -5,7 +5,7 @@ "category": "veh_parts", "name": "light wheel mount", "description": "A piece of metal with holes suitable for a bike or motorbike wheel.", - "weight": 150, + "weight": "150 g", "volume": "250 ml", "price": 10, "material": [ "steel" ], @@ -16,9 +16,9 @@ "id": "wheel_mount_medium", "type": "GENERIC", "category": "veh_parts", - "name": "medium wheel hub assembly", + "name": { "str": "medium wheel hub assembly", "str_pl": "medium wheel hub assemblies" }, "description": "A metal assembly that allows bolting a wheel on a car. Fit for a car wheel.", - "weight": 5000, + "weight": "5 kg", "volume": "6 L", "price": 3000, "bashing": 14, @@ -31,9 +31,9 @@ "id": "wheel_mount_heavy", "type": "GENERIC", "category": "veh_parts", - "name": "heavy wheel hub assembly", + "name": { "str": "heavy wheel hub assembly", "str_pl": "heavy wheel hub assemblies" }, "description": "A heavy metal assembly that allows bolting a wheel on a car. Fit for a large car wheel.", - "weight": 6000, + "weight": "6 kg", "volume": "7 L", "price": 5000, "bashing": 14, @@ -152,6 +152,23 @@ "diameter": 4, "width": 1 }, + { + "id": "wheel_10", + "category": "veh_parts", + "type": "WHEEL", + "name": { "str": "set of wheels", "str_pl": "sets of wheels" }, + "description": "A set of four small wheels with tough rubber tires.", + "weight": "4 kg", + "volume": "4 L", + "price": 14000, + "bashing": 6, + "to_hit": -1, + "material": [ "steel", "plastic" ], + "symbol": "]", + "color": "dark_gray", + "diameter": 10, + "width": 4 + }, { "id": "wheel_metal", "category": "veh_parts", @@ -188,7 +205,7 @@ }, { "id": "wheel_rail_small_pair", - "name": "pair of small rail wheels", + "name": { "str": "pair of small rail wheels", "str_pl": "pairs of small rail wheels" }, "type": "WHEEL", "description": "A pair of small rail wheels. It fits small railroad rails found in places like amusement parks. Mostly for hobby purposes rather then transportation.", "copy-from": "wheel_rail", diff --git a/data/json/items/vehicle_parts.json b/data/json/items/vehicle_parts.json index 60fd123b72f37..781f5cf511b21 100644 --- a/data/json/items/vehicle_parts.json +++ b/data/json/items/vehicle_parts.json @@ -95,7 +95,7 @@ { "id": "yoke_harness", "type": "WHEEL", - "name": "yoke and harness", + "name": { "str": "yoke and harness", "str_pl": "yokes and harnesses" }, "category": "veh_parts", "description": "A bar and harness to attach a creature to a wheeled vehicle, they then should be able to pull it.", "weight": "1000 g", diff --git a/data/json/mapgen/city_blocks/city_block_2.json b/data/json/mapgen/city_blocks/city_block_2.json new file mode 100644 index 0000000000000..fdfb627b61eb6 --- /dev/null +++ b/data/json/mapgen/city_blocks/city_block_2.json @@ -0,0 +1,315 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "city_block2_1", "city_block2_2", "city_block2_3", "city_block2_4" ] ], + "weight": 250, + "object": { + "fill_ter": "t_floor", + "rows": [ + "..MMMsssMMMss|ooooo|+||~~$M|o+o|...sss...|o+o|M.M.X.s|oo|+|oo|s.X.M$~~$ss|ooooooooo|MMMsssMMMsss", + ".|ooo|+|ooo|s|y JE F|~~||| |o|sss>|o| yH|o|2 R|>|R 2 |--sssoRHy 2 |ooo|||ooo|--", + "-|2 3 |>| |--|4 ||!|!|| 4 | R|!|R |-->|o|y |2 yHR|s-", + "-| |!| |--| 9 |9 | ! ! |--s! | !ss", + "-| | | |--| | | %%| |%% |--s|E | R|>s", + "-| ! ! AA|--| | | %t|||t% |---|K | R|||", + "-| y|||%%Q YJJJ|--@ DLD R%%%%|%%%%R DD | * j|j * |---|K JA %%%%%%| l|", + "-| A AA Y|Ttj%Q n@--@ DLD R%tjT|Tjt%R LL | RR%TT|TT%RR @---|n J *7 | DLD J K@", + "-|JJJJJJ Q|T * i|--| * T|T * DD | %%%%%|%%%%% |---|i JA % | DLD AJ n@", + "-|Q Q|%%%%*% KKl|--@y %%%%%%|%%%%%% y| *7 |6 * |---|K % | DLD AJ i@", + "-|lKinKK Q|1 %*%%%|--|Y *8 |1 * Y|LD % | % AL|---|% %% % |y J K@", + "-|%%%%%% R| %7 |--|Q l% | %l Q|LD % | % AL@---|Q Q% %%%%%%|%%%%%% Q|", + "-|1 * R| % |--|Q K% | %K Q|LD % | %y AL|-;;|QQQ% *8 |1 * QQQ|", + "-| %%*%| % @--|Q K% | %K Q| %%%%%|%%%%% |-;S|%%%% % | %%*%|||", + "-@ %j t| % |--|KinK% | %KinK|Q *7 |6 * Y|-;;|jYt% % | %j t|S-", + "-| % ||@|@|||@|||--||@@||||@|||||@|||||@||Q K% | %Q K|--;@ * % | % y@;-", + "-| %TTy|S;;;;----------------;;S;S;;-------@Y K% | %Q K@--;|TTy% % | %YTT|;-", + "-||@|@|||@||;;--------------------;;;;;--------|lniK% | %linK|--;|||||||||@|||||@|||||||;-", + "--------;;;;;;---------------------------------||@|||||@|||@@||||@||----------------------------", + "----------------------------------------------------;;;;;S;;;-----------------------------------", + "------------------------------------------------------------------------------------------------", + "------------------------------------------------------------------------------------------------", + "------------------------------------------------------------------------------------------------", + "------------------------------------------------------------------------------------------------" + ], + "palettes": [ "city_block_foundation_palette" ], + "terrain": { "%": "t_wall_w" }, + "nested": { + "1": { + "chunks": [ + [ "bedroom_5x5_adult_N_1", 20 ], + [ "bedroom_5x5_adult_S_1", 20 ], + [ "bedroom_5x5_adult_W_1", 20 ], + [ "bedroom_5x5_adult_N_2", 20 ], + [ "bedroom_5x5_adult_E_2", 20 ], + [ "bedroom_5x5_adult_N_2", 20 ], + [ "bedroom_5x5_adult_N_2", 20 ], + [ "bedroom_5x5_adult_S_2", 20 ] + ] + }, + "2": { "chunks": [ [ "livingroom_5x5_E_1", 20 ], [ "livingroom_5x5_W_1", 20 ], [ "livingroom_5x5_E_2", 20 ] ] }, + "3": { "chunks": [ [ "bonus_room_3x3_4", 20 ], [ "bonus_room_3x3_N_6", 20 ], [ "bonus_room_3x3_N_8", 20 ] ] }, + "4": { + "chunks": [ + [ "livingroom_5x5_E_1", 20 ], + [ "livingroom_5x5_E_2", 20 ], + [ "bonus_room_3x3_5", 20 ], + [ "bonus_room_3x3_E_5", 20 ], + [ "bonus_room_2x2_1", 20 ] + ] + }, + "5": { + "chunks": [ + [ "bonus_room_3x3_E_5", 20 ], + [ "bonus_room_3x3_N_6", 20 ], + [ "bonus_room_3x3_S_6", 20 ], + [ "bonus_room_3x3_W_6", 20 ], + [ "bonus_room_3x3_N_8", 20 ], + [ "bonus_room_3x3_E_8", 20 ], + [ "bonus_room_3x3_E_6", 20 ] + ] + }, + "6": { + "chunks": [ + [ "bedroom_4x4_adult_1_W", 20 ], + [ "bedroom_4x4_adult_1_S", 20 ], + [ "bedroom_4x4_adult_2_N", 20 ], + [ "bedroom_4x4_adult_2_W", 20 ], + [ "bedroom_4x4_adult_2_E", 20 ], + [ "bedroom_4x4_adult_2_S", 20 ], + [ "bedroom_4x4_adult_3_S", 20 ], + [ "bedroom_4x4_adult_3_N", 20 ], + [ "bedroom_4x4_adult_3_E", 20 ], + [ "bedroom_4x4_adult_3_W", 20 ] + ] + }, + "7": { + "chunks": [ + [ "bedroom_4x4_adult_1_S", 20 ], + [ "bedroom_4x4_adult_3_S", 20 ], + [ "bedroom_4x4_adult_3_N", 20 ], + [ "bedroom_4x4_adult_3_E", 20 ], + [ "bedroom_4x4_adult_3_W", 20 ] + ] + }, + "8": { + "chunks": [ + [ "bedroom_5x5_adult_N_1", 20 ], + [ "bedroom_5x5_adult_S_1", 20 ], + [ "bedroom_5x5_adult_E_1", 20 ], + [ "bedroom_5x5_adult_N_2", 20 ], + [ "bedroom_5x5_adult_S_2", 20 ], + [ "bedroom_5x5_adult_E_2", 20 ], + [ "bedroom_5x5_adult_W_2", 20 ] + ] + }, + "9": { "chunks": [ [ "bonus_room_3x3_S_6", 20 ], [ "bonus_room_3x3_S_8", 20 ] ] } + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines candy shop front & back 9x9 front, 3x3 back crates.", + "nested_mapgen_id": "city_block_2_candy_shop", + "object": { + "mapgensize": [ 15, 15 ], + "place_nested": [ + { "chunks": [ "city_block_9x9_candy_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_3x3_backroom_crates_candy" ], "x": 6, "y": 12 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines beauty shop front & back 9x9 front, 3x3 back crates.", + "nested_mapgen_id": "city_block_2_beauty_shop", + "object": { + "mapgensize": [ 15, 15 ], + "place_nested": [ + { "chunks": [ "city_block_9x9_beauty_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_3x3_backroom_crates_beauty" ], "x": 6, "y": 12 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines beauty shop front & back 9x9 front, 3x3 back crates.", + "nested_mapgen_id": "city_block_2_vitamin_shop", + "object": { + "mapgensize": [ 15, 15 ], + "place_nested": [ + { "chunks": [ "city_block_9x9_vitamin_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_3x3_backroom_crates_vitamin" ], "x": 6, "y": 12 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines cellphone shop front & back 9x9 front, 3x3 back crates.", + "nested_mapgen_id": "city_block_2_cellphone_shop", + "object": { + "mapgensize": [ 15, 15 ], + "place_nested": [ + { "chunks": [ "city_block_9x9_cellphone_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_3x3_backroom_crates_cellphone" ], "x": 6, "y": 12 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines music shop front & back 9x9 front, 3x3 back crates.", + "nested_mapgen_id": "city_block_2_music_shop", + "object": { + "mapgensize": [ 15, 15 ], + "place_nested": [ + { "chunks": [ "city_block_9x9_music_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_3x3_backroom_crates_music" ], "x": 6, "y": 12 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines electronics shop front & back 9x9 front, 3x3 back crates.", + "nested_mapgen_id": "city_block_2_electronics_shop", + "object": { + "mapgensize": [ 15, 15 ], + "place_nested": [ + { "chunks": [ "city_block_9x9_electronics_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_3x3_backroom_crates_electronics" ], "x": 6, "y": 12 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines pizza shop front & back 9x9 front, 3x3 back crates.", + "nested_mapgen_id": "city_block_2_pizza_shop", + "object": { + "mapgensize": [ 15, 15 ], + "place_nested": [ + { "chunks": [ "city_block_9x9_pizza_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_3x3_backroom_crates_pizza" ], "x": 6, "y": 12 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines general shop front & back 8x8 front, 4x4 back room.", + "nested_mapgen_id": "city_block_2_clothing_shop", + "object": { + "mapgensize": [ 12, 12 ], + "place_nested": [ + { "chunks": [ "city_block_8x8_clothing_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_4x4_backroom_clothing" ], "x": 4, "y": 8 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines formal clothing shop front & back 8x8 front, 4x4 back room.", + "nested_mapgen_id": "city_block_2_formal_clothing_shop", + "object": { + "mapgensize": [ 12, 12 ], + "place_nested": [ + { "chunks": [ "city_block_8x8_formal_clothing_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_4x4_backroom_clothing_formal" ], "x": 4, "y": 8 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines leather clothing shop front & back 8x8 front, 4x4 back room.", + "nested_mapgen_id": "city_block_2_leather_clothing_shop", + "object": { + "mapgensize": [ 12, 12 ], + "place_nested": [ + { "chunks": [ "city_block_8x8_leather_clothing_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_4x4_backroom_clothing_leather" ], "x": 4, "y": 8 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "//": "combines fur clothing shop front & back 8x8 front, 4x4 back room.", + "nested_mapgen_id": "city_block_2_fur_clothing_shop", + "object": { + "mapgensize": [ 12, 12 ], + "place_nested": [ + { "chunks": [ "city_block_8x8_fur_clothing_shop_front" ], "x": 0, "y": 0 }, + { "chunks": [ "city_block_4x4_backroom_clothing_fur" ], "x": 4, "y": 8 } + ] + } + } +] diff --git a/data/json/mapgen/collapsed_tower.json b/data/json/mapgen/collapsed_tower.json index 173c6c414ef3e..f0878bb330727 100644 --- a/data/json/mapgen/collapsed_tower.json +++ b/data/json/mapgen/collapsed_tower.json @@ -182,7 +182,7 @@ { "item": "cleaning", "x": [ 11, 11 ], "y": [ 21, 22 ], "chance": 60 }, { "item": "cleaning", "x": [ 15, 15 ], "y": [ 21, 22 ], "chance": 60 } ], - "place_monster": [ { "monster": "mon_tripod", "x": [ 12, 13 ], "y": [ 20, 23 ] } ], + "place_monster": [ { "monster": "mon_talon_m202a1", "x": [ 12, 13 ], "y": [ 20, 23 ] } ], "monster": { " ": { "monster": "mon_zombie_living_wall", "chance": 20 } }, "place_monsters": [ { "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 0, 15 ], "density": 2.5 }, diff --git a/data/json/mapgen/garage.json b/data/json/mapgen/garage.json index f09175017c530..0b8dfc194b2c7 100644 --- a/data/json/mapgen/garage.json +++ b/data/json/mapgen/garage.json @@ -64,7 +64,7 @@ "p": "f_hydraulic_press", "l": "f_heavy_lathe", "t": "f_toilet", - "x": "f_crate_c", + "x": "f_utility_shelf", "h": "f_chair", "U": [ "f_dumpster", "f_recycle_bin" ] }, @@ -72,7 +72,7 @@ "L": { "item": "clothing_work_set", "chance": 55 }, "c": { "item": "mechanics", "chance": 60 }, "S": { "item": "mechanics", "chance": 80, "repeat": [ 1, 6 ] }, - "x": { "item": "mechanics", "chance": 80, "repeat": [ 1, 3 ] } + "x": { "item": "SUS_welding_gear", "chance": 80, "repeat": [ 1, 2 ] } }, "place_vehicles": [ { "vehicle": "garage", "x": [ 8, 8 ], "y": [ 9, 10 ], "chance": 25, "rotation": 90 }, @@ -263,8 +263,8 @@ " |c........c|-------+-|X", " |c.xx..xx.p|xx.+T|<..OX", " |l.xx..xx.c|x..-|----|X", - " |S.........O..xx|4UUXXX", - " |ScccccccSS|----|UXXXXX", + " |w.........O..xx|4UUXXX", + " |ScccccccwS|----|UXXXXX", " |----------|WWWWWWWWWWW", " " ], @@ -305,6 +305,7 @@ "S": "f_utility_shelf", "s": "f_sink", "t": "f_toilet", + "w": "f_utility_shelf", "x": "f_crate_c", "f": "f_filing_cabinet", "h": "f_chair", @@ -316,6 +317,7 @@ "c": { "item": "mechanics", "chance": 60 }, "S": { "item": "mechanics", "chance": 80, "repeat": [ 1, 6 ] }, "x": { "item": "mechanics", "chance": 80, "repeat": [ 1, 6 ] }, + "w": { "item": "SUS_welding_gear", "chance": 80, "repeat": [ 1, 2 ] }, "f": { "item": "office", "chance": 70, "repeat": [ 1, 6 ] }, "d": { "item": "office", "chance": 70, "repeat": [ 1, 6 ] }, "T": { "item": "cleaning", "chance": 70, "repeat": [ 1, 6 ] } diff --git a/data/json/mapgen/hazardous_waste_sarcophagus.json b/data/json/mapgen/hazardous_waste_sarcophagus.json new file mode 100644 index 0000000000000..12532ead88c59 --- /dev/null +++ b/data/json/mapgen/hazardous_waste_sarcophagus.json @@ -0,0 +1,335 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "haz_sar_1_2", "haz_sar_1_1" ], [ "haz_sar_1_4", "haz_sar_1_3" ] ], + "weight": 10, + "object": { + "rows": [ + " :::::::::::::::: ", + " :::::::::::::::: ", + " :::::::::::::::: ", + " ffffffffffffffffffffffffffffffff:::::::|www- ", + " f ,,,,,,,,,,,,,,,,,,,,,, f:::::::wcdcw ", + " f ,,:::::::::;:::::::::, v f:::::::+.C6w ", + " f ,,:::::::::;:::::::::, |LLLLLLL--+--ff ", + " f ,,:::::::::;:::::::::,,,,,,,,:::::::,,,, f ", + " f ,,::::::::::::::::::::::::::::::::::,,,, f ", + " f ,,::::::::::::::::::::::::::::::::::, f ", + " f ,,::::::::::::::::::::::::::::::::::, f ", + " f ,,::::::::::::::::::::::::::::::::::, f ", + " f ,,::::;::::;::::;::::,,,,,,,,:::::::, f ", + " f ,,::::;::::;::::;::::,,,,,,,,:::::::, f ", + " f ,,::::;::::;::::;::::,,|-+-|-LLLLLLL-| f ", + " f ,,::::;::::;::::;::::,,|4.6|~~~~~~~~~| f ", + " f ,,,,,,,,,,,,,,,,,,,,,,,|4..`~~~~~~~~~| f ", + " f ,,,,,,,,,,,,,,,,,,,,,,,|4..`~~~~~~~~l| f ", + " f |-000--000-0*0|000-000| |4..`~~~~~~~~l| f ", + " f |dddrFFddcW..2|2..Fddd| |s..|~~~~~~~~l| f ", + " f 0dC.....Cc....*....dCr| |4..?~~~~~~~~~| f ", + " f 0............a|b...d..| |4..|~~~~~~~~4| f ", + " f 0..C...|*-|-*-|b......| |4..`::::::::4| f ", + " f |rddd1p|.l|&.s|a36561p| |s..`~~~~~~~~4| f ", + " f |-000--|--|---|-------| |4..`~~~~~~~~~| f ", + " f |4.6|6~~~~~~~~| f ", + " f ////////////////////+///LLLLLLL/// f ", + " f /////////////////////.//6~~~~~~~./// f ", + " f //.......................~~~~~~~~..// f ", + " f //.......||||............~~~~~~~~~..// f ", + " f //........|EE.......A....~~~~~~~~~~..// f ", + " f //...S....|EE......AA...~~~~~~~~~~~.9// f ", + " f //...P....|e.|.....AA..~~~~~~~~~~~~.9// f ", + " f //.``P``...............~~~~~~~~~~~~.9// f ", + " f //.`$$$`.......AAA.....~~~~~~~~~~~~.9// f ", + " f //.`$$$`6......AA......~~~~~~~~~~~~.9// f ", + " f //.`$$$`...............~~~~~~~~~~~~..// f ", + " f //.`$$$`...............~~~~~~~~~~~~..// f ", + " f //.``P``.|G|...........SS6~~~~~~~~~..// f ", + " f //...PPPPPPPPPPPPPPPPPPSS~~~~~~~~~~..// f ", + " f //......|G|..............~~~~~~~~~.// f ", + " f //.........V.V.V...........7788..// f ", + " f ///////////////////////////////// f ", + " f /////////////////////////////// f ", + " f f ", + " f f ", + " ffffffffffffffffffffffffffffffffffffffffffffff ", + " " + ], + "terrain": { + " ": [ + [ "t_grass", 20 ], + [ "t_grass_dead", 3 ], + [ "t_grass_tall", 5 ], + [ "t_grass_long", 3 ], + [ "t_dirt", 5 ], + [ "t_shrub", 2 ], + [ "t_tree", 1 ] + ], + "f": "t_chainfence", + "|": "t_wall", + "-": "t_wall", + "/": "t_concrete_wall", + "+": "t_door_locked", + "*": "t_door_c", + "?": "t_door_locked_alarm", + "w": "t_window_alarm", + "0": [ [ "t_curtains", 10 ], [ "t_window_open", 3 ], [ "t_window_domestic", 5 ] ], + ",": "t_sidewalk", + ":": "t_pavement", + ";": "t_pavement_y", + "1": "t_floor", + "2": "t_floor", + "3": "t_floor", + "4": "t_floor", + "5": "t_console", + "6": "t_console_broken", + "7": "t_floor", + "8": "t_floor", + "9": "t_floor", + "&": "t_floor", + "$": "t_sewage", + ".": "t_floor", + "a": "t_floor", + "b": "t_floor", + "r": "t_floor", + "F": "t_floor", + "c": "t_floor", + "C": "t_floor", + "d": "t_floor", + "l": "t_floor", + "p": "t_floor", + "A": "t_floor", + "P": "t_sewage_pipe", + "S": "t_sewage_pump", + "G": "t_grate", + "E": "t_elevator", + "e": "t_elevator_control_off", + "s": "t_floor", + "v": "t_dirt", + "V": "t_vat", + "L": "t_door_metal_locked", + "W": "t_water_dispenser", + "~": "t_thconc_floor", + "`": "t_wall_glass" + }, + "furniture": { + "1": "f_shredder", + "2": "f_rack_coat", + "3": "f_server", + "4": "f_utility_shelf", + "7": "f_locker", + "8": "f_utility_shelf", + "9": "f_utility_shelf", + "a": "f_air_conditioner", + "b": "f_bookcase", + "r": "f_trashcan", + "F": "f_filing_cabinet", + "A": "f_crate_c", + "c": "f_counter", + "C": "f_chair", + "d": "f_desk", + "l": "f_locker", + "p": [ "f_indoor_plant", "f_indoor_plant_y" ], + "s": "f_sink", + "v": "f_vent_pipe" + }, + "toilets": { "&": { } }, + "items": { + "2": { "item": "coat_rack", "chance": 60, "repeat": 2 }, + "4": { "item": "toxic_dump_equipment", "chance": 85, "repeat": [ 1, 2 ] }, + "7": { "item": "tools_common", "chance": 85, "repeat": [ 1, 2 ] }, + "8": { "item": "tools_common", "chance": 85, "repeat": [ 1, 2 ] }, + "9": { "item": "cleaning", "chance": 85, "repeat": [ 1, 2 ] }, + "r": { "item": "trash_cart", "chance": 50 }, + "d": { "item": "office", "chance": 50 }, + "c": { "item": "office_supplies", "chance": 60 }, + "b": { "item": "lab_bookshelves", "chance": 60, "repeat": 2 }, + "l": { "item": "cleaning", "chance": 85, "repeat": 2 }, + "F": { "item": "office_paper", "chance": 50 } + }, + "place_item": [ { "item": "id_military", "x": 22, "y": 20 }, { "item": "cleansuit", "x": 28, "y": 24 } ], + "set": [ + { "square": "radiation", "amount": [ 10, 30 ], "x": 0, "y": 0, "x2": 23, "y2": 23 }, + { "square": "radiation", "amount": [ 10, 30 ], "x": 0, "y": 24, "x2": 23, "y2": 47 }, + { "square": "radiation", "amount": [ 10, 30 ], "x": 24, "y": 0, "x2": 47, "y2": 23 }, + { "square": "radiation", "amount": [ 10, 30 ], "x": 24, "y": 24, "x2": 47, "y2": 47 } + ], + "place_monster": [ + { "monster": "mon_hazmatbot", "x": 36, "y": 20 }, + { "monster": "mon_hazmatbot", "x": 13, "y": 29 }, + { "monster": "mon_hazmatbot", "x": 26, "y": 37 }, + { "monster": "mon_hazmatbot", "x": 22, "y": 29 } + ], + "computers": { + "5": { + "name": "SRCF Security Terminal", + "security": 5, + "options": [ + { "name": "Security Reminder [1055]", "action": "sr1_mess" }, + { "name": "Security Reminder [1056]", "action": "sr2_mess" }, + { "name": "Security Reminder [1057]", "action": "sr3_mess" }, + { "name": "Security Reminder [1058]", "action": "sr4_mess" }, + { "name": "EPA: Report All Potential Containment Breaches [3873643]", "action": "srcf_1_mess" }, + { "name": "SRCF: Internal Memo, EPA [2918024]", "action": "srcf_2_mess" }, + { "name": "CDC: Internal Memo, Standby [2918115]", "action": "srcf_3_mess" }, + { "name": "USARMY: SEAL SRCF [987167]", "action": "srcf_seal_order" }, + { "name": "COMMAND: REACTIVATE ELEVATOR", "action": "srcf_elevator" }, + { "name": "COMMAND: SEAL SRCF [4423]", "action": "srcf_seal" } + ], + "failures": [ { "action": "alarm" } ] + } + }, + "place_vehicles": [ { "vehicle": "military_cargo_truck", "x": 37, "y": 35, "chance": 25, "status": 1, "rotation": 90, "fuel": 40 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "haz_sar_b_2", "haz_sar_b_1" ], [ "haz_sar_b_4", "haz_sar_b_3" ] ], + "weight": 10, + "object": { + "rows": [ + "###|-------------------|-------------------|####", + "###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####", + "###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####", + "###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####", + "###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####", + "###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####", + "###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####", + "###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####", + "###|----|~~~~~~~~~|----|----|~~~~~~~~~|----|####", + "########|--LLLLL--|#########|--LLLLL--|#########", + "####### ^ ### #### ^###########", + "###### ###########", + "#### ############", + "### #|---------|", + "# |~~~~~~~~~|", + "## L~~~~~~~~~|", + "## L~~~~~~~~~|", + "# L~~~~~~~~~|", + "## L~~~~~~~~~|", + "### L~~~~~~~~~|", + "## ^|~~~~~~~~~|", + "### #|---------|", + "#### |+%%-| #############", + "#### |....| ^ #############", + "####|-%%%%-|-%%+|-|-LLLLL-| #|---------|", + "####|a....8|a....W|^.....a| |~~~~~~~~~|", + "####|.c5c..*......*.......| L~~~~~~~~~|", + "####|.cC..F|...|--|......8| L~~~~~~~~~|", + "####|.c....%...|99|......8| L~~~~~~~~~|", + "####|......%...+..|......8| L~~~~~~~~~|", + "####|l...C.%...|--|-L-|---| L~~~~~~~~~|", + "####|l.Fddd|...*EE|l..|#### ^|~~~~~~~~~|", + "####|-|----|...*EE|l..|#### #|---------|", + "######|....*...|e||-+-|## ############", + "######|&rsa|...|-|## ### #############", + "######|----|---|#### ##############", + "################### ###############", + "#####|----------|# |----------|####", + "#####|~~~~~~~~~~|^ |~~~~~~~~~~|####", + "#####|~~~~~~~~~~L L~~~~~~~~~~|####", + "#####|~~~~~~~~~~L L~~~~~~~~~~|####", + "#####|~~~~~~~~~~L L~~~~~~~~~~|####", + "#####|~~~~~~~~~~L L~~~~~~~~~~|####", + "#####|~~~~~~~~~~L L~~~~~~~~~~|####", + "#####|~~~~~~~~~~| ^|~~~~~~~~~~|####", + "#####|----------| ###|----------|####", + "####################### ## ####################", + "################################################" + ], + "terrain": { + " ": "t_rock_floor", + ".": "t_metal_floor", + "&": "t_metal_floor", + "a": "t_metal_floor", + "l": "t_metal_floor", + "s": "t_metal_floor", + "r": "t_metal_floor", + "c": "t_metal_floor", + "C": "t_metal_floor", + "d": "t_metal_floor", + "8": "t_metal_floor", + "9": "t_metal_floor", + "F": "t_metal_floor", + "|": "t_concrete_wall", + "-": "t_concrete_wall", + "+": "t_door_metal_c", + "*": "t_door_metal_c", + "L": "t_door_metal_locked", + "#": "t_rock", + "^": "t_gates_control_concrete", + "%": "t_reinforced_glass", + "E": "t_elevator", + "e": "t_elevator_control_off", + "5": "t_console", + "W": "t_water_dispenser", + "~": [ [ "t_sewage", 55 ], [ "t_dirtfloor", 25 ], [ "t_dirtmound", 20 ] ] + }, + "furniture": { + "s": "f_sink", + "r": "f_trashcan", + "d": "f_desk", + "c": "f_counter", + "C": "f_chair", + "l": "f_locker", + "8": "f_utility_shelf", + "9": "f_utility_shelf", + "a": "f_air_conditioner", + "F": "f_filing_cabinet", + "~": [ [ "f_null", 50 ], [ "f_wreckage", 50 ] ] + }, + "toilets": { "&": { } }, + "items": { + "8": { "item": "mechanics", "chance": 60, "repeat": [ 1, 2 ] }, + "9": { "item": "sewage_plant", "chance": 60, "repeat": [ 1, 2 ] }, + "r": { "item": "trash_cart", "chance": 50 }, + "d": { "item": "office", "chance": 50 }, + "c": { "item": "office_supplies", "chance": 60 }, + "l": { "item": "cleaning", "chance": 60, "repeat": 2 }, + "F": { "item": "office_paper", "chance": 50 }, + " ": { "item": "corpse_and_science", "chance": 1 }, + "~": [ { "item": "trash", "chance": 50 }, { "item": "sewer", "chance": 50 }, { "item": "nanomaterials", "chance": 3 } ] + }, + "place_item": [ { "item": "sarcophagus_access_code", "x": 20, "y": 31 } ], + "set": [ + { "square": "radiation", "amount": [ 10, 30 ], "x": 0, "y": 0, "x2": 23, "y2": 23 }, + { "square": "radiation", "amount": [ 10, 30 ], "x": 0, "y": 24, "x2": 23, "y2": 47 }, + { "square": "radiation", "amount": [ 10, 30 ], "x": 24, "y": 0, "x2": 47, "y2": 23 }, + { "square": "radiation", "amount": [ 10, 30 ], "x": 24, "y": 24, "x2": 47, "y2": 47 } + ], + "monster": { " ": { "monster": "mon_zombie", "chance": 10 } }, + "monsters": { "~": { "monster": "GROUP_VANILLA", "chance": 20, "density": 0.1 } }, + "computers": { + "5": { + "name": "SRCF Security Terminal", + "security": 5, + "options": [ + { "name": "Security Reminder [1055]", "action": "sr1_mess" }, + { "name": "Security Reminder [1056]", "action": "sr2_mess" }, + { "name": "Security Reminder [1057]", "action": "sr3_mess" }, + { "name": "Security Reminder [1058]", "action": "sr4_mess" }, + { "name": "EPA: Report All Potential Containment Breaches [3873643]", "action": "srcf_1_mess" }, + { "name": "SRCF: Internal Memo, EPA [2918024]", "action": "srcf_2_mess" }, + { "name": "CDC: Internal Memo, Standby [2918115]", "action": "srcf_3_mess" }, + { "name": "USARMY: SEAL SRCF [987167]", "action": "srcf_seal_order" }, + { "name": "COMMAND: REACTIVATE ELEVATOR", "action": "srcf_elevator" } + ], + "failures": [ { "action": "alarm" } ] + } + } + } + }, + { + "id": "corpse_and_science", + "type": "item_group", + "subtype": "collection", + "entries": [ { "item": "corpse_generic_human", "prob": 100 }, { "group": "science", "prob": 100 } ] + }, + { + "id": "nanomaterials", + "type": "item_group", + "subtype": "collection", + "entries": [ { "item": "nanomaterial", "prob": 100 } ] + } +] diff --git a/data/json/mapgen/house/house_inner_garden.json b/data/json/mapgen/house/house_inner_garden.json new file mode 100644 index 0000000000000..542e3b906ea8f --- /dev/null +++ b/data/json/mapgen/house/house_inner_garden.json @@ -0,0 +1,122 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_inner_garden", + "object": { + "fill_ter": "t_floor", + "rows": [ + "...$..GssMMMMMMMMsssss..", + ".$.....ssM......Msssssu.", + ".......ssM.....##xxxxx%#", + ".#MMM##8]#8#8#8#~~~~~~u#", + ".#888#E #5 #~~~~~~~#", + "^#yay##8]# #~~~~~~##", + "##4 #~~~~~~N#", + "#h #~~~~~~U#", + "## #~~~~~~U#", + ".# +~~~~~~U#", + ".# y y8]#88#888888##", + ".###iL## #8sssssssssss#.", + ".p#n 8s#3..3..sFs#.", + ".M#K JA ]s.......sFs#.", + ".^#QllJA 8s#......sFs#.", + "######## #8sssssssssss#.", + "#y + y8]#8]#8]8888#.", + "o 6 #R + 1 #.", + "o #R #++#HLH #.", + "#O ##+#Wg#### #.", + "#######j ####j + #.", + ".....^#t d#dd t# #OOOO#.", + "......###o#o###########.", + "........................" + ], + "palettes": [ "house_w_foundation_palette" ], + "terrain": { + "8": "t_wall_glass", + "#": "t_rock_wall", + "]": "t_door_glass_c", + "%": "t_wall_w", + "F": "t_concrete", + "U": "t_thconc_floor", + "N": "t_thconc_floor" + }, + "furniture": { "a": "f_displaycase" }, + "place_vehicles": [ + { "vehicle": "showroom_small_vehicles", "x": 17, "y": 5, "rotation": 270, "chance": 20, "status": 0 }, + { "vehicle": "showroom_small_vehicles", "x": 19, "y": 5, "rotation": 270, "chance": 20, "status": 0 } + ], + "items": { + "E": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] }, + "G": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, + "a": { "item": "art", "chance": 100 }, + "n": [ + { "item": "SUS_dishes", "chance": 100 }, + { "item": "SUS_silverware", "chance": 100 }, + { "item": "SUS_kitchen_sink", "chance": 100 } + ], + "Q": [ { "item": "SUS_cookware", "chance": 100 }, { "item": "SUS_spice_collection", "chance": 100 } ], + "K": [ + { "item": "SUS_utensils", "chance": 100 }, + { "item": "SUS_knife_drawer", "chance": 100 }, + { "item": "SUS_junk_drawer", "chance": 100 }, + { "item": "SUS_appliances_cupboard", "chance": 100 } + ], + "J": [ { "item": "SUS_breakfast_cupboard", "chance": 100 }, { "item": "SUS_coffee_cupboard", "chance": 100 } ], + "l": { "item": "SUS_fridge", "chance": 100 }, + "i": { "item": "SUS_oven", "chance": 100 } + }, + "nested": { + "1": { "chunks": [ [ "bedroom_4x4_adult_1_E", 20 ] ] }, + "3": { "chunks": [ [ "garden_3x3_1", 50 ], [ "garden_3x3_2", 33 ], [ "garden_3x3_3", 33 ] ] }, + "4": { "chunks": [ [ "diningroom_5x5_N_S", 50 ], [ "diningroom_6x6_N_S_1A", 50 ] ] }, + "5": { + "chunks": [ + [ "livingroom_5x5_N_1", 20 ], + [ "livingroom_5x5_S_1", 20 ], + [ "livingroom_5x5_E_1", 20 ], + [ "livingroom_5x5_E_2", 20 ], + [ "livingroom_5x5_W_1", 20 ] + ] + }, + "6": { "chunks": [ [ "bonus_room_3x3_S_6", 40 ], [ "bonus_room_3x3_S_5", 20 ], [ "bonus_room_3x3_S_7", 40 ] ] } + } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "house_inner_garden_roof", + "object": { + "fill_ter": "t_shingle_flat_roof", + "rows": [ + " ", + " ", + " --------|", + " ---------------.......|", + " |................ooo..|", + " |.....................|", + "5|................ooo.A|", + "|~.....................|", + "||................ooo..|", + " |.....................|", + " |..........22222222223|", + " |..........3 ", + " |..&.......3 ", + " |..........3 ", + " |..........3 ", + "||..........3 ", + "|...........22222222222 ", + "|.....................| ", + "|.....................| ", + "|................... .| ", + "-------...............| ", + " 5..&............| ", + " ----------------- ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_shingle_flat_roof" } + } + } +] diff --git a/data/json/mapgen/lab/lab_floorplans_finale1level.json b/data/json/mapgen/lab/lab_floorplans_finale1level.json index d3b2e9bd026df..0a7db4fa0685a 100644 --- a/data/json/mapgen/lab/lab_floorplans_finale1level.json +++ b/data/json/mapgen/lab/lab_floorplans_finale1level.json @@ -131,8 +131,8 @@ }, "mapping": { "r": { "item": { "item": "standard_template_construct" } }, "R": { "item": { "item": "nanomaterial" } } }, "place_monster": [ - { "monster": "mon_tripod", "x": [ 1, 4 ], "y": [ 20, 22 ], "chance": 90 }, - { "monster": "mon_tripod", "x": [ 19, 20 ], "y": [ 20, 22 ], "chance": 90 }, + { "monster": "mon_secubot", "x": [ 1, 4 ], "y": [ 20, 22 ], "chance": 90 }, + { "monster": "mon_secubot", "x": [ 19, 20 ], "y": [ 20, 22 ], "chance": 90 }, { "monster": "mon_zombie_scientist", "x": [ 2, 20 ], "y": [ 1, 9 ], "chance": 90, "repeat": [ 1, 2 ] }, { "monster": "mon_mech_lifter", "x": 2, "y": 2, "chance": 50 } ] diff --git a/data/json/mapgen/map_extras/wilderness.json b/data/json/mapgen/map_extras/wilderness.json new file mode 100644 index 0000000000000..1c09726ef2364 --- /dev/null +++ b/data/json/mapgen/map_extras/wilderness.json @@ -0,0 +1,256 @@ +[ + { + "type": "palette", + "id": "long_grass_meadow_palette", + "terrain": { + " ": "t_null", + ".": [ [ "t_region_groundcover", 10 ], "t_grass_long" ], + ",": [ [ "t_region_groundcover", 4 ], "t_grass_long" ], + ";": [ "t_region_groundcover", [ "t_grass_long", 2 ] ], + "|": [ "t_region_groundcover", [ "t_grass_long", 10 ] ] + }, + "furniture": { + ".": [ [ "f_null", 2000 ], [ "f_region_weed", 20 ], [ "f_boulder_small", 6 ], "f_boulder_medium", "f_boulder_large" ], + ",": [ [ "f_null", 2000 ], [ "f_region_weed", 40 ], [ "f_boulder_small", 6 ], "f_boulder_medium", "f_boulder_large" ], + ";": [ [ "f_null", 2000 ], [ "f_region_weed", 50 ], [ "f_boulder_small", 6 ], "f_boulder_medium", "f_boulder_large" ], + "|": [ [ "f_null", 2000 ], [ "f_region_weed", 60 ], [ "f_boulder_small", 6 ], "f_boulder_medium", "f_boulder_large" ] + } + }, + { + "type": "palette", + "id": "copse_trees_palette", + "terrain": { + " ": "t_null", + ".": [ [ "t_region_groundcover", 60 ], "t_region_tree", "t_region_shrub" ], + ",": [ [ "t_region_groundcover", 30 ], [ "t_region_groundcover_forest", 8 ], [ "t_region_tree", 2 ], "t_region_shrub" ], + ";": [ [ "t_region_groundcover", 10 ], [ "t_region_groundcover_forest", 8 ], [ "t_region_tree", 6 ], "t_region_shrub" ], + "|": [ [ "t_region_groundcover_forest", 7 ], "t_water_sh" ] + }, + "furniture": { + ".": [ [ "f_null", 2000 ], [ "f_region_weed", 20 ], [ "f_boulder_small", 6 ], "f_boulder_medium", "f_boulder_large" ], + ",": [ [ "f_null", 2000 ], [ "f_region_weed", 40 ], [ "f_boulder_small", 6 ], [ "f_boulder_medium", 2 ], "f_boulder_large" ], + ";": [ [ "f_null", 2000 ], [ "f_region_weed", 60 ], [ "f_boulder_small", 6 ], [ "f_boulder_medium", 2 ], "f_boulder_large" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_grass_map", + "object": { + "rows": [ + " ......... ", + " ............... ", + " .......,,,,,....... ", + " .....,,,,,,,,,,..... ", + " ...,,,,,,,,,,,,,,.... ", + " ....,,,;;;;;;;,,,,.... ", + " ...,,,;;;;;;;;;,,,,... ", + "....,,;;;;||;;;;,,,,....", + "...,,,,;;;;;||;;,,,,,...", + "...,;,;;||;||;;;;,,,,...", + "...,,;;;;;;;;||;;,,,,...", + "...,;,;||;||;;;;;,,,,...", + "...,,,,;;;;;;||;,,,,,...", + "...,;,,;;||;||;;,,,,,...", + "...,,,;;|;;;;||;;,,,,...", + "...,,,,,;;||;;;;,,,,,...", + "....,,;,;;;;;;;,,,,,....", + " ...,,,,,,;;||;;;,,,... ", + " ....,,,,,;;;;;,,,,.... ", + " ....,,,,,,,,,,,,,,.... ", + " .......,,,,,,....... ", + " .................... ", + " ................ ", + " .......... " + ], + "palettes": [ "long_grass_meadow_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_grass_map", + "object": { "place_nested": [ { "chunks": [ [ "mx_grass_nested", 100 ] ], "x": [ 0, 17 ], "y": [ 0, 17 ], "repeat": [ 1, 6 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_grass_nested", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " .... ", + ".,,,,.", + ".,|;,.", + ".,;|,.", + ".,,,,.", + " .... " + ], + "palettes": [ "long_grass_meadow_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_grass_nested", + "object": { + "mapgensize": [ 8, 8 ], + "rows": [ + " ...... ", + "..,,,,..", + ".,,|;,,.", + ".,;||;,.", + ".,;|;;,.", + ".,,;|,,.", + "..,,,,..", + " ...... " + ], + "palettes": [ "long_grass_meadow_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_trees_map", + "object": { + "rows": [ + " ......... ", + " ............... ", + " .......,,,,,....... ", + " .....,,,,,,,,,,..... ", + " ...,,,,,,,,,,,,,,.... ", + " ....,,,;;;;;;;,,,,.... ", + " ...,,,;;;;;;;;;,,,,... ", + "....,,;;;;||;;;;,,,,....", + "...,,,,;;;;;||;;,,,,,...", + "...,;,;;||;||;;;;,,,,...", + "...,,;;;;;;;;||;;,,,,...", + "...,;,;||;||;;;;;,,,,...", + "...,,,,;;;;;;||;,,,,,...", + "...,;,,;;||;||;;,,,,,...", + "...,,,;;|;;;;||;;,,,,...", + "...,,,,,;;||;;;;,,,,,...", + "....,,;,;;;;;;;,,,,,....", + " ...,,,,,,;;||;;;,,,... ", + " ....,,,,,;;;;;,,,,.... ", + " ....,,,,,,,,,,,,,,.... ", + " .......,,,,,,....... ", + " .................... ", + " ................ ", + " .......... " + ], + "palettes": [ "copse_trees_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_trees_map", + "object": { "place_nested": [ { "chunks": [ [ "mx_trees_nested", 100 ] ], "x": [ 0, 17 ], "y": [ 0, 17 ], "repeat": [ 1, 6 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_trees_nested", + "object": { + "mapgensize": [ 6, 6 ], + "rows": [ + " .... ", + ".,,,,.", + ".,|;,.", + ".,;|,.", + ".,,,,.", + " .... " + ], + "palettes": [ "copse_trees_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_trees_nested", + "object": { + "mapgensize": [ 8, 8 ], + "rows": [ + " ...... ", + "..,,,,..", + ".,,|;,,.", + ".,;||;,.", + ".,;|;;,.", + ".,,;|,,.", + "..,,,,..", + " ...... " + ], + "palettes": [ "copse_trees_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_fallen_shed_map", + "object": { + "place_nested": [ + { + "chunks": [ [ "mx_grass_nested", 70 ], [ "mx_trees_nested", 30 ] ], + "x": [ 0, 17 ], + "y": [ 0, 17 ], + "repeat": [ 2, 6 ] + }, + { "chunks": [ [ "mx_fallen_shed_nested", 100 ] ], "x": [ 0, 11 ], "y": [ 0, 11 ] } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_fallen_shed_nested", + "object": { + "mapgensize": [ 11, 11 ], + "rows": [ + "--++++--||-", + "-_______RR|", + "w_______RRw", + "w________Rw", + "|_________|", + "||-_____|||", + "|_________|", + "w_________w", + "w_________w", + "-_________|", + "--||||||-||" + ], + "palettes": [ "desolatebarn_palette" ], + "terrain": { "_": "t_dirt" }, + "furniture": { "_": [ [ "f_null", 30 ], "f_rubble", "f_rubble_rock" ] }, + "items": { + "_": { "item": "wood_workshop", "chance": 1 }, + "R": [ { "item": "wood_workshop", "chance": 3 }, { "item": "mischw", "chance": 2 } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "mx_fallen_shed_nested", + "object": { + "mapgensize": [ 8, 8 ], + "rows": [ + "--w_-||-", + "-______|", + "|______+", + "|R_____+", + "|RR____|", + "|_RRR__w", + "-__RRR_w", + "--w||-||" + ], + "palettes": [ "desolatebarn_palette" ], + "terrain": { "_": "t_dirt" }, + "furniture": { "_": [ [ "f_null", 30 ], "f_rubble", "f_rubble_rock" ] }, + "items": { + "_": { "item": "wood_workshop", "chance": 1 }, + "R": [ { "item": "wood_workshop", "chance": 3 }, { "item": "mischw", "chance": 2 } ] + } + } + } +] diff --git a/data/json/mapgen/missile_silo.json b/data/json/mapgen/missile_silo.json index 806f9e52595b1..a71acf5036f8d 100644 --- a/data/json/mapgen/missile_silo.json +++ b/data/json/mapgen/missile_silo.json @@ -509,7 +509,7 @@ "access_denied": "ERROR! Access denied! Unauthorized access will be met with lethal force!", "security": 10, "failures": [ { "action": "alarm" }, { "action": "damage" }, { "action": "secubots" } ], - "options": [ { "name": "Launch Missile", "action": "miss_launch" }, { "name": "Disarm Missile", "action": "miss_disarm" } ] + "options": [ { "name": "Disarm Missile", "action": "miss_disarm" } ] } }, "place_graffiti": [ { "text": "Warning! Automatic security measures engaged due to the lockdown order!", "x": 17, "y": 20 } ], diff --git a/data/json/mapgen/necropolis/necropolisB3.json b/data/json/mapgen/necropolis/necropolisB3.json index 27e238ee8d03d..49c9cea1a881f 100644 --- a/data/json/mapgen/necropolis/necropolisB3.json +++ b/data/json/mapgen/necropolis/necropolisB3.json @@ -2,8 +2,7 @@ { "name": "GROUP_NECROPOLIS_ROBOT", "type": "monstergroup", - "default": "mon_chickenbot", - "monsters": [ { "monster": "mon_tankbot", "freq": 20, "cost_multiplier": 0 } ] + "default": "mon_secubot" }, { "name": "GROUP_NECROPOLIS_VAULT3", diff --git a/data/json/mapgen/nested/retail_nested.json b/data/json/mapgen/nested/retail_nested.json new file mode 100644 index 0000000000000..48f3c48b02fe2 --- /dev/null +++ b/data/json/mapgen/nested/retail_nested.json @@ -0,0 +1,1369 @@ +[ + { + "type": "mapgen", + "method": "json", + "//": "designed for spaces 9x9.", + "nested_mapgen_id": "city_block_9x9_candy_shop_front", + "object": { + "mapgensize": [ 9, 9 ], + "rotation": [ 0, 3 ], + "rows": [ + "LHL LHL", + " ", + "w L L L w", + "w L L L w", + "w L L L w", + "y ", + "MMM?MM Y", + " A ", + " VVV " + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { + "L": "f_table", + "H": "f_table", + "G": "f_table", + "M": "f_displaycase", + "w": "f_rack_wood", + "V": "f_glass_cabinet", + "Y": "f_trashcan", + "A": "f_stool", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "H": [ { "item": "toy_store", "chance": 30, "repeat": [ 1, 2 ] } ], + "Y": [ { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "candy_chocolate", "chance": 30, "repeat": [ 0, 4 ] } ], + "w": [ { "item": "candy_chocolate", "chance": 30, "repeat": [ 0, 4 ] } ], + "M": [ + { "item": "candy_chocolate", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "toy_store", "chance": 30, "repeat": [ 1, 2 ] } + ], + "V": [ + { "item": "candy_chocolate", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "toy_store", "chance": 30, "repeat": [ 1, 2 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 3x3 candy shop crates.", + "nested_mapgen_id": "city_block_3x3_backroom_crates_candy", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "candy_chocolate", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "toy_store", "chance": 30, "repeat": [ 1, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for spaces 9x9. Beauty and cosmetics shop.", + "nested_mapgen_id": "city_block_9x9_beauty_shop_front", + "object": { + "mapgensize": [ 9, 9 ], + "rotation": [ 0, 3 ], + "rows": [ + "HHH HHH", + " ....... ", + "w.L.L.L.w", + "w.L.L.L.w", + "w.L.L.L.w", + "y....... ", + "MMM?MM Y", + " A ", + " VVV " + ], + "terrain": { " ": "t_floor", "L": "t_carpet_yellow", ".": "t_carpet_yellow", "?": "t_console_broken" }, + "furniture": { + "L": "f_table", + "H": "f_table", + "G": "f_table", + "M": "f_displaycase", + "w": "f_rack", + "V": "f_glass_cabinet", + "Y": "f_trashcan", + "A": "f_stool", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "H": [ { "item": "beauty", "chance": 30, "repeat": [ 1, 2 ] } ], + "Y": [ { "item": "beauty", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "beauty", "chance": 30, "repeat": [ 0, 4 ] } ], + "w": [ { "item": "beauty", "chance": 30, "repeat": [ 0, 4 ] } ], + "M": [ { "item": "beauty", "chance": 30, "repeat": [ 0, 4 ] } ], + "V": [ { "item": "beauty", "chance": 30, "repeat": [ 0, 4 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 3x3 beauty shop crates.", + "nested_mapgen_id": "city_block_3x3_backroom_crates_beauty", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { "z": [ { "item": "beauty", "chance": 30, "repeat": [ 1, 6 ] } ] } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 9x9 vitamin shop.", + "nested_mapgen_id": "city_block_9x9_vitamin_shop_front", + "object": { + "mapgensize": [ 9, 9 ], + "rotation": [ 0, 3 ], + "rows": [ + "LHL LHL", + " ", + "V V V V V", + "V V V V V", + "V V V V V", + "y ", + "MMM?MM Y", + " A ", + "y VVV " + ], + "terrain": { + " ": "t_linoleum_white", + "L": "t_linoleum_white", + "H": "t_linoleum_white", + "V": "t_linoleum_white", + "M": "t_linoleum_white", + "A": "t_linoleum_white", + "y": "t_linoleum_white", + "Y": "t_linoleum_white", + "?": "t_console_broken" + }, + "furniture": { + "L": "f_table", + "H": "f_table", + "G": "f_table", + "M": "f_counter", + "V": "f_rack", + "Y": "f_trashcan", + "A": "f_stool", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "H": [ { "item": "vitamin_shop", "chance": 30, "repeat": [ 1, 2 ] } ], + "Y": [ { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "vitamin_shop", "chance": 30, "repeat": [ 0, 4 ] } ], + "M": [ { "item": "office", "chance": 30, "repeat": [ 0, 4 ] } ], + "V": [ { "item": "vitamin_shop", "chance": 30, "repeat": [ 0, 4 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 3x3 vitamin shop crates.", + "nested_mapgen_id": "city_block_3x3_backroom_crates_vitamin", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { "z": [ { "item": "vitamin_shop", "chance": 30, "repeat": [ 1, 6 ] } ] } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 9x9 cellphone shop.", + "nested_mapgen_id": "city_block_9x9_cellphone_shop_front", + "object": { + "mapgensize": [ 9, 9 ], + "rotation": [ 0, 3 ], + "rows": [ + "GGy yGG", + " ....... ", + "V.LL.HH.V", + "V.LL.HH.V", + "V.LL.HH.V", + " ....... ", + "M?MM?M Y", + " A A ", + "y MMMM y" + ], + "terrain": { + " ": "t_linoleum_white", + "G": "t_linoleum_white", + "V": "t_linoleum_white", + "M": "t_linoleum_white", + "A": "t_linoleum_white", + "y": "t_linoleum_white", + "Y": "t_linoleum_white", + "H": "t_carpet_green", + "L": "t_carpet_green", + ".": "t_carpet_green", + "?": "t_console_broken" + }, + "furniture": { + "L": "f_table", + "H": "f_table", + "G": "f_displaycase", + "M": "f_counter", + "V": "f_rack", + "Y": "f_trashcan", + "A": "f_stool", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "H": [ { "item": "elecsto_pcs", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "elecsto_persele", "chance": 30, "repeat": [ 1, 2 ] } ], + "Y": [ { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "cell_shop", "chance": 30, "repeat": [ 0, 4 ] } ], + "M": [ { "item": "cell_shop", "chance": 30, "repeat": [ 0, 1 ] } ], + "V": [ { "item": "cell_shop", "chance": 30, "repeat": [ 0, 4 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 3x3 cellphone shop crates.", + "nested_mapgen_id": "city_block_3x3_backroom_crates_cellphone", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "cell_shop", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "elecsto_pcs", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "elecsto_persele", "chance": 30, "repeat": [ 1, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 9x9 music shop.", + "nested_mapgen_id": "city_block_9x9_music_shop_front", + "object": { + "mapgensize": [ 9, 9 ], + "rotation": [ 0, 3 ], + "rows": [ + "HHHy yHHH", + " ....... ", + "V.LL.GG.V", + "V.LL.GG.V", + "V.LL.GG.V", + " .......V", + "MMMM?M V", + " A ", + "y MMMM Y" + ], + "terrain": { " ": "t_floor", "G": "t_carpet_red", "L": "t_carpet_red", ".": "t_carpet_red", "?": "t_console_broken" }, + "furniture": { + "L": "f_table", + "H": "f_table", + "G": "f_displaycase", + "M": "f_counter", + "V": "f_bookcase", + "Y": "f_trashcan", + "A": "f_stool", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "H": [ { "item": "musicstore_showpiece", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "mussto_windinst", "chance": 30, "repeat": [ 1, 2 ] } ], + "Y": [ { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "mussto_stringinst", "chance": 30, "repeat": [ 0, 4 ] } ], + "M": [ { "item": "office", "chance": 30, "repeat": [ 0, 1 ] } ], + "V": [ { "item": "musicstore_showpiece", "chance": 30, "repeat": [ 0, 4 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 3x3 music shop crates.", + "nested_mapgen_id": "city_block_3x3_backroom_crates_music", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "musicstore_showpiece", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "mussto_windinst", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "mussto_stringinst", "chance": 30, "repeat": [ 0, 2 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 9x9 electronics shop.", + "nested_mapgen_id": "city_block_9x9_electronics_shop_front", + "object": { + "mapgensize": [ 9, 9 ], + "rotation": [ 0, 3 ], + "rows": [ + "HHHy yHHH", + " ....... ", + "V.LL.LL.V", + "V.GG.GG.V", + "V.BB.BB.V", + " .......V", + "MMMM?M y", + " A ", + "y MMMM Y" + ], + "terrain": { + " ": "t_floor", + "G": "t_carpet_yellow", + "L": "t_carpet_yellow", + "B": "t_carpet_yellow", + ".": "t_carpet_yellow", + "?": "t_console_broken" + }, + "furniture": { + "L": "f_table", + "B": "f_table", + "H": "f_displaycase", + "G": "f_displaycase", + "M": "f_counter", + "V": "f_rack", + "Y": "f_trashcan", + "A": "f_stool", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "H": [ { "item": "elecsto_pcs", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "elecsto_cameras", "chance": 30, "repeat": [ 1, 2 ] } ], + "Y": [ { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "elecsto_entapl", "chance": 30, "repeat": [ 0, 4 ] } ], + "B": [ { "item": "elecsto_homapl", "chance": 30, "repeat": [ 0, 4 ] } ], + "M": [ { "item": "office", "chance": 30, "repeat": [ 0, 1 ] } ], + "V": [ + { "item": "elecsto_lights", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "elecsto_diy", "chance": 30, "repeat": [ 0, 4 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 3x3 electronics shop crates.", + "nested_mapgen_id": "city_block_3x3_backroom_crates_electronics", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "elecsto_pcs", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "elecsto_cameras", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "elecsto_entapl", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "elecsto_homapl", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "elecsto_lights", "chance": 30, "repeat": [ 0, 2 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 9x9 pizza shop.", + "nested_mapgen_id": "city_block_9x9_pizza_shop_front", + "object": { + "mapgensize": [ 9, 9 ], + "rotation": [ 0, 3 ], + "rows": [ + "AAAY YMMM", + "MMM AAA", + "V ? ", + "B M R RR", + "i G L LL", + "B G R RR", + "s M ", + "F M R RR", + "Q RLyLL" + ], + "terrain": { + " ": "t_linoleum_gray", + "L": "t_linoleum_gray", + "R": "t_linoleum_gray", + "B": "t_linoleum_gray", + "G": "t_linoleum_gray", + "M": "t_linoleum_gray", + "F": "t_linoleum_gray", + "V": "t_linoleum_gray", + "Q": "t_linoleum_gray", + "Y": "t_linoleum_gray", + "y": "t_linoleum_gray", + "A": "t_linoleum_gray", + "s": "t_linoleum_gray", + "i": "t_linoleum_gray", + "?": "t_console_broken" + }, + "furniture": { + "L": "f_table", + "i": "f_oven", + "s": "f_sink", + "R": "f_bench", + "B": "f_counter", + "G": "f_displaycase", + "M": "f_counter", + "F": "f_glass_fridge", + "V": "f_rack", + "Q": "f_rack", + "Y": "f_trashcan", + "A": "f_stool", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "B": [ { "item": "pizza_kitchen", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "pizza_display", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "pizza_table", "chance": 30, "repeat": [ 1, 2 ] } ], + "Y": [ { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] } ], + "F": [ { "item": "pizza_fridge", "chance": 30, "repeat": [ 0, 4 ] } ], + "V": [ { "item": "pizza_display", "chance": 30, "repeat": [ 0, 4 ] } ], + "Q": [ { "item": "pizza_kitchen", "chance": 30, "repeat": [ 0, 1 ] } ], + "M": [ + { "item": "pizza_table", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "pizza_display", "chance": 30, "repeat": [ 0, 1 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 3x3 pizza shop crates.", + "nested_mapgen_id": "city_block_3x3_backroom_crates_pizza", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "pizza_kitchen", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "pizza_table", "chance": 30, "repeat": [ 0, 2 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 8x8 clothing shop.", + "nested_mapgen_id": "city_block_8x8_clothing_shop_front", + "object": { + "mapgensize": [ 8, 8 ], + "rotation": [ 0, 3 ], + "rows": [ + " BBB ", + " C GA b", + " C G?G ", + " d R", + " LdL ", + " C R", + " C QQVV ", + "|| |||||" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken", "|": "t_brick_wall" }, + "furniture": { + "A": "f_stool", + "B": "f_counter", + "C": "f_table", + "G": "f_displaycase", + "b": "f_bigmirror", + "d": "f_mannequin", + "L": "f_table", + "Q": "f_rack_wood", + "R": "f_armchair", + "V": "f_rack_wood", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "d": [ + { "item": "jackets", "chance": 40 }, + { "item": "pants", "chance": 100 }, + { "item": "shirts", "chance": 100 }, + { "item": "hatstore_accessories", "chance": 100 }, + { "item": "shoestore_shoes", "chance": 100 } + ], + "C": [ { "item": "shirts", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "pants", "chance": 30, "repeat": [ 1, 2 ] } ], + "Q": [ { "item": "bags", "chance": 30, "repeat": [ 1, 2 ] } ], + "V": [ { "item": "shoestore_shoes", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ + { "item": "hatstore_accessories", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "jewelry_front", "chance": 30, "repeat": [ 0, 1 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 general clothing shop crates.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "z zz", + " z z", + "z z ", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "shirts", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "pants", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "jackets", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "hatstore_accessories", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "shoestore_shoes", "chance": 30, "repeat": [ 1, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 general clothing backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "CCCC", + " ", + " ", + "CC C" + ], + "terrain": { " ": "t_floor" }, + "furniture": { "C": "f_rack" }, + "items": { + "C": [ + { "item": "shirts", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "pants", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "jackets", "chance": 30, "repeat": [ 1, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 8x8 formal clothing shop.", + "nested_mapgen_id": "city_block_8x8_formal_clothing_shop_front", + "object": { + "mapgensize": [ 8, 8 ], + "rotation": [ 0, 3 ], + "rows": [ + " GGG ", + " e A b", + " C B?B ", + " d b", + " RCR ", + " b", + " b LLL ", + "|| |||||" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken", "|": "t_brick_wall" }, + "furniture": { + "A": "f_stool", + "B": "f_counter", + "C": "f_table", + "G": "f_displaycase", + "b": "f_bigmirror", + "d": "f_mannequin", + "e": "f_mannequin", + "L": "f_wardrobe", + "R": "f_armchair" + }, + "items": { + "d": [ + { "item": "wedding_suits", "chance": 100 }, + { "item": "hatstore_accessories", "chance": 100 }, + { "item": "dress_shoes", "chance": 100 } + ], + "e": [ + { "item": "wedding_suits", "chance": 100 }, + { "item": "hatstore_accessories", "chance": 100 }, + { "item": "dress_shoes", "chance": 100 } + ], + "C": [ { "item": "dress_shoes", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "wedding_suits", "chance": 30, "repeat": [ 1, 2 ] } ], + "V": [ { "item": "shoestore_shoes", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ + { "item": "neckties", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "accesories_personal_unisex", "chance": 30, "repeat": [ 0, 1 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 formal clothing shop crates.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_formal", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "z zz", + " z z", + "z z ", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "wedding_suits", "chance": 30, "repeat": [ 0, 6 ] }, + { "item": "hatstore_accessories", "chance": 30, "repeat": [ 0, 6 ] }, + { "item": "dress_shoes", "chance": 30, "repeat": [ 0, 6 ] }, + { "item": "neckties", "chance": 30, "repeat": [ 0, 6 ] }, + { "item": "accesories_personal_unisex", "chance": 30, "repeat": [ 0, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 formal clothing backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_formal", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "CCCC", + " ", + " ", + "CC C" + ], + "terrain": { " ": "t_floor" }, + "furniture": { "C": "f_rack" }, + "items": { + "C": [ + { "item": "wedding_suits", "chance": 30, "repeat": [ 0, 6 ] }, + { "item": "dress_shoes", "chance": 30, "repeat": [ 0, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 formal clothing backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_formal", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "CBBB", + "e Ad", + " ", + "bb C" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { "A": "f_stool", "B": "f_workbench", "C": "f_rack_wood", "d": "f_mannequin", "e": "f_mannequin", "b": "f_bench" }, + "items": { + "C": [ { "item": "SUS_tailoring_materials", "chance": 30, "repeat": [ 1, 2 ] } ], + "d": [ { "item": "SUS_mannequin_formal_mens", "chance": 30 } ], + "e": [ { "item": "SUS_mannequin_dresses", "chance": 30 } ], + "B": [ + { "item": "SUS_tailoring_tool_drawer", "chance": 30, "repeat": [ 0, 1 ] }, + { "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 2, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 8x8 leather clothing shop.", + "nested_mapgen_id": "city_block_8x8_leather_clothing_shop_front", + "object": { + "mapgensize": [ 8, 8 ], + "rotation": [ 0, 3 ], + "rows": [ + " d B?B ", + " Q AB b", + " Q ", + " Q C G b", + " d C G ", + " b", + " b LLL ", + "|| |||||" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken", "|": "t_brick_wall" }, + "furniture": { + "A": "f_stool", + "B": "f_counter", + "C": "f_table", + "G": "f_displaycase", + "b": "f_bigmirror", + "Q": "f_rack_wood", + "d": "f_mannequin", + "L": "f_wardrobe" + }, + "items": { + "d": [ + { "item": "leather_shop", "chance": 100 }, + { "item": "pants", "chance": 50 }, + { "item": "shirts", "chance": 50 }, + { "item": "leather_shop_accessories", "chance": 100 } + ], + "C": [ { "item": "leather_shop", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "leather_shop", "chance": 30, "repeat": [ 1, 2 ] } ], + "Q": [ { "item": "leather_shop", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ + { "item": "leather_shop_accessories", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "accesories_personal_unisex", "chance": 30, "repeat": [ 0, 1 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 leather clothing shop crates.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_leather", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "z zz", + " z z", + "z z ", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "leather_shop", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "leather_shop_accessories", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "accesories_personal_unisex", "chance": 30, "repeat": [ 1, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 leather clothing backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_leather", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "CCCC", + " ", + " ", + "CC C" + ], + "terrain": { " ": "t_floor" }, + "furniture": { "C": "f_rack" }, + "items": { + "C": [ + { "item": "leather_shop", "chance": 30, "repeat": [ 0, 6 ] }, + { "item": "leather_shop_accessories", "chance": 30, "repeat": [ 0, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 leather clothing backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_leather", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "CBBB", + " Ad", + "A ", + "BB C" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { "A": "f_stool", "B": "f_workbench", "C": "f_rack_wood", "d": "f_mannequin", "e": "f_mannequin", "b": "f_bench" }, + "items": { + "C": [ + { "item": "SUS_tailoring_materials", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "leather_shop_repair", "chance": 30, "repeat": [ 2, 6 ] } + ], + "d": [ + { "item": "leather_shop", "chance": 100 }, + { "item": "pants", "chance": 50 }, + { "item": "shirts", "chance": 50 }, + { "item": "leather_shop_accessories", "chance": 100 } + ], + "B": [ + { "item": "SUS_tailoring_tool_drawer", "chance": 30, "repeat": [ 0, 1 ] }, + { "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 2, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 8x8 fur clothing shop.", + "nested_mapgen_id": "city_block_8x8_fur_clothing_shop_front", + "object": { + "mapgensize": [ 8, 8 ], + "rotation": [ 0, 3 ], + "rows": [ + " d B?B ", + " L AB b", + " L ", + " L C G b", + " d C G ", + " b", + " b QQQ ", + "|| |||||" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken", "|": "t_brick_wall" }, + "furniture": { + "A": "f_stool", + "B": "f_counter", + "C": "f_table", + "G": "f_displaycase", + "b": "f_bigmirror", + "Q": "f_rack_wood", + "d": "f_mannequin", + "L": "f_wardrobe" + }, + "items": { + "d": [ + { "item": "fancyfurs", "chance": 100 }, + { "item": "pants", "chance": 50 }, + { "item": "shirts", "chance": 50 }, + { "item": "dress_shoes", "chance": 100 } + ], + "C": [ { "item": "fancyfurs", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "fancyfurs", "chance": 30, "repeat": [ 1, 2 ] } ], + "Q": [ { "item": "fancyfurs", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ + { "item": "neckties", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "jewelry_front", "chance": 30, "repeat": [ 0, 1 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 fur clothing shop crates.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_fur", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z ", + "z z ", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "fancyfurs", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "neckties", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "accesories_personal_unisex", "chance": 30, "repeat": [ 1, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 fur clothing backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_fur", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "CCCC", + " ", + " ", + "CC C" + ], + "terrain": { " ": "t_floor" }, + "furniture": { "C": "f_rack" }, + "items": { "C": [ { "item": "fancyfurs", "chance": 30, "repeat": [ 0, 6 ] } ] } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 fur clothing backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_clothing_fur", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "CBBB", + " Ad", + "A ", + "BB C" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { "A": "f_stool", "B": "f_workbench", "C": "f_rack_wood", "d": "f_mannequin", "e": "f_mannequin", "b": "f_bench" }, + "items": { + "C": [ + { "item": "SUS_tailoring_materials", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "SUS_fur_tailoring_materials", "chance": 30, "repeat": [ 2, 6 ] } + ], + "d": [ { "item": "SUS_mannequin_fur", "chance": 100 } ], + "B": [ + { "item": "SUS_tailoring_tool_drawer", "chance": 30, "repeat": [ 0, 1 ] }, + { "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 2, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 5x5 shop backroom.", + "nested_mapgen_id": "city_block_5x5_backroom_shop", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "d G", + "L G", + "BA ", + "B zz", + "Cyz " + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { + "A": "f_chair", + "B": "f_desk", + "C": "f_rack", + "G": "f_locker", + "b": "f_bench", + "d": "f_filing_cabinet", + "L": "f_shredder", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ], + "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] + }, + "items": { + "d": [ { "item": "office_paper", "chance": 25 } ], + "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], + "B": [ { "item": "office", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 5x5 shop backroom.", + "nested_mapgen_id": "city_block_5x5_backroom_shop", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "y GG", + "b G", + "b z ", + " zz", + "CDF " + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { + "A": "f_chair", + "B": "f_desk", + "C": "f_rack", + "G": "f_locker", + "b": "f_bench", + "d": "f_filing_cabinet", + "L": "f_shredder", + "D": "f_vending_c", + "F": "f_vending_c", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ], + "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] + }, + "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, + "items": { + "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 shop backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_shop", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "FD d", + "G ", + "G ", + "ybb " + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { + "G": "f_locker", + "b": "f_bench", + "d": "f_filing_cabinet", + "D": "f_vending_c", + "F": "f_vending_c", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, + "items": { + "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 shop backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_shop", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "FD d", + "G ", + "G ", + "y C " + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { + "C": "f_rack", + "G": "f_sofa", + "d": "f_filing_cabinet", + "D": "f_vending_c", + "F": "f_vending_c", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, + "items": { + "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 4x4 shop backroom.", + "nested_mapgen_id": "city_block_4x4_backroom_shop", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "d L", + "B ", + "BA ", + "y GC" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { + "A": "f_chair", + "B": "f_desk", + "C": "f_rack", + "G": "f_locker", + "d": "f_filing_cabinet", + "L": "f_shredder", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], + "B": [ { "item": "office", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 5x5 shop backroom.", + "nested_mapgen_id": "city_block_5x5_backroom_shop", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "d FD", + "G b ", + "G b z", + "G b ", + "yz CC" + ], + "terrain": { " ": "t_floor", "?": "t_console_broken" }, + "furniture": { + "A": "f_chair", + "B": "f_desk", + "C": "f_rack", + "G": "f_locker", + "b": "f_bench", + "d": "f_filing_cabinet", + "L": "f_shredder", + "D": "f_vending_c", + "F": "f_vending_c", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ], + "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] + }, + "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, + "items": { + "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 5x5 shop backroom.", + "nested_mapgen_id": "city_block_5x5_backroom_shop", + "object": { + "mapgensize": [ 5, 5 ], + "rotation": [ 0, 3 ], + "rows": [ + "d FD", + "G ", + "G z", + "C ", + "yAAA " + ], + "terrain": { " ": "t_floor" }, + "furniture": { + "A": "f_sofa", + "C": "f_rack", + "G": "f_locker", + "d": "f_filing_cabinet", + "D": "f_vending_c", + "F": "f_vending_c", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ], + "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] + }, + "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, + "items": { + "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], + "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for 3x3 candy shop crates.", + "nested_mapgen_id": "city_block_3x3_backroom_crates_candy", + "object": { + "mapgensize": [ 3, 3 ], + "rotation": [ 0, 3 ], + "rows": [ + "z z", + " z", + "z z" + ], + "terrain": { "z": "t_floor" }, + "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, + "items": { + "z": [ + { "item": "candy_chocolate", "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "toy_store", "chance": 30, "repeat": [ 1, 6 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for restaurant spaces 14x14.", + "nested_mapgen_id": "city_block_14x14_restaurant", + "object": { + "mapgensize": [ 14, 14 ], + "rotation": [ 0, 3 ], + "rows": [ + " ", + " ", + "HLH HLH GG ", + "HLH HLH LL ", + " GG ", + "HLH HLH y ", + "HLH HLH GG ", + " LL ", + "|||||||| GG ", + "JJiRiJJ| || ", + "F n| |t ", + "F RRR l| * ", + "F * | ", + "YPPQQSY| |j " + ], + "terrain": { "?": "t_console_broken", "|": "t_brick_wall", "*": "t_door_c" }, + "furniture": { + "L": "f_table", + "H": "f_chair", + "G": "f_sofa", + "t": "f_toilet", + "j": "f_sink", + "P": "f_rack", + "S": "f_rack", + "Q": "f_rack", + "Y": "f_trashcan", + "A": "f_stool", + "i": "f_oven", + "F": "f_fridge", + "n": "f_sink", + "l": "f_dishwasher", + "J": "f_counter", + "R": "f_counter", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "Y": [ { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] } ], + "l": [ { "item": "restaur_sink", "chance": 30, "repeat": [ 1, 2 ] } ], + "n": [ { "item": "restaur_sink", "chance": 30, "repeat": [ 1, 2 ] } ], + "j": [ { "item": "restaur_bath", "chance": 30, "repeat": [ 1, 2 ] } ], + "i": [ { "item": "SUS_oven", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "restaur_table", "chance": 30, "repeat": [ 0, 4 ] } ], + "J": [ + { "item": "SUS_knife_drawer", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "restaur_kitchen", "chance": 30, "repeat": [ 1, 2 ] } + ], + "R": [ + { "item": "restaur_kitchen", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "diner_food", "chance": 30, "repeat": [ 1, 2 ] } + ], + "P": [ + { "item": "restaur_kitchen", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "restaur_rack", "chance": 30, "repeat": [ 1, 2 ] } + ], + "Q": [ + { "item": "restaur_kitchen", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "restaur_kitchen", "chance": 30, "repeat": [ 1, 2 ] } + ], + "S": [ + { "item": "groce_bread", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "restaur_kitchen", "chance": 30, "repeat": [ 1, 2 ] } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "//": "designed for bar spaces 11x11.", + "nested_mapgen_id": "city_block_11x11_bar", + "object": { + "mapgensize": [ 11, 11 ], + "rotation": [ 0, 3 ], + "rows": [ + "y A xx ", + "F RRA xx ", + "n RA xx ", + "J RA ", + "J ARA LG ", + "F RA LLG ", + "F yGGG ", + "|| ||||||| ", + "t| |FFFllK ", + " * * K ", + "j|K|YnJK " + ], + "terrain": { " ": "t_null", "|": "t_brick_wall", "*": "t_door_c" }, + "furniture": { + "L": "f_table", + "x": "f_pool_table", + "G": "f_sofa", + "t": "f_toilet", + "j": "f_sink", + "Y": "f_trashcan", + "A": "f_stool", + "F": "f_glass_fridge", + "n": "f_sink", + "l": "f_dishwasher", + "J": "f_counter", + "R": "f_counter", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ] + }, + "items": { + "K": { "item": "keg_beer", "chance": 50 }, + "Y": [ { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] } ], + "x": [ { "item": "pool_table", "chance": 30, "repeat": [ 1, 2 ] } ], + "l": [ { "item": "restaur_sink", "chance": 30, "repeat": [ 1, 2 ] } ], + "n": [ { "item": "restaur_sink", "chance": 30, "repeat": [ 1, 2 ] } ], + "j": [ { "item": "restaur_bath", "chance": 30, "repeat": [ 1, 2 ] } ], + "L": [ { "item": "bar_table", "chance": 30, "repeat": [ 0, 4 ] } ], + "J": [ + { "item": "liqstore_brew", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "bar_alcohol", "chance": 30, "repeat": [ 1, 2 ] } + ], + "R": [ { "item": "bar_table", "chance": 30, "repeat": [ 0, 4 ] } ], + "F": [ + { "item": "bar_alcohol", "chance": 30, "repeat": [ 0, 4 ] }, + { "item": "bar_fridge", "chance": 30, "repeat": [ 1, 2 ] } + ] + } + } + } +] diff --git a/data/json/mapgen/office_tower_2.json b/data/json/mapgen/office_tower_2.json index 326fd9515730f..1dfe16498d816 100644 --- a/data/json/mapgen/office_tower_2.json +++ b/data/json/mapgen/office_tower_2.json @@ -229,7 +229,7 @@ ], "place_monsters": [ { "monster": "GROUP_OFFICE_TOWER_2", "x": [ 7, 21 ], "y": [ 13, 21 ], "chance": 2, "repeat": [ 1 ] } ], "place_monster": [ { "monster": "mon_zombie_scientist", "x": [ 7, 21 ], "y": [ 4, 10 ], "repeat": [ 1, 3 ] } ], - "monster": { "7": { "monster": "mon_turret_rifle" } } + "monster": { "7": { "monster": "mon_turret_riot" } } } }, { diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json index eb91104628b0c..7f227c2e24a23 100644 --- a/data/json/mapgen/prison_1.json +++ b/data/json/mapgen/prison_1.json @@ -178,11 +178,11 @@ "place_item": [ { "item": "visions_solitude", "x": 16, "y": 108, "amount": 1 } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 15, 20 ], "y": [ 34, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_ROBOT_SECUBOT", "x": [ 15, 20 ], "y": [ 39, 42 ], "density": 0.1 }, + { "monster": "GROUP_TURRET_RIOT", "x": [ 15, 20 ], "y": [ 39, 42 ], "density": 0.1 }, { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 15, 20 ], "y": [ 44, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_ROBOT_SECUBOT", "x": [ 32, 39 ], "y": [ 39, 42 ], "density": 0.1 }, + { "monster": "GROUP_TURRET_RIOT", "x": [ 32, 39 ], "y": [ 39, 42 ], "density": 0.1 }, { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 51, 56 ], "y": [ 34, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_ROBOT_SECUBOT", "x": [ 51, 56 ], "y": [ 39, 42 ], "density": 0.1 }, + { "monster": "GROUP_TURRET_RIOT", "x": [ 51, 56 ], "y": [ 39, 42 ], "density": 0.1 }, { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 51, 56 ], "y": [ 44, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, { "monster": "GROUP_ROBOT_EYEBOT", "x": [ 24, 47 ], "y": [ 0, 13 ], "density": 0.1 }, { "monster": "GROUP_ROBOT_EYEBOT", "x": [ 27, 44 ], "y": [ 52, 60 ], "density": 0.1 }, @@ -253,7 +253,7 @@ }, "place_monsters": [ { "monster": "GROUP_ZOMBIE_COP", "x": [ 35, 38 ], "y": [ 2, 7 ], "density": 0.2 } ], "monster": { - "7": { "monster": "mon_turret_rifle" }, + "7": { "monster": "mon_turret_riot" }, "Z": { "monster": "mon_zombie_prisoner" }, "C": { "monster": "mon_broken_cyborg" } } @@ -474,7 +474,7 @@ }, "place_monster": [ { "monster": "mon_zombie_hulk", "x": 45, "y": 3 }, - { "monster": "mon_secubot", "x": 90, "y": 37 }, + { "monster": "mon_turret_riot", "x": 90, "y": 37 }, { "monster": "mon_zombie_brute", "x": 60, "y": 56 } ], "place_graffiti": [ { "text": "Dufresne was here", "x": 19, "y": 22 } ], diff --git a/data/json/mapgen/shelter.json b/data/json/mapgen/shelter.json index 08c04be62d0d2..c334dc18539ce 100644 --- a/data/json/mapgen/shelter.json +++ b/data/json/mapgen/shelter.json @@ -5,16 +5,29 @@ "subtype": "collection", "//": "now used for shelters that have been looted by kids, see SUS groups for general shelter supplies", "items": [ - [ "jacket_evac", 10 ], - [ "emer_blanket", 40 ], [ "wrapper", 90 ], + [ "evac_pamphlet", 80 ], [ "glass_shard", 80 ], + [ "emer_blanket", 40 ], [ "bottle_plastic", 30 ], [ "plastic_knife", 20 ], [ "plastic_spoon", 20 ], [ "plastic_fork", 20 ], [ "bowl_plastic", 10 ], - [ "evac_pamphlet", 80 ], + [ "jacket_evac", 15 ], + [ "folding_poncho", 10 ], + [ "sponge", 10 ], + [ "mask_dust", 9 ], + [ "handflare_dead", 9 ], + [ "whistle", 7 ], + [ "teddy_bear", 7 ], + { "item": "vinegar", "prob": 6, "charges-min": 1 }, + [ "candle", 5 ], + [ "pliers", 4 ], + [ "mirror", 4 ], + [ "wearable_light", 2 ], + [ "calcium_tablet", 1 ], + [ "vitamins", 1 ], { "item": "protein_bar_evac", "count": [ 0, 3 ] } ] }, diff --git a/data/json/mapgen/steel_mill/steel_mill_z2.json b/data/json/mapgen/steel_mill/steel_mill_z2.json index b18b63b7901e9..f4b994053c9af 100644 --- a/data/json/mapgen/steel_mill/steel_mill_z2.json +++ b/data/json/mapgen/steel_mill/steel_mill_z2.json @@ -133,7 +133,7 @@ "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::", "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::" ], - "terrain": [ { "M": "t_grate" }, { "8": "t_grate" } ], + "terrain": { "M": "t_grate", "8": "t_grate" }, "furniture": { }, "palettes": [ "steel_mill_palette" ], "place_monsters": [ diff --git a/data/json/mapgen_palettes/abandoned_barn_p.json b/data/json/mapgen_palettes/abandoned_barn_p.json index 55c671531bf1a..eabe6188dd4a5 100644 --- a/data/json/mapgen_palettes/abandoned_barn_p.json +++ b/data/json/mapgen_palettes/abandoned_barn_p.json @@ -5,9 +5,9 @@ "terrain": { ".": [ [ "t_region_groundcover", 50 ], [ "t_region_shrub", 2 ], "t_region_tree" ], "#": "t_region_shrub", - "&": "t_wall_wood_broken", + "&": [ [ "t_wall_wood_broken", 4 ], "t_wall_wood_chipped" ], "+": [ [ "t_door_c", 2 ], [ "t_door_o", 2 ], "t_door_boarded", "t_door_boarded_damaged" ], - "-": "t_wall_wood_chipped", + "-": [ [ "t_wall_wood_chipped", 4 ], "t_wall_wood" ], ":": "t_fencegate_c", "~": [ "t_swater_sh", [ "t_covered_well", 3 ], "t_water_pump" ], "0": "t_window_empty", @@ -21,7 +21,7 @@ "_": "t_dirtfloor", "=": "t_dirtfloor", "{": "t_dirtfloor", - "%": "t_wall_wood_broken", + "%": [ [ "t_wall_wood_broken", 4 ], "t_wall_wood_chipped" ], "!": "t_dirtfloor", "a": "t_grass", "b": "t_dirtfloor", @@ -33,7 +33,7 @@ "g": "t_generator_broken", "h": "t_dirtfloor", "I": "t_dirtfloor", - "L": [ "t_covered_well", "t_water_pump", "t_water_pump" ], + "L": [ "t_covered_well", [ "t_water_pump", 2 ] ], "m": "t_machinery_old", "M": "t_milking_machine", "n": "t_dirtfloor", @@ -52,7 +52,7 @@ "Q": "t_bulk_tank", "w": "t_window_boarded_noglass", "W": "t_window", - "|": "t_wall_wood", + "|": [ [ "t_wall_wood", 4 ], "t_wall_wood_chipped" ], "<": "t_ladder_up", ">": "t_ladder_down" }, diff --git a/data/json/mapgen_palettes/apartment.json b/data/json/mapgen_palettes/apartment.json index 4ce45b04f3ab6..ff2fcc03e34a6 100644 --- a/data/json/mapgen_palettes/apartment.json +++ b/data/json/mapgen_palettes/apartment.json @@ -83,12 +83,19 @@ "d": { "item": "dresser", "chance": 70, "repeat": [ 1, 3 ] }, "e": { "item": "fridge", "chance": 70, "repeat": [ 1, 10 ] }, "j": { "item": "trash", "chance": 65, "repeat": [ 1, 3 ] }, - "o": [ - { "item": "magazines", "chance": 30 }, - { "item": "novels", "chance": 40 }, - { "item": "alcohol", "chance": 30 }, - { "item": "manuals", "chance": 20 } - ], + "o": { + "item": { + "subtype": "distribution", + "entries": [ + { "group": "magazines" }, + { "group": "SUS_fiction_bookcase" }, + { + "distribution": [ { "group": "SUS_tailoring_bookcase" }, { "group": "SUS_crafts_bookcase" }, { "group": "SUS_cooking_bookcase" } ] + } + ] + }, + "chance": 75 + }, "O": { "item": "oven", "chance": 70 }, "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, "r": [ { "item": "dresser", "chance": 30 }, { "item": "jackets", "chance": 60 } ], diff --git a/data/json/mapgen_palettes/city_block_palette.json b/data/json/mapgen_palettes/city_block_palette.json new file mode 100644 index 0000000000000..11ff96b47b26a --- /dev/null +++ b/data/json/mapgen_palettes/city_block_palette.json @@ -0,0 +1,122 @@ +[ + { + "type": "palette", + "id": "city_block_foundation_palette", + "furniture": { + "A": "f_stool", + "B": "f_beaded_door", + "D": "f_chair", + "E": "f_rack_coat", + "F": "f_bench", + "G": "f_bench", + "H": "f_armchair", + "I": "f_desk", + "J": "f_counter", + "K": "f_cupboard", + "L": "f_table", + "N": "f_workbench", + "O": "f_wardrobe", + "P": "f_locker", + "Q": "f_rack", + "R": "f_bookcase", + "T": "f_bathtub", + "U": "f_utility_shelf", + "W": "f_washer", + "X": "f_birdbath", + "Y": "f_trashcan", + "Z": "f_dryer", + "d": "f_shower", + "g": "f_water_heater", + "h": "f_fireplace", + "i": "f_oven", + "j": "f_sink", + "n": "f_sink", + "k": "f_woodstove", + "l": "f_fridge", + "m": "f_glass_fridge", + "p": [ "f_dumpster", "f_recycle_bin" ], + "r": "f_wood_keg", + "v": "f_safe_l", + "w": "f_rack_wood", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ], + "z": "f_metal_butcher_rack" + }, + "terrain": { + ".": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub_decorative" ], + "-": "t_open_air", + "p": "t_concrete", + "X": "t_region_groundcover_urban", + " ": "t_floor", + "|": "t_brick_wall", + "%": "t_wall_w", + "<": "t_stairs_up", + ">": "t_stairs_down", + "o": "t_laminated_glass", + "+": "t_laminated_door_glass_c", + "@": "t_window_domestic", + "*": [ [ "t_door_c", 10 ], [ "t_door_o", 5 ], [ "t_door_locked_interior", 3 ] ], + "!": [ [ "t_door_locked_peep", 2 ], "t_door_locked_alarm", [ "t_door_locked", 10 ], "t_door_c" ], + "s": "t_concrete", + "~": "t_pavement", + "#": "t_chainfence", + "u": "t_chaingate_l", + "x": [ [ "t_door_metal_pickable", 20 ], [ "t_door_metal_c", 5 ], [ "t_door_metal_c_peep", 3 ] ], + "C": "t_column", + "^": "t_gutter_downspout", + ",": "t_glass_railing", + ";": "t_grate", + "M": "t_region_shrub_decorative", + "S": "t_ladder_down", + "V": "t_ladder_up", + "?": "t_console_broken", + "$": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ] + }, + "toilets": { "t": { } }, + "liquids": { "g": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, + "items": { + "O": [ { "item": "wardrobe_mens", "chance": 50 }, { "item": "wardrobe_womens", "chance": 50, "repeat": [ 1, 2 ] } ], + "Q": [ + { "item": "preserved_food", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "dry_goods", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "pet_food", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "condiments", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "pantry_liquids", "chance": 10 } + ], + "K": [ + { "item": "dishes_utility", "chance": 30 }, + { "item": "condiments", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "SUS_knife_drawer", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "SUS_junk_drawer", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "SUS_cookware", "chance": 20 } + ], + "w": [ + { "item": "shower", "chance": 20 }, + { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] } + ], + "v": [ + { "item": "art", "chance": 5 }, + { "item": "gemstones", "chance": 10, "repeat": [ 3, 6 ] }, + { "item": "jewelry_front", "chance": 5, "repeat": [ 1, 4 ] }, + { "item": "drugdealer", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "maps", "chance": 2 } + ], + "U": [ + { "item": "home_hw", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mechanics", "chance": 10, "repeat": [ 1, 2 ] } + ], + "j": [ + { "item": "softdrugs", "chance": 45, "repeat": [ 1, 3 ] }, + { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "harddrugs", "chance": 5 } + ], + "T": { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] }, + "n": { "item": "SUS_kitchen_sink", "chance": 10, "repeat": [ 1, 2 ] }, + "i": { "item": "SUS_oven", "chance": 25, "repeat": [ 1, 2 ] }, + "l": { "item": "SUS_fridge", "chance": 30, "repeat": [ 1, 2 ] }, + "Y": { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] }, + "R": { "item": "homebooks", "chance": 30, "repeat": [ 1, 2 ] } + } + } +] diff --git a/data/json/materials.json b/data/json/materials.json index e08a228dbaf48..83dd0f33d81b8 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -38,7 +38,7 @@ "elec_resist": 0, "chip_resist": 10, "repaired_with": "material_aluminium_ingot", - "dmg_adj": [ "dented", "bent", "smashed", "shattered" ], + "dmg_adj": [ "dented", "bent", "smashed", "destroyed" ], "bash_dmg_verb": "dented", "cut_dmg_verb": "scratched", "compacts_into": [ "material_aluminium_ingot", "aluminum_foil" ] @@ -276,6 +276,24 @@ "bash_dmg_verb": "chipped", "cut_dmg_verb": "scratched" }, + { + "type": "material", + "ident": "gemstone", + "name": "Gemstone", + "density": 14, + "specific_heat_liquid": 0.52, + "specific_heat_solid": 0.52, + "latent_heat": 5200, + "bash_resist": 14, + "cut_resist": 20, + "acid_resist": 10, + "fire_resist": 3, + "elec_resist": 3, + "chip_resist": 100, + "dmg_adj": [ "marked", "chipped", "cracked", "shattered" ], + "bash_dmg_verb": "chipped", + "cut_dmg_verb": "scratched" + }, { "type": "material", "ident": "egg", diff --git a/data/json/monsterdrops/monster_drops.json b/data/json/monsterdrops/monster_drops.json index 292cf5b945653..367f8cdfd1b30 100644 --- a/data/json/monsterdrops/monster_drops.json +++ b/data/json/monsterdrops/monster_drops.json @@ -347,38 +347,6 @@ { "item": "cash_card", "charges-min": 0, "charges-max": 50000 } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "mon_zombie_bio_op_death_drops", - "ammo": 30, - "magazine": 100, - "entries": [ - { "group": "bio_op_boots", "damage": [ 1, 4 ] }, - { "group": "mil_armor_torso", "damage": [ 1, 4 ] }, - { "group": "mil_armor_pants", "damage": [ 1, 4 ] }, - { "group": "mil_armor_helmet", "damage": [ 1, 4 ], "prob": 50 }, - { "group": "bio_op_face", "damage": [ 1, 4 ], "prob": 50 }, - { "group": "bio_op_torso", "damage": [ 1, 4 ], "prob": 50 }, - { "group": "bio_op_gloves", "damage": [ 1, 4 ], "prob": 50 }, - { "group": "underwear", "damage": [ 1, 4 ] }, - { - "distribution": [ - { "group": "ammo_milspec", "prob": 15 }, - { "group": "guns_pistol_milspec", "prob": 5 }, - { "group": "guns_shotgun_milspec", "prob": 4 }, - { "group": "guns_smg_milspec", "prob": 5 }, - { "group": "guns_rifle_milspec", "prob": 10 }, - { "group": "bots", "prob": 1 }, - { "group": "grenades", "prob": 5 }, - { "group": "mil_accessories", "prob": 10 }, - { "group": "mil_food", "prob": 5 }, - { "group": "bionics_mil", "prob": 1 } - ] - }, - { "item": "cash_card", "charges-min": 0, "charges-max": 50000 } - ] - }, { "type": "item_group", "subtype": "collection", diff --git a/data/json/monsterdrops/zombie_soldier.json b/data/json/monsterdrops/zombie_soldier.json index ad708b90a70ab..a3698aa977ff5 100644 --- a/data/json/monsterdrops/zombie_soldier.json +++ b/data/json/monsterdrops/zombie_soldier.json @@ -8,45 +8,22 @@ "entries": [ { "distribution": [ - { "group": "clothing_soldier_set", "prob": 65, "damage-min": 1, "damage-max": 4 }, - { "group": "clothing_soldier_winter_set", "prob": 35, "damage-min": 1, "damage-max": 4 } + { "group": "clothing_soldier_set", "prob": 65, "damage": [ 1, 4 ] }, + { "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 1, 4 ] } ] }, - { "group": "gear_soldier_sidearm", "prob": 30, "damage-min": 1, "damage-max": 4 }, - { - "collection": [ - { - "distribution": [ - { "group": "guns_rifle_milspec", "prob": 75, "damage-min": 1, "damage-max": 4 }, - { "group": "guns_shotgun_milspec", "prob": 25, "damage-min": 1, "damage-max": 4 } - ] - }, - { - "distribution": [ - { "item": "red_dot_sight", "prob": 100 }, - { "item": "suppressor", "prob": 100 }, - { "item": "laser_sight", "prob": 50 }, - { "collection": [ { "item": "m320" }, { "group": "ammo_launcher_grenade" } ], "prob": 100 } - ], - "prob": 30 - } - ], - "prob": 20 - }, { "distribution": [ - { "item": "LAW_Packed", "prob": 20 }, - { "item": "e_tool", "prob": 100 }, - { "item": "mask_gas", "prob": 100, "charges-min": 1, "charges-max": 100, "damage-min": 1, "damage-max": 4 }, - { "item": "two_way_radio", "prob": 50 }, - { "item": "c4", "prob": 10 } - ], - "prob": 20 + { "group": "military_standard_assault_rifles", "prob": 75 }, + { "group": "military_standard_lmgs", "prob": 10 }, + { "group": "military_standard_sniper_rifles", "prob": 10 }, + { "group": "military_standard_shotguns", "prob": 5 } + ] }, - { "item": "grenade", "prob": 5 }, - { "group": "drugs_soldier", "prob": 20 }, - { "group": "mil_food", "prob": 15 }, - { "item": "id_military", "prob": 5 }, + { "group": "infantry_common_gear" }, + { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 }, + { "group": "military_patrol_food" }, + { "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 }, { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 }, { "group": "misc_smoking", "prob": 30 } ] @@ -56,5 +33,36 @@ "type": "item_group", "subtype": "distribution", "entries": [ { "group": "mon_zombie_soldier_death_drops" }, { "group": "mon_zombie_cop_death_drops" } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "mon_zombie_bio_op_death_drops", + "magazine": 100, + "ammo": 60, + "entries": [ + { + "distribution": [ + { "group": "clothing_soldier_set", "prob": 65, "damage": [ 1, 4 ] }, + { "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 1, 4 ] } + ] + }, + { + "distribution": [ + { "group": "military_standard_assault_rifles", "contents-group": "sopmod", "prob": 75 }, + { "group": "military_standard_lmgs", "prob": 10 }, + { "group": "military_standard_sniper_rifles", "prob": 10 }, + { "group": "military_standard_shotguns", "prob": 5 } + ] + }, + { "group": "infantry_common_gear" }, + { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 }, + { "group": "military_patrol_food" }, + { + "collection": [ { "group": "infantry_officer_gear", "prob": 90 }, { "group": "infantry_medical_gear", "prob": 80 } ] + }, + { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 }, + { "group": "misc_smoking", "prob": 30 } + ] } ] diff --git a/data/json/monstergroups/monstergroups.json b/data/json/monstergroups/monstergroups.json index c6e8fed4a2478..c93385f156532 100644 --- a/data/json/monstergroups/monstergroups.json +++ b/data/json/monstergroups/monstergroups.json @@ -2316,6 +2316,7 @@ { "monster": "mon_zombie_swimmer", "freq": 10, "cost_multiplier": 5 }, { "monster": "mon_zombie_static", "freq": 10, "cost_multiplier": 5 }, { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }, + { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 60 }, { "monster": "mon_beekeeper", "freq": 1, "cost_multiplier": 5 }, { "monster": "mon_zombie_technician", "freq": 1, "cost_multiplier": 12 }, { "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, @@ -4261,7 +4262,6 @@ { "monster": "mon_zombie_technician", "freq": 50, "cost_multiplier": 3 }, { "monster": "mon_zombie_static", "freq": 50, "cost_multiplier": 3 }, { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 }, - { "monster": "mon_chickenbot", "freq": 1, "cost_multiplier": 50 }, { "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 50 }, { "monster": "mon_skeleton_hulk", "freq": 1, "cost_multiplier": 50 } ] @@ -4351,27 +4351,6 @@ "default": "mon_spider_web", "monsters": [ ] }, - { - "type": "monstergroup", - "name": "GROUP_ROBOT", - "default": "mon_manhack", - "monsters": [ - { "monster": "mon_skitterbot", "freq": 220, "cost_multiplier": 0 }, - { "monster": "mon_secubot", "freq": 150, "cost_multiplier": 0 }, - { "monster": "mon_talon_m202a1", "freq": 75, "cost_multiplier": 0 }, - { "monster": "mon_copbot", "freq": 0, "cost_multiplier": 0 }, - { "monster": "mon_molebot", "freq": 40, "cost_multiplier": 0 }, - { "monster": "mon_tripod", "freq": 110, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 60, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "freq": 20, "cost_multiplier": 0 } - ] - }, - { - "type": "monstergroup", - "name": "GROUP_TURRET", - "default": "mon_turret_rifle", - "monsters": [ { "monster": "mon_turret_bmg", "freq": 50, "cost_multiplier": 2 } ] - }, { "type": "monstergroup", "name": "GROUP_POLICE", @@ -4391,7 +4370,8 @@ { "monster": "mon_dog_zombie_rot", "freq": 5, "cost_multiplier": 2 }, { "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 }, { "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 }, - { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 } + { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }, + { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 60 } ] }, { @@ -4413,7 +4393,8 @@ { "monster": "mon_dog_zombie_rot", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 }, { "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 }, - { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 } + { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }, + { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 60 } ] }, { @@ -4422,7 +4403,8 @@ "default": "mon_zombie", "monsters": [ { "monster": "mon_zombie_tough", "freq": 180, "cost_multiplier": 0 }, - { "monster": "mon_zombie_survivor", "freq": 400, "cost_multiplier": 0 } + { "monster": "mon_zombie_survivor", "freq": 400, "cost_multiplier": 0 }, + { "monster": "mon_zombie_survivor_elite", "freq": 20, "cost_multiplier": 25, "starts": 60 } ] }, { @@ -4445,6 +4427,7 @@ { "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 }, { "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 }, { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }, + { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 60 }, { "monster": "mon_zombie_runner", "freq": 130, "cost_multiplier": 3 } ] }, @@ -4467,7 +4450,8 @@ { "monster": "mon_dog_zombie_rot", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 }, { "monster": "mon_zombie_static", "freq": 180, "cost_multiplier": 5 }, - { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 } + { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }, + { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 60 } ] }, { @@ -4489,7 +4473,8 @@ { "monster": "mon_dog_zombie_rot", "freq": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 }, { "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 }, - { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 } + { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }, + { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 60 } ] }, { @@ -5083,18 +5068,6 @@ { "monster": "mon_dog_zombie_cop", "freq": 50, "cost_multiplier": 2, "pack_size": [ 1, 2 ] } ] }, - { - "type": "monstergroup", - "name": "GROUP_ROBOT_EYEBOT", - "default": "mon_eyebot", - "monsters": [ { "monster": "mon_eyebot", "freq": 100, "cost_multiplier": 0 } ] - }, - { - "type": "monstergroup", - "name": "GROUP_ROBOT_SECUBOT", - "default": "mon_secubot", - "monsters": [ { "monster": "mon_secubot", "freq": 100, "cost_multiplier": 0 } ] - }, { "type": "monstergroup", "name": "GROUP_PARK_ANIMAL", @@ -5195,6 +5168,7 @@ { "monster": "mon_zombie_swimmer", "freq": 10, "cost_multiplier": 5 }, { "monster": "mon_zombie_static", "freq": 10, "cost_multiplier": 5 }, { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }, + { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 60 }, { "monster": "mon_beekeeper", "freq": 1, "cost_multiplier": 5 }, { "monster": "mon_zombie_technician", "freq": 1, "cost_multiplier": 12 }, { "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, @@ -5220,6 +5194,7 @@ { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 3 }, { "monster": "mon_zombie_static", "freq": 10, "cost_multiplier": 5 }, { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }, + { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 60 }, { "monster": "mon_zombie_technician", "freq": 1, "cost_multiplier": 12 }, { "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, { "monster": "mon_zombie_brainless", "freq": 55, "cost_multiplier": 1 } @@ -5271,7 +5246,8 @@ { "monster": "mon_zombie_fat", "freq": 150, "cost_multiplier": 1 }, { "monster": "mon_zombie_wretched", "freq": 120, "cost_multiplier": 1 }, { "monster": "mon_zombie_crawler", "freq": 100, "cost_multiplier": 1 }, - { "monster": "mon_zombie_survivor", "freq": 70, "cost_multiplier": 1 } + { "monster": "mon_zombie_survivor", "freq": 70, "cost_multiplier": 1 }, + { "monster": "mon_zombie_survivor_elite", "freq": 10, "cost_multiplier": 1, "starts": 60 } ] }, { @@ -5318,12 +5294,6 @@ "default": "mon_dark_wyrm", "monsters": [ { "monster": "mon_dark_wyrm", "freq": 40, "cost_multiplier": 1 } ] }, - { - "name": "GROUP_HAZMATBOT", - "type": "monstergroup", - "default": "mon_hazmatbot", - "monsters": [ { "monster": "mon_hazmatbot", "freq": 40, "cost_multiplier": 1 } ] - }, { "name": "GROUP_STRAY_DOGS", "type": "monstergroup", diff --git a/data/json/monstergroups/robots.json b/data/json/monstergroups/robots.json new file mode 100644 index 0000000000000..d4cbf677275ba --- /dev/null +++ b/data/json/monstergroups/robots.json @@ -0,0 +1,44 @@ +[ + { + "type": "monstergroup", + "name": "GROUP_ROBOT", + "default": "mon_manhack", + "monsters": [ + { "monster": "mon_skitterbot", "freq": 220, "cost_multiplier": 0 }, + { "monster": "mon_secubot", "freq": 150, "cost_multiplier": 0 }, + { "monster": "mon_talon_m202a1", "freq": 75, "cost_multiplier": 0 }, + { "monster": "mon_copbot", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_molebot", "freq": 40, "cost_multiplier": 0 } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_TURRET", + "default": "mon_turret_rifle", + "monsters": [ { "monster": "mon_turret_bmg", "freq": 50, "cost_multiplier": 2 } ] + }, + { + "name": "GROUP_HAZMATBOT", + "type": "monstergroup", + "default": "mon_hazmatbot", + "monsters": [ { "monster": "mon_hazmatbot", "freq": 40, "cost_multiplier": 1 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_ROBOT_EYEBOT", + "default": "mon_eyebot", + "monsters": [ { "monster": "mon_eyebot", "freq": 100, "cost_multiplier": 0 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_ROBOT_SECUBOT", + "default": "mon_secubot", + "monsters": [ { "monster": "mon_secubot", "freq": 100, "cost_multiplier": 0 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_TURRET_RIOT", + "default": "mon_turret_riot", + "monsters": [ { "monster": "mon_turret_riot", "freq": 100, "cost_multiplier": 0 } ] + } +] diff --git a/data/json/monstergroups/triffid.json b/data/json/monstergroups/triffid.json index 4a5b95dea3050..325a32845e862 100644 --- a/data/json/monstergroups/triffid.json +++ b/data/json/monstergroups/triffid.json @@ -10,7 +10,8 @@ { "monster": "mon_fungal_fighter", "freq": 160, "cost_multiplier": 0 }, { "monster": "mon_vinebeast", "freq": 160, "cost_multiplier": 10 }, { "monster": "mon_creeper_hub", "freq": 50, "cost_multiplier": 2 }, - { "monster": "mon_biollante", "freq": 50, "cost_multiplier": 2 } + { "monster": "mon_biollante", "freq": 50, "cost_multiplier": 2 }, + { "monster": "mon_triffid_flower", "freq": 25, "cost_multiplier": 4 } ] }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index af7410c863183..d730b37a7fdc6 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -23,7 +23,7 @@ "melee_cut": 1, "dodge": 4, "harvest": "bird_tiny", - "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 5 }, + "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 2 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 3 }, "death_function": [ "NORMAL" ], diff --git a/data/json/monsters/defense_bot.json b/data/json/monsters/defense_bot.json index 53290ecf44f6e..a8b43a916600e 100644 --- a/data/json/monsters/defense_bot.json +++ b/data/json/monsters/defense_bot.json @@ -205,7 +205,7 @@ { "id": "mon_dispatch", "type": "MONSTER", - "name": { "str": "NR-031 Dispatch" }, + "name": { "str": "NR-031 Dispatch", "str_pl": "NR-031 Dispatches" }, "description": "The Northrop Dispatch, designed for crowd control situations, carries and deploys kamikaze drones of various types. The bright green-and-yellow paint marks a low-force variant - *comparatively* low-force, anyways - typically deployed as guards after an area has been cleared.", "default_faction": "defense_bot", "species": [ "ROBOT" ], @@ -238,7 +238,7 @@ { "id": "mon_dispatch_military", "type": "MONSTER", - "name": { "str": "NR-V05-M Dispatch" }, + "name": { "str": "NR-V05-M Dispatch", "str_pl": "NR-V05-M Dispatches" }, "description": "The Northrop Dispatch, designed for crowd control situations, carries and deploys kamikaze drones of various types. The dark green paint job marks the lethal and feared military variant, carrying extreme and deadly firepower.", "default_faction": "defense_bot", "species": [ "ROBOT" ], diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 6bfe9815f3bf2..6d95772cbe3f3 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -6,7 +6,7 @@ "name": "black bear cub", "description": "A juvenile American black bear. This one isn't much of a threat, but be wary of its parent; black bears are known for their protectiveness.", "volume": "40750 ml", - "weight": 40750, + "weight": "40750 g", "hp": 20, "speed": 90, "symbol": "b", @@ -30,7 +30,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "154250 ml", - "weight": 154250, + "weight": "154250 g", "hp": 100, "speed": 140, "material": [ "flesh" ], @@ -67,7 +67,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "20250 ml", - "weight": 20250, + "weight": "20250 g", "hp": 16, "speed": 90, "material": [ "flesh" ], @@ -95,7 +95,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "200 ml", - "weight": 200, + "weight": "200 g", "hp": 6, "speed": 100, "material": [ "flesh" ], @@ -128,7 +128,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "8600 ml", - "weight": 8600, + "weight": "8600 g", "hp": 16, "speed": 150, "material": [ "flesh" ], @@ -158,7 +158,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "4000 ml", - "weight": 4000, + "weight": "4 kg", "hp": 12, "speed": 150, "material": [ "flesh" ], @@ -189,7 +189,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "96 ml", - "weight": 96, + "weight": "96 g", "hp": 4, "speed": 110, "material": [ "flesh" ], @@ -217,7 +217,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "63000 ml", - "weight": 63000, + "weight": "63 kg", "hp": 60, "speed": 180, "material": [ "flesh" ], @@ -254,14 +254,14 @@ { "id": "mon_cow_calf", "type": "MONSTER", - "name": "calf", + "name": { "str": "calf", "str_pl": "calves" }, "description": "The domestic cow, a baleful, ruminating farm animal. It is quite muscular, and the males can have a violent streak to accompany their nasty-looking horns.", "default_faction": "herbivore", "bodytype": "dog", "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 40, "speed": 120, "material": [ "flesh" ], @@ -298,7 +298,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "680388 ml", - "weight": 680388, + "weight": "680388 g", "hp": 100, "speed": 130, "material": [ "flesh" ], @@ -347,7 +347,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "13250 ml", - "weight": 13250, + "weight": "13250 g", "hp": 22, "speed": 155, "material": [ "flesh" ], @@ -379,7 +379,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "13250 ml", - "weight": 13250, + "weight": "13250 g", "hp": 20, "speed": 155, "material": [ "flesh" ], @@ -411,7 +411,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "40750 ml", - "weight": 40750, + "weight": "40750 g", "hp": 20, "speed": 200, "material": [ "flesh" ], @@ -443,7 +443,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "87000 ml", - "weight": 87000, + "weight": "87 kg", "hp": 60, "speed": 300, "material": [ "flesh" ], @@ -477,7 +477,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "30000 ml", - "weight": 30000, + "weight": "30 kg", "harvest": "mammal_small_fur", "hp": 30, "speed": 150, @@ -523,7 +523,7 @@ "name": { "str": "Labrador puppy", "str_pl": "Labrador puppies" }, "description": "An adorable, defenseless Labrador puppy. Much safer to tame than an adult dog.", "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 8, "speed": 98, "aggression": -13, @@ -545,7 +545,7 @@ "name": "bulldog", "description": "The American bulldog is a hardy, well built dog, that seems suited for surviving the apocalypse.", "volume": "25000 ml", - "weight": 25000, + "weight": "25 kg", "hp": 47, "speed": 135, "melee_skill": 4, @@ -578,7 +578,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 12, "speed": 88, "material": [ "flesh" ], @@ -605,7 +605,7 @@ "name": { "str": "pit bull mix", "str_pl": "pit bull mixes" }, "description": "The oft-misunderstood pit bull is not actually a single breed but a label for several kinds of terriers. It has average abilities, and is well-known for its 'lock jaw' - which isn't real, but their incredible determination is.", "hp": 27, - "weight": 25000, + "weight": "25 kg", "speed": 135, "aggression": 1, "morale": 11, @@ -639,7 +639,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "harvest": "mammal_tiny", "hp": 7, "speed": 88, @@ -668,7 +668,7 @@ "type": "MONSTER", "name": "beagle", "description": "An adorable beagle that has managed to survive the apocalypse. Being agile and small, they are difficult to shoot at. Generally attacks in packs.", - "weight": 10000, + "weight": "10 kg", "harvest": "mammal_small_leather", "hp": 13, "speed": 135, @@ -705,7 +705,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 4, "speed": 88, "material": [ "flesh" ], @@ -735,7 +735,7 @@ "name": "border collie", "description": "An athletic and hyperactive dog that loves to herd animals and jump, the Border Collie is an agile attacker. Although they can be easy to train, they don't work well in packs.", "hp": 19, - "weight": 16000, + "weight": "16 kg", "speed": 200, "aggression": -5, "morale": 10, @@ -768,7 +768,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 5, "speed": 130, "material": [ "flesh" ], @@ -799,7 +799,7 @@ "description": "An ordinary breed full of affection, the boxer mastiff doesn't otherwise stand out amongst other dogs with its capabilities.", "hp": 29, "aggression": -8, - "weight": 27500, + "weight": "27500 g", "melee_skill": 4, "melee_dice_sides": 2, "melee_cut": 4, @@ -821,7 +821,7 @@ "species": [ "MAMMAL" ], "diff": 3, "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 7, "speed": 98, "material": [ "flesh" ], @@ -863,7 +863,7 @@ "name": "Chihuahua", "description": "It's a tiny Chihuahua. How it has managed to survive is a miracle, although its small size and aggressive nature may have proven useful.", "volume": "750 ml", - "weight": 2200, + "weight": "2200 g", "hp": 6, "speed": 135, "aggression": 4, @@ -899,7 +899,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "500 ml", - "weight": 500, + "weight": "500 g", "hp": 2, "speed": 88, "material": [ "flesh" ], @@ -929,7 +929,7 @@ "name": "dachshund", "description": "A wiener dog! This awkward looking dog can be a useful watchdog, plus it looks adorable as it bumbles around. Its tiny size also makes it hard to shoot (you monster).", "hp": 10, - "weight": 10000, + "weight": "10 kg", "speed": 135, "aggression": -4, "morale": 10, @@ -965,7 +965,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 3, "speed": 88, "material": [ "flesh" ], @@ -995,7 +995,7 @@ "name": "German shepherd", "description": "The original K-9 breed. An easy to train and great attack dog that will also defend its owner to the death, however they don't work well in packs.", "volume": "35000 ml", - "weight": 35000, + "weight": "35 kg", "hp": 36, "aggression": 2, "morale": 10, @@ -1016,7 +1016,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 9, "speed": 98, "material": [ "flesh" ], @@ -1047,7 +1047,7 @@ "//": "Rare, location specific only", "description": "A large and powerful breed, the Great Pyrenees has a beautiful, thick white coat. Originally bred to deter wolves and other predators, now faced with protecting livestock from shambling hordes of undead.", "volume": "52500 ml", - "weight": 52500, + "weight": "52500 g", "hp": 40, "speed": 100, "aggression": 3, @@ -1083,7 +1083,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 10, "speed": 65, "material": [ "flesh" ], @@ -1114,7 +1114,7 @@ "//": "Rare, location specific only", "description": "A terrifying breed to face feral, Rottweilers are descended from Roman legion mastiffs. It's robust, vicious, and quite capable of mauling a human to death.", "volume": "50000 ml", - "weight": 50000, + "weight": "50 kg", "hp": 42, "speed": 135, "aggression": 4, @@ -1150,7 +1150,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 11, "speed": 88, "material": [ "flesh" ], @@ -1180,7 +1180,7 @@ "name": "cattle dog", "description": "An agile and sturdy breed that is welcome on any farm, the Australian cattle dog is adept at leaping fences and herding livestock.", "hp": 20, - "weight": 18000, + "weight": "18 kg", "speed": 200, "morale": 10, "melee_skill": 4, @@ -1215,7 +1215,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 5, "speed": 130, "material": [ "flesh" ], @@ -1248,7 +1248,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "4750 ml", - "weight": 4750, + "weight": "4750 g", "hp": 20, "speed": 130, "material": [ "flesh" ], @@ -1262,7 +1262,7 @@ "melee_cut": 2, "dodge": 6, "vision_night": 5, - "harvest": "mammal_tiny", + "harvest": "mammal_small_fur", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "MEAT" ], @@ -1279,7 +1279,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "4132 ml", - "weight": 4132, + "weight": "4132 g", "hp": 30, "speed": 145, "material": [ "flesh" ], @@ -1310,7 +1310,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "3628 ml", - "weight": 3628, + "weight": "3628 g", "hp": 12, "speed": 140, "material": [ "flesh" ], @@ -1337,7 +1337,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "4175 ml", - "weight": 4175, + "weight": "4175 g", "hp": 10, "speed": 170, "material": [ "flesh" ], @@ -1362,7 +1362,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "550000 ml", - "weight": 550000, + "weight": "550 kg", "hp": 90, "speed": 300, "material": [ "flesh" ], @@ -1404,7 +1404,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "30 ml", - "weight": 30, + "weight": "30 g", "hp": 4, "speed": 90, "material": [ "flesh" ], @@ -1430,7 +1430,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "800 ml", - "weight": 800, + "weight": "800 g", "hp": 30, "speed": 130, "material": [ "flesh" ], @@ -1460,7 +1460,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "386000 ml", - "weight": 386000, + "weight": "386 kg", "hp": 120, "speed": 200, "material": [ "flesh" ], @@ -1496,7 +1496,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "1362 ml", - "weight": 1362, + "weight": "1362 g", "hp": 10, "speed": 100, "material": [ "flesh" ], @@ -1525,7 +1525,7 @@ "species": [ "MAMMAL" ], "diff": 2, "volume": "200000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 120, "speed": 80, "material": [ "flesh" ], @@ -1562,7 +1562,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "3000 ml", - "weight": 3000, + "weight": "3 kg", "hp": 12, "speed": 110, "material": [ "flesh" ], @@ -1591,7 +1591,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "9000 ml", - "weight": 9000, + "weight": "9 kg", "hp": 12, "speed": 110, "material": [ "flesh" ], @@ -1618,7 +1618,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "10000 ml", - "weight": 10000, + "weight": "10 kg", "hp": 5, "speed": 80, "material": [ "flesh" ], @@ -1652,7 +1652,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "200000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 50, "speed": 100, "material": [ "flesh" ], @@ -1687,7 +1687,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "1600 ml", - "weight": 1600, + "weight": "1600 g", "hp": 8, "speed": 160, "material": [ "flesh" ], @@ -1697,10 +1697,11 @@ "morale": -7, "melee_cut": 0, "dodge": 6, + "reproduction": { "baby_monster": "mon_rabbit", "baby_count": 3, "baby_timer": 55 }, "harvest": "mammal_small_fur", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "death_function": [ "NORMAL" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "CATTLEFODDER", "PET_WONT_FOLLOW", "WARM" ] }, { "id": "mon_raccoon", @@ -1712,7 +1713,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "6000 ml", - "weight": 6000, + "weight": "6 kg", "hp": 14, "speed": 100, "material": [ "flesh" ], @@ -1740,7 +1741,7 @@ "species": [ "MAMMAL" ], "diff": 10, "volume": "81500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 220, "speed": 40, "material": [ "flesh" ], @@ -1766,7 +1767,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 10, "speed": 100, "material": [ "flesh" ], @@ -1798,7 +1799,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "40750 ml", - "weight": 40750, + "weight": "40750 g", "hp": 20, "speed": 90, "material": [ "flesh" ], @@ -1829,7 +1830,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "81500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 90, "material": [ "flesh" ], @@ -1862,7 +1863,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "624 ml", - "weight": 624, + "weight": "624 g", "hp": 6, "speed": 140, "material": [ "flesh" ], @@ -1889,7 +1890,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "663 ml", - "weight": 663, + "weight": "663 g", "hp": 6, "speed": 130, "material": [ "flesh" ], @@ -1916,7 +1917,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "150 ml", - "weight": 151, + "weight": "151 g", "hp": 20, "speed": 110, "material": [ "flesh" ], @@ -1943,7 +1944,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "26625 ml", - "weight": 26625, + "weight": "26625 g", "hp": 40, "speed": 165, "material": [ "flesh" ], diff --git a/data/json/monsters/monsters.json b/data/json/monsters/monsters.json index 2241e6429827c..6769422fdd945 100644 --- a/data/json/monsters/monsters.json +++ b/data/json/monsters/monsters.json @@ -7,7 +7,7 @@ "default_faction": "", "species": [ "ZOMBIE" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 10000, "speed": 100, "material": [ "flesh" ], @@ -32,7 +32,7 @@ "categories": [ "WILDLIFE" ], "species": [ "NETHER" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 200, "speed": 50, "material": [ "flesh" ], @@ -65,7 +65,7 @@ "species": [ "MUTANT" ], "diff": 2, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 120, "speed": 95, "material": [ "flesh" ], @@ -100,7 +100,7 @@ "species": [ "HORROR" ], "diff": 5, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 250, "speed": 70, "material": [ "flesh" ], @@ -128,7 +128,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 10, "speed": 230, "material": [ "flesh" ], @@ -158,7 +158,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 70, "speed": 60, "material": [ "flesh" ], @@ -205,7 +205,7 @@ "species": [ "NETHER" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 80, "material": [ "flesh" ], @@ -232,7 +232,7 @@ "species": [ "NETHER", "BLOB" ], "diff": 1, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 70, "symbol": "O", @@ -262,7 +262,7 @@ "species": [ "NETHER", "BLOB" ], "diff": 5, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 400, "speed": 50, "symbol": "O", @@ -290,7 +290,7 @@ "species": [ "NETHER", "BLOB" ], "diff": 1, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 160, "speed": 90, "symbol": "O", @@ -321,7 +321,7 @@ "species": [ "NETHER", "BLOB" ], "diff": 1, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 40, "speed": 50, "symbol": "o", @@ -349,7 +349,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 40, "speed": 200, "material": [ "flesh" ], @@ -376,7 +376,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 40, "speed": 55, "material": [ "flesh" ], @@ -421,7 +421,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "102500 ml", - "weight": 160000, + "weight": "160 kg", "hp": 90, "speed": 25, "material": [ "flesh" ], @@ -464,7 +464,7 @@ "species": [ "FUNGUS" ], "diff": 5, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 30, "speed": 40, "material": [ "flesh" ], @@ -496,7 +496,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 110, "speed": 85, "material": [ "flesh" ], @@ -542,7 +542,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 8, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 112, "speed": 60, "material": [ "flesh" ], @@ -591,7 +591,7 @@ "bodytype": "blob", "species": [ "NETHER" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 100, "symbol": "o", @@ -611,7 +611,7 @@ "bodytype": "blob", "species": [ "NETHER" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 100, "symbol": "O", @@ -631,7 +631,7 @@ "bodytype": "human", "species": [ "ROBOT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 90, "material": [ "steel" ], @@ -674,7 +674,7 @@ "bodytype": "human", "species": [ "ROBOT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 90, "material": [ "steel" ], @@ -716,7 +716,7 @@ "bodytype": "human", "species": [ "ABERRATION" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 95, "material": [ "flesh" ], @@ -739,39 +739,6 @@ "death_function": [ "MELT" ], "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "NOGIB", "POISON", "FILTHY" ] }, - { - "id": "mon_chickenbot", - "type": "MONSTER", - "name": "chicken walker", - "description": "The Northrop ATSV, a massive, heavily-armed and armored robot walking on a pair of reverse-jointed legs. Armed with a 40mm anti-vehicle grenade launcher, 5.56 anti-personnel gun, and the ability to electrify itself against attackers, it is an effective automated sentry, though production was limited due to a legal dispute.", - "default_faction": "military", - "species": [ "ROBOT" ], - "diff": 20, - "volume": "92500 ml", - "weight": 120000, - "hp": 90, - "speed": 115, - "material": [ "steel" ], - "symbol": "R", - "color": "red", - "aggression": 100, - "morale": 100, - "melee_skill": 3, - "melee_dice": 3, - "melee_dice_sides": 3, - "melee_cut": 0, - "armor_bash": 18, - "armor_cut": 14, - "vision_day": 50, - "vision_night": 35, - "revert_to_itype": "bot_chickenbot", - "starting_ammo": { "40x46mm_m433": 100, "556": 1000 }, - "path_settings": { "max_dist": 10 }, - "special_attacks": [ [ "CHICKENBOT", 4 ] ], - "death_drops": { "groups": [ [ "robots", 4 ], [ "chickenbot", 4, 6 ] ] }, - "death_function": [ "EXPLODE" ], - "flags": [ "SEES", "HEARS", "BASHES", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS" ] - }, { "id": "mon_chud", "type": "MONSTER", @@ -781,7 +748,7 @@ "bodytype": "human", "species": [ "MUTANT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 110, "material": [ "flesh" ], @@ -813,7 +780,7 @@ "species": [ "ROBOT" ], "diff": 10, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "steel" ], @@ -844,7 +811,7 @@ "default_faction": "mutant", "species": [ "ABERRATION" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 180, "speed": 80, "material": [ "flesh" ], @@ -872,7 +839,7 @@ "bodytype": "snake", "species": [ "MUTANT" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 120, "speed": 100, "material": [ "flesh" ], @@ -899,7 +866,7 @@ "species": [ "NETHER" ], "diff": 2, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 800, "speed": 140, "symbol": "S", @@ -930,7 +897,7 @@ "bodytype": "human", "species": [ "ZOMBIE" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "flesh" ], @@ -958,7 +925,7 @@ "bodytype": "dog", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 12, "speed": 100, "material": [ "bone" ], @@ -989,7 +956,7 @@ "bodytype": "dog", "species": [ "NETHER" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 25, "speed": 150, "material": [ "flesh" ], @@ -1017,7 +984,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 42, "speed": 105, "material": [ "flesh" ], @@ -1049,7 +1016,7 @@ "bodytype": "dog", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 24, "speed": 105, "material": [ "flesh" ], @@ -1078,7 +1045,7 @@ "species": [ "ROBOT" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 20, "speed": 120, "material": [ "steel" ], @@ -1104,7 +1071,7 @@ "default_faction": "nurse_bot", "species": [ "ROBOT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "steel" ], @@ -1134,7 +1101,7 @@ "default_faction": "nurse_bot", "species": [ "ROBOT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "steel" ], @@ -1164,7 +1131,7 @@ "default_faction": "mech_bot", "species": [ "ROBOT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "steel" ], @@ -1200,7 +1167,7 @@ "default_faction": "mech_bot", "species": [ "ROBOT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "steel" ], @@ -1226,7 +1193,7 @@ "species": [ "NETHER" ], "diff": 20, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 300, "speed": 90, "material": [ "flesh" ], @@ -1254,7 +1221,7 @@ "species": [ "ZOMBIE" ], "diff": 5, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 200, "speed": 120, "material": [ "flesh" ], @@ -1283,7 +1250,7 @@ "species": [ "NETHER" ], "diff": 20, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 350, "speed": 280, "material": [ "flesh" ], @@ -1322,7 +1289,7 @@ "species": [ "FUNGUS" ], "diff": 20, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 30, "speed": 100, "material": [ "veggy" ], @@ -1348,7 +1315,7 @@ "species": [ "FUNGUS" ], "diff": 5, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 40, "speed": 100, "material": [ "stone" ], @@ -1376,7 +1343,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 30, "speed": 100, "material": [ "veggy" ], @@ -1405,7 +1372,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 20, "speed": 100, "material": [ "veggy" ], @@ -1434,7 +1401,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 40, "material": [ "veggy" ], @@ -1461,7 +1428,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 300, "speed": 100, "material": [ "stone" ], @@ -1486,7 +1453,7 @@ "species": [ "FUNGUS" ], "diff": 10, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 300, "speed": 100, "material": [ "stone" ], @@ -1512,7 +1479,7 @@ "species": [ "FUNGUS" ], "diff": 5, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 300, "speed": 100, "material": [ "stone" ], @@ -1542,7 +1509,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 70, "speed": 70, "material": [ "veggy" ], @@ -1572,7 +1539,7 @@ "species": [ "NETHER" ], "diff": 2, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 200, "speed": 40, "symbol": "O", @@ -1597,7 +1564,7 @@ "default_faction": "player", "species": [ "UNKNOWN" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 500, "speed": 100, "material": [ "steel" ], @@ -1620,7 +1587,7 @@ "bodytype": "crab", "species": [ "MUTANT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 50, "speed": 130, "material": [ "flesh" ], @@ -1649,7 +1616,7 @@ "species": [ "NETHER" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 400, "speed": 80, "material": [ "flesh" ], @@ -1688,7 +1655,7 @@ "bodytype": "snake", "species": [ "WORM" ], "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 210, "speed": 180, "material": [ "flesh" ], @@ -1716,7 +1683,7 @@ "species": [ "NETHER" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 180, "material": [ "flesh" ], @@ -1741,7 +1708,7 @@ "bodytype": "snake", "species": [ "WORM" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 20, "speed": 80, "material": [ "flesh" ], @@ -1767,7 +1734,7 @@ "bodytype": "human", "species": [ "HALLUCINATION" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 5, "speed": 100, "material": [ "flesh" ], @@ -1790,7 +1757,7 @@ "default_faction": "factionless", "species": [ "HALLUCINATION" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 5, "speed": 50, "material": [ "steel" ], @@ -1813,7 +1780,7 @@ "default_faction": "utility_bot", "species": [ "ROBOT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 70, "material": [ "steel" ], @@ -1838,7 +1805,7 @@ "bodytype": "dog", "species": [ "NETHER" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 120, "material": [ "flesh" ], @@ -1864,7 +1831,7 @@ "default_faction": "factionless", "species": [ "UNKNOWN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 1, "speed": 150, "symbol": "@", @@ -1888,7 +1855,7 @@ "bodytype": "human", "species": [ "ZOMBIE" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 110, "material": [ "flesh" ], @@ -1916,7 +1883,7 @@ "bodytype": "dog", "species": [ "NETHER" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 300, "speed": 70, "material": [ "flesh" ], @@ -1959,7 +1926,7 @@ "bodytype": "dog", "species": [ "NETHER" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 100, "speed": 70, "material": [ "flesh" ], @@ -2002,7 +1969,7 @@ "species": [ "ABERRATION" ], "diff": 5, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 80, "speed": 50, "material": [ "flesh" ], @@ -2029,7 +1996,7 @@ "default_faction": "nether", "species": [ "NETHER" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 280, "speed": 180, "symbol": "s", @@ -2067,7 +2034,7 @@ "bodytype": "human", "species": [ "ABERRATION" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 80, "material": [ "flesh" ], @@ -2099,7 +2066,7 @@ "bodytype": "human", "species": [ "ABERRATION" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 88, "material": [ "flesh" ], @@ -2132,7 +2099,7 @@ "bodytype": "human", "species": [ "ABERRATION" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 95, "material": [ "flesh" ], @@ -2165,7 +2132,7 @@ "bodytype": "human", "species": [ "ABERRATION" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 100, "material": [ "flesh" ], @@ -2197,7 +2164,7 @@ "default_faction": "jabberwock", "species": [ "ABERRATION" ], "volume": "80000 ml", - "weight": 90000, + "weight": "90 kg", "hp": 100, "speed": 50, "material": [ "flesh" ], @@ -2227,7 +2194,7 @@ "default_faction": "jabberwock", "species": [ "ABERRATION" ], "volume": "300000 ml", - "weight": 120000, + "weight": "120 kg", "hp": 200, "speed": 80, "material": [ "flesh" ], @@ -2257,7 +2224,7 @@ "default_faction": "jabberwock", "species": [ "ABERRATION" ], "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 400, "speed": 140, "material": [ "flesh" ], @@ -2288,7 +2255,7 @@ "bodytype": "dog", "species": [ "NETHER" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 30, "speed": 100, "material": [ "flesh" ], @@ -2317,7 +2284,7 @@ "bodytype": "snake", "species": [ "ROBOT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 40, "material": [ "steel" ], @@ -2344,7 +2311,7 @@ "bodytype": "human", "species": [ "MUTANT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 130, "material": [ "flesh" ], @@ -2375,7 +2342,7 @@ "species": [ "MUTANT" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 40, "speed": 100, "symbol": "O", @@ -2404,7 +2371,7 @@ "bodytype": "crab", "species": [ "MUTANT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 85, "material": [ "flesh" ], @@ -2438,7 +2405,7 @@ "species": [ "ROBOT" ], "diff": 10, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "steel" ], @@ -2468,7 +2435,7 @@ "species": [ "NETHER" ], "diff": 2, "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 60, "speed": 90, "symbol": "A", @@ -2513,7 +2480,7 @@ "bodytype": "snake", "species": [ "NETHER" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 40, "speed": 90, "material": [ "flesh" ], @@ -2540,7 +2507,7 @@ "bodytype": "human", "species": [ "ZOMBIE" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 50, "speed": 110, "material": [ "flesh" ], @@ -2583,7 +2550,7 @@ "bodytype": "blob", "species": [ "NETHER" ], "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 400, "speed": 90, "symbol": "&", @@ -2614,7 +2581,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 30, "speed": 60, "material": [ "bone" ], @@ -2649,7 +2616,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 175, "speed": 60, "material": [ "bone" ], @@ -2687,7 +2654,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 15, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 105, "speed": 90, "material": [ "bone" ], @@ -2721,7 +2688,7 @@ "species": [ "MUTANT" ], "diff": 2, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 300, "speed": 60, "material": [ "flesh" ], @@ -2751,7 +2718,7 @@ "species": [ "MOLLUSK" ], "diff": 5, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 190, "speed": 60, "material": [ "flesh" ], @@ -2781,7 +2748,7 @@ "species": [ "FUNGUS" ], "diff": 1, "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 4, "speed": 100, "material": [ "veggy" ], @@ -2797,38 +2764,6 @@ "upgrades": { "half_life": 10, "into": "mon_fungaloid" }, "flags": [ "STUMBLES", "FLIES", "POISON", "NO_BREATHE", "NOHEAD", "NOGIB" ] }, - { - "id": "mon_tankbot", - "type": "MONSTER", - "name": "Beagle Mini-Tank UGV", - "description": "The Northrop Beagle is a refrigerator-sized urban warfare UGV. Sporting an anti-tank missile launcher, 40mm grenade launcher, and numerous anti-infantry weapons, it's designed for high-risk urban fighting.", - "default_faction": "military", - "species": [ "ROBOT" ], - "diff": 30, - "volume": "875000 ml", - "weight": 200000, - "hp": 240, - "speed": 75, - "material": [ "steel" ], - "symbol": "R", - "color": "dark_gray", - "aggression": 100, - "morale": 100, - "melee_skill": 5, - "melee_dice": 5, - "melee_dice_sides": 5, - "melee_cut": 0, - "armor_bash": 90, - "armor_cut": 90, - "vision_day": 50, - "revert_to_itype": "bot_tankbot", - "starting_ammo": { "40x46mm_m433": 200, "556": 3000 }, - "path_settings": { "max_dist": 20 }, - "special_attacks": [ [ "MULTI_ROBOT", 3 ] ], - "death_drops": { "groups": [ [ "robots", 4 ] ] }, - "death_function": [ "BROKEN" ], - "flags": [ "SEES", "HEARS", "GOODHEARING", "NOHEAD", "BASHES", "DESTROYS", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS" ] - }, { "id": "mon_thing", "type": "MONSTER", @@ -2838,7 +2773,7 @@ "bodytype": "blob", "species": [ "NETHER" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 160, "speed": 140, "material": [ "flesh" ], @@ -2857,36 +2792,6 @@ "death_function": [ "MELT" ], "flags": [ "SMELLS", "HEARS", "NOHEAD", "BASHES", "GROUP_BASH", "SWIMS", "ATTACKMON", "PLASTIC", "ACIDPROOF", "NOGIB", "CLIMBS" ] }, - { - "id": "mon_tripod", - "type": "MONSTER", - "name": "tripod", - "description": "The Honda Regnal, a tall robot walking on three spidery legs. For weapons, it has a trio of spiked retractable cables and a flamethrower mounted on its head.", - "default_faction": "military", - "species": [ "ROBOT" ], - "diff": 20, - "volume": "92500 ml", - "weight": 120000, - "hp": 80, - "speed": 90, - "material": [ "steel" ], - "symbol": "R", - "color": "white", - "aggression": 100, - "morale": 100, - "melee_skill": 10, - "melee_dice": 3, - "melee_dice_sides": 12, - "melee_cut": 6, - "armor_bash": 12, - "armor_cut": 8, - "path_settings": { "max_dist": 5 }, - "revert_to_itype": "bot_tripod", - "special_attacks": [ [ "FLAMETHROWER", 10 ] ], - "death_drops": { "groups": [ [ "robots", 4 ], [ "tripod", 1 ] ] }, - "death_function": [ "BROKEN" ], - "flags": [ "SEES", "HEARS", "GOODHEARING", "BASHES", "NO_BREATHE", "ELECTRONIC", "CLIMBS", "PRIORITIZE_TARGETS" ] - }, { "id": "mon_turret_searchlight", "type": "MONSTER", @@ -2896,7 +2801,7 @@ "species": [ "ROBOT" ], "diff": 2, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 30, "speed": 100, "material": [ "steel" ], @@ -2923,7 +2828,7 @@ "bodytype": "human", "species": [ "HORROR" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 70, "speed": 90, "material": [ "flesh" ], @@ -2949,7 +2854,7 @@ "species": [ "UNKNOWN" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 20, "speed": 120, "material": [ "powder" ], @@ -2971,7 +2876,7 @@ "bodytype": "snake", "species": [ "WORM" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 50, "speed": 80, "material": [ "flesh" ], @@ -2998,7 +2903,7 @@ "species": [ "NETHER" ], "diff": 10, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 320, "speed": 80, "material": [ "flesh" ], @@ -3026,7 +2931,7 @@ "bodytype": "dog", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 48, "speed": 116, "material": [ "flesh" ], @@ -3056,7 +2961,7 @@ "bodytype": "bear", "species": [ "ZOMBIE" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 180, "speed": 120, "material": [ "flesh" ], @@ -3089,7 +2994,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 70, "material": [ "flesh" ], @@ -3135,7 +3040,7 @@ "diff": 2, "volume": "62500 ml", "//": "Higher weight from attached junks.", - "weight": 84500, + "weight": "84500 g", "hp": 55, "speed": 65, "material": [ "flesh" ], @@ -3182,7 +3087,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 65, "speed": 80, "material": [ "flesh" ], @@ -3228,7 +3133,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 110, "material": [ "flesh" ], @@ -3289,7 +3194,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "61875 ml", - "weight": 78200, + "weight": "78200 g", "//": "Weight and volume reduced to reflect missing head parts. Based on average headsize/weight, but are not exact.", "hp": 60, "//": "Lower hp to reflect previous damage. Plus they're virtually useless so might as well make them a quick kill.", @@ -3337,7 +3242,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 105, "material": [ "flesh" ], @@ -3384,7 +3289,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 280, "speed": 95, "material": [ "flesh" ], @@ -3432,7 +3337,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 200, "speed": 90, "material": [ "flesh" ], @@ -3481,7 +3386,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 10, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 275, "speed": 110, "material": [ "flesh" ], @@ -3528,7 +3433,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 200, "speed": 50, "//": "slow walk speed - intimidating!", @@ -3561,7 +3466,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 70, "material": [ "flesh" ], @@ -3609,7 +3514,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 15, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 140, "speed": 75, "material": [ "flesh" ], @@ -3673,7 +3578,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 20, "material": [ "flesh" ], @@ -3715,7 +3620,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 10000, "speed": 200, "material": [ "flesh" ], @@ -3747,7 +3652,7 @@ "bodytype": "dog", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 36, "speed": 105, "material": [ "flesh" ], @@ -3777,7 +3682,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62275 ml", - "weight": 79800, + "weight": "79800 g", "//": "Weight and volume changed to reflect a (mostly) lack of head.", "hp": 90, "speed": 70, @@ -3825,7 +3730,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 75, "material": [ "flesh" ], @@ -3871,7 +3776,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 10, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 85, "speed": 105, "material": [ "flesh" ], @@ -3918,7 +3823,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 95, "speed": 55, "material": [ "flesh" ], @@ -3964,7 +3869,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 100, "material": [ "flesh" ], @@ -3999,7 +3904,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 70, "material": [ "flesh" ], @@ -4047,7 +3952,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 45, "material": [ "flesh" ], @@ -4079,7 +3984,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 15, "speed": 80, "material": [ "flesh" ], @@ -4109,7 +4014,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 5, "speed": 80, "material": [ "flesh" ], @@ -4139,7 +4044,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 15, "speed": 90, "material": [ "flesh" ], @@ -4169,7 +4074,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 14, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 30, "speed": 12, "material": [ "flesh" ], @@ -4207,7 +4112,7 @@ "description": "A great tendril of mutated flesh and sharpened bone. Emergent from a crevice in the ruined floor, hundreds of human limbs seek freedom and writhe incessantly from underneath its grotesque carapace. As enormous as it may already be, you feel certain that this is just part of a creature much bigger, for when it moves, you can feel this whole ruin tremble, as if an unseen giant struggled against the weight of its concrete tomb.", "default_faction": "zombie", "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "species": [ "ZOMBIE", "HUMAN" ], "diff": 35, "hp": 500, @@ -4235,7 +4140,7 @@ "description": "A great lump of mutated flesh. It resembles the innards of some gigantic creature and is covered in a grid of diminutive veins.", "default_faction": "zombie", "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "species": [ "ZOMBIE", "HUMAN" ], "diff": 1, "hp": 3, @@ -4263,7 +4168,7 @@ "species": [ "FUNGUS" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 10, "speed": 50, "material": [ "flesh" ], @@ -4293,7 +4198,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 95, "speed": 80, "material": [ "flesh" ], @@ -4340,7 +4245,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 110, "speed": 85, "material": [ "flesh" ], @@ -4386,7 +4291,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 70, "material": [ "flesh" ], @@ -4431,7 +4336,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 70, "material": [ "flesh" ], @@ -4464,7 +4369,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 480, "speed": 130, "material": [ "flesh" ], @@ -4510,7 +4415,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 110, "material": [ "flesh" ], @@ -4549,7 +4454,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 100, "material": [ "flesh" ], @@ -4581,7 +4486,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 100, "material": [ "flesh" ], @@ -4643,7 +4548,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 20, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 180, "speed": 90, "material": [ "flesh" ], @@ -4691,7 +4596,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 20, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 100, "material": [ "flesh" ], @@ -4737,7 +4642,7 @@ "bodytype": "pig", "species": [ "ZOMBIE" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 55, "speed": 70, "material": [ "flesh" ], @@ -4782,7 +4687,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 140, "material": [ "flesh" ], @@ -4825,7 +4730,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 55, "speed": 70, "material": [ "flesh" ], @@ -4869,7 +4774,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 70, "speed": 105, "material": [ "flesh" ], @@ -4908,7 +4813,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 40, "speed": 60, "material": [ "flesh" ], @@ -4942,7 +4847,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 85, "speed": 100, "material": [ "flesh" ], @@ -4974,7 +4879,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 70, "material": [ "flesh" ], @@ -5020,7 +4925,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 95, "material": [ "flesh" ], @@ -5066,7 +4971,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 135, "speed": 100, "material": [ "flesh" ], @@ -5114,7 +5019,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 75, "speed": 110, "material": [ "flesh" ], @@ -5159,7 +5064,7 @@ "bodytype": "human", "species": [ "FUNGUS" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "diff": 7, "hp": 55, "speed": 45, @@ -5192,7 +5097,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 10, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 70, "speed": 95, "material": [ "flesh" ], @@ -5238,7 +5143,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 90, "material": [ "flesh" ], @@ -5278,7 +5183,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 70, "speed": 95, "material": [ "flesh" ], @@ -5325,7 +5230,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 85, "speed": 75, "material": [ "flesh" ], @@ -5357,7 +5262,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "PLANT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 50, "material": [ "veggy" ], @@ -5404,7 +5309,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 85, "material": [ "flesh" ], @@ -5451,7 +5356,7 @@ "bodytype": "dog", "species": [ "ZOMBIE" ], "volume": "20250 ml", - "weight": 20000, + "weight": "20 kg", "hp": 30, "speed": 80, "material": [ "flesh" ], @@ -5481,7 +5386,7 @@ "bodytype": "horse", "species": [ "ZOMBIE" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 210, "speed": 140, "material": [ "flesh" ], @@ -5512,7 +5417,7 @@ "bodytype": "dog", "species": [ "ZOMBIE" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 65, "speed": 126, "material": [ "flesh" ], @@ -5558,7 +5463,7 @@ "species": [ "ZOMBIE" ], "diff": 5, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 480, "speed": 60, "material": [ "bone" ], @@ -5613,7 +5518,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 300, "speed": 30, "material": [ "bone" ], @@ -5660,7 +5565,7 @@ "default_faction": "zombie", "diff": 50, "volume": "875000 ml", - "weight": 4535, + "weight": "4535 g", "hp": 1, "material": [ "paper" ], "symbol": "D", diff --git a/data/json/monsters/obsolete.json b/data/json/monsters/obsolete.json index a12dcc9c8cef5..1a55c325f7992 100644 --- a/data/json/monsters/obsolete.json +++ b/data/json/monsters/obsolete.json @@ -7,7 +7,7 @@ "default_faction": "vermin", "species": [ "INSECT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 1, "speed": 90, "material": [ "iflesh" ], @@ -29,7 +29,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 4, "speed": 100, "material": [ "flesh" ], @@ -53,7 +53,7 @@ "default_faction": "vermin", "species": [ "INSECT" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 1, "speed": 180, "material": [ "iflesh" ], @@ -77,7 +77,7 @@ "default_faction": "vermin", "species": [ "AMPHIBIAN" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 3, "speed": 80, "material": [ "flesh" ], @@ -99,7 +99,7 @@ "default_faction": "vermin", "species": [ "INSECT" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 1, "speed": 120, "material": [ "iflesh" ], @@ -120,7 +120,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 4, "speed": 70, "material": [ "flesh" ], @@ -143,7 +143,7 @@ "default_faction": "vermin", "species": [ "MOLLUSK" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 1, "speed": 90, "material": [ "flesh" ], @@ -164,7 +164,7 @@ "default_faction": "vermin", "species": [ "SPIDER" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 1, "speed": 20, "material": [ "iflesh" ], @@ -185,7 +185,7 @@ "default_faction": "vermin", "species": [ "SPIDER" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 1, "speed": 20, "material": [ "iflesh" ], @@ -205,7 +205,7 @@ "default_faction": "vermin", "species": [ "SPIDER" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 1, "speed": 30, "material": [ "iflesh" ], @@ -225,7 +225,7 @@ "default_faction": "vermin", "species": [ "SPIDER" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 1, "speed": 120, "material": [ "iflesh" ], @@ -245,7 +245,7 @@ "default_faction": "vermin", "species": [ "INSECT" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 1, "speed": 150, "material": [ "iflesh" ], @@ -259,5 +259,109 @@ "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "FLIES", "VERMIN", "HIT_AND_RUN" ], "//": "id mon_wasp is already used, so changing would break tilests and other things" + }, + { + "id": "mon_tripod", + "type": "MONSTER", + "name": "tripod", + "description": "The Honda Regnal, a tall robot walking on three spidery legs. For weapons, it has a trio of spiked retractable cables and a flamethrower mounted on its head.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 20, + "volume": "92500 ml", + "weight": "120 kg", + "hp": 80, + "speed": 90, + "material": [ "steel" ], + "symbol": "R", + "color": "white", + "aggression": 100, + "morale": 100, + "melee_skill": 10, + "melee_dice": 3, + "melee_dice_sides": 12, + "melee_cut": 6, + "armor_bash": 12, + "armor_cut": 8, + "path_settings": { "max_dist": 5 }, + "revert_to_itype": "bot_tripod", + "special_attacks": [ [ "FLAMETHROWER", 10 ] ], + "death_drops": { "groups": [ [ "robots", 4 ], [ "tripod", 1 ] ] }, + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "HEARS", "GOODHEARING", "BASHES", "NO_BREATHE", "ELECTRONIC", "CLIMBS", "PRIORITIZE_TARGETS" ] + }, + { + "id": "mon_tankbot", + "type": "MONSTER", + "name": "Beagle Mini-Tank UGV", + "description": "The Northrop Beagle is a refrigerator-sized urban warfare UGV. Sporting an anti-tank missile launcher, 40mm grenade launcher, and numerous anti-infantry weapons, it's designed for high-risk urban fighting.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 30, + "volume": "875000 ml", + "weight": "200 kg", + "hp": 240, + "speed": 75, + "material": [ "steel" ], + "symbol": "R", + "color": "dark_gray", + "aggression": 100, + "morale": 100, + "melee_skill": 5, + "melee_dice": 5, + "melee_dice_sides": 5, + "melee_cut": 0, + "armor_bash": 90, + "armor_cut": 90, + "vision_day": 50, + "revert_to_itype": "bot_tankbot", + "starting_ammo": { "40x46mm_m433": 200, "556": 3000 }, + "path_settings": { "max_dist": 20 }, + "special_attacks": [ [ "MULTI_ROBOT", 3 ] ], + "death_function": [ "BROKEN" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "NOHEAD", + "BASHES", + "DESTROYS", + "NO_BREATHE", + "ELECTRONIC", + "PRIORITIZE_TARGETS", + "DROPS_AMMO" + ] + }, + { + "id": "mon_chickenbot", + "type": "MONSTER", + "name": "chicken walker", + "description": "The Northrop ATSV, a massive, heavily-armed and armored robot walking on a pair of reverse-jointed legs. Armed with a 40mm anti-vehicle grenade launcher, 5.56 anti-personnel gun, and the ability to electrify itself against attackers, it is an effective automated sentry, though production was limited due to a legal dispute.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 20, + "volume": "92500 ml", + "weight": "120 kg", + "hp": 90, + "speed": 115, + "material": [ "steel" ], + "symbol": "R", + "color": "red", + "aggression": 100, + "morale": 100, + "melee_skill": 3, + "melee_dice": 3, + "melee_dice_sides": 3, + "melee_cut": 0, + "armor_bash": 18, + "armor_cut": 14, + "vision_day": 50, + "vision_night": 35, + "revert_to_itype": "bot_chickenbot", + "starting_ammo": { "40x46mm_m433": 100, "556": 1000 }, + "path_settings": { "max_dist": 10 }, + "special_attacks": [ [ "CHICKENBOT", 4 ] ], + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "HEARS", "BASHES", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS", "DROPS_AMMO" ] } ] diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index d9c73d3009516..a3904f354cd57 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -8,7 +8,7 @@ "bodytype": "frog", "species": [ "AMPHIBIAN" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 70, "speed": 90, "material": [ "flesh" ], @@ -39,7 +39,7 @@ "categories": [ "WILDLIFE" ], "species": [ "REPTILE" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 90, "speed": 90, "material": [ "flesh" ], @@ -88,7 +88,7 @@ "species": [ "REPTILE" ], "diff": 2, "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 12, "speed": 90, "material": [ "flesh" ], @@ -122,7 +122,7 @@ "species": [ "REPTILE" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 48, "speed": 100, "material": [ "flesh" ], @@ -165,7 +165,7 @@ "species": [ "REPTILE" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 10, "speed": 90, "material": [ "flesh" ], diff --git a/data/json/monsters/triffid.json b/data/json/monsters/triffid.json index e836af66dd862..5a3950f0ecd04 100644 --- a/data/json/monsters/triffid.json +++ b/data/json/monsters/triffid.json @@ -6,7 +6,7 @@ "name": "biollante sprig", "description": "A short fat stalk with broad leaves and tiny flower buds.", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 20, "special_attacks": [ [ "SPIT_SAP", 10 ] ], "upgrades": { "age_grow": 14, "into": "mon_biollante_sprout" }, @@ -19,7 +19,7 @@ "name": "biollante sprout", "description": "A thick stalk that rises five feet from the ground and has heavy broad leaves at its base. Purple flower buds adorn the top.", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "special_attacks": [ [ "SPIT_SAP", 6 ] ], "upgrades": { "age_grow": 14, "into": "mon_biollante" }, @@ -34,7 +34,7 @@ "species": [ "PLANT" ], "diff": 2, "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 120, "speed": 100, "material": [ "veggy" ], @@ -57,7 +57,7 @@ "default_faction": "triffid", "species": [ "PLANT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 100, "material": [ "veggy" ], @@ -80,7 +80,7 @@ "default_faction": "triffid", "species": [ "PLANT" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 2, "speed": 75, "material": [ "veggy" ], @@ -103,7 +103,7 @@ "default_faction": "triffid", "species": [ "PLANT" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 3, "speed": 50, "material": [ "veggy" ], @@ -128,7 +128,7 @@ "default_faction": "triffid", "species": [ "PLANT" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 40, "speed": 50, "material": [ "veggy" ], @@ -153,7 +153,7 @@ "default_faction": "triffid", "species": [ "PLANT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 50, "material": [ "veggy" ], @@ -179,7 +179,7 @@ "default_faction": "triffid", "species": [ "PLANT" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 280, "speed": 85, "material": [ "veggy" ], @@ -206,7 +206,7 @@ "default_faction": "triffid", "species": [ "PLANT" ], "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "hp": 100, "speed": 100, "material": [ "veggy" ], @@ -232,7 +232,7 @@ "default_faction": "triffid", "species": [ "PLANT" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 60, "speed": 50, "material": [ "veggy" ], @@ -257,6 +257,29 @@ "death_function": [ "NORMAL" ], "flags": [ "HEARS", "SMELLS", "NOHEAD", "CAN_DIG" ] }, + { + "id": "mon_triffid_flower", + "type": "MONSTER", + "name": "triffid flower", + "description": "A giant plant with a thick stalk adorned by a purple flower. Its petals are open with ominous shine in center.", + "default_faction": "triffid", + "species": [ "PLANT" ], + "diff": 4, + "volume": "100 L", + "weight": "150 kg", + "hp": 200, + "speed": 100, + "material": [ "veggy" ], + "symbol": "F", + "color": "magenta", + "aggression": 100, + "morale": 100, + "melee_cut": 0, + "harvest": "triffid_large", + "special_attacks": [ [ "SPIT_SAP", 3 ], [ "PARA_STING", 12 ] ], + "death_function": [ "NORMAL" ], + "flags": [ "NOHEAD", "IMMOBILE" ] + }, { "id": "mon_triffid_heart", "type": "MONSTER", @@ -266,7 +289,7 @@ "species": [ "PLANT" ], "diff": 50, "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 500, "speed": 100, "material": [ "veggy" ], diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json index 78767aa5ad809..cf04b7a8bb24f 100644 --- a/data/json/monsters/turrets.json +++ b/data/json/monsters/turrets.json @@ -8,7 +8,7 @@ "species": [ "ROBOT" ], "diff": 20, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 30, "speed": 100, "material": [ "steel" ], @@ -55,7 +55,7 @@ "species": [ "ROBOT" ], "diff": 20, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 30, "speed": 100, "material": [ "steel" ], @@ -91,7 +91,7 @@ "species": [ "ROBOT" ], "diff": 40, "volume": "62500 ml", - "weight": 172000, + "weight": "172 kg", "hp": 40, "speed": 100, "material": [ "steel" ], @@ -139,7 +139,7 @@ "species": [ "ROBOT" ], "diff": 30, "volume": "60000 ml", - "weight": 172000, + "weight": "172 kg", "hp": 40, "speed": 100, "material": [ "steel" ], @@ -187,7 +187,7 @@ "species": [ "ROBOT" ], "diff": 35, "volume": "60000 ml", - "weight": 172000, + "weight": "172 kg", "hp": 40, "speed": 100, "material": [ "steel" ], @@ -225,5 +225,55 @@ "death_drops": { }, "death_function": [ "BROKEN" ], "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] + }, + { + "id": "mon_turret_riot", + "type": "MONSTER", + "name": "riot control platform", + "description": "These TALON-derived riot control platforms were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation. On the bright side, although it shoots autonomously, it requires a human operator to relocate, so it's not so mobile anymore.", + "default_faction": "cop_bot", + "looks_like": "mon_turret", + "species": [ "ROBOT" ], + "diff": 20, + "volume": "62500 ml", + "weight": 172000, + "hp": 30, + "speed": 100, + "material": [ "steel" ], + "symbol": "2", + "color": "blue", + "aggression": 50, + "morale": 100, + "anger_triggers": [ "PLAYER_CLOSE", "HURT", "FRIEND_ATTACKED", "FRIEND_DIED" ], + "armor_bash": 14, + "armor_cut": 16, + "vision_day": 50, + "vision_night": 3, + "revert_to_itype": "bot_turret_riot", + "starting_ammo": { "40x46mm_m1006": 6 }, + "special_attacks": [ + { + "//": "For later: needs the ability to preferentially target legs and arms", + "type": "gun", + "cooldown": 1, + "move_cost": 150, + "gun_type": "pseudo_m203", + "ammo_type": "40x46mm_m1006", + "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], + "fake_dex": 12, + "ranges": [ [ 0, 30, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 200, + "targeting_timeout_extend": -10, + "targeting_sound": "\"Universal curfew is in effect. Please return to your home. This unit is authorized to open fire.\"", + "targeting_volume": 50, + "no_ammo_sound": "a chk!" + } + ], + "death_drops": { }, + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] } ] diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json index a61cdfa40a73c..649f7e9b41b84 100644 --- a/data/json/monsters/zed_children.json +++ b/data/json/monsters/zed_children.json @@ -8,7 +8,7 @@ "bodytype": "human", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 35, "speed": 105, "material": [ "flesh" ], @@ -41,7 +41,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 40, "speed": 65, "material": [ "flesh" ], @@ -91,7 +91,7 @@ "species": [ "ZOMBIE" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 35, "speed": 90, "material": [ "flesh" ], @@ -136,7 +136,7 @@ "bodytype": "human", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 25, "speed": 55, "material": [ "flesh" ], @@ -182,7 +182,7 @@ "species": [ "ZOMBIE" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 20, "speed": 95, "material": [ "flesh" ], @@ -227,7 +227,7 @@ "bodytype": "human", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 25, "speed": 65, "material": [ "flesh" ], @@ -260,7 +260,7 @@ "bodytype": "human", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 30, "speed": 85, "material": [ "flesh" ], @@ -306,7 +306,7 @@ "species": [ "ZOMBIE" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 15, "speed": 65, "material": [ "bone" ], @@ -353,7 +353,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 35, "speed": 50, "material": [ "flesh" ], diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json index b7fd714db25a2..30474ae699764 100644 --- a/data/json/monsters/zed_explosive.json +++ b/data/json/monsters/zed_explosive.json @@ -10,7 +10,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 20, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 90, "material": [ "flesh" ], @@ -57,7 +57,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 30, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 100, "material": [ "flesh" ], diff --git a/data/json/monsters/zed_lab.json b/data/json/monsters/zed_lab.json index 366671b304b8a..2183422508216 100644 --- a/data/json/monsters/zed_lab.json +++ b/data/json/monsters/zed_lab.json @@ -10,7 +10,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 75, "material": [ "flesh" ], @@ -62,7 +62,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 85, "material": [ "flesh" ], diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json index d4b2fbad6c514..b3601d8a29e1f 100644 --- a/data/json/monsters/zed_soldiers.json +++ b/data/json/monsters/zed_soldiers.json @@ -9,7 +9,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 80, "material": [ "flesh" ], @@ -58,7 +58,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 90, "material": [ "flesh" ], @@ -194,7 +194,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "72500 ml", - "weight": 85500, + "weight": "85500 g", "hp": 150, "speed": 80, "material": [ "flesh" ], @@ -245,7 +245,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "625000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 300, "speed": 75, "material": [ "flesh" ], @@ -296,7 +296,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 85, "material": [ "flesh" ], @@ -343,7 +343,7 @@ "bodytype": "human", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 70, "material": [ "flesh" ], @@ -394,7 +394,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 70, "material": [ "flesh" ], @@ -428,7 +428,7 @@ "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 120, "speed": 95, "material": [ "flesh" ], diff --git a/data/json/monsters/zed_survivor.json b/data/json/monsters/zed_survivor.json new file mode 100644 index 0000000000000..e11684b72e341 --- /dev/null +++ b/data/json/monsters/zed_survivor.json @@ -0,0 +1,14 @@ +[ + { + "id": "mon_zombie_survivor_elite", + "type": "MONSTER", + "name": "veteran survivor zombie", + "description": "This zombie once was a survivor like you, and a pretty good one at that. Unfortunately they didn't make it, despite the custom-made, heavy armor pieces they wear and the gear that they are still lugging around.", + "copy-from": "mon_zombie_survivor", + "looks_like": "mon_zombie_survivor", + "color": "light_red_green", + "armor_bash": 15, + "armor_cut": 25, + "death_drops": "mon_zombie_survivor_elite_death_drops" + } +] diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 6fc4f126e3793..932266ca20252 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -724,8 +724,9 @@ "id": "PRETTY", "name": "Pretty", "points": 1, + "visibility": 1, "ugliness": -2, - "description": "You are a sight to behold. NPCs who care about such things will react more kindly to you.", + "description": "You are a sight to behold. People who care about such things will react more kindly to you.", "starting_trait": true, "category": [ "ALPHA", "FELINE", "LUPINE" ], "cancels": [ "UGLY", "DEFORMED", "DEFORMED2", "DEFORMED3" ], @@ -1258,8 +1259,9 @@ "id": "UGLY", "name": "Ugly", "points": -1, + "visibility": 1, "ugliness": 2, - "description": "You're not much to look at. NPCs who care about such things will react poorly to you.", + "description": "You're not much to look at. People who care about such things will react poorly to you.", "starting_trait": true, "cancels": [ "PRETTY", "BEAUTIFUL", "BEAUTIFUL2", "BEAUTIFUL3" ], "changes_to": [ "DEFORMED" ], @@ -2018,8 +2020,9 @@ "points": 2, "visibility": 6, "ugliness": 3, + "bash_dmg_bonus": 2, "mixed_effect": true, - "description": "You've grown a chitin exoskeleton, much like that of an insect. It provides considerable physical protection, but reduces your Dexterity by 1. Somewhat reduces wet effects.", + "description": "You've grown a chitin exoskeleton, much like that of an insect. It provides considerable physical protection, and make your punches hit a little harder but reduces your Dexterity by 1. Somewhat reduces wet effects.", "types": [ "SKIN" ], "prereqs": [ "CHITIN" ], "changes_to": [ "CHITIN3" ], @@ -2046,7 +2049,8 @@ "points": 2, "visibility": 8, "ugliness": 5, - "description": "You've grown a chitin exoskeleton made of thick, stiff plates. It provides excellent physical protection, but reduces your Dexterity by 1 and encumbers all body parts but your eyes and mouth. Greatly reduces wet effects.", + "bash_dmg_bonus": 3, + "description": "You've grown a chitin exoskeleton made of thick, stiff plates. It provides excellent physical protection, make your punches hit harder but reduces your Dexterity by 1 and encumbers all body parts but your eyes and mouth. Greatly reduces wet effects.", "types": [ "SKIN" ], "prereqs": [ "CHITIN2", "CHITIN_FUR2" ], "category": [ "SPIDER" ], @@ -2446,6 +2450,7 @@ "points": 2, "visibility": 3, "ugliness": 2, + "cut_dmg_bonus": 3, "description": "You have claws on the ends of your fingers. If you aren't wearing gloves, your unarmed attacks deal a minor amount of cutting damage.", "types": [ "CLAWS" ], "prereqs": [ "NAILS" ], @@ -2460,6 +2465,8 @@ "points": 3, "visibility": 3, "ugliness": 4, + "cut_dmg_bonus": 1, + "flags": [ "UNARMED_BONUS" ], "description": "Your claws have grown tougher and slightly gnarled.", "types": [ "CLAWS" ], "prereqs": [ "CLAWS" ], @@ -2476,6 +2483,8 @@ "ugliness": 5, "valid": false, "purifiable": false, + "cut_dmg_bonus": 1, + "flags": [ "UNARMED_BONUS" ], "description": "Your paws are bone, muscle, and claw with a thin layer of skin and fur. They might as well be made of stainless steel.", "types": [ "CLAWS" ], "prereqs": [ "CLAWS_RAT" ], @@ -2490,6 +2499,8 @@ "name": "Retractable Claws", "points": 2, "ugliness": 1, + "cut_dmg_bonus": 3, + "flags": [ "NEED_ACTIVE_TO_MELEE" ], "description": "You have claws on the ends of your fingers, and can extend or retract them as desired. Gloves will still get in the way, though.", "types": [ "CLAWS" ], "prereqs": [ "CLAWS" ], @@ -2519,6 +2530,8 @@ "points": 2, "visibility": 4, "ugliness": 3, + "cut_dmg_bonus": 3, + "flags": [ "UNARMED_BONUS" ], "mixed_effect": true, "restricts_gear": [ "HAND_L", "HAND_R" ], "destroys_gear": true, @@ -2614,7 +2627,8 @@ "points": 2, "description": "Your body is simply immune to diseases. You will never catch an ambient disease.", "prereqs": [ "DISRESISTANT" ], - "category": [ "PLANT", "SLIME", "TROGLOBITE" ] + "category": [ "PLANT", "SLIME", "TROGLOBITE" ], + "flags": [ "NO_DISEASE" ] }, { "type": "mutation", @@ -2685,6 +2699,7 @@ "points": 1, "visibility": 5, "ugliness": 4, + "rand_cut_bonus": { "min": 2, "max": 3 }, "description": "The skin on your hands is a mucous membrane and produces a thick, acrid slime. Attacks using your hand will cause minor acid damage. Slightly increases wet benefits.", "prereqs": [ "SLIMY" ], "category": [ "SLIME" ], @@ -4409,7 +4424,7 @@ "id": "BEAUTIFUL", "name": "Beautiful", "points": 2, - "visibility": -4, + "visibility": 4, "ugliness": -4, "description": "You're a real head-turner. Some people will react well to your appearance, and most people have an easier time trusting you.", "cancels": [ "UGLY", "DEFORMED", "DEFORMED2", "DEFORMED3" ], @@ -4421,7 +4436,7 @@ "id": "BEAUTIFUL2", "name": "Very Beautiful", "points": 3, - "visibility": -7, + "visibility": 7, "ugliness": -7, "description": "You are a vision of beauty. Some people will react very well to your looks, and most people will trust you immediately.", "cancels": [ "UGLY", "DEFORMED", "DEFORMED2", "DEFORMED3" ], @@ -4433,7 +4448,7 @@ "id": "BEAUTIFUL3", "name": "Glorious", "points": 4, - "visibility": -10, + "visibility": 10, "ugliness": -10, "description": "You are incredibly beautiful. People cannot help themselves due to your charms, and will do whatever they can to please you.", "cancels": [ "UGLY", "DEFORMED", "DEFORMED2", "DEFORMED3" ], @@ -4839,6 +4854,7 @@ "description": "Your hands have fused into quasi-paws. Fine manipulation is a challenge: permanent hand encumbrance of 10, difficulty with delicate craftwork, and your gloves don't fit. But they handle water better.", "encumbrance_always": [ [ "HAND_L", 10 ], [ "HAND_R", 10 ] ], "restricts_gear": [ "HAND_L", "HAND_R" ], + "craft_skill_bonus": [ [ "electronics", -2 ], [ "tailor", -2 ], [ "mechanics", -2 ] ], "types": [ "HANDS" ], "prereqs": [ "CLAWS", "CLAWS_RETRACT", "CLAWS_RAT" ], "cancels": [ "TALONS" ], @@ -4854,6 +4870,17 @@ "ugliness": 3, "mixed_effect": true, "description": "Your paws are much larger now. Manual dexterity is difficult: permanent hand encumbrance of 20, serious problems crafting, and no gloves. But you can swim more effectively.", + "craft_skill_bonus": [ + [ "electronics", -4 ], + [ "tailor", -4 ], + [ "mechanics", -4 ], + [ "firstaid", -2 ], + [ "computer", -2 ], + [ "traps", -2 ], + [ "fabrication", -2 ], + [ "cooking", -2 ], + [ "survival", -2 ] + ], "encumbrance_always": [ [ "HAND_L", 20 ], [ "HAND_R", 20 ] ], "restricts_gear": [ "HAND_L", "HAND_R" ], "types": [ "HANDS" ], @@ -5039,7 +5066,7 @@ "points": -2, "visibility": 10, "ugliness": 10, - "description": "Your flesh is a pleasing gel-like consistency. Your bodily functions seem to be moving around, and your leg-equivalents flow comfortably.", + "description": "Your flesh is a pleasing gel-like consistency. Your bodily functions seem to be moving around, and your leg-equivalents flow comfortably - if a little slower than your old meat-legs.", "purifiable": false, "leads_to": [ "INT_SLIME", "PER_SLIME" ], "prereqs": [ "VISCOUS" ], diff --git a/data/json/npcs/NPC_Brigitte_LaCroix.json b/data/json/npcs/NPC_Brigitte_LaCroix.json index 28d336331b296..4f16fd2657eeb 100644 --- a/data/json/npcs/NPC_Brigitte_LaCroix.json +++ b/data/json/npcs/NPC_Brigitte_LaCroix.json @@ -226,12 +226,12 @@ }, "dialogue": { "describe": "There is always work to be done, song to be woven.", - "offer": "If you wish to be set on the path to enlightenment, first you must learn to listen and hear the song. Go out, butcher a creature and feel the power between your fingertips. Then bring me the bones and I shall carve them for you.", - "accepted": "Excellent. Now be on your way.", - "rejected": "I understand your reluctancy. Feel free to return when you see the way.", - "advice": "The shambling corpses we see all around move in discord. Their song can be used, but for an Acolyte, this would be needlessly hard. Be sure to carve an unspoiled living creature.", + "offer": "If you wish to be set on the path to enlightenment, first you must learn to listen and hear the song. Go out, butcher a creature and feel the power between your fingertips. Then bring me the bones and I shall carve them for you.", + "accepted": "Excellent. Now be on your way.", + "rejected": "I understand your reluctancy. Feel free to return when you see the way.", + "advice": "The shambling corpses we see all around move in discord. Their song can be used, but for an Acolyte, this would be needlessly hard. Be sure to carve an unspoiled living creature.", "inquire": "Have you felt the song in your hands yet?", - "success": "And so, another cycle ends. You have done well. I will now bestow my mark upon you, so that others may know the path you walk and aid you.", + "success": "And so, another cycle ends. You have done well. I will now bestow my mark upon you, so that others may know the path you walk and aid you.", "success_lie": "So you say, but the song sings otherwise.", "failure": "Then you shall try again, until you hear." } @@ -241,12 +241,12 @@ "type": "talk_topic", "dynamic_line": { "has_no_available_mission": { - "has_no_assigned_mission": "The song is… quiet for now. Perhaps with time, more notes will be etched in the bones of this world.", + "has_no_assigned_mission": "The song is… quiet for now. Perhaps with time, more notes will be etched in the bones of this world.", "no": { "has_many_assigned_missions": "An acolyte should not take on too many songs at once.", "no": "That is all for now." } }, "no": { "has_many_available_missions": { - "has_no_assigned_mission": "There are bones to etch, songs to sing. Wish to join me?", + "has_no_assigned_mission": "There are bones to etch, songs to sing. Wish to join me?", "no": { "has_many_assigned_missions": "Do you wish to take on more songs?", "no": "Do you believe you can take on the burden of additional bones?" diff --git a/data/json/npcs/TALK_TEST.json b/data/json/npcs/TALK_TEST.json index 3689139115853..93cdab41ac3b3 100644 --- a/data/json/npcs/TALK_TEST.json +++ b/data/json/npcs/TALK_TEST.json @@ -117,7 +117,7 @@ "responses": [ { "text": "This is a basic test response.", "topic": "TALK_DONE" }, { "text": "This is a cash test response.", "topic": "TALK_DONE", "condition": { "u_has_cash": 500 } }, - { "text": "This is an npc service test response.", "topic": "TALK_DONE", "condition": { "npc_service": 500 } }, + { "text": "This is an npc service test response.", "topic": "TALK_DONE", "condition": { "npc_service": true } }, { "text": "This is an npc available test response.", "topic": "TALK_DONE", "condition": "npc_available" } ] }, diff --git a/data/json/npcs/TALK_TRUE_FOODPERSON.json b/data/json/npcs/TALK_TRUE_FOODPERSON.json index 3af15cc0db5b0..c67aa640abab7 100644 --- a/data/json/npcs/TALK_TRUE_FOODPERSON.json +++ b/data/json/npcs/TALK_TRUE_FOODPERSON.json @@ -92,7 +92,7 @@ ] }, "text": "I am you but from an alternate reality.", - "trial": { "type": "LIE", "difficulty": 10, "mod": { "trust": 1, "value": 1 } }, + "trial": { "type": "LIE", "difficulty": 10, "mod": [ [ "TRUST", 1 ], [ "VALUE", 1 ] ] }, "success": { "topic": "TALK_FOODPERSON_MULTIVERSE", "opinion": { "trust": 2, "value": 2 } }, "failure": { "topic": "TALK_FOODPERSON_ONLYONE", "opinion": { "trust": -5, "value": -5 } } }, diff --git a/data/json/npcs/classes.json b/data/json/npcs/classes.json index 275401f058bca..b3e991bbb5910 100644 --- a/data/json/npcs/classes.json +++ b/data/json/npcs/classes.json @@ -210,7 +210,8 @@ "traits": [ { "group": "BG_survival_story_CRIMINAL" }, { "group": "NPC_starting_traits" }, - { "group": "Appearance_demographics" } + { "group": "Appearance_demographics" }, + [ "FELINE_EARS", 100 ] ], "bonus_dex": { "rng": [ -2, 0 ] }, "bonus_int": { "rng": [ -2, 0 ] }, diff --git a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json index 11a70b1485f3e..834ab44363852 100644 --- a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json @@ -77,7 +77,7 @@ "destination": "dairy_farm_isherwood_W", "start": { "effect": [ { "u_add_var": "u_have_barry_escape", "type": "general", "context": "meeting", "value": "yes" } ], - "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "om_special": "Isherwood Farms", "reveal_radius": 3 } + "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "reveal_radius": 3 } }, "end": { "opinion": { "trust": 5, "value": 5 }, diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json index a8fd1ec2c2c2a..2057b0d5855e5 100644 --- a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json @@ -195,13 +195,7 @@ "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "leather_armor_horse", "count": 1 } ], - "update_mapgen": [ - { - "om_terrain": "horse_farm_isherwood_4", - "om_special": "Isherwood Farms", - "set": [ { "point": "furniture", "id": "f_anvil", "x": 6, "y": 12 } ] - } - ] + "update_mapgen": [ { "om_terrain": "horse_farm_isherwood_4", "set": [ { "point": "furniture", "id": "f_anvil", "x": 6, "y": 12 } ] } ] } }, { diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json index d78f4c0fd01b7..5ac7a4e57e4aa 100644 --- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json @@ -186,13 +186,7 @@ }, "end": { "opinion": { "trust": 5, "value": 5 }, - "update_mapgen": [ - { - "om_terrain": "cabin_isherwood", - "om_special": "Isherwood Farms", - "place_nested": [ { "chunks": [ "cabin_isherwood_update" ], "x": 3, "y": 1 } ] - } - ] + "update_mapgen": [ { "om_terrain": "cabin_isherwood", "place_nested": [ { "chunks": [ "cabin_isherwood_update" ], "x": 3, "y": 1 } ] } ] } } ] diff --git a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json index b6ebfe24db8a8..04230835c8f5b 100644 --- a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json @@ -286,7 +286,7 @@ "inquire": "How is the search going?", "success": "Thanks. Here's a small reward to show my appreciation for your help.", "success_lie": "What good does this do us?", - "failure": "I wonder if the wildlife ate all the greens..." + "failure": "I wonder if the wildlife ate all the greens…" } }, { diff --git a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json index d2ce435f3e92a..8ea71c937395f 100644 --- a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json @@ -211,7 +211,7 @@ "inquire": "Do you have the stone?", "success": "I appreciate it, this will make Luke happy.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "opinion": { "trust": 1, "value": 1 }, @@ -222,7 +222,6 @@ "update_mapgen": [ { "om_terrain": "rural_outbuilding", - "om_special": "Isherwood Farms", "place_nested": [ { "chunks": [ "isherwood_outbuilding_kilns" ], "x": 0, "y": 0 } ], "set": [ { "point": "furniture", "id": "f_kiln_empty", "x": 8, "y": 13 }, @@ -256,9 +255,9 @@ "rejected": "Oh well. I'll try to find time to get it myself, thanks.", "advice": "You can find it along river banks, or maybe landscaping supplies and hardware stores.", "inquire": "How is the search going?", - "success": "Thanks, now Luke can get started. Here's a token of my thanks.", + "success": "Thanks, now Luke can get started. Here's a token of my thanks.", "success_lie": "What good does this do us?", - "failure": "I wonder where all the sand went..." + "failure": "I wonder where all the sand went…" } }, { @@ -290,7 +289,7 @@ "inquire": "How is the search going?", "success": "Thanks, now Luke can get started making jugs, We'd like to give you a cow, Here's Daisy, take good care of her and she'll provide you with milk.", "success_lie": "What good does this do us?", - "failure": "I wonder where all the sand went..." + "failure": "I wonder where all the sand went…" } } ] diff --git a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json index 503e5f717a3c2..f1a53e261b5e2 100644 --- a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json @@ -327,7 +327,7 @@ "inquire": "How is the search going?", "success": "Wow, perfect. Thanks. Here's your reward.", "success_lie": "What good does this do us?", - "failure": "I wonder where all the jars went..." + "failure": "I wonder where all the jars went…" } }, { @@ -359,7 +359,7 @@ "inquire": "How is the search going?", "success": "Wow, perfect. Thanks. Here's your reward.", "success_lie": "What good does this do us?", - "failure": "I wonder where all the seeds went..." + "failure": "I wonder where all the seeds went…" } } ] diff --git a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json index 8beb529b3c52f..631da27f5e4cb 100644 --- a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json @@ -202,9 +202,9 @@ "rejected": "Thanks anyway, we will try some traps.", "advice": "A gun will probably help.", "inquire": "Did you kill it?", - "success": "I appreciate it, I've got this old saddle I want you to have. I'll be happy to put a horse under it if you want to do some more heroics.", + "success": "I appreciate it, I've got this old saddle I want you to have. I'll be happy to put a horse under it if you want to do some more heroics.", "success_lie": "Show me the bodies.", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "riding_saddle", "count": 1 } ] } }, @@ -228,9 +228,9 @@ "rejected": "Thanks anyway, we will try some traps.", "advice": "A gun will probably help.", "inquire": "Did you kill it?", - "success": "I appreciate it, I've got this old saddle I want you to have. I'll be happy to put a horse under it if you want to do some more heroics.", + "success": "I appreciate it, I've got this old saddle I want you to have. I'll be happy to put a horse under it if you want to do some more heroics.", "success_lie": "Show me the bodies.", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "riding_saddle", "count": 1 } ] } }, @@ -254,9 +254,9 @@ "rejected": "Thanks anyway, we will try some traps.", "advice": "A gun will probably help.", "inquire": "Did you kill it?", - "success": "I appreciate it, this will help keep our animals safe. This is, Steve, he's a good, steady horse. You should talk to Carlos about some armor for him.", + "success": "I appreciate it, this will help keep our animals safe. This is, Steve, he's a good, steady horse. You should talk to Carlos about some armor for him.", "success_lie": "Show me the bodies.", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "opinion": { "trust": 1, "value": 1 }, diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 100a2738a1197..ed071ec660526 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -16,7 +16,7 @@ "type": "npc_class", "id": "NC_ISHERWOOD_LUKE", "name": "Luke Isherwood", - "job_description": "I'm a Eddie's son, part of the Isherwood family", + "job_description": "I'm Eddie's son, part of the Isherwood family", "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ], "common": false, "bonus_per": { "one_in": 4 }, @@ -171,8 +171,8 @@ "advice": "A library, bookstore or a glass blower's studio should have one.", "inquire": "Do you have the book?", "success": "I appreciate it, this will make my life so much easier.", - "success_lie": "I don't see a book...?", - "failure": "At least you escaped with your life..." + "success_lie": "I don't see a book…?", + "failure": "At least you escaped with your life…" } }, { @@ -197,8 +197,8 @@ "advice": "A library, bookstore should have one, schools are another good idea.", "inquire": "Do you have the book?", "success": "I appreciate it, this will make my life so much easier.", - "success_lie": "I don't see a book...?", - "failure": "At least you escaped with your life..." + "success_lie": "I don't see a book…?", + "failure": "At least you escaped with your life…" } } ] diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index ac7a201b27a6b..c68493e638455 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -26,12 +26,12 @@ { "type": "item_group", "id": "npc_underwear_feet_male", - "items": [ [ "socks", 80 ], [ "socks_wool", 20 ], [ "null", 5 ] ] + "items": [ [ "socks", 80 ], [ "socks_ankle", 60 ], [ "socks_wool", 20 ], [ "null", 5 ] ] }, { "type": "item_group", "id": "npc_underwear_feet_female", - "items": [ [ "socks", 50 ], [ "socks_wool", 10 ], [ "stockings", 20 ], [ "tights", 20 ], [ "null", 5 ] ] + "items": [ [ "socks", 50 ], [ "socks_ankle", 30 ], [ "socks_wool", 10 ], [ "stockings", 20 ], [ "tights", 20 ], [ "null", 5 ] ] }, { "type": "item_group", @@ -1008,6 +1008,7 @@ [ "smrifle_primer", 2 ], [ "soap", 10 ], [ "socks", 10 ], + [ "socks_ankle", 10 ], [ "socks_wool", 10 ], [ "solder_wire", 5 ], [ "soldering_iron", 5 ], diff --git a/data/json/npcs/missiondef.json b/data/json/npcs/missiondef.json index c41032e0b92be..f656fa048fd06 100644 --- a/data/json/npcs/missiondef.json +++ b/data/json/npcs/missiondef.json @@ -8,12 +8,12 @@ "value": 50000, "start": { "effect": [ "follow", { "u_buy_item": "sarcophagus_access_code" } ], - "assign_mission_target": { "om_terrain": "haz_sar", "om_special": "Hazardous Waste Sarcophagus", "reveal_radius": 3 } + "assign_mission_target": { "om_terrain": "haz_sar_1_1", "om_special": "Hazardous Waste Sarcophagus", "reveal_radius": 3 } }, "origins": [ "ORIGIN_SECONDARY" ], - "destination": "haz_sar_b1", + "destination": "haz_sar_b_1", "dialogue": { - "describe": "You wouldn't believe what I found...", + "describe": "You wouldn't believe what I found…", "offer": "Holy hell, the crash you recovered the black box from wasn't as old as I thought. Check this out, it was on its approach to pick up a team sent to secure and destroy something called a 'Hazardous Waste Sarcophagus' in the middle of nowhere. If the bird never picked up the team then we may still have a chance to meet up with them. It includes an access code for the elevator and an encoded message for the team leader, I guess. If we want to join up with what remains of the government then now may be our only chance.", "accepted": "Fuck ya, America!", "rejected": "Are you going to forfeit your duty when the country needs you the most?", @@ -37,9 +37,9 @@ "deadline_low": 30, "deadline_high": 48, "dialogue": { - "describe": "I'm… short… of breath....", - "offer": "I'm asthmatic. I need you to get an inhaler for me...", - "accepted": "Oh, thank god, thank you so much! I won't last more than a couple of days, so hurry...", + "describe": "I'm… short… of breath…", + "offer": "I'm asthmatic. I need you to get an inhaler for me…", + "accepted": "Oh, thank god, thank you so much! I won't last more than a couple of days, so hurry…", "rejected": "What?! Please, without your help!", "advice": "There's a town nearby. Check pharmacies; it'll be behind the counter.", "inquire": "Find any inhaler yet?", @@ -71,9 +71,9 @@ "deadline_low": 24, "deadline_high": 48, "dialogue": { - "describe": "This infection is bad, bad...", - "offer": "I'm infected. Badly. I need you to get some antibiotics for me...", - "accepted": "Oh, thank god, thank you so much! I won't last more than a couple of days, so hurry...", + "describe": "This infection is bad, bad…", + "offer": "I'm infected. Badly. I need you to get some antibiotics for me…", + "accepted": "Oh, thank god, thank you so much! I won't last more than a couple of days, so hurry…", "rejected": "What?! Please, without your help!", "advice": "There's a town nearby. Check pharmacies; it'll be behind the counter.", "inquire": "Find any antibiotics yet?", @@ -106,7 +106,7 @@ "followup": "MISSION_GET_BLACK_BOX_TRANSCRIPT", "dialogue": { "describe": "We've got the flag, now we need to locate US forces.", - "offer": "We have the flag but now we need to locate US troops to see what we can do to help. I haven't seen any but I'm figure'n one of those choppers that were fly'n round during th outbreak would have a good idea. If you can get me a black box from one of the wrecks I'll look into where we might open'er at.", + "offer": "We have the flag but now we need to locate US troops to see what we can do to help. I haven't seen any but I'm figure'n one of those choppers that were fly'n round during th' outbreak would have a good idea. If you can get me a black box from one of the wrecks I'll look into where we might open'er at.", "accepted": "Fuck ya, America!", "rejected": "Do you have any better ideas?", "advice": "Survivors were talking about them crashing but I don't know where. If I were a pilot I'd avoid crash landing in a city or forest though.", @@ -149,7 +149,7 @@ "item": "badge_deputy", "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "Those twisted snakes...", + "describe": "Those twisted snakes…", "offer": "I hope you will find use from what you got out of the deposit box but I also have another job for you that might lead you to an opportunity to deal out justice for those who cannot. First things first, we can't just look like ruffians. Find us a deputy badge, easy enough?", "accepted": "I'd check the police station.", "rejected": "We're also official… just hang in there and I'll show you what we can really do.", @@ -174,7 +174,7 @@ "describe": "Does our flag still yet wave?", "offer": "Does our flag still yet wave? We're battered but not yet out of the fight, we need the old colors!", "accepted": "Hell ya! Find me one of those big ol' American flags.", - "rejected": "Seriously? God damned commie...", + "rejected": "Seriously? God damned commie…", "advice": "Find a large federal building or school, they must have one.", "inquire": "Rescued the standard yet?", "success": "America, fuck ya!", @@ -194,7 +194,7 @@ "origins": [ "ORIGIN_OPENER_NPC", "ORIGIN_ANY_NPC" ], "followup": "MISSION_GET_SAFE_BOX", "dialogue": { - "describe": "Those twisted snakes...", + "describe": "Those twisted snakes…", "offer": "Our world fell apart because our leaders were as crooked as the con-men that paid for their elections. Just find me one of those corporate accounting books and I'll show you and the rest of the world just who is at fault.", "accepted": "You'll see, I know I'm right.", "rejected": "I know it isn't pressing but the big corporations didn't get a chance to destroy the evidence yet.", @@ -217,15 +217,15 @@ "origins": [ "ORIGIN_OPENER_NPC", "ORIGIN_ANY_NPC" ], "followup": "MISSION_REACH_FEMA_CAMP", "dialogue": { - "describe": "I hope I don't see many names I know...", + "describe": "I hope I don't see many names I know…", "offer": "I've lost so many friends… please find me a patient list from the regional hospital or doctor's office. I just want to know who might still be out there.", "accepted": "Thank you, I suppose it won't change what has already happened but it will bring me closure.", "rejected": "Please, I just want to know what happened to everyone.", "advice": "I bet you'll run into a lot of those things in the hospital, please be careful.", "inquire": "Any luck?", - "success": "Oh dear, I thought Timmy would have made it...", + "success": "Oh dear, I thought Timmy would have made it…", "success_lie": "Thanks for trying… I guess.", - "failure": "I bet some of them are still out there..." + "failure": "I bet some of them are still out there…" } }, { @@ -239,7 +239,7 @@ "start": { "reveal_om_ter": "station_radio" }, "origins": [ "ORIGIN_OPENER_NPC", "ORIGIN_ANY_NPC" ], "dialogue": { - "describe": "I wonder if a retreat might exist...", + "describe": "I wonder if a retreat might exist…", "offer": "Everyone who dies gets back up, right? Which means that whatever is causing this it must be airborne to have infected everyone. I believe that if that is the case then there should be regions that were not downwind from where-ever the disease was released. We need to find a record of all the weather patterns leading up to the outbreak.", "accepted": "Thanks so much, you may save both of us yet.", "rejected": "Ya, it was a long shot I admit.", @@ -262,15 +262,15 @@ "origins": [ "ORIGIN_OPENER_NPC", "ORIGIN_ANY_NPC" ], "followup": "MISSION_RECOVER_PRIEST_DIARY", "dialogue": { - "describe": "St. Michael the archangel defend me in battle...", + "describe": "St. Michael the archangel defend me in battle…", "offer": "As the world seems to abandon the reality that we once knew, it becomes plausible that the old superstitions that were cast aside may have had some truth to them. Please go and find me a religious relic… I doubt it will be of much use but I've got to hope in something.", "accepted": "I wish you the best of luck, may whatever god you please guide your path.", - "rejected": "Ya, I guess the stress may just be getting to me...", + "rejected": "Ya, I guess the stress may just be getting to me…", "advice": "I suppose a large church or cathedral may have something.", "inquire": "Any luck? Please find me a small relic. Any relic will do.", - "success": "Thank you, I need some time alone now...", + "success": "Thank you, I need some time alone now…", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -286,7 +286,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_GET_DEPUTY_BADGE", "dialogue": { - "describe": "Those twisted snakes...", + "describe": "Those twisted snakes…", "offer": "Now I don't mean to upset you but I'm not sure what I can do with the accounting ledger at the moment. We do have a new lead though, the ledger has a safe deposit box under the regional manager's name. Guess what, dumb sucker wrote down his combination. Come with me to retrieve the box and you can keep any of the goodies in it that I can't use to press charges against these bastards.", "accepted": "You may make a tidy profit from this.", "rejected": "I know it isn't pressing but the world is going to be just as corrupt when we start rebuilding unless we take measure to stop those who seek to rule over us.", @@ -308,15 +308,15 @@ "start": "place_npc_software", "origins": [ "ORIGIN_OPENER_NPC", "ORIGIN_ANY_NPC" ], "dialogue": { - "describe": "Oh man, I can't believe I forgot to download it...", + "describe": "Oh man, I can't believe I forgot to download it…", "offer": "There's some important software on my computer that I need on USB.", "accepted": "Thanks! Just pull the data onto this USB drive and bring it to me.", - "rejected": "Seriously? It's an easy job...", + "rejected": "Seriously? It's an easy job…", "advice": "Take this USB drive. Use the console, and download the software.", "inquire": "So, do you have my software yet?", "success": "Excellent, thank you!", "success_lie": "What?! You liar!", - "failure": "Wow, you failed? All that work, down the drain..." + "failure": "Wow, you failed? All that work, down the drain…" } }, { @@ -333,15 +333,15 @@ }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "It could be very informative to perform an analysis of zombie blood...", + "describe": "It could be very informative to perform an analysis of zombie blood…", "offer": "I need someone to get a sample of zombie blood, take it to a hospital, and perform a centrifuge analysis of it.", "accepted": "Excellent. Take this blood draw kit; once you've produced a zombie corpse, use it to extract blood from the body, then take it to a hospital for analysis.", - "rejected": "Are you sure? The scientific value of that blood data could be priceless...", + "rejected": "Are you sure? The scientific value of that blood data could be priceless…", "advice": "The centrifuge is a bit technical; you might want to study up on the usage of computers before completing that part.", "inquire": "Well, do you have the data yet?", "success": "Excellent! This may be the key to removing the infection.", "success_lie": "Wait, you couldn't possibly have the data! Liar!", - "failure": "What a shame, that data could have proved invaluable..." + "failure": "What a shame, that data could have proved invaluable…" } }, { @@ -356,15 +356,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_INVESTIGATE_PRISON_VISIONARY", "dialogue": { - "describe": "St. Michael the archangel defend me in battle...", + "describe": "St. Michael the archangel defend me in battle…", "offer": "You have no idea how interesting this diary is. I have two very promising leads… First things first, the Catholic Church has been performing its own investigations into global cult phenomenon and it appears to have become very interested in a local cult as of recently. Could you investigate a location for me? I'm not sure what was going on here but the priest seemed fairly worried about it.", "accepted": "I wish you the best of luck, may whatever god you please guide your path… You may need it this time more than the past excursions you have gone on. There is a note about potential human sacrifice in the days immediately before and after the outbreak. The name of the cult is believed to be the Church of Starry Wisdom but it is noted that accounts differ.", - "rejected": "Ya, I guess the stress may just be getting to me...", + "rejected": "Ya, I guess the stress may just be getting to me…", "advice": "I doubt the site is still occupied but I'd carry a firearm at least… I'm not sure what you might be looking for but I'm positive you'll find something out of the ordinary if you look long enough.", "inquire": "I'm positive there is something there… there has to be, any luck?", "success": "Thank you, your account of these… demonic creations proves the fears the churches had were well founded. Our priority should be routing out any survivors of this cult… I don't known if they are responsible for the outbreak but they certainly know more about it than I do.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -378,15 +378,15 @@ "start": { "assign_mission_target": { "om_terrain": "prison_1_5", "om_special": "Prison", "reveal_radius": 3 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "St. Michael the archangel defend me in battle...", + "describe": "St. Michael the archangel defend me in battle…", "offer": "I have another task if you are feeling up to it. There is a prisoner that the priest made special mention of. I was wondering if you could see what may have happened to him or if he left anything in his cell. The priest admits the individual is rather unstable, to put it lightly, but the priest personally believed the man was some kind of repentant visionary. I'm not in a position to cast out the account just yet… it seems the man has prophesied events accurately before concerning the Church of Starry Wisdom.", "accepted": "I wish you the best of luck, may whatever god you please guide your path… I can only imagine that the prison will be a little slice of hell. I'm not sure what they would have decided to do with the inmates when they knew death was almost certain. ", - "rejected": "Ya, I guess the stress may just be getting to me...", + "rejected": "Ya, I guess the stress may just be getting to me…", "advice": "The worst case scenario will probably be that the prisoners have escaped their cells and turned the building into their own little fortress. Best case, the building went into lock-down and secured the prisoners in their cells. Either way, navigating the building will pose its own difficulties.", "inquire": "Any luck?", "success": "Thank you, I'm not sure what to make of this but I'll ponder your account.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -401,14 +401,14 @@ "start": { "effect": "follow" }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "Well damn, you must be the guys here to pick me up...", + "describe": "Well damn, you must be the guys here to pick me up…", "offer": "I got the brief so I know what I'm getting into. Let me be upfront, treat me like shit and I'm going to cover my own hide. However, you treat me well and give me something to believe in, even if it's just a shiny bit of metal, and I'll do you right. Without a strong band a man doesn't stand a chance in this world. You ready to take charge boss? This world could use a Sheriff just about now.", "accepted": "Before we get into a major fight just make sure we have the gear we need, boss.", "rejected": "I don't think you're going to find many other survivors who haven't taken up a faction yet.", "advice": "I'm a pretty good shot with a rifle or pistol.", "inquire": "Any problems boss?", "success": "Wait… are you really making me a deputy?", - "success_lie": "I don't think so...", + "success_lie": "I don't think so…", "failure": "Quitting already?" } }, @@ -426,7 +426,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_KILL_HORDE_MASTER", "dialogue": { - "describe": "You seem to know this new world better than most...", + "describe": "You seem to know this new world better than most…", "offer": "You're kitted out better than most… would you be interested in making this world a little better for the rest of us? The towns have enough supplies for us survivors to start securing a foothold but we don't have anyone with the skills and equipment to thin the masses of undead. I'll lend you a hand to the best of my ability but you really showed promise taking out that other beast. You, I, and a 100 zombies laid to rest, what do you say?", "accepted": "Hell ya, we may get ourselves killed but we'll be among the first legends of the apocalypse.", "rejected": "Hey, I know I wouldn't volunteer for it either… but then I remember that most of us survivors won't make it unless someone decides to take the initiative.", @@ -450,7 +450,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RECRUIT_TRACKER", "dialogue": { - "describe": "I've heard some bad rumors so I hope you are up for another challenge...", + "describe": "I've heard some bad rumors so I hope you are up for another challenge…", "offer": "Apparently one of the other survivors picked up on an unusually dense horde of undead moving into the area. At the center of this throng there was a 'leader' of some sort. The short of it is, kill the son of a bitch. We don't know what it is capable of or why it is surrounded by other zombies but this thing reeks of trouble. Do whatever it takes but we can't risk it getting away.", "accepted": "I'll lend you a hand but I'd try and recruit another gunslinger if you can.", "rejected": "What's the use of walking away, they'll track you down eventually.", @@ -477,7 +477,7 @@ "origins": [ "ORIGIN_OPENER_NPC", "ORIGIN_ANY_NPC" ], "followup": "MISSION_KILL_100_Z", "dialogue": { - "describe": "The eater of the dead… something was ripping zombies to shreds and only leaving a few scattered limbs...", + "describe": "The eater of the dead… something was ripping zombies to shreds and only leaving a few scattered limbs…", "offer": "A few days ago another survivor and I were trying to avoid the cities by staying in the woods during the day and foraging for gear at night. It worked well against the normal zed's but one night something caught onto our trail and chased us for ten minutes or so until we decided to split up and meet-up back here. My buddy never showed up and I don't have the means to kill whatever it was. Can you lend a hand?", "accepted": "Thanks, make sure you're ready for whatever the beast is.", "rejected": "Hey, I know I wouldn't volunteer for it either.", @@ -501,12 +501,12 @@ "end": { "effect": "npc_thankful" }, "origins": [ "ORIGIN_OPENER_NPC", "ORIGIN_ANY_NPC" ], "dialogue": { - "describe": "Oh god, I can't believe it happened...", + "describe": "Oh god, I can't believe it happened…", "offer": "My mom… she's… she was killed, but then she just got back up… she's one of those things now. Can you put her out of her misery for me?", "accepted": "Thank you… she would've wanted it this way.", - "rejected": "Please reconsider, I know she's suffering...", - "advice": "Find a gun if you can, make it quick...", - "inquire": "Well...? Did you… finish things for my mom?", + "rejected": "Please reconsider, I know she's suffering…", + "advice": "Find a gun if you can, make it quick…", + "inquire": "Well…? Did you… finish things for my mom?", "success": "Thank you. I couldn't rest until I knew that was finished.", "success_lie": "What?! You're lying, I can tell! Ugh, forget it!", "failure": "Really… that's too bad." @@ -533,7 +533,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "destination": "farm_2", "dialogue": { - "describe": "I just need a place to start over...", + "describe": "I just need a place to start over…", "offer": "I've accepted that everyone I used to know is dead… one way or another. I really wish I could have done something to save my brother but he was one of the first to go. I'd like to start over, just rebuild at one of the farms in the countryside. Can you help me secure one?", "accepted": "Thank you, let's find a remote one so we don't have to worry about many zombies.", "rejected": "Please, I just don't know what to do otherwise.", @@ -556,7 +556,7 @@ "followup": "MISSION_REACH_FARM_HOUSE", "destination": "fema", "dialogue": { - "describe": "Maybe they escaped to one of the camps...", + "describe": "Maybe they escaped to one of the camps…", "offer": "I can't thank you enough for bringing me the patient records but I do have another request. You seem to know your way around… could you take me to one of the FEMA camps? I know some were overrun but I don't want to believe all of them could have fallen.", "accepted": "Thank you, just bring me to the camp… I just want to see.", "rejected": "Please, I don't know what else to do.", @@ -564,7 +564,7 @@ "inquire": "Any leads on where a camp might be?", "success": "I guess this wasn't as bright an idea as I thought.", "success_lie": "Thanks for trying… I guess.", - "failure": "I bet some of them are still out there..." + "failure": "I bet some of them are still out there…" } }, { @@ -589,15 +589,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_INVESTIGATE_CULT", "dialogue": { - "describe": "St. Michael the archangel defend me in battle...", + "describe": "St. Michael the archangel defend me in battle…", "offer": "From what I understand, the creatures you encountered surrounding this relic were unlike anything I've heard of. It is laughable that I now consider the living dead to be part of our ordinary reality. Never-the-less, the church must have some explanation for these events. I have located the residence of a local clergy man, could you go to this address and recover any items that may reveal what the church's stance is on these events?", "accepted": "I wish you the best of luck, may whatever god you please guide your path.", - "rejected": "Ya, I guess the stress may just be getting to me...", + "rejected": "Ya, I guess the stress may just be getting to me…", "advice": "If the information is confidential the priest must have it hidden within his own home.", "inquire": "Any luck?", "success": "Thank you, a diary is exactly what I was looking for.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -614,14 +614,14 @@ }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "You seem to know this new world better than most...", + "describe": "You seem to know this new world better than most…", "offer": "We've got another problem to deal with but I don't think we can handle it on our own. So, I sent word out and found us a volunteer… of sorts. He's vain as hell but has a little skill with firearms. He was supposed to collect whatever he had of value and is going to meet us at a cabin in the woods. Wasn't sure how long we were going to be so I told him to just camp there until we picked him up.", "accepted": "Rodger, if he's a no-show then any other gunslinger will do… but I doubt he'll quit before we even begin.", "rejected": "Hey, I know I wouldn't volunteer for it either… but then I remember that most of us survivors won't make it unless someone decides to take the initiative.", "advice": "I hope the bastard is packing heat… else we'll need to grab him a gun before we hit our next target.", "inquire": "Found a gunslinger?", "success": "Great, just let me know when you are ready to wade knee-deep in an ocean of blood.", - "success_lie": "I don't think so...", + "success_lie": "I don't think so…", "failure": "Quitting already?" } }, @@ -636,7 +636,7 @@ "start": "place_dog", "origins": [ "ORIGIN_OPENER_NPC" ], "dialogue": { - "describe": "Oh, my poor puppy...", + "describe": "Oh, my poor puppy…", "offer": "I left my poor dog in a house, not far from here. Can you retrieve it?", "accepted": "Thank you! Please hurry back!", "rejected": "Please, think of my poor little puppy!", @@ -644,7 +644,7 @@ "inquire": "Have you found my dog yet?", "success": "Thank you so much for finding him!", "success_lie": "What?! You're lying, I can tell! Ugh, forget it!", - "failure": "Oh no! My poor puppy..." + "failure": "Oh no! My poor puppy…" } }, { @@ -658,9 +658,9 @@ "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": "I need you to get my family photo from the armory safe.", - "offer": "I left the only photo I have from my family in the armory. I don't have the code, can you get in?", + "offer": "I left the only photo I have from my family in the armory. I don't have the code, can you get in?", "accepted": "Thanks, it's great to see someone willing to help a out.", - "rejected": "Well, I'll find someone else to do it for me, real shame with all those guns locked up too...", + "rejected": "Well, I'll find someone else to do it for me, real shame with all those guns locked up too…", "advice": "You look like a resourceful sort, maybe you can hack it or something.", "inquire": "Got the photo? Should've been in my gun safe.", "success": "Thanks! I'll be sure to put in a good word for you around town.", @@ -703,7 +703,7 @@ "inquire": "How is it going? Do you have them?", "success": "YES! I knew you could do it! You proved your worth and I'm proud to call you a friend.", "success_lie": "Well… where are they?", - "failure": "I'm so disappointed in you kid..." + "failure": "I'm so disappointed in you kid…" } }, { @@ -718,13 +718,13 @@ "origins": [ "ORIGIN_OPENER_NPC" ], "end": { "effect": "follow" }, "dialogue": { - "describe": "It's hard to tell who actually has the skills to survive these days...", + "describe": "It's hard to tell who actually has the skills to survive these days…", "offer": "It's hard surviving out here on our own, and we'd probably have a better chance working together. Problem is, I don't really know you and what you're capable of. You might have what it takes, or you might not. Either way, I'm going to need some proof. Come back in a few days and I'll gladly follow you. It's basically a win-win for me: either you come back and I'll know you've got what it takes, or you don't and I'll know that I was right not to follow you.", "accepted": "I'll see you then…or I won't, and then I'll know I made the right decision.", "rejected": "Ya, it was a long shot I admit.", - "advice": "Don't die. If you're asking me for advice, that doesn't bode well for you.", + "advice": "Don't die. If you're asking me for advice, that doesn't bode well for you.", "inquire": "Well, you're not dead…yet.", - "success": "I'll be honest, I wasn't really expecting to see you again. A promise is a promise, I'll follow you now!", + "success": "I'll be honest, I wasn't really expecting to see you again. A promise is a promise, I'll follow you now!", "success_lie": "I know time is relative and all that.", "failure": "I'm not quite sure how you failed to survive AND are talking to me." } diff --git a/data/json/npcs/necropolis/NPC_Old_Guard_Captain.json b/data/json/npcs/necropolis/NPC_Old_Guard_Captain.json index eedf075c97a9d..105594f6d9856 100644 --- a/data/json/npcs/necropolis/NPC_Old_Guard_Captain.json +++ b/data/json/npcs/necropolis/NPC_Old_Guard_Captain.json @@ -74,15 +74,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_OLD_GUARD_NEC_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "My communications team went to secure the radio control room after we breached the facility. I haven't heard from them since, I need you to locate them. Their first objective was to record all active channels that were transmitting information on other survivors or facilities. Find them and return the frequency list to me. I'm sure they could probably use your help also.", "accepted": "Good luck, the communications room shouldn't be far from here.", - "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks...", + "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks…", "advice": "We were briefed that the communications array was on this level.", "inquire": "How is the search going?", "success": "Thanks, let me know when you need another tasking.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -97,15 +97,15 @@ "monster_kill_goal": 20, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Your assistance is greatly appreciated, we need to clear out the more ruthless monsters that are wandering up from the lower levels. If you could cull twenty or so of what we refer to as 'nightmares' my men would be much safer. If you've cleared out most of this floor then the lower levels should be your next target. ", "accepted": "Good luck, finding a clear passage to the second level may be tricky.", - "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks...", + "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks…", "advice": "These creatures can swing their appendages surprisingly far.", "inquire": "How is the hunt going?", "success": "Thanks, let me know when you need another tasking.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } } ] diff --git a/data/json/npcs/necropolis/NPC_Old_Guard_Commo.json b/data/json/npcs/necropolis/NPC_Old_Guard_Commo.json index 02be287b051a6..62e7a85c734ef 100644 --- a/data/json/npcs/necropolis/NPC_Old_Guard_Commo.json +++ b/data/json/npcs/necropolis/NPC_Old_Guard_Commo.json @@ -91,15 +91,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_OLD_GUARD_NEC_COMMO_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "My chief responsibility is to monitor radio traffic and locate potential targets to secure or rescue. The majority of radio repeaters are down and those that are working have only emergency power. If you have a basic understanding of electronics you should be able to fabricate the 'radio repeater mod' found in these plans. When this mod is attached to a radio station's main terminal, all short range radio traffic on emergency channels is boosted so we can pick it up at much longer ranges. I really need you make me one.", "accepted": "Thanks, I know the labs on the other side of the complex have electronic parts sitting around.", - "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks...", + "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks…", "advice": "I'm sure the motorpool has a truck battery you could salvage.", "inquire": "Have you had any luck fabricating it?", "success": "Thanks, I'll see to installing this one. It will be some time but I could use someone to position these around the region.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -112,15 +112,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_OLD_GUARD_NEC_COMMO_3", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I guess I could use your skills once again. There are small transmitters located in the nearby evacuation shelters; if we don't separate them from the power grid their power systems will rapidly deteriorate over the next few weeks. The task is rather simple but the shelters offer us a place to redirect refugees until this vault can be secured. ", "accepted": "Thanks, I should be ready for you to install the radio repeater mods by the time you get back.", - "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks...", + "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks…", "advice": "Try searching on the outskirts of towns.", "inquire": "Have you had any luck severing the connection?", "success": "We are good to go! The last of the gear is powering up now.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -133,15 +133,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_OLD_GUARD_NEC_COMMO_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Most of my essential gear has been brought back online so it is time for you to install your first radio repeater mod. Head topside and locate the nearest radio station. Install the mod on the backup terminal and return to me so that I can verify that everything was successful. Radio towers must unfortunately be ignored for now, without a dedicated emergency power system they won't be useful for some time.", "accepted": "I'll be standing by down here once you are done.", - "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks...", + "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks…", "advice": "If you could make some sort of directional antenna, it might help locating the radio stations.", "inquire": "Have you had any luck finding a radio station?", "success": "That's one down.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -154,15 +154,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_OLD_GUARD_NEC_COMMO_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I could always use you to put another repeater mod up. I don't have to remind you but every one that goes up extends our response area just a little bit more. With enough of them we'll be able to maintain communication with anyone in the region.", "accepted": "I'll be standing by.", - "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks...", + "rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks…", "advice": "Getting a working vehicle is going to become important as the distance you have to travel increases.", "inquire": "Have you had any luck finding a radio station?", "success": "I'll try and update the captain with any signals that I need investigated.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } } ] diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json index 0e76d2184c7c3..fa2e92803ca4c 100644 --- a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json +++ b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json @@ -343,13 +343,13 @@ "dialogue": { "describe": "This is the last thing I need from you. I've been collecting the other parts myself, it's been easier with more cardboard around. Can you bring me five more really big cardboard boxes?", "offer": "This is the last thing I need from you. I've been collecting the other parts myself, it's been easier with more cardboard around. Can you bring me five more really big cardboard boxes? Five more cardboard boxes, as big as it gets. I have a few already stored up, that should be all I need.", - "accepted": "Yes! The home stretch!", + "accepted": "Yes! The home stretch!", "rejected": "Oh man, but we're so close!", "advice": "Try looking in cargo storage areas.", "inquire": "Did you bring me those last few boxes?", "success": "Brilliant! You're a true hero. I'll see if I can find a place to set these up now.", "success_lie": "Brilliant! You're a true hero. I'll see if I can find a place to set these up now.", - "failure": "No! Oh god, no, this can't be happening..." + "failure": "No! Oh god, no, this can't be happening…" } } ] diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json index 4d092a1329238..af7b627121e8d 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json @@ -328,7 +328,7 @@ "item": "landough_calrisean", "start": { "assign_mission_target": { "om_terrain": "bakery", "reveal_radius": 1, "random": true, "search_range": 120 }, - "update_mapgen": { "om_terrain": "bakery", "om_special": "bakery", "place_item": [ { "item": "landough_calrisean", "x": 5, "y": 16 } ] }, + "update_mapgen": { "om_terrain": "bakery", "place_item": [ { "item": "landough_calrisean", "x": 5, "y": 16 } ] }, "effect": { "u_add_var": "Dana_Sourdough", "type": "mission", "context": "flag", "value": "in_progress" } }, "end": { @@ -339,7 +339,7 @@ }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "I could get my real sourdough starter...", + "describe": "I could get my real sourdough starter…", "offer": "If you really like this second-rate bread, you could risk your life for something actually worth it. I left my actual sourdough starter back in the bakery where I worked. That baby is a hundred years old, and has been in my family for generations… if you can bring him to me, I'll bake you the finest bread you've ever had.", "accepted": "Take care of yourself out there. And listen, when you bring my sourdough back, I don't want to see a scratch on him, you understand?", "rejected": "I can understand why you think you wouldn't want to risk your life for a bread starter. You haven't tried that bread.", diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json index c6e322cae53f1..55f215edb0830 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json @@ -405,7 +405,7 @@ "//": "followup: MISSION_REFUGEE_Jenny_GET_RIFLES", "dialogue": { "describe": "Now that I've got that motor, I can get my compressor mostly built. I will need a tank though.", - "offer": "I can get started building the compressor, but I need a large metal tank to store compressed air centrally. About 60 liters should do...", + "offer": "I can get started building the compressor, but I need a large metal tank to store compressed air centrally. About 60 liters should do…", "accepted": "Great! Bring it to me when you find one.", "rejected": "Oh well. Thanks for offering anyway.", "advice": "It needs to be a good strong tank, like a big propane tank or something… you could look at fuel storage tanks and things, as long as they're durable enough. Heck, if you get some sheet metal you could probably even weld a good one together.", diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json index a4023d5ecff30..bd469aac05eef 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json @@ -134,7 +134,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_REFUGEE_Uyen_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "There's the doc out front helping anyone that can pay… but for us up here, money mostly goes to food. I could do a lot for basic cuts, bruises, and common stuff if I had some supplies to help out. Could you bring me a few extra first aid kits? Five would probably have enough to last us a while.", "accepted": "Thanks so much. It's a small thing but it'd be really helpful.", "rejected": "That's okay. I'm sure we'll make do somehow.", @@ -142,7 +142,7 @@ "inquire": "How is the search going?", "success": "Thanks so much. Listen, I told some of the others what you were up to for us and we pooled our cash to thank you. It's not much but I hope it helps… these are merch, the local money, you can trade them for goods from the shop.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "effect": [ @@ -162,7 +162,7 @@ "count": 6, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "We could still use your help...", + "describe": "We could still use your help…", "offer": "I probably shouldn't be prescribing things, but there's a ton of people needing help with sleep in here. If you could get us some antidepressants, Rhyzaea and I can probably make sure they're doled out appropriately without people having to starve to pay for them. Three month's worth - about 6 bottles - would last us a little while.", "accepted": "Thanks so much. It's a small thing but it'd be really helpful.", "rejected": "That's okay. I'm sure we'll make do somehow.", @@ -170,7 +170,7 @@ "inquire": "How is the search going?", "success": "Thanks so much. Listen, I told some of the others what you were up to for us and we pooled our cash to thank you. You've done a lot to help us out.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "effect": [ diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json index 51e47c564e8f9..9adccd16183f9 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json @@ -217,7 +217,7 @@ "inquire": "How is the search going?", "success": "Wow, that's a lot more jars than it sounded on paper. Thanks. Here's your payment.", "success_lie": "What good does this do us?", - "failure": "I wonder where all the jars went..." + "failure": "I wonder where all the jars went…" } } ] diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json index c42ac20006ba6..18bc9aafba028 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json @@ -125,7 +125,7 @@ "rejected": "Well, I'll find someone else to do it for me.", "advice": "Plenty of smokers in towns. Gotta be some left over cigs in some of them houses.", "inquire": "Got the smokes?", - "success": "Thanks! I'll be sure to put in a good word for you around the center.", + "success": "Thanks! I'll be sure to put in a good word for you around the center.", "success_lie": "OK, then hand it over.", "failure": "Shit happens." } diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json index c9b611f314bed..da837fc20736f 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json @@ -415,7 +415,6 @@ "assign_mission_target": { "om_terrain": "evac_center_9", "reveal_radius": 1 }, "update_mapgen": { "om_terrain": "evac_center_9", - "om_special": "evac_center", "place_monster": [ { "group": "GROUP_REFUGEE_BOSS_ZOMBIE", "name": "Sean McLaughlin", "x": 10, "y": 10, "target": true } ] } }, @@ -426,14 +425,13 @@ ], "update_mapgen": { "om_terrain": "evac_center_9", - "om_special": "evac_center", "set": [ { "square": "terrain", "id": "t_floor", "x": 0, "y": 23, "x2": 1, "y2": 23 } ] } }, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_FREE_MERCHANTS_EVAC_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "If you really want to lend a hand we could use your help clearing out the dead in the back bay. Fearful of going outside during the first days of the Cataclysm we ended up throwing our dead and the zombies we managed to kill in the sealed back bay. Our promising leader at the time even fell… he turned into something different. Kill all of them and make sure they won't bother us again. We can't pay much, besides some of our own internal money which isn't good for that much yet, but it would help us to reclaim the bay.", "accepted": "Please be careful, we don't need any more deaths.", "rejected": "Come back when you get a chance, we really need to start reclaiming the region.", @@ -441,7 +439,7 @@ "inquire": "Will they be bothering us any longer?", "success": "Thank you, having that big of a threat close to home was nerve wracking. Here's some of our local certified notes, we've been paying these to our workers in exchange for supplies. They're getting some value in the center as a trade item, I'm afraid they're all we have to spare at the moment.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -519,15 +517,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_FREE_MERCHANTS_EVAC_3", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "This is a bit more involved than the last request, we recently lost a scavenger party coming to trade with us and would like you to investigate. We strongly suspect a raider band or horde caught them off-guard. I can give you the coordinates of their last radio message but little else. In either case, deal with the threat so that the scavengers can continue to pass through in relative safety. The best reward I can offer is a claim to the supplies they were carrying, plus thirty certified notes - that's our own internal money, good for trading and such.", "accepted": "Our community survives on trade, we appreciate it.", "rejected": "Come back when you get a chance, we really need to start reclaiming the region.", "advice": "If you can, get a friend or two to help you.", "inquire": "Have you dealt with them?", - "success": "Thank you, the world is a better place without them. Two of our more skilled individuals accepted the assistance of the Old Guard in setting up an outpost while you were out. We didn't have many other options, refugees are still streaming in and we don't know what else to do with our limited food supply. If you get a chance, you should see if they need your assistance in the future...", + "success": "Thank you, the world is a better place without them. Two of our more skilled individuals accepted the assistance of the Old Guard in setting up an outpost while you were out. We didn't have many other options, refugees are still streaming in and we don't know what else to do with our limited food supply. If you get a chance, you should see if they need your assistance in the future…", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -556,7 +554,6 @@ ], "update_mapgen": { "om_terrain": "evac_center_8", - "om_special": "evac_center", "set": [ { "point": "terrain", "id": "t_gates_mech_control_lab", "x": 17, "y": 1 }, { "point": "terrain", "id": "t_gates_mech_control_lab", "x": 17, "y": 3 } @@ -566,7 +563,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_FREE_MERCHANTS_EVAC_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "We recently set out some skilled people to start an outpost, to secure us some food supplies in a safer location. The new outpost that we've started could use your assistance. I need you to get the foreman's prospectus before we begin to send additional refugees to the farming commune. Consult with the foreman to get more detailed tasks. We've got 50 Certified Notes for you if you can do this for us.", "accepted": "I'm sure the outpost will expand quickly with your assistance.", "rejected": "Come back when you get a chance, we really need to start reclaiming the region.", @@ -574,7 +571,7 @@ "inquire": "Do you have the prospectus?", "success": "With this we'll be able to convince others to invest in the commune. Thank you, here's your money. We also managed to get a manual crank hooked up to the garage in the back, so feel free to make use of that - you've been a great help to us.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -596,7 +593,7 @@ ] }, "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "We are starting to build new infrastructure here and would like to get a few new electrical systems online… unfortunately our existing system relies on an array of something called RTGs. Running generators isn't a viable option underground, of course. We have a big flat roof up top, and if we had a few solar panels we could use them to top up our usage. We could pay you pretty handsomely to bring us, say, ten solar panels?", "accepted": "If you can do this for us our survival options would vastly increase.", "rejected": "Come back when you get a chance, we really need to start reclaiming the region.", @@ -604,7 +601,7 @@ "inquire": "How is the search going?", "success": "Great, I know it isn't much but we hope to continue to expand thanks to your help.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -625,15 +622,15 @@ }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "We need help...", - "offer": "While we've managed to secure day to day food supplies, it's very much hand to mouth. Our reserves would barely last a few days if something kept our people locked in. We need a stockpile to avoid that. Thanks to our outpost we have a bit of meat and vegetables coming in, but we need a better way to preserve them. Some of our people know enough about food canning that if we had a good stock of canning jars, we could make pickles and canned meats to get us set for the winter. I'll pay you a premium rate if you can bring us around a hundred jars to get us started.", + "describe": "We need help…", + "offer": "While we've managed to secure day to day food supplies, it's very much hand to mouth. Our reserves would barely last a few days if something kept our people locked in. We need a stockpile to avoid that. Thanks to our outpost we have a bit of meat and vegetables coming in, but we need a better way to preserve them. Some of our people know enough about food canning that if we had a good stock of canning jars, we could make pickles and canned meats to get us set for the winter. I'll pay you a premium rate if you can bring us around a hundred jars to get us started.", "accepted": "It'll take a load off my shoulders if I can finally stop worrying about this.", "rejected": "We'll hold for the moment, but I'll get an ulcer if I have to keep worrying. If you reconsider let me know.", "advice": "Grocery stores, house kitchens, there's plenty of places to look.", "inquire": "How is the search going?", "success": "That's one less thing to worry about. Glad to have someone like you on our side. Here's 25 merch, and the broker will buy any further glass jars you can find - at a reduced price, we can't keep up the premium rate. Actually, the broker was saying they had some jobs like this for you, and that it might be easier to just go straight through their office if you want more work.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } } ] diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json b/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json index c20a95030c15d..70c2c28165268 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json @@ -75,15 +75,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_SCIENCE_REP_2", "dialogue": { - "describe": "It could be very informative to perform an analysis of zombie blood...", + "describe": "It could be very informative to perform an analysis of zombie blood…", "offer": "We don't have the equipment for real analysis here so it'll need to be done in the field. I need you to get a fresh sample of zombie blood, take it to a hospital, and perform a centrifuge analysis of it.", "accepted": "Excellent. Take this blood draw kit; once you've found a zombie corpse, use it to extract blood from the body, then take it to a hospital for analysis.", - "rejected": "Are you sure? The scientific value of that blood data could be priceless...", + "rejected": "Are you sure? The scientific value of that blood data could be priceless…", "advice": "The centrifuge is a bit technical; you might want to study up on the usage of computers before completing that part.", "inquire": "Well, do you have the data yet?", "success": "Excellent! This may be the key to removing the infection.", "success_lie": "Wait, you couldn't possibly have the data! Liar!", - "failure": "What a shame, that data could have proved invaluable..." + "failure": "What a shame, that data could have proved invaluable…" } }, { @@ -98,7 +98,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_SCIENCE_REP_3", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The medical software didn't just analyze the blood, it triggered a government alert. Medical staff was under orders to immediately drive any matching samples to the nearest laboratory. That must mean the government knew! We have the destination address. Go there, get in, and bring back any records you can download off a computer.", "accepted": "Great! I've mapped out a route to the address.", "rejected": "Can't blame you, but come back if you change your mind.", @@ -106,7 +106,7 @@ "inquire": "Have you completed your mission?", "success": "Thanks! This data looks damaged, but maybe I can make something out of it.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -121,7 +121,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_SCIENCE_REP_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Unfortunately the data you got was incomplete and mostly encrypted. There may be a way to get encryption codes, though. I found a complaint by the infosec team that they were unable to deliver critical security updates to one research site. It was some kind of more restricted secondary site hidden beneath a town, they weren't allowed in. That means it should have unsecured computers we can get the codes from.", "accepted": "Great! I've mapped out a route, it should look like a normal house. Bring back anything you find on a USB drive.", "rejected": "Can't blame you, but come back if you change your mind.", @@ -129,7 +129,7 @@ "inquire": "Have you completed your mission?", "success": "Wonderful! Now I just need to get an undamaged, complete archive, and we can really figure out what happened.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -144,7 +144,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_SCIENCE_REP_5", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "So there looks to be months, maybe years of experiments, and that data set must be huge. Database servers massive enough to house it would overheat running on emergency power. But I did found communications from a lab that had some kind of freezing portal open during the Cataclysm, sending everything to subzero temperatures. I bet the archives inside that lab are still working.", "accepted": "Great! I've mapped out a route. Bundle up, it gets colder the deeper you go and it looks like the archives were on the fourth basement level.", "rejected": "Can't blame you, but come back if you change your mind.", @@ -152,7 +152,7 @@ "inquire": "Have you completed your mission?", "success": "Thanks! This is a lot of data to go through.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -166,7 +166,7 @@ "start": "reveal_lab_train_depot", "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "In the data we found a major contract for tunneling and train equipment, ordered a long time ago. It's the best lead we have. Here's the address of the government lab where the equipment was delivered. I want you to go there, find the tunnels that they dug, and download everything you can about the train network.", "accepted": "So glad for your help.", "rejected": "Can't blame you, but come back if you change your mind.", @@ -174,7 +174,7 @@ "inquire": "Have you completed your mission?", "success": "Fantastic! I should be able to reconstruct what cargo moved between which labs. I wonder what was really going on down there.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } } ] diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json index 4f6c05a918819..686dec9ac4f66 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json @@ -110,7 +110,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_OLD_GUARD_REP_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I don't like sending untested men into the field but if you have stayed alive so far you might have some skills. There are at least a pair of bandits squatting in a local cabin, anyone who preys upon civilians meets a quick end… execute both of them for their crimes. Complete this and the Old Guard will consider you an asset in the region.", "accepted": "Contractor, I welcome you aboard.", "rejected": "The States will remain a wasteland unless good men choose to save it.", @@ -118,7 +118,7 @@ "inquire": "Have you completed your mission?", "success": "The Old Guard thanks you for eliminating the criminals. You won't be forgotten.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -131,14 +131,9 @@ "value": 50000, "start": { "update_mapgen": [ - { - "om_terrain": "evac_center_19", - "om_special": "evac_center", - "place_npcs": [ { "class": "evac_guard3", "x": 12, "y": 12, "target": true } ] - }, + { "om_terrain": "evac_center_19", "place_npcs": [ { "class": "evac_guard3", "x": 12, "y": 12, "target": true } ] }, { "om_terrain": "evac_center_7", - "om_special": "evac_center", "place_npcs": [ { "class": "scavenger_hunter", "x": [ 9, 15 ], "y": [ 9, 15 ] } ] } ] @@ -146,15 +141,15 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_OLD_GUARD_REP_3", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "This task is going to require a little more persuasive skill. I believe the Hell's Raiders have an informant here to monitor who comes and goes. I need you to find out who it is and deal with them without letting anyone else know of my suspicions. We normally allow the Free Merchants to govern themselves so I would hate to offend them.", "accepted": "Thank you, please keep this discreet.", "rejected": "Come back when you get a chance, we could use a few good men.", - "advice": "If they draw first blood their friends are less likely to blame you...", + "advice": "If they draw first blood their friends are less likely to blame you…", "inquire": "You deal with the rat?", "success": "Thank you, I'll do the explaining if anyone else asks about it.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -166,7 +161,7 @@ "difficulty": 5, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": [ 10, 50 ] }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 30 }, "update_mapgen": { "place_monster": [ { "monster": "mon_graboid", "name": "Little Guy", "x": 12, "y": 12, "target": true }, @@ -177,7 +172,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_OLD_GUARD_REP_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "There is another monster troubling the merchants but this time it isn't human… at least I don't think. Guy just disappeared while walking behind a packed caravan. They didn't hear any shots but I suppose some raider may have been real sneaky. Check out the area and report anything you find.", "accepted": "Thanks, keeping the people safe is what we try and do.", "rejected": "Come back when you get a chance, we really need to start reclaiming the region.", @@ -185,7 +180,7 @@ "inquire": "How is the search going?", "success": "Great work, wasn't sure what I was sending you after.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -216,15 +211,15 @@ }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I've located a Hell's Raiders encampment in the region that appears to be coordinating operations against the Free Merchants. We know almost nothing about the command structure in the 'gang' so I need to send someone in to decapitate the leadership. The raid will be held under orders of the U.S. Marshals Service and by agreeing to the mission you will become a marshal, swearing to assist the federal government in regaining order.", - "accepted": "Now repeat after me… I do solemnly swear that I will support and defend the Constitution of the United States against all enemies, foreign and domestic...... that I will bear true faith and allegiance to the same...... that I take this obligation freely, without any mental reservation or purpose of evasion...... and that I will well and faithfully discharge the duties of the office on which I am about to enter. To establish justice, insure domestic tranquility, provide for the common defense, promote the general welfare and secure the blessings of liberty. So help me God. Congratulations Marshal, don't forget your badge and gun. As a marshal all men or women assisting you are considered deputy marshals so keep them in line.", + "accepted": "Now repeat after me… I do solemnly swear that I will support and defend the Constitution of the United States against all enemies, foreign and domestic…… that I will bear true faith and allegiance to the same…… that I take this obligation freely, without any mental reservation or purpose of evasion…… and that I will well and faithfully discharge the duties of the office on which I am about to enter. To establish justice, insure domestic tranquility, provide for the common defense, promote the general welfare and secure the blessings of liberty. So help me God. Congratulations Marshal, don't forget your badge and gun. As a marshal all men or women assisting you are considered deputy marshals so keep them in line.", "rejected": "Come back when you get a chance, we could use a few good men.", "advice": "I'd recommend having two deputies… it would be a death trap if a single man got surrounded.", "inquire": "Has the leadership been dealt with?", "success": "Marshal, you continue to impress us. If you are interested, I recently received a message that a unit was deploying into our AO. I don't have the exact coordinates but they said they were securing an underground facility and may require assistance. The bird dropped them off next to a pump station. Can't tell you much more. If you could locate the captain in charge, I'm sure he could use your skills. Don't forget to wear your badge when meeting with them. Thank you once again marshal.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } } ] diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json index ea38f5434b0f1..1ba17637da2ac 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json @@ -93,15 +93,15 @@ "has_generic_rewards": false, "followup": "MISSION_ROBOFAC_INTERCOM_2", "dialogue": { - "describe": "No, I said … [*You hear a short, muffled conversation from across the intercom*]/nWell, it seems we do have a use for you. It's dangerous and you are likely to die, but if you complete it we will allow you limited access to our resources.", - "offer": "One of our scientists recently left the lab to perform a field test on a prototype robot, but failed to return, and has not been heard of since. Investigate the test and return with her and the prototype. Failing that, return with the data recorder that was attached to our prototype.", + "describe": "…", + "offer": "One of our scientists recently left the lab to perform a field test on a prototype robot, but failed to return, and has not been heard of since. Investigate the test and return with her and the prototype. Failing that, return with the data recorder that was attached to our prototype.", "accepted": "We appreciate your help, good luck.", "rejected": "Don't expect our help then.", "advice": "If the robot remains operational don’t try to fight it head on, because it WILL kill you. Dr. Prado left the Hub with a handful of EMP grenades, use those to disable the robot.", "inquire": "Don't you have a job to do?", "success": "Unfortunate only the data was salvageable, but you have our thanks for returning it nonetheless.", "success_lie": "What good does this do us?", - "failure": "Simply useless..." + "failure": "Simply useless…" } }, { @@ -122,12 +122,10 @@ "update_mapgen": [ { "om_terrain": "robofachq_surface_b0", - "om_special": "hub_01", "place_nested": [ { "chunks": [ "robofac_hq_surface_freemerchant_camp" ], "x": 4, "y": 0 } ] }, { "om_terrain": "robofachq_surface_entrance", - "om_special": "hub_01", "place_nested": [ { "chunks": [ "robofac_hq_surface_merc_1" ], "x": 3, "y": 10 } ] } ], @@ -141,11 +139,11 @@ "offer": "When the portal storms started, the Government issued an evacuation order for critical XEDRA personnel and sent convoys to retrieve them, with our head of AI research among the recalled. We recently discovered that he died when the convoy transferring him was ambushed in the initial chaos, but his corpse and memory bionic might remain intact enough for us to extract valuable knowledge. We want you to travel to the location, make a copy of his Bionic Memory Unit, and return it to us.", "accepted": "Remember, perform the extraction /exactly/ as specified, otherwise the bionic will self-destruct.", "rejected": "Yes, we recognize that our request is exceptional. Return if you change your mind.", - "advice": " You do know what a memory unit looks like, right? Matte gray, pill-sized, right in front of the corpus callosum. We suggest a forceps through the eye socket, shaking slightly, then slowly and carefully...", + "advice": " You do know what a memory unit looks like, right? Matte gray, pill-sized, right in front of the corpus callosum. We suggest a forceps through the eye socket, shaking slightly, then slowly and carefully…", "inquire": "Do you have the scan?", "success": "You have our thanks and payment.", "success_lie": "What good does this do us?", - "failure": "Simply useless..." + "failure": "Simply useless…" } }, { @@ -180,7 +178,7 @@ "inquire": "Have you retrieved the blueprints?", "success": "You have our thanks and payment.", "success_lie": "What good does this do us?", - "failure": "Simply useless..." + "failure": "Simply useless…" } }, { @@ -332,9 +330,18 @@ { "text": "Wait! Maybe I can help you!", "condition": { "not": { "u_has_mission": "MISSION_ROBOFAC_INTERCOM_1" } }, - "topic": "TALK_MISSION_LIST" + "topic": "MISSION_ROBOFAC_INTERCOM_1_INTRODUCTION" }, { "text": "Alright, I'll leave", "topic": "TALK_DONE" } ] + }, + { + "id": "MISSION_ROBOFAC_INTERCOM_1_INTRODUCTION", + "type": "talk_topic", + "dynamic_line": "Theres nothing you could do for us, now leave before I'm forced to…\n[You hear a short, muffled conversation from across the intercom]\n\nthe intercom: Well, it seems we do have some use for you. It's a dangerous task, but if you complete it we will allow you limited trading access.", + "responses": [ + { "text": "Tell me about it.", "topic": "TALK_MISSION_OFFER" }, + { "text": "I'm not risking myself for a deal that bad.", "topic": "TALK_DONE" } + ] } ] diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json index 6b483fc2b4129..e9ba2f72a9a31 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json @@ -203,7 +203,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, "dialogue": { - "describe": "I could do with some help...", + "describe": "I could do with some help…", "offer": "I'm still supposed to scavenge for gold, I can offer you the same deal as last time.", "accepted": "Wonderful.", "rejected": "Well I'll look for the gold myself.", diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json index afa3ace311ea3..d00e908b9fb04 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json @@ -80,7 +80,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_BARTENDER_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The wine and beer we can brew are sufficient to attract most patrons but we need something a bit stronger to get them to forget their misery. Could you build me a pair of stills?", "accepted": "This should let us start producing whiskey, rum, and brandy when we get access to the ingredients.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -88,12 +88,11 @@ "inquire": "Do you have the stills?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_bartender_1" ], "x": 0, "y": 0 } ] } } @@ -110,7 +109,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_BARTENDER_3", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The last batch that I brewed was terrible, I'm fairly sure something contaminated the yeast we have been using. Could you locate a source of fresh yeast for us to use? I'd need about 20 teaspoons of dry yeast to get started.", "accepted": "Thank you for your assistance.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -118,13 +117,12 @@ "inquire": "Do you have the yeast?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "effect": { "npc_add_trait": "NPC_BRANDY" }, "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_bartender_2" ], "x": 0, "y": 0 } ] } } @@ -141,21 +139,20 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_BARTENDER_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Sugar and molasses remains in short supply. I've put in a request for more but it is unlikely that I'm going to see a reliable source for some time. If you are interested, we are going to need sugar beet seeds to meet future demand regardless of what the scavengers can find. Could you bring me at least enough seeds to plant a small 10 meter long patch?", "accepted": "Thank you for your assistance.", "rejected": "Come back when you get a chance. We need skilled survivors.", - "advice": "Farms or supply stores might have a few seeds...", + "advice": "Farms or supply stores might have a few seeds…", "inquire": "Do you have the sugar beet seeds?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "effect": { "npc_add_trait": "NPC_RUM" }, "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_bartender_3" ], "x": 0, "y": 0 } ] } } @@ -172,7 +169,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_BARTENDER_5", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The drinks we brew here have become a major draw for visitors and the occasional trader. Our batches have become larger but we are still running out of storage space between trading runs. I've been able to get a few volunteers to help me build a set of standing tanks but I still need 12 metal tanks to build them. I've talked with the scrappers but we are a low priority at the moment.", "accepted": "Thank you for your assistance.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -180,13 +177,12 @@ "inquire": "Do you have the metal tanks?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "effect": { "npc_add_trait": "NPC_WHISKEY" }, "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_bartender_4" ], "x": 0, "y": 0 } ] } } @@ -203,7 +199,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_NULL", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The other survivor outposts that we have contact with have been more than eager to trade for beer or other drinks. Transporting the drinks to them has presented a number of challenges though. If you could locate a pair of 200-liter drums we should be able to keep them supplied while turning a significant profit.", "accepted": "Thank you for your assistance.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -211,7 +207,7 @@ "inquire": "Do you have the 200-liter drums?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } } ] diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json index 8d3f66d705851..26f7d87dc09df 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json @@ -90,7 +90,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Our first project is to enclose the barn so that new refugees have a safe place to sleep. Before we can begin serious improvements we need lumber to work with. Enclosing the four barn entrances will take nearly 400 2x4's… if you could provide half of that we should be able to take care of the other half and construction. If you don't have a truck, I'd make finding one your first priority. ", "accepted": "The more men we can bring to the camp the quicker improvements can be made.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -98,19 +98,17 @@ "inquire": "Do you have them?", "success": "Great, I'll send word that we could use another set of hands or two to help out here.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_west_wall_door" ], "x": 22, "y": 0 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_east_wall_door" ], "x": 0, "y": 0 }, @@ -120,13 +118,11 @@ }, { "om_terrain": "ranch_camp_74", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_west_wall_door" ], "x": 22, "y": 0 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_east_wall_door" ], "x": 0, "y": 0 }, @@ -149,7 +145,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_3", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "With the barn entrances enclosed the refugees moving into there should feel safer but the weather can be bitter here. We're going to need to build makeshift beds in the stalls to ward off disease and frostbite. We can take care of the frames but will need your help looting blankets. We'd need 25 blankets to provide the most basic sleeping accommodations.", "accepted": "I'd start with looting hotels or you could sew them together… but that would be a last resort.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -157,13 +153,12 @@ "inquire": "Do you have them?", "success": "Your assistance is always appreciated.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "//": "Beds in the barn", "place_nested": [ { "chunks": [ "tacoma_commune_makeshift_bed" ], "x": 19, "y": 1 }, @@ -178,7 +173,6 @@ }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "//": "Beds in the barn", "place_nested": [ { "chunks": [ "tacoma_commune_makeshift_bed" ], "x": 19, "y": 1 }, @@ -215,7 +209,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Our supply of nails has been depleted. I'm going to have to ask you to get us a few more boxes. Hardware stores should have a few if they haven't been looted. I suppose you may be able to find handfuls of them in building rubble. We'd need 2500 to have enough that we won't be sending you back out too soon.", "accepted": "Deconstructing furniture isn't going to be efficient, try looking for boxes or grabbing any sitting on top of rubble piles.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -223,13 +217,12 @@ "inquire": "Do you have them?", "success": "Your assistance is always appreciated.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_46", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "set": [ @@ -240,7 +233,6 @@ }, { "om_terrain": "ranch_camp_55", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "set": [ @@ -251,21 +243,15 @@ }, { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "hippie_van", "x": 10, "y": 10, "rotation": 270, "chance": 100 } ] }, { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "place_furniture": [ { "furn": "f_bookcase", "x": 17, "y": 11 } ], "place_npcs": [ { "class": "ranch_farmer_1", "x": 19, "y": 20 } ] }, - { - "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", - "place_npcs": [ { "class": "ranch_woodcutter_1", "x": 4, "y": 11 } ] - } + { "om_terrain": "ranch_camp_66", "place_npcs": [ { "class": "ranch_woodcutter_1", "x": 4, "y": 11 } ] } ] } }, @@ -281,7 +267,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_5", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I'm sure you've noticed the new workers that have started trickling in. The Free Merchant counsel is demanding that we immediately begin projects to become self-sufficient due to limited supplies. We are going to need to rapidly setup an agricultural industry before winter and starvation catches us unprepared and unsupported. In order to get a half dozen shovels and a couple of bags of seeds, we are going to have to trade for it. I've already got the deal lined up but the only thing they are willing to trade it for is salt. I negotiated them down from 500 units to 300… we were hoping you might have access to a source.", "accepted": "Salt is key to preserving meat and other perishables… without any excess food it wouldn't do us much good now but I imagine we'll need to send you out to get more in the future. ", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -289,13 +275,12 @@ "inquire": "Do you have the salt?", "success": "We are going to begin preparing our fields immediately.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_46", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "set": [ { "square": "terrain", "id": "t_dirtmound", "x": 14, "y": 5, "x2": 15, "y2": 22 }, @@ -305,7 +290,6 @@ }, { "om_terrain": "ranch_camp_55", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "set": [ { "square": "terrain", "id": "t_dirtmound", "x": 14, "y": 2, "x2": 15, "y2": 17 }, @@ -315,24 +299,20 @@ }, { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "place_vehicles": [ { "vehicle": "flatbed_truck", "x": 18, "y": 3, "rotation": 0, "chance": 100 } ] }, { "om_terrain": "ranch_camp_57", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_npcs": [ { "class": "ranch_crop_overseer", "x": 12, "y": 7 } ] }, { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_4" ], "x": 0, "y": 2 } ] }, { "om_terrain": "ranch_camp_67", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "set": [ { "square": "terrain", "id": "t_palisade", "x": 21, "y": 19, "x2": 23, "y2": 19 } ] } @@ -351,7 +331,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_6", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Well, our first crop will be planted shortly but I'm starting to suspect that our profit margin is going to be much smaller than we expect. With limited seed for our original crop our next course of action is to increase the soil's fertility. Is there any way you could find or produce a basic liquid fertilizer for us? We'd need at least 30 units to make a significant improvement in our output. ", "accepted": "I don't know the exact recipe but I'm sure you could make it from a commercial fertilizer or produce it from bonemeal.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -359,30 +339,26 @@ "inquire": "Do you have the liquid fertilizer?", "success": "This really should make the first winter easier to survive.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "place_vehicles": [ { "vehicle": "car_chassis", "x": 17, "y": 11, "rotation": 90, "chance": 100 } ] }, { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_5" ], "x": 0, "y": 2 } ], "set": [ { "point": "terrain", "id": "t_pit", "x": 6, "y": 18 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "set": [ { "point": "terrain", "id": "t_palisade", "x": 23, "y": 22 } ], "place_npcs": [ { "class": "ranch_farmer_2", "x": 9, "y": 22 } ] }, { "om_terrain": "ranch_camp_67", - "om_special": "ranch_camp", "set": [ { "square": "terrain", "id": "t_palisade", "x": 0, "y": 22, "x2": 5, "y2": 22 } ] } ] @@ -400,7 +376,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_7", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Our current assessment for survivability has increased significantly thanks to your efforts. The next priority issue is securing a cleaner water source. Drinking from the pond on the back end of the ranch has led to an outbreak of dysentery. As quickly as possible we need to improve the sanitary conditions in the camp. To do so the first step is to dig a well and construct stone fireplaces in the barn for the migrants to boil water. We are going to need at least 75 large rocks from you if we hope to accomplish the task before we all get sick. After we have them installed you will have free access to them, guaranteed. ", "accepted": "If you take a shovel to a pile of rubble you should be able to pull out structural grade stone.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -408,19 +384,17 @@ "inquire": "Do you have the stone?", "success": "I appreciate the work you do.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_6" ], "x": 0, "y": 2 } ], "set": [ { "point": "terrain", "id": "t_covered_well", "x": 6, "y": 18 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "set": [ { "point": "furniture", "id": "f_fireplace", "x": 6, "y": 12 }, { "point": "furniture", "id": "f_fireplace", "x": 8, "y": 12 } @@ -449,7 +423,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_8", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "To fabricate the well's hand pump and construct components for several other projects we are going to need to find or fabricate a number of steel pipes. Plumbing is a distant possibility for now but some form of irrigation will eventually become desirable. You could assist us with procuring 50 steel pipes, if you so have the chance.", "accepted": "Hopefully we will be able to assign new migrants to help fulfill our needs in the future.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -457,13 +431,12 @@ "inquire": "Do you have the pipes?", "success": "I appreciate the work you do.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "//": "western palisade", "set": [ { "square": "terrain", "id": "t_palisade", "x": 16, "y": 16, "x2": 16, "y2": 23 }, @@ -473,7 +446,6 @@ }, { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_7" ], "x": 0, "y": 2 } ], "//": "finish the well", "set": [ @@ -483,7 +455,6 @@ }, { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "//": "untilled soil in the fields", "set": [ { "square": "terrain", "id": "t_dirt", "x": 0, "y": 4, "x2": 12, "y2": 18 } ] } @@ -502,7 +473,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_9", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "With the well's completion we are rapidly closing the sustainability gap. In order to expand from here we will need massive quantities of lumber to construct fortifications and new buildings. We have already begun work on a manually operated sawmill but we will need two motors to control the actual blades. We were hoping you might be able to secure the motors for us.", "accepted": "Power for the motors will be provided by a salvaged truck battery, you need not bring additional mechanical components. ", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -510,13 +481,12 @@ "inquire": "Do you have the motors?", "success": "I appreciate the work you do.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "//": "finish western palisade", "set": [ { "square": "terrain", "id": "t_palisade", "x": 23, "y": 7, "x2": 23, "y2": 10 }, @@ -525,12 +495,10 @@ }, { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_8_done" ], "x": 0, "y": 2 } ] }, { "om_terrain": "ranch_camp_59", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_toolshed_8" ], "x": 13, "y": 17 }, { "chunks": [ "tacoma_commune_clinic_8" ], "x": 0, "y": 2 } @@ -538,7 +506,6 @@ }, { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "set": [ { "square": "terrain", "id": "t_dirtmound", "x": 1, "y": 5, "x2": 2, "y2": 17 }, @@ -549,7 +516,6 @@ }, { "om_terrain": "ranch_camp_68", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_outhouse_8" ], "x": 16, "y": 1 } ] } ] @@ -567,21 +533,20 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_10", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Disease and infection remains a persistent problem among the refugees. Without dedicated medical personnel and facilities I doubt everyone will be willing to stick around when the next outbreak happens. Until we can get a former medic or nurse I'm just going to have to improvise. Sterilization would be the first step I imagine. Bring me 5 gallon jugs of bleach so we can get started.", - "accepted": "I'm sure you can find bleach in most homes...", + "accepted": "I'm sure you can find bleach in most homes…", "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "If you can't find a large supply I'd recommend checking hospitals or research labs.", "inquire": "Do you have the bleach?", "success": "I appreciate it.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_59", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_toolshed_9_done" ], "x": 13, "y": 17 }, { "chunks": [ "tacoma_commune_clinic_9" ], "x": 0, "y": 2 } @@ -589,7 +554,6 @@ }, { "om_terrain": "ranch_camp_68", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_outhouse_9_done" ], "x": 16, "y": 1 } ] } ] @@ -607,26 +571,21 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_11", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "We've started planning a medical clinic but we are going to need a lot more supplies if we hope to warrant sending one of the few people with medical experience from the refugee center to our outpost. I know first aid kits are rare but they have all the basic supplies that I'm uncertain of. If you could bring in 6 full kits I'm sure we could supplement them to make them last a bit longer.", - "accepted": "We'll do our best to make them last...", + "accepted": "We'll do our best to make them last…", "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Homes, hospitals, labs, and doctor offices would be where I'd check.", "inquire": "Do you have the first aid kits?", "success": "I appreciate it.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ - { - "om_terrain": "ranch_camp_59", - "om_special": "ranch_camp", - "place_nested": [ { "chunks": [ "tacoma_commune_clinic_10" ], "x": 0, "y": 2 } ] - }, + { "om_terrain": "ranch_camp_59", "place_nested": [ { "chunks": [ "tacoma_commune_clinic_10" ], "x": 0, "y": 2 } ] }, { "om_terrain": "ranch_camp_60", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_10" ], "x": 0, "y": 4 } ] } ] @@ -644,7 +603,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_12", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The work you have done has swayed the leaders at the refugee center to send someone out to assist with our medical needs. The next step is for us to get a sort of chop-shop setup so that we can begin using scrap metal to build fortifications and equipment. We are going to need a pair of electric welders for our mechanics to use.", "accepted": "With two, we should be able to repair one if it breaks.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -652,23 +611,17 @@ "inquire": "Do you have the welders?", "success": "I appreciate it.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ - { - "om_terrain": "ranch_camp_59", - "om_special": "ranch_camp", - "place_nested": [ { "chunks": [ "tacoma_commune_clinic_11" ], "x": 0, "y": 2 } ] - }, + { "om_terrain": "ranch_camp_59", "place_nested": [ { "chunks": [ "tacoma_commune_clinic_11" ], "x": 0, "y": 2 } ] }, { "om_terrain": "ranch_camp_60", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_11" ], "x": 0, "y": 4 } ] }, { "om_terrain": "ranch_camp_61", - "om_special": "ranch_camp", "place_vehicles": [ { "vehicle": "car", "chance": 100, "rotation": 270, "x": 1, "y": 20 }, { "vehicle": "cube_van_cheap", "chance": 100, "rotation": 90, "x": 10, "y": 10 }, @@ -678,7 +631,6 @@ }, { "om_terrain": "ranch_camp_69", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "car_chassis", "chance": 100, "rotation": 0, "x": 3, "y": 14 }, @@ -701,7 +653,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_13", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "We have the basic equipment that we need but without a functioning power grid we are forced to rely on the readily available vehicle batteries. This is going to be a chore but I'll need twelve car batteries to swap between charging and powering our equipment. The good news is that they don't need to be charged, we can take care of that.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -709,23 +661,17 @@ "inquire": "Do you have the car batteries?", "success": "I'm impressed with your abilities.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ - { - "om_terrain": "ranch_camp_49", - "om_special": "ranch_camp", - "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_12" ], "x": 0, "y": 9 } ] - }, + { "om_terrain": "ranch_camp_49", "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_12" ], "x": 0, "y": 9 } ] }, { "om_terrain": "ranch_camp_60", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_12_done" ], "x": 0, "y": 4 } ] }, { "om_terrain": "ranch_camp_69", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "cube_van", "chance": 100, "rotation": 180, "x": 13, "y": 15 } ] } @@ -744,7 +690,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_14", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Check with the nurse when you get a chance, I know she will need help setting up our clinic. On the construction front, we are going to need to get dedicated scavenger teams setup to bring in the miscellaneous supplies that we use in small quantities. We are going to start setting up a junk shop for them in the North end of the outpost so we could use your help with that. Communication is the biggest obstacle for the teams… could you bring in a pair of two-way radios?", "accepted": "Organizing the scavenging missions is difficult enough without communication.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -752,23 +698,14 @@ "inquire": "Do you have the two-way radios?", "success": "I'm sure the scavengers will find these useful.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ - { - "om_terrain": "ranch_camp_49", - "om_special": "ranch_camp", - "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_13" ], "x": 0, "y": 9 } ] - }, - { - "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", - "place_npcs": [ { "class": "ranch_barber", "x": 5, "y": 3 } ] - }, + { "om_terrain": "ranch_camp_49", "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_13" ], "x": 0, "y": 9 } ] }, + { "om_terrain": "ranch_camp_66", "place_npcs": [ { "class": "ranch_barber", "x": 5, "y": 3 } ] }, { "om_terrain": "ranch_camp_70", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "car_mini", "chance": 100, "rotation": 45, "x": 8, "y": 3 } ] } @@ -787,7 +724,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_15", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The volunteers for the scavenging teams will need to be issued some basic equipment. When the boss sets up shop in the junk shed you should ask him what else he needs for his teams. In the meantime we can provide a few backpacks to get them started. Could you find five backpacks to give to the initial team?", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -795,23 +732,20 @@ "inquire": "Do you have the backpacks?", "success": "Having at least basic equipment greatly increases survivability. Thanks.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_49", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_14_done" ], "x": 0, "y": 9 } ] }, { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_14" ], "x": 0, "y": 0 } ] }, { "om_terrain": "ranch_camp_61", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "ambulance", "chance": 100, "rotation": 90, "x": 14, "y": 4 } ] } @@ -830,7 +764,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_16", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Growth has lately begun to stall, we have individuals passing through the outpost but the prospect of hard labor just to eke out an existence is driving them away. We've asked around and decided that, despite our pressing needs, building a bar ought to draw some of the less committed individuals to the outpost. Unlike other settlements, the more hands we have to more food we can produce… at least in the long term. Unfortunately, no one here has brewed alcoholic drinks before so we are going to need you to find a book called the 'Homebrewer's Bible' or something along those lines.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -838,14 +772,10 @@ "inquire": "Do you have the book?", "success": "I guarantee we will toast to your name when the bar is finished.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { - "update_mapgen": { - "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", - "place_nested": [ { "chunks": [ "tacoma_commune_bar_15" ], "x": 0, "y": 0 } ] - } + "update_mapgen": { "om_terrain": "ranch_camp_51", "place_nested": [ { "chunks": [ "tacoma_commune_bar_15" ], "x": 0, "y": 0 } ] } } }, { @@ -860,7 +790,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_FOREMAN_17", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Just flipping through the book I can tell that one ingredient in most of the alcoholic drinks that we don't have a large supply of is sugar. What alcohol we have been able to loot isn't going to last us long so starting our first large batch is a priority. Could you bring in 80 units of sugar? That should last us until we can start producing our own supply.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -868,18 +798,13 @@ "inquire": "Do you have the sugar?", "success": "There is a large group of thirsty individuals in our outpost that are truly thankful for your work.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ - { - "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", - "place_nested": [ { "chunks": [ "tacoma_commune_bar_16_done" ], "x": 0, "y": 0 } ] - }, + { "om_terrain": "ranch_camp_51", "place_nested": [ { "chunks": [ "tacoma_commune_bar_16_done" ], "x": 0, "y": 0 } ] }, { "om_terrain": "ranch_camp_52", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_greenhouse_16" ], "x": 2, "y": 10 } ] } ] @@ -897,7 +822,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_NULL", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Although we are an agricultural outpost, we are restricted to growing plants that are compatible with the New England climate during the warmer months. The easiest way to work around that is to build green houses to supplement our external fields. There isn't going to be an easy way to build these, we are going to need a massive number of glass sheets to enclose the frames. The first house will need 30 sheets of glass if you are still interested.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -905,13 +830,12 @@ "inquire": "Do you have the glass sheets?", "success": "We'll begin planting our first seeds as soon as we can get these installed.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" }, "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_52", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_greenhouse_17_done" ], "x": 2, "y": 10 } ] } ] diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json index aae3288d31962..5f108afd6f1b5 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json @@ -77,13 +77,13 @@ "text": "[$200, 30m] I need you to patch me up.", "topic": "TALK_RANCH_NURSE_AID_DONE", "effect": [ "give_aid", { "u_spend_cash": 20000 } ], - "condition": { "npc_service": 20000 } + "condition": { "npc_service": true } }, { "text": "[$500, 1h] I need you to patch me up.", "topic": "TALK_RANCH_NURSE_AID_DONE", "effect": [ "give_all_aid", { "u_spend_cash": 50000 } ], - "condition": { "npc_service": 50000 } + "condition": { "npc_service": true } }, { "text": "I should be fine.", "topic": "TALK_RANCH_NURSE" } ] @@ -106,7 +106,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I've got a handful of bandages and a few first aid kits to work with at the moment… in other words I'm completely unable to treat most serious medical emergencies. I'm supposed to have priority on any medical supplies that the scavengers bring in but I imagine the black market for the stuff will prevent me from ever seeing it. I could use your help getting a few bottles of aspirin to start with.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -114,7 +114,7 @@ "inquire": "Do you have the aspirin?", "success": "We'll go through this pretty quickly but it does help.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -130,7 +130,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_3", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I was given a few bottles of bleach when I arrived but I need a number of hotplates to actually sterilize equipment. I'm sure you can find them in any old house or appliance store. Three should be enough for now.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -138,7 +138,7 @@ "inquire": "Do you have the hotplates?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -154,7 +154,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Disease is spreading rapidly due to poor nutrition and there is little that I can do about it. With food being scarce, people are willing to survive on whatever they can. I need to start supplementing the outpost's diet with vitamins to prevent potential deaths indirectly attributable to nutrition. I know it is a lot but if you could bring me 200 multivitamin pills I'd be able to treat the most vulnerable before they spread anything to the rest of us.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -162,7 +162,7 @@ "inquire": "Do you have the vitamins?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -178,7 +178,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_5", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Despite my recommendations, we continue to have travelers come in with illnesses I've been able to trace back to contaminated drinking water. When boiling water isn't an option they need some form of charcoal water filter that they can use. If you could build me four charcoal water filters I'll distribute them to groups as they pass through.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -186,7 +186,7 @@ "inquire": "Do you have the charcoal water filters?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -201,7 +201,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_6", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I've been working on producing some of our own medical supplies but I'm going to need a chemistry set to get everything that I need in order. Is there any way you could go through one of the school chemistry labs and steal me a chemistry set?", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -209,7 +209,7 @@ "inquire": "Do you have the chemistry set?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -225,7 +225,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_7", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The number of airway infections that I've encountered in the past week has depleted my supply of masks. Could you find me 10 filter masks? I tend to only distribute them in severe cases so I'll be sure to make them last.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -233,7 +233,7 @@ "inquire": "Do you have the filter masks?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -249,7 +249,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_8", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The bodily fluids that I often have to clean up and the caustic chemicals I deal with have done a number on my current pair of gloves. Could you find me four pairs of heavy rubber gloves? That should be enough that I can task a few laborers with cleanup details in the event of an outbreak.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -257,7 +257,7 @@ "inquire": "Do you have the rubber gloves?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -273,7 +273,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_9", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I heard that we may have a physician on his way here. The workers have already begun expanding the clinic but I need you to locate a pair of scalpels to use in surgery when he arrives. I'm sure you should be able to find them in a hospital or craft shop.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -281,7 +281,7 @@ "inquire": "Do you have the scalpels?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -296,7 +296,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_10", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Have you heard of a book called the 'Guide to Advanced Emergency Care?' I really need a copy. The doctor is requesting a lot of supplies that I'm not familiar with but I believe I could make if I could get a copy of the book.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -304,7 +304,7 @@ "inquire": "Do you have the Guide to Advanced Emergency Care?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -319,7 +319,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_NURSE_11", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "The doctor has some ideas on how to recreate a vaccination program for the common flu. If you come across an unused flu shot please bring it to me. We haven't had any fatalities from the flu yet but it is only a matter of time until one of the older or younger members of the outpost gets a bad case.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -327,7 +327,7 @@ "inquire": "Do you have the flu shot?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -342,7 +342,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_NULL", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "We are starting to isolate a few natural antibiotic serums but we don't have the supplies to administer the cocktails. I need you to bring me 10 empty syringes to use. I'll take care of cleaning them to prevent transferring infections.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -350,7 +350,7 @@ "inquire": "Do you have the empty syringes?", "success": "Thank you for your assistance.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } } ] diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json b/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json index c9e2ac7c67897..0ad34f063796d 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json @@ -54,7 +54,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_SCAVENGER_2", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "I can usually use additional survival gear to kit-out the new recruits. The most basic weapon that everyone gets is the knife spear… it provides a good mix of range, power, and ease of use when engaging the more common monsters. Could you make me a dozen of them? I may need more later but that should help the first few teams.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -62,7 +62,7 @@ "inquire": "Do you have the knife spears?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -78,7 +78,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_SCAVENGER_3", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Night is the ideal time for my team to go on raids but they are going to need better light sources to speed up their missions. Could you craft a set of five headlamps for them? Keeping both hands free greatly helps during combat.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -86,7 +86,7 @@ "inquire": "Do you have the wearable flashlights?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -102,7 +102,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_SCAVENGER_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "Clothing that can withstand the wear and tear of climbing through windows and fighting back wild animals is in high demand. The best that we have been able to field is leather body armor but it is difficult to make with our limited resources. Could you craft us three pairs of leather body armor? The life-expectancy of my scavengers would drastically increase if you did.", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -110,7 +110,7 @@ "inquire": "Do you have the leather armor?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } }, { @@ -126,7 +126,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_RANCH_SCAVENGER_4", "dialogue": { - "describe": "We need help...", + "describe": "We need help…", "offer": "When outnumbered or forced to pull back my scavengers have been taught to throw Molotov cocktails to keep monsters from chasing them. We go through one or two on every mission so we can always use a few more. Would you be willing to make us a dozen? I'm willing to pay you what I can for your assistance. ", "accepted": "I'm counting on you.", "rejected": "Come back when you get a chance. We need skilled survivors.", @@ -134,7 +134,7 @@ "inquire": "Do you have the Molotov cocktails?", "success": "Thank you for the delivery.", "success_lie": "What good does this do us?", - "failure": "It was a lost cause anyways..." + "failure": "It was a lost cause anyways…" } } ] diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json b/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json index c13d1d1e28ad4..32b1003f822ea 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json @@ -39,13 +39,13 @@ "text": "[$2000, 1d] 10 logs", "topic": "TALK_DONE", "effect": [ "buy_10_logs", { "u_spend_cash": 200000 } ], - "condition": { "npc_service": 200000 } + "condition": { "npc_service": true } }, { "text": "[$12000, 7d] 100 logs", "topic": "TALK_DONE", "effect": [ "buy_100_logs", { "u_spend_cash": 1200000 } ], - "condition": { "npc_service": 1200000 } + "condition": { "npc_service": true } }, { "text": "Maybe later.", "topic": "TALK_RANCH_WOODCUTTER", "condition": "npc_available" }, { "text": "I'll be back later.", "topic": "TALK_RANCH_WOODCUTTER" } diff --git a/data/json/obsolete.json b/data/json/obsolete.json index 6671b6357e6bb..2594ed0db7bad 100644 --- a/data/json/obsolete.json +++ b/data/json/obsolete.json @@ -131,7 +131,7 @@ "reload_noise_volume": 10, "name": "fusion blaster rifle", "description": "A cyborg's fusion blaster arm, cannibalized and converted into a rifle. This improvised weapon is powered by a standard UPS connection.", - "weight": 2680, + "weight": "2680 g", "volume": "2500 ml", "price": 420000, "to_hit": -1, @@ -174,7 +174,7 @@ "ups_charges": 5, "skill": "rifle", "ammo": "fusion", - "weight": 2267, + "weight": "2267 g", "volume": "3500 ml", "bashing": 10, "to_hit": -1, @@ -210,7 +210,7 @@ "description": "In the middle of the 21st Century, military powers began to look towards energy based weapons. The result was the standard fusion pack, capable of delivering bolts of superheated gas at near light speed with no recoil.", "material": "plastic", "volume": "250 ml", - "weight": 68, + "weight": "68 g", "ammo_type": "fusion", "damage": 12, "pierce": 15, @@ -229,7 +229,7 @@ "description": "In the middle of the 21st Century, military powers began to look towards energy based weapons. The result was the standard fusion pack, capable of delivering bolts of superheated gas at near light speed with no recoil. This one has been hand-crafted from spare parts.", "material": "plastic", "volume": "250 ml", - "weight": 68, + "weight": "68 g", "bashing": 1, "ammo_type": "fusion", "damage": 11, diff --git a/data/json/obsolete_terrains.json b/data/json/obsolete_terrains.json index 6efe843d24515..ff08cf793d1f9 100644 --- a/data/json/obsolete_terrains.json +++ b/data/json/obsolete_terrains.json @@ -269,7 +269,31 @@ "dairy_farm_SW", "dairy_farm_SE", "megastore", - "megastore_entrance" + "megastore_entrance", + "haz_sar_entrance", + "haz_sar", + "haz_sar_entrance_b1", + "haz_sar_b1", + "haz_sar_entrance_north", + "haz_sar_north", + "haz_sar_entrance_b1_north", + "haz_sar_b1_north", + "haz_sar_entrance_east", + "haz_sar_east", + "haz_sar_entrance_b1_east", + "haz_sar_b1_east", + "haz_sar_entrance_south", + "haz_sar_south", + "haz_sar_entrance_b1_south", + "haz_sar_b1_south", + "haz_sar_entrance_west", + "haz_sar_west", + "haz_sar_entrance_b1_west", + "haz_sar_b1_west", + "house_base_north", + "house_base_south", + "house_base_east", + "house_base_west" ] } ] diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json index 7896bda6c724b..9bf619d283ff8 100644 --- a/data/json/overmap/map_extras.json +++ b/data/json/overmap/map_extras.json @@ -81,7 +81,7 @@ "type": "map_extra", "name": "Roadblock (Bandits)", "description": "This road is blocked by bandits.", - "generator": { "generator_method": "map_extra_function", "generator_id": "mx_roadblock" }, + "generator": { "generator_method": "map_extra_function", "generator_id": "mx_bandits_block" }, "sym": "x", "color": "yellow", "autonote": true @@ -256,6 +256,27 @@ "color": "yellow", "autonote": true }, + { + "id": "mx_trees", + "type": "map_extra", + "name": "Stand of trees", + "description": "A copse of trees.", + "generator": { "generator_method": "update_mapgen", "generator_id": "mx_trees_map" } + }, + { + "id": "mx_grass", + "type": "map_extra", + "name": "Tall grass", + "description": "A meadow of tall grass.", + "generator": { "generator_method": "update_mapgen", "generator_id": "mx_grass_map" } + }, + { + "id": "mx_fallen_shed", + "type": "map_extra", + "name": "Derelict shed", + "description": "A collapsed shed.", + "generator": { "generator_method": "update_mapgen", "generator_id": "mx_fallen_shed_map" } + }, { "id": "mx_clay_deposit", "type": "map_extra", diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index d3f3460264f36..6acd7d0a7817e 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -3,7 +3,7 @@ "type": "city_building", "id": "house_base", "locations": [ "land", "swamp" ], - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_base_north" }, { "point": [ 0, 0, -1 ], "overmap": "basement" } ] + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_north" }, { "point": [ 0, 0, -1 ], "overmap": "basement" } ] }, { "type": "city_building", @@ -76,6 +76,15 @@ { "point": [ 0, 0, -1 ], "overmap": "basement" } ] }, + { + "type": "city_building", + "id": "house_inner_garden", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "house_inner_garden_north" }, + { "point": [ 0, 0, 1 ], "overmap": "house_inner_garden_roof_north" } + ] + }, { "type": "city_building", "id": "s_electronics", @@ -2390,6 +2399,21 @@ { "point": [ 0, 1, 3 ], "overmap": "homeless_1_0_roof_north" } ] }, + { + "type": "city_building", + "id": "city_block_2", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "city_block2_1_north" }, + { "point": [ 0, 0, 1 ], "overmap": "city_block2_flr2_1_north" }, + { "point": [ 1, 0, 0 ], "overmap": "city_block2_2_north" }, + { "point": [ 1, 0, 1 ], "overmap": "city_block2_flr2_2_north" }, + { "point": [ 2, 0, 0 ], "overmap": "city_block2_3_north" }, + { "point": [ 2, 0, 1 ], "overmap": "city_block2_flr2_3_north" }, + { "point": [ 3, 0, 0 ], "overmap": "city_block2_4_north" }, + { "point": [ 3, 0, 1 ], "overmap": "city_block2_flr2_4_north" } + ] + }, { "type": "city_building", "id": "craft_shop", diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index da119bace153a..e122084ec5da7 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -1089,14 +1089,14 @@ "id": "Hazardous Waste Sarcophagus", "overmaps": [ { "point": [ 1, -1, 0 ], "overmap": "road_end_north" }, - { "point": [ 0, 0, 0 ], "overmap": "haz_sar_north" }, - { "point": [ 1, 0, 0 ], "overmap": "haz_sar_entrance_north" }, - { "point": [ 0, 1, 0 ], "overmap": "haz_sar_north" }, - { "point": [ 1, 1, 0 ], "overmap": "haz_sar_north" }, - { "point": [ 0, 0, -2 ], "overmap": "haz_sar_b1_north" }, - { "point": [ 1, 0, -2 ], "overmap": "haz_sar_entrance_b1_north" }, - { "point": [ 0, 1, -2 ], "overmap": "haz_sar_b1_north" }, - { "point": [ 1, 1, -2 ], "overmap": "haz_sar_b1_north" } + { "point": [ 1, 0, 0 ], "overmap": "haz_sar_1_1_north" }, + { "point": [ 0, 0, 0 ], "overmap": "haz_sar_1_2_north" }, + { "point": [ 1, 1, 0 ], "overmap": "haz_sar_1_3_north" }, + { "point": [ 0, 1, 0 ], "overmap": "haz_sar_1_4_north" }, + { "point": [ 1, 0, -2 ], "overmap": "haz_sar_b_1_north" }, + { "point": [ 0, 0, -2 ], "overmap": "haz_sar_b_2_north" }, + { "point": [ 1, 1, -2 ], "overmap": "haz_sar_b_3_north" }, + { "point": [ 0, 1, -2 ], "overmap": "haz_sar_b_4_north" } ], "connections": [ { "point": [ 1, -1, 0 ] } ], "locations": [ "land" ], diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index b2afe72317d67..36987631da696 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -212,8 +212,7 @@ "name": "forest", "sym": "C", "color": "i_green", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -233,7 +232,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -242,8 +240,7 @@ "name": "forest", "sym": "F", "color": "green", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -252,7 +249,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -261,8 +257,7 @@ "name": "forest", "sym": "F", "color": "green", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -271,7 +266,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -289,8 +283,7 @@ "name": "forest", "sym": ".", "color": "blue", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -583,7 +576,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -593,7 +585,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "//": "RISK_LOW due to risk and safety being based on NPCs perception of what the area may contain", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, @@ -604,7 +595,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -614,7 +604,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -624,7 +613,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -650,7 +638,6 @@ "sym": "+", "color": "green", "see_cost": 5, - "extras": "field", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -661,7 +648,6 @@ "sym": "+", "color": "green", "see_cost": 5, - "extras": "field", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -672,7 +658,6 @@ "sym": "+", "color": "light_green", "see_cost": 5, - "extras": "field", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, @@ -683,7 +668,6 @@ "sym": "+", "color": "light_green", "see_cost": 5, - "extras": "field", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -694,7 +678,6 @@ "sym": "+", "color": "light_green", "see_cost": 5, - "extras": "field", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -732,7 +715,6 @@ "sym": "F", "color": "cyan", "see_cost": 5, - "extras": "field", "flags": [ "SOURCE_SAFETY", "SOURCE_FOOD" ] }, { @@ -741,8 +723,7 @@ "name": "swamp shack roof", "sym": "F", "color": "cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -751,7 +732,6 @@ "sym": "F", "color": "cyan", "see_cost": 5, - "extras": "field", "flags": [ "SOURCE_SAFETY", "SOURCE_FOOD" ] }, { @@ -760,8 +740,7 @@ "name": "swamp shack roof", "sym": "F", "color": "cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -770,7 +749,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -781,7 +759,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -792,7 +769,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -803,7 +779,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -814,7 +789,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -824,7 +798,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -835,7 +808,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -846,7 +818,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -857,7 +828,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -868,7 +838,6 @@ "sym": "+", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -887,7 +856,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, { @@ -897,7 +865,6 @@ "sym": "F", "color": "green", "see_cost": 5, - "extras": "field", "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json b/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json index 5af142174dfeb..46a864135fea6 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json @@ -162,7 +162,6 @@ "land_use_code": "cemetery", "sym": "n", "color": "white", - "extras": "field", "see_cost": 5, "mondensity": 2 }, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json index 773358de93171..e8dadf64c06f4 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json @@ -23,7 +23,6 @@ "sym": "│", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -33,7 +32,6 @@ "sym": "┬", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -43,7 +41,6 @@ "sym": "┐", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -53,7 +50,6 @@ "sym": "┌", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -63,7 +59,6 @@ "sym": "│", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -73,7 +68,6 @@ "sym": "┐", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -83,7 +77,6 @@ "sym": "┌", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -93,7 +86,6 @@ "sym": "┬", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -103,7 +95,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -134,7 +125,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -144,7 +134,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -154,7 +143,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -164,7 +152,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -174,7 +161,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -184,7 +170,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -194,7 +179,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -204,7 +188,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -214,7 +197,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -224,7 +206,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -234,7 +215,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -244,7 +224,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -254,7 +233,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -264,7 +242,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -274,7 +251,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -284,7 +260,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -294,7 +269,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -304,7 +278,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -314,7 +287,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -324,7 +296,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -334,7 +305,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ] }, @@ -345,7 +315,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -355,7 +324,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -365,7 +333,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -375,7 +342,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -385,7 +351,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -395,7 +360,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -405,7 +369,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -415,7 +378,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -425,7 +387,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -435,7 +396,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ] }, @@ -446,7 +406,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -456,7 +415,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -466,7 +424,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -476,7 +433,6 @@ "sym": "#", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -486,7 +442,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -496,7 +451,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -506,7 +460,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -516,7 +469,6 @@ "sym": "#", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -526,7 +478,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -536,7 +487,6 @@ "sym": "T", "color": "light_green", "see_cost": 5, - "extras": "field", "mondensity": 3 }, { @@ -546,7 +496,6 @@ "sym": "T", "color": "i_light_green", "see_cost": 5, - "extras": "field", "mondensity": 3 }, { @@ -556,7 +505,6 @@ "sym": "T", "color": "i_light_green", "see_cost": 5, - "extras": "field", "mondensity": 3 }, { @@ -706,7 +654,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -746,7 +693,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -756,7 +702,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -766,7 +711,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -776,7 +720,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -786,7 +729,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -796,7 +738,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -806,7 +747,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -816,7 +756,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -826,7 +765,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -836,7 +774,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -856,7 +793,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -866,7 +802,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -876,7 +811,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -886,7 +820,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -896,7 +829,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -906,7 +838,6 @@ "sym": "&", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -916,7 +847,6 @@ "sym": "&", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -926,7 +856,6 @@ "sym": "&", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -936,7 +865,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -946,7 +874,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -956,7 +883,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -966,7 +892,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -976,7 +901,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -986,7 +910,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -996,7 +919,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1006,7 +928,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1016,7 +937,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1026,7 +946,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1036,7 +955,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1046,7 +964,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1056,7 +973,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1131,7 +1047,6 @@ "sym": "T", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1141,7 +1056,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1161,7 +1075,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1171,7 +1084,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1181,7 +1093,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1191,7 +1102,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1201,7 +1111,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1211,7 +1120,6 @@ "sym": "&", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1221,7 +1129,6 @@ "sym": "&", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1231,7 +1138,6 @@ "sym": "&", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1241,7 +1147,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1251,7 +1156,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1261,7 +1165,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1271,7 +1174,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1281,7 +1183,6 @@ "sym": "o", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1291,7 +1192,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1301,7 +1201,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1311,7 +1210,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_ANIMALS", "SOURCE_FARMING" ] }, @@ -1322,7 +1220,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1332,7 +1229,6 @@ "sym": "^", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1342,7 +1238,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1352,7 +1247,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1362,7 +1256,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1372,7 +1265,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1382,7 +1274,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1392,7 +1283,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1402,7 +1292,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1412,7 +1301,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1422,7 +1310,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1432,7 +1319,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1442,7 +1328,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1452,7 +1337,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1462,7 +1346,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1472,7 +1355,6 @@ "sym": "#", "color": "i_brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1482,7 +1364,6 @@ "sym": "│", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1492,7 +1373,6 @@ "sym": "┬", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1502,7 +1382,6 @@ "sym": "┐", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1512,7 +1391,6 @@ "sym": "┌", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1522,7 +1400,6 @@ "sym": "│", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1532,7 +1409,6 @@ "sym": "┐", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1542,7 +1418,6 @@ "sym": "┌", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1552,7 +1427,6 @@ "sym": "┬", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1602,7 +1476,6 @@ "sym": "#", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -1612,7 +1485,6 @@ "sym": "#", "color": "brown", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json index fc9c9013cf16f..c3a56648cab83 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json @@ -1911,7 +1911,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK", "SOURCE_CONSTRUCTION", "SOURCE_FABRICATION", "SOURCE_WEAPON", "RISK_HIGH" ] }, { @@ -1921,7 +1920,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -1931,7 +1929,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -1941,7 +1938,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -1951,7 +1947,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -1961,7 +1956,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -1971,7 +1965,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -1981,7 +1974,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -1991,7 +1983,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -2001,7 +1992,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -2011,7 +2001,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -2021,7 +2010,6 @@ "sym": "H", "color": "light_green_yellow", "see_cost": 5, - "extras": "field", "flags": [ "SIDEWALK" ] }, { @@ -2030,8 +2018,7 @@ "name": "home improvement superstore", "sym": ".", "color": "light_blue", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -2039,8 +2026,7 @@ "name": "home improvement superstore", "sym": ".", "color": "light_blue", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -2048,8 +2034,7 @@ "name": "home improvement superstore", "sym": ".", "color": "light_blue", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -2057,8 +2042,7 @@ "name": "home improvement superstore", "sym": ".", "color": "light_blue", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -2066,8 +2050,7 @@ "name": "home improvement superstore", "sym": ".", "color": "light_blue", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -2075,8 +2058,7 @@ "name": "home improvement superstore", "sym": ".", "color": "light_blue", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -3206,5 +3188,61 @@ "name": "hunting supply store roof", "sym": "H", "color": "brown" + }, + { + "type": "overmap_terrain", + "id": "city_block2_1", + "name": "urban city block", + "copy-from": "generic_city_building", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "city_block2_2", + "name": "urban city block", + "copy-from": "generic_city_building", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "city_block2_3", + "name": "urban city block", + "copy-from": "generic_city_building", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "city_block2_4", + "name": "urban city block", + "copy-from": "generic_city_building", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "city_block2_flr2_1", + "name": "urban city block", + "copy-from": "generic_city_building", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "city_block2_flr2_2", + "name": "urban city block", + "copy-from": "generic_city_building", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "city_block2_flr2_3", + "name": "urban city block", + "copy-from": "generic_city_building", + "color": "light_blue" + }, + { + "type": "overmap_terrain", + "id": "city_block2_flr2_4", + "name": "urban city block", + "copy-from": "generic_city_building", + "color": "light_blue" } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json index a00100a11d9bf..565295e68f01e 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json @@ -14,7 +14,6 @@ "sym": "O", "color": "red", "see_cost": 2, - "extras": "field", "flags": [ "NO_ROTATE" ] }, { @@ -95,7 +94,6 @@ "sym": "F", "color": "green", "see_cost": 3, - "extras": "field", "spawns": { "group": "GROUP_STANDING_STONES", "population": [ 1, 4 ], "chance": 100 }, "flags": [ "NO_ROTATE" ] }, @@ -187,7 +185,6 @@ "sym": "C", "color": "brown", "see_cost": 2, - "extras": "field", "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] }, { @@ -206,7 +203,6 @@ "sym": "8", "color": "yellow", "see_cost": 3, - "extras": "field", "flags": [ "NO_ROTATE", "RISK_HIGH" ] }, { @@ -216,7 +212,6 @@ "sym": "F", "color": "green", "see_cost": 3, - "extras": "field", "flags": [ "NO_ROTATE", "RISK_HIGH" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json b/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json index 2ffb6e2b15632..dcd268a2f8a14 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json @@ -89,8 +89,7 @@ "name": "small power substation", "sym": "H", "color": "light_cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -98,8 +97,7 @@ "name": "small power substation roof", "sym": "H", "color": "light_cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -107,8 +105,7 @@ "name": "large power substation", "sym": "H", "color": "cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -116,8 +113,7 @@ "name": "large power substation roof", "sym": "H", "color": "cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -125,8 +121,7 @@ "name": "large power substation", "sym": "H", "color": "cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -134,8 +129,7 @@ "name": "large power substation roof", "sym": "H", "color": "cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -143,8 +137,7 @@ "name": "large power substation", "sym": "H", "color": "cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -152,8 +145,7 @@ "name": "large power substation", "sym": "H", "color": "cyan", - "see_cost": 5, - "extras": "field" + "see_cost": 5 }, { "type": "overmap_terrain", @@ -346,7 +338,6 @@ "copy-from": "generic_city_building_no_sidewalk", "sym": "L", "color": "green", - "extras": "field", "flags": [ "SOURCE_CONSTRUCTION", "SOURCE_FABRICATION" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json index ca4eb46cd9ade..9a379447d5d4c 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json @@ -374,8 +374,7 @@ "sym": "H", "color": "i_green", "see_cost": 5, - "mondensity": 2, - "extras": "field" + "mondensity": 2 }, { "type": "overmap_terrain", @@ -416,7 +415,6 @@ "sym": "g", "color": "yellow", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "SOURCE_FARMING" ] }, @@ -427,7 +425,6 @@ "sym": "g", "color": "light_green", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -437,7 +434,6 @@ "sym": "g", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "SIDEWALK", "SOURCE_FARMING" ] }, @@ -448,7 +444,6 @@ "sym": "g", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -458,7 +453,6 @@ "sym": "g", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "SIDEWALK", "SOURCE_FARMING" ] }, @@ -469,7 +463,6 @@ "sym": "g", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -479,7 +472,6 @@ "sym": "T", "color": "i_green", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -489,7 +481,6 @@ "sym": "S", "color": "red", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "SOURCE_GUN", "SOURCE_AMMO" ] }, @@ -500,7 +491,6 @@ "sym": "S", "color": "red", "see_cost": 5, - "extras": "field", "mondensity": 2 }, { @@ -510,7 +500,6 @@ "sym": "S", "color": "red", "see_cost": 5, - "extras": "field", "mondensity": 2, "flags": [ "SOURCE_GUN", "SOURCE_AMMO" ] }, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index bc6579c6778c7..70aa81386b929 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -11,8 +11,7 @@ { "type": "overmap_terrain", "id": "basement", - "copy-from": "generic_city_house_basement", - "mapgen": [ { "method": "builtin", "name": "basement_junk" }, { "method": "builtin", "name": "basement_spiders" } ] + "copy-from": "generic_city_house_basement" }, { "type": "overmap_terrain", @@ -34,11 +33,6 @@ "see_cost": 2, "extras": "build", "mondensity": 2, - "mapgen": [ - { "method": "builtin", "name": "house_generic_boxy" }, - { "method": "builtin", "name": "house_generic_big_livingroom" }, - { "method": "builtin", "name": "house_generic_center_hallway" } - ], "flags": [ "SIDEWALK", "GENERIC_LOOT" ] }, { @@ -50,16 +44,6 @@ "see_cost": 2, "flags": [ "SIDEWALK", "GENERIC_LOOT" ] }, - { - "type": "overmap_terrain", - "id": "house_base", - "copy-from": "house", - "mapgen": [ - { "method": "builtin", "name": "house_generic_boxy" }, - { "method": "builtin", "name": "house_generic_big_livingroom" }, - { "method": "builtin", "name": "house_generic_center_hallway" } - ] - }, { "type": "overmap_terrain", "id": "duplex", @@ -463,8 +447,7 @@ "copy-from": "generic_city_building", "name": "derelict property", "sym": "X", - "color": "i_brown", - "extras": "field" + "color": "i_brown" }, { "type": "overmap_terrain", @@ -485,6 +468,23 @@ "see_cost": 2, "mondensity": 2 }, + { + "type": "overmap_terrain", + "id": "house_inner_garden", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2, + "flags": [ "SIDEWALK", "GENERIC_LOOT" ] + }, + { + "type": "overmap_terrain", + "id": "house_inner_garden_roof", + "name": "house", + "copy-from": "generic_city_building", + "color": "light_green", + "see_cost": 2 + }, { "type": "overmap_terrain", "id": "house_w_1", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json b/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json index d694f200f3f97..cf32339ffccd4 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json @@ -58,7 +58,6 @@ "name": "road", "sym": "┼", "color": "light_gray", - "extras": "field", "flags": [ "NO_ROTATE" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json index b504798207ef7..2959f76bfd649 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json @@ -102,7 +102,7 @@ }, { "type": "overmap_terrain", - "id": "haz_sar_entrance", + "id": "haz_sar_1_1", "name": "hazardous waste sarcophagus", "sym": "X", "color": "pink", @@ -111,15 +111,16 @@ }, { "type": "overmap_terrain", - "id": "haz_sar", + "id": "haz_sar_1_2", "name": "hazardous waste sarcophagus", "sym": "X", "color": "pink", - "see_cost": 5 + "see_cost": 5, + "flags": [ "RISK_HIGH" ] }, { "type": "overmap_terrain", - "id": "haz_sar_entrance_b1", + "id": "haz_sar_1_3", "name": "hazardous waste sarcophagus", "sym": "X", "color": "pink", @@ -128,11 +129,48 @@ }, { "type": "overmap_terrain", - "id": "haz_sar_b1", + "id": "haz_sar_1_4", "name": "hazardous waste sarcophagus", "sym": "X", "color": "pink", - "see_cost": 5 + "see_cost": 5, + "flags": [ "RISK_HIGH" ] + }, + { + "type": "overmap_terrain", + "id": "haz_sar_b_1", + "name": "hazardous waste sarcophagus", + "sym": "X", + "color": "pink", + "see_cost": 5, + "flags": [ "RISK_HIGH" ] + }, + { + "type": "overmap_terrain", + "id": "haz_sar_b_2", + "name": "hazardous waste sarcophagus", + "sym": "X", + "color": "pink", + "see_cost": 5, + "flags": [ "RISK_HIGH" ] + }, + { + "type": "overmap_terrain", + "id": "haz_sar_b_3", + "name": "hazardous waste sarcophagus", + "sym": "X", + "color": "pink", + "see_cost": 5, + "flags": [ "RISK_HIGH" ] + }, + { + "type": "overmap_terrain", + "id": "haz_sar_b_4", + "name": "hazardous waste sarcophagus", + "sym": "X", + "color": "pink", + "see_cost": 5, + "flags": [ "RISK_HIGH" ] }, { "type": "overmap_terrain", diff --git a/data/json/professions.json b/data/json/professions.json index 5bbe9d7edec91..b4eda0c9233a0 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -144,103 +144,177 @@ }, { "type": "profession_item_substitutions", - "substitutions": [ - { - "trait": "WOOLALLERGY", - "sub": [ - [ "blazer", "jacket_leather_red" ], - [ "hat_hunting", "hat_cotton", 2 ], - [ "hat_newsboy", "hat_cotton", 2 ], - [ "peacoat", "jacket_flannel" ], - [ "sweater", "sweatshirt" ], - [ "boots_winter", "boots_fur" ], - [ "cloak_wool", "cloak_leather" ], - [ "gloves_wool", "gloves_leather" ], - [ "socks_wool", "socks" ], - [ "kilt", "kilt_leather" ], - [ "mask_ski", "balclava" ] - ] - }, - { - "item": "sunglasses", - "sub": [ [ [ "HYPEROPIC" ], "fitover_sunglasses" ], [ [ "MYOPIC" ], "fitover_sunglasses" ] ] - }, - { - "item": "fancy_sunglasses", - "sub": [ [ [ "HYPEROPIC" ], "fitover_sunglasses" ], [ [ "MYOPIC" ], "fitover_sunglasses" ] ] - }, - { - "item": "hardtack", - "sub": [ [ [ "ANTIWHEAT" ], [ "MEATARIAN" ], "cornbread" ], [ [ "ANTIWHEAT", "MEATARIAN" ], "meat_cooked", 0.72 ] ] - }, - { "item": "gum", "sub": [ [ [ "ANTIJUNK" ], "nic_gum" ] ] }, - { - "item": "sandwich_pbj", - "sub": [ - [ [ "ANTIFRUIT" ], [ "ANTIWHEAT" ], "sandwich_pbh" ], - [ [ "ANTIWHEAT" ], [ "VEGETARIAN" ], "cracklins", 5.625 ], - [ [ "ANTIWHEAT", "VEGETARIAN" ], "boiled_egg" ] - ] - }, - { - "item": "granola", - "sub": [ - [ [ "ANTIFRUIT" ], [ "MEATARIAN" ], "pemmican", 0.838 ], - [ [ "ANTIFRUIT", "MEATARIAN" ], "jerky", 4 ], - [ [ "ANTIWHEAT" ], [ "ANTIFRUIT" ], "boiled_egg", 0.818 ] - ] - }, + "trait": "WOOLALLERGY", + "sub": [ + { "item": "blazer", "new": [ "jacket_leather_red" ] }, + { "item": "hat_hunting", "new": [ { "item": "hat_cotton", "ratio": 2 } ] }, + { "item": "hat_newsboy", "new": [ { "item": "hat_cotton", "ratio": 2 } ] }, + { "item": "peacoat", "new": [ "jacket_flannel" ] }, + { "item": "sweater", "new": [ "sweatshirt" ] }, + { "item": "boots_winter", "new": [ "boots_fur" ] }, + { "item": "cloak_wool", "new": [ "cloak_leather" ] }, + { "item": "gloves_wool", "new": [ "gloves_leather" ] }, + { "item": "socks_wool", "new": [ "socks" ] }, + { "item": "kilt", "new": [ "kilt_leather" ] }, + { "item": "mask_ski", "new": [ "balclava" ] } + ] + }, + { + "type": "profession_item_substitutions", + "item": "sunglasses", + "sub": [ + { "present": [ "HYPEROPIC" ], "new": [ "fitover_sunglasses" ] }, + { "present": [ "MYOPIC" ], "new": [ "fitover_sunglasses" ] } + ] + }, + { + "type": "profession_item_substitutions", + "item": "fancy_sunglasses", + "sub": [ + { "present": [ "HYPEROPIC" ], "new": [ "fitover_sunglasses" ] }, + { "present": [ "MYOPIC" ], "new": [ "fitover_sunglasses" ] } + ] + }, + { + "type": "profession_item_substitutions", + "item": "hardtack", + "sub": [ + { "present": [ "ANTIWHEAT" ], "absent": [ "MEATARIAN" ], "new": [ "cornbread" ] }, + { "present": [ "ANTIWHEAT", "MEATARIAN" ], "new": [ { "item": "meat_cooked", "ratio": 0.72 } ] } + ] + }, + { + "type": "profession_item_substitutions", + "item": "gum", + "sub": [ { "present": [ "ANTIJUNK" ], "new": [ "nic_gum" ] } ] + }, + { + "type": "profession_item_substitutions", + "item": "sandwich_pbj", + "sub": [ + { "present": [ "ANTIFRUIT" ], "absent": [ "ANTIWHEAT" ], "new": [ "sandwich_pbh" ] }, + { "present": [ "ANTIWHEAT" ], "absent": [ "VEGETARIAN" ], "new": [ { "item": "cracklins", "ratio": 5.625 } ] }, + { "present": [ "ANTIWHEAT", "VEGETARIAN" ], "new": [ "boiled_egg" ] } + ] + }, + { + "type": "profession_item_substitutions", + "item": "granola", + "sub": [ + { "present": [ "ANTIFRUIT" ], "absent": [ "MEATARIAN" ], "new": [ { "item": "pemmican", "ratio": 0.838 } ] }, + { "present": [ "ANTIFRUIT", "MEATARIAN" ], "new": [ { "item": "jerky", "ratio": 4 } ] }, + { "present": [ "ANTIWHEAT" ], "absent": [ "ANTIFRUIT" ], "new": [ { "item": "boiled_egg", "ratio": 0.818 } ] } + ] + }, + { + "type": "profession_item_substitutions", + "item": "juice", + "sub": [ + { "present": [ "ANTIFRUIT" ], "absent": [ "ANTIJUNK" ], "new": [ "lemonlime" ] }, + { "present": [ "ANTIFRUIT", "ANTIJUNK" ], "new": [ { "item": "water_clean", "ratio": 0.4 } ] } + ] + }, + { + "type": "profession_item_substitutions", + "item": "cheeseburger", + "sub": [ + { "present": [ "ANTIWHEAT" ], "absent": [ "ANTIJUNK" ], "new": [ { "item": "fries", "ratio": 4 } ] }, + { "present": [ "ANTIWHEAT", "ANTIJUNK" ], "absent": [ "MEATARIAN" ], "new": [ "veggy_salad", "fork" ] }, + { "present": [ "ANTIWHEAT", "ANTIJUNK", "MEATARIAN" ], "new": [ "fried_spam", "fork" ] }, + { "present": [ "LACTOSE" ], "absent": [ "ANTIWHEAT", "VEGETARIAN" ], "new": [ "hamburger" ] }, + { "present": [ "LACTOSE", "VEGETARIAN" ], "absent": [ "ANTIWHEAT" ], "new": [ "sandwich_veggy" ] }, { - "item": "juice", - "sub": [ [ [ "ANTIFRUIT" ], [ "ANTIJUNK" ], "lemonlime" ], [ [ "ANTIFRUIT", "ANTIJUNK" ], "water_clean", 0.4 ] ] - }, + "present": [ "VEGETARIAN" ], + "absent": [ "ANTIWHEAT", "LACTOSE" ], + "new": [ { "item": "sandwich_cheese_grilled", "ratio": 0.5 } ] + } + ] + }, + { + "type": "profession_item_substitutions", + "item": "pizza_meat", + "sub": [ + { "present": [ "VEGETARIAN" ], "absent": [ "ANTIWHEAT" ], "new": [ "pizza_veggy" ] }, + { "present": [ "VEGETARIAN", "ANTIWHEAT" ], "new": [ "veggy_salad", "fork" ] }, { - "item": "cheeseburger", - "sub": [ - [ [ "ANTIWHEAT" ], [ "ANTIJUNK" ], "fries", 4 ], - [ [ "ANTIWHEAT", "ANTIJUNK" ], [ "MEATARIAN" ], "veggy_salad", "fork" ], - [ [ "ANTIWHEAT", "ANTIJUNK", "MEATARIAN" ], "fried_spam", "fork" ], - [ [ "LACTOSE" ], [ "ANTIWHEAT", "VEGETARIAN" ], "hamburger" ], - [ [ "LACTOSE", "VEGETARIAN" ], [ "ANTIWHEAT" ], "sandwich_veggy" ], - [ [ "VEGETARIAN" ], [ "ANTIWHEAT", "LACTOSE" ], "sandwich_cheese_grilled", 0.5 ] - ] + "present": [ "ANTIWHEAT" ], + "absent": [ "VEGETARIAN", "ANTIJUNK" ], + "new": [ { "item": "fchicken", "ratio": 3 } ] }, { - "item": "pizza_meat", - "sub": [ - [ [ "VEGETARIAN" ], [ "ANTIWHEAT" ], "pizza_veggy" ], - [ [ "VEGETARIAN", "ANTIWHEAT" ], "veggy_salad", "fork" ], - [ [ "ANTIWHEAT" ], [ "VEGETARIAN", "ANTIJUNK" ], "fchicken", 3 ], - [ [ "ANTIWHEAT", "ANTIJUNK" ], [ "VEGETARIAN" ], "fish_fried", 2, "fork", 0.5 ] - ] - }, + "present": [ "ANTIWHEAT", "ANTIJUNK" ], + "absent": [ "VEGETARIAN" ], + "new": [ { "item": "fish_fried", "ratio": 2 }, { "item": "fork", "ratio": 0.5 } ] + } + ] + }, + { + "type": "profession_item_substitutions", + "item": "pizza_veggy", + "sub": [ + { "present": [ "ANTIWHEAT", "VEGETARIAN" ], "new": [ "veggy_salad", "fork" ] }, { - "item": "pizza_veggy", - "sub": [ - [ [ "ANTIWHEAT", "VEGETARIAN" ], "veggy_salad", "fork" ], - [ [ "ANTIWHEAT" ], [ "VEGETARIAN", "ANTIJUNK" ], "fchicken", 3 ], - [ [ "ANTIWHEAT", "ANTIJUNK" ], [ "VEGETARIAN" ], "fish_fried", 2, "fork", 0.5 ], - [ [ "MEATARIAN" ], [ "ANTIWHEAT" ], "pizza_meat" ] - ] + "present": [ "ANTIWHEAT" ], + "absent": [ "VEGETARIAN", "ANTIJUNK" ], + "new": [ { "item": "fchicken", "ratio": 3 } ] }, { - "item": "grahmcrackers", - "sub": [ - [ [ "ANTIJUNK" ], [ "ANTIWHEAT" ], "crackers" ], - [ [ "ANTIWHEAT" ], [ "ANTIJUNK" ], "neccowafers" ], - [ [ "ANTIJUNK", "ANTIWHEAT" ], "boiled_egg" ] - ] + "present": [ "ANTIWHEAT", "ANTIJUNK" ], + "absent": [ "VEGETARIAN" ], + "new": [ { "item": "fish_fried", "ratio": 2 }, { "item": "fork", "ratio": 0.5 } ] }, - { "item": "can_beans", "sub": [ [ [ "MEATARIAN" ], "can_spam" ] ] }, - { "item": "glasses_eye", "bonus": [ [ "MYOPIC" ], [ "HYPEROPIC" ] ] }, - { "item": "glasses_bifocal", "bonus": [ [ "HYPEROPIC", "MYOPIC" ] ] }, - { "item": "glasses_reading", "bonus": [ [ "HYPEROPIC" ], [ "MYOPIC" ] ] }, - { "item": "inhaler", "bonus": [ [ "ASTHMA" ] ] }, - { "item": "thorazine", "bonus": [ [ "SCHIZOPHRENIC" ] ] }, - { "item": "cookbook_human", "bonus": [ [ "CANNIBAL" ] ] }, - { "item": "teleumbrella", "bonus": [ [ "ALBINO" ] ] } + { "present": [ "MEATARIAN" ], "absent": [ "ANTIWHEAT" ], "new": [ "pizza_meat" ] } ] }, + { + "type": "profession_item_substitutions", + "item": "grahmcrackers", + "sub": [ + { "present": [ "ANTIJUNK" ], "absent": [ "ANTIWHEAT" ], "new": [ "crackers" ] }, + { "present": [ "ANTIWHEAT" ], "absent": [ "ANTIJUNK" ], "new": [ "neccowafers" ] }, + { "present": [ "ANTIJUNK", "ANTIWHEAT" ], "new": [ "boiled_egg" ] } + ] + }, + { + "type": "profession_item_substitutions", + "item": "can_beans", + "sub": [ { "present": [ "MEATARIAN" ], "new": [ "can_spam" ] } ] + }, + { + "type": "profession_item_substitutions", + "item": "glasses_eye", + "bonus": { "present": [ "MYOPIC" ], "absent": [ "HYPEROPIC" ] } + }, + { + "type": "profession_item_substitutions", + "item": "glasses_bifocal", + "bonus": { "present": [ "HYPEROPIC", "MYOPIC" ] } + }, + { + "type": "profession_item_substitutions", + "item": "glasses_reading", + "bonus": { "present": [ "HYPEROPIC" ], "absent": [ "MYOPIC" ] } + }, + { + "type": "profession_item_substitutions", + "item": "inhaler", + "bonus": { "present": [ "ASTHMA" ] } + }, + { + "type": "profession_item_substitutions", + "item": "thorazine", + "bonus": { "present": [ "SCHIZOPHRENIC" ] } + }, + { + "type": "profession_item_substitutions", + "item": "cookbook_human", + "bonus": { "present": [ "CANNIBAL" ] } + }, + { + "type": "profession_item_substitutions", + "item": "teleumbrella", + "bonus": { "present": [ "ALBINO" ] } + }, { "type": "profession", "ident": "vagabond", @@ -586,7 +660,7 @@ "skills": [ { "level": 2, "name": "dodge" }, { "level": 3, "name": "throw" } ], "items": { "both": { - "items": [ "tank_top", "jersey", "b_shorts", "socks", "sneakers", "basketball", "sports_drink" ], + "items": [ "tank_top", "jersey", "b_shorts", "socks_ankle", "sneakers", "basketball", "sports_drink" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "boxer_shorts" ], @@ -638,7 +712,7 @@ "folding_bicycle", "under_armor_shorts", "under_armor", - "socks", + "socks_ankle", "sneakers", "sports_drink", "wristwatch", @@ -1409,7 +1483,7 @@ "points": 0, "items": { "both": { - "items": [ "jeans", "socks", "boots", "hat_hunting", "jacket_flannel", "knit_scarf", "vest", "wristwatch" ], + "items": [ "jeans", "socks", "boots", "hat_hunting", "jacket_flannel", "knit_scarf", "vest", "wristwatch", "axe_ring" ], "entries": [ { "group": "charged_cell_phone" }, { "item": "ax", "custom-flags": [ "auto_wield" ] } ] }, "male": [ "boxer_shorts" ], @@ -1687,7 +1761,7 @@ "CBMs": [ "bio_str_enhancer", "bio_adrenaline", "bio_hydraulics", "bio_metabolics", "bio_power_storage_mkII" ], "items": { "both": [ - "socks", + "socks_ankle", "under_armor_shorts", "under_armor", "tshirt", @@ -1711,7 +1785,7 @@ "CBMs": [ "bio_adrenaline", "bio_torsionratchet", "bio_power_storage_mkII", "bio_jointservo" ], "items": { "both": [ - "socks", + "socks_ankle", "under_armor_shorts", "under_armor", "tshirt", @@ -2677,7 +2751,7 @@ "description": "You were on your way to the dojo for your first lesson when the world ended. And you really wanted to learn how to swim, too.", "points": -1, "items": { - "both": [ "karate_gi", "judo_belt_white", "mouthpiece", "socks", "sneakers" ], + "both": [ "karate_gi", "judo_belt_white", "mouthpiece", "socks_ankle", "sneakers" ], "male": [ "boxer_shorts" ], "female": [ "sports_bra", "boy_shorts" ] } @@ -2691,7 +2765,7 @@ "traits": [ "PROF_MA_ORANGE" ], "skills": [ { "level": 2, "name": "melee" }, { "level": 2, "name": "unarmed" }, { "level": 2, "name": "dodge" } ], "items": { - "both": [ "karate_gi", "judo_belt_orange", "mouthpiece", "socks", "sneakers" ], + "both": [ "karate_gi", "judo_belt_orange", "mouthpiece", "socks_ankle", "sneakers" ], "male": [ "boxer_shorts" ], "female": [ "sports_bra", "boy_shorts" ] } @@ -3036,7 +3110,7 @@ "shortbow", "shelter_kit", "leather_funnel", - "rock_pot", + "clay_pot", "waterskin", "needle_bone", "fur_rollmat", @@ -3329,7 +3403,7 @@ "skills": [ { "level": 1, "name": "dodge" }, { "level": 1, "name": "throw" } ], "items": { "both": { - "items": [ "tshirt", "jacket_light", "jeans", "socks", "lowtops", "slingpack", "juice" ], + "items": [ "tshirt", "jacket_light", "jeans", "socks_ankle", "lowtops", "slingpack", "juice" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], @@ -3432,7 +3506,7 @@ "skills": [ { "level": 2, "name": "dodge" }, { "level": 2, "name": "speech" } ], "items": { "both": { - "items": [ "baseball", "bat", "whistle", "tank_top", "shorts", "socks", "sneakers", "runner_bag", "wristwatch" ], + "items": [ "baseball", "bat", "whistle", "tank_top", "shorts", "socks_ankle", "sneakers", "runner_bag", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], @@ -3524,7 +3598,7 @@ "skills": [ { "level": 4, "name": "dodge" } ], "items": { "both": { - "items": [ "tshirt", "hoodie", "pants_cargo", "socks", "sneakers", "runner_bag", "wristwatch" ], + "items": [ "tshirt", "hoodie", "pants_cargo", "socks_ankle", "sneakers", "runner_bag", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 1b131cdf0187c..d260dfb4e3cc5 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -290,6 +290,18 @@ "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 1 ] ], [ [ "cordage_short", 1, "LIST" ] ] ] }, + { + "result": "tabi_dress", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "tailor", + "difficulty": 1, + "time": "20 m", + "book_learn": [ [ "tailor_japanese", 2 ] ], + "using": [ [ "sewing_standard", 6 ] ], + "components": [ [ [ "rag", 3 ] ] ] + }, { "result": "footrags", "type": "recipe", @@ -422,6 +434,17 @@ "qualities": [ { "id": "KNIT", "level": 1 } ], "components": [ [ [ "yarn", 75 ] ] ] }, + { + "result": "socks_ankle", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "tailor", + "time": "10 m", + "autolearn": true, + "using": [ [ "sewing_standard", 4 ] ], + "components": [ [ [ "rag", 2 ] ] ] + }, { "result": "stockings", "type": "recipe", diff --git a/data/json/recipes/armor/pets_horse.json b/data/json/recipes/armor/pets_horse.json index fb9d27f30aabf..a020d119a8d9d 100644 --- a/data/json/recipes/armor/pets_horse.json +++ b/data/json/recipes/armor/pets_horse.json @@ -164,5 +164,16 @@ "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "rag", 70 ] ] ] + }, + { + "result": "saddlebag", + "type": "recipe", + "category": "CC_ANIMALS", + "subcategory": "CSC_ANIMALS_EQUINE STORAGE", + "skills_required": [ "tailor", 4 ], + "time": "120 m", + "autolearn": true, + "using": [ [ "sewing_standard", 40 ] ], + "components": [ [ [ "leather", 12 ], [ "tanned_hide", 3 ] ] ] } ] diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index c6248fbdbfd83..a4785e43a926b 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -51,6 +51,19 @@ "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 5 ], [ "rag", 5 ] ], [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ] ], [ [ "filament", 20, "LIST" ] ] ] }, + { + "result": "axe_ring", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 4, + "time": "20 m", + "autolearn": true, + "using": [ [ "adhesive", 1 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ], + "components": [ [ [ "leather", 5 ] ], [ [ "scrap", 3 ] ], [ [ "nail", 4 ] ] ] + }, { "result": "back_holster", "type": "recipe", @@ -333,7 +346,7 @@ "time": "36 s", "reversible": true, "autolearn": true, - "components": [ [ [ "raw_leather", 6 ], [ "raw_hleather", 6 ], [ "raw_fur", 6 ] ] ], + "components": [ [ [ "raw_leather", 6 ], [ "raw_hleather", 6 ], [ "raw_fur", 6 ], [ "raw_hfur", 6 ] ] ], "flags": [ "BLIND_EASY" ] }, { diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json index 39ae0c9ca41df..34707c7d73d29 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json +++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json @@ -337,7 +337,7 @@ { "type": "recipe", "result": "faction_base_modular_shelter_1_beds_standard_S1", - "description": "Let's furnish the southern bedroom with a regular beds.", + "description": "Let's furnish the southern bedroom with regular beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, @@ -352,7 +352,7 @@ { "type": "recipe", "result": "faction_base_modular_shelter_1_beds_straw_S1", - "description": "Let's furnish the southern bedroom with a straw beds.", + "description": "Let's furnish the southern bedroom with straw beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, @@ -367,7 +367,7 @@ { "type": "recipe", "result": "faction_base_modular_shelter_1_beds_makeshift_S1", - "description": "Let's furnish the southern bedroom with a makeshift beds.", + "description": "Let's furnish the southern bedroom with makeshift beds.", "category": "CC_BUILDING", "subcategory": "CSC_BUILDING_BASES", "autolearn": false, diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index e11b985ec3be8..21cd9be418d22 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -237,7 +237,7 @@ { "type": "recipe", "result": "brew_vinegar", - "result_mult": 7, + "result_mult": 10, "category": "CC_FOOD", "subcategory": "CSC_FOOD_BREW", "skill_used": "cooking", @@ -246,8 +246,8 @@ "batch_time_factors": [ 50, 4 ], "autolearn": true, "components": [ - [ [ "water", 7 ], [ "water_clean", 7 ] ], - [ [ "juice", 14 ], [ "apple_cider", 7 ], [ "cheap_wine", 21, "LIST" ], [ "worthy_wine", 15, "LIST" ] ] + [ [ "water", 2 ], [ "water_clean", 2 ] ], + [ [ "juice", 2 ], [ "apple_cider", 4 ], [ "cheap_wine", 2, "LIST" ], [ "worthy_wine", 1, "LIST" ] ] ] } ] diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index b0af9744cae1d..db9729a4b4133 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -419,7 +419,6 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "cooking", 1 ], "difficulty": 1, "time": "20 m", "reversible": true, @@ -433,7 +432,6 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "cooking", 1 ], "difficulty": 1, "time": "20 m", "reversible": true, diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 19b98be6fcdcb..f95621da6a057 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -174,6 +174,104 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 3 ] ] ] }, + { + "result": "garnet_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "garnet", 1 ] ] ] + }, + { + "result": "amethyst_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "amethyst", 1 ] ] ] + }, + { + "result": "aquamarine_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "aquamarine", 1 ] ] ] + }, + { + "result": "emerald_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "emerald", 1 ] ] ] + }, + { + "result": "alexandrite_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "alexandrite", 1 ] ] ] + }, + { + "result": "ruby_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "ruby", 1 ] ] ] + }, + { + "result": "peridot_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "peridot", 1 ] ] ] + }, + { + "result": "sapphire_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "sapphire", 1 ] ] ] + }, + { + "result": "tourmaline_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "tourmaline", 1 ] ] ] + }, + { + "result": "citrine_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "citrine", 1 ] ] ] + }, + { + "result": "blue_topaz_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "blue_topaz", 1 ] ] ] + }, + { + "result": "opal_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "opal", 1 ] ] ] + }, + { + "result": "pearl_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "pearl", 1 ] ] ] + }, + { + "result": "diamond_silver_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 2 ] ], [ [ "diamond", 1 ] ] ] + }, { "result": "leather_collar", "type": "uncraft", @@ -731,7 +829,7 @@ "result": "broken_turret", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -752,7 +850,7 @@ "result": "broken_turret_rifle", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -773,7 +871,7 @@ "result": "broken_crows_m240", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -794,7 +892,7 @@ "result": "broken_turret_bmg", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -811,11 +909,34 @@ [ [ "turret_chassis", 1 ] ] ] }, + { + "result": "broken_turret_riot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 4, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "m203", 6 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "power_supply", 3 ] ], + [ [ "antenna", 1 ] ], + [ [ "robot_controls", 1 ] ], + [ [ "omni_wheel", 1 ] ], + [ [ "copbot_chassis", 1 ] ] + ] + }, { "result": "broken_laserturret", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -920,56 +1041,6 @@ [ [ "mil_plate", 20 ] ] ] }, - { - "result": "broken_tankbot", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 8, - "time": "10 h", - "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "ai_module", 1 ] ], - [ [ "sensor_module", 1 ] ], - [ [ "memory_module", 1 ] ], - [ [ "pathfinding_module", 1 ] ], - [ [ "identification_module", 1 ] ], - [ [ "tank_tread", 1 ] ], - [ [ "tankbot_chassis", 1 ] ], - [ [ "targeting_module", 1 ] ], - [ [ "gun_module", 3 ] ], - [ [ "flamethrower", 1 ] ], - [ [ "tazer", 1 ] ], - [ [ "m4a1", 1 ] ], - [ [ "power_supply", 20 ] ], - [ [ "storage_battery", 1 ] ], - [ [ "plut_cell", 4 ] ], - [ [ "mil_plate", 2 ] ] - ] - }, - { - "result": "broken_tripod", - "type": "uncraft", - "skill_used": "electronics", - "difficulty": 8, - "time": "5 h", - "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 10 ] ], - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "ai_module", 1 ] ], - [ [ "sensor_module", 1 ] ], - [ [ "memory_module", 1 ] ], - [ [ "pathfinding_module", 1 ] ], - [ [ "identification_module", 1 ] ], - [ [ "spidery_legs_big", 1 ] ], - [ [ "tripod_chassis", 1 ] ], - [ [ "targeting_module", 1 ] ], - [ [ "gun_module", 1 ] ], - [ [ "power_supply", 12 ] ], - [ [ "storage_battery", 1 ] ], - [ [ "flamethrower", 1 ] ] - ] - }, { "result": "broken_nursebot", "type": "uncraft", @@ -1084,7 +1155,7 @@ [ [ "pathfinding_module", 1 ] ], [ [ "identification_module", 1 ] ], [ [ "tank_tread", 1 ] ], - [ [ "tankbot_chassis", 1 ] ], + [ [ "copbot_chassis", 1 ] ], [ [ "targeting_module", 1 ] ], [ [ "power_supply", 3 ] ], [ [ "plut_cell", 1 ] ], @@ -1108,7 +1179,7 @@ [ [ "pathfinding_module", 1 ] ], [ [ "identification_module", 1 ] ], [ [ "tank_tread", 1 ] ], - [ [ "tankbot_chassis", 1 ] ], + [ [ "copbot_chassis", 1 ] ], [ [ "targeting_module", 1 ] ], [ [ "power_supply", 3 ] ], [ [ "plut_cell", 1 ] ], @@ -1506,6 +1577,83 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "gold_small", 2 ] ], [ [ "diamond", 1 ] ] ] }, + { + "result": "garnet_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "garnet", 1 ] ] ] + }, + { + "result": "amethyst_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "amethyst", 1 ] ] ] + }, + { + "result": "aquamarine_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "aquamarine", 1 ] ] ] + }, + { + "result": "emerald_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "emerald", 1 ] ] ] + }, + { + "result": "alexandrite_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "alexandrite", 1 ] ] ] + }, + { + "result": "ruby_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "ruby", 1 ] ] ] + }, + { + "result": "peridot_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "peridot", 1 ] ] ] + }, + { + "result": "sapphire_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "sapphire", 1 ] ] ] + }, + { + "result": "tourmaline_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "tourmaline", 1 ] ] ] + }, + { + "result": "citrine_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "citrine", 1 ] ] ] + }, + { + "result": "blue_topaz_dental_grill", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "blue_topaz", 1 ] ] ] + }, { "result": "diamond_ring", "type": "uncraft", @@ -1652,127 +1800,323 @@ "components": [ [ [ "gold_small", 8 ] ] ] }, { - "result": "gold_dental_grill", + "result": "garnet_gold_bracelet", "type": "uncraft", - "time": "30 s", + "time": "60 s", "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "gold_small", 2 ] ] ] + "components": [ [ [ "gold_small", 8 ] ], [ [ "garnet", 4 ] ] ] }, { - "result": "gold_ear", + "result": "amethyst_gold_bracelet", "type": "uncraft", - "time": "30 s", + "time": "60 s", "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "gold_small", 2 ] ] ] + "components": [ [ [ "gold_small", 8 ] ], [ [ "amethyst", 4 ] ] ] }, { - "result": "gold_watch", + "result": "aquamarine_gold_bracelet", "type": "uncraft", - "time": "36 s", - "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "gold_small", 12 ] ], [ [ "clockworks", 1 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "aquamarine", 4 ] ] ] }, { - "result": "hd_steel_drum", + "result": "emerald_gold_bracelet", "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "12 h 30 m", - "qualities": [ { "id": "SAW_M", "level": 1 } ], - "tools": [ [ [ "welder", 500 ], [ "toolset", 750 ] ] ], - "components": [ [ [ "steel_plate", 10 ] ], [ [ "steel_lump", 70 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "emerald", 4 ] ] ] }, { - "result": "heavy_flashlight", + "result": "alexandrite_gold_bracelet", "type": "uncraft", - "skill_used": "electronics", - "difficulty": 3, - "time": "10 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "cable", 12 ] ], [ [ "amplifier", 2 ] ], [ [ "lightstrip_inactive", 1 ] ], [ [ "material_aluminium_ingot", 1 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "alexandrite", 4 ] ] ] }, { - "result": "holy_symbol", + "result": "ruby_gold_bracelet", "type": "uncraft", - "time": "30 s", + "time": "60 s", "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "gold_small", 4 ] ] ] + "components": [ [ [ "gold_small", 8 ] ], [ [ "ruby", 4 ] ] ] }, { - "result": "horn_big", + "result": "peridot_gold_bracelet", "type": "uncraft", - "skill_used": "electronics", - "difficulty": 3, - "time": "10 m", - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "e_scrap", 4 ] ], [ [ "amplifier", 2 ] ], [ [ "scrap", 4 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "peridot", 4 ] ] ] }, { - "result": "horn_car", + "result": "sapphire_gold_bracelet", "type": "uncraft", - "skill_used": "electronics", - "difficulty": 2, - "time": "10 m", - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "e_scrap", 2 ] ], [ [ "amplifier", 1 ] ], [ [ "scrap", 2 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "sapphire", 4 ] ] ] }, { - "result": "kiln_done", + "result": "tourmaline_gold_bracelet", "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 1, - "time": "1 m", - "components": [ [ [ "charcoal", 200 ] ], [ [ "char_kiln", 1 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "tourmaline", 4 ] ] ] }, { - "result": "knife_steak", + "result": "citrine_gold_bracelet", "type": "uncraft", - "time": "2 m", - "components": [ [ [ "spike", 1 ] ] ], - "flags": [ "BLIND_EASY" ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "citrine", 4 ] ] ] }, { - "result": "l_HFPack", + "result": "blue_topaz_gold_bracelet", "type": "uncraft", - "time": "30 s", - "components": [ - [ [ "l_long_45", 1 ] ], - [ [ "l_enforcer_45", 1 ] ], - [ [ "small_repairkit", 1 ] ], - [ [ "medium_battery_cell", 1 ] ], - [ [ "manual_gun", 1 ] ], - [ [ "holster", 1 ] ] - ], - "flags": [ "BLIND_EASY", "FULL_MAGAZINE" ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "blue_topaz", 4 ] ] ] }, { - "result": "laptop", + "result": "opal_gold_bracelet", "type": "uncraft", - "skill_used": "electronics", - "time": "1 h", - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ - [ [ "processor", 1 ] ], - [ [ "RAM", 4 ] ], - [ [ "cable", 6 ] ], - [ [ "amplifier", 1 ] ], - [ [ "plastic_chunk", 6 ] ], - [ [ "small_lcd_screen", 1 ] ], - [ [ "small_storage_battery", 2 ] ] - ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "opal", 4 ] ] ] }, { - "result": "large_lcd_screen", + "result": "pearl_gold_bracelet", "type": "uncraft", - "skill_used": "electronics", - "time": "30 m", - "using": [ [ "soldering_standard", 15 ] ], - "components": [ [ [ "e_scrap", 3 ] ], [ [ "plastic_chunk", 5 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "pearl", 4 ] ] ] }, { - "result": "small_lcd_screen", + "result": "diamond_gold_bracelet", "type": "uncraft", - "skill_used": "electronics", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 8 ] ], [ [ "diamond", 4 ] ] ] + }, + { + "result": "gold_dental_grill", + "type": "uncraft", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ] ] + }, + { + "result": "gold_ear", + "type": "uncraft", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ] ] + }, + { + "result": "garnet_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "garnet", 2 ] ] ] + }, + { + "result": "amethyst_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "amethyst", 2 ] ] ] + }, + { + "result": "aquamarine_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "aquamarine", 2 ] ] ] + }, + { + "result": "emerald_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "emerald", 2 ] ] ] + }, + { + "result": "alexandrite_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "alexandrite", 2 ] ] ] + }, + { + "result": "ruby_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "ruby", 2 ] ] ] + }, + { + "result": "peridot_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "peridot", 2 ] ] ] + }, + { + "result": "sapphire_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "sapphire", 2 ] ] ] + }, + { + "result": "tourmaline_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "tourmaline", 2 ] ] ] + }, + { + "result": "citrine_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "citrine", 2 ] ] ] + }, + { + "result": "blue_topaz_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "blue_topaz", 2 ] ] ] + }, + { + "result": "opal_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "opal", 2 ] ] ] + }, + { + "result": "pearl_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "pearl", 2 ] ] ] + }, + { + "result": "diamond_gold_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ], [ [ "diamond", 2 ] ] ] + }, + { + "result": "gold_watch", + "type": "uncraft", + "time": "36 s", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], + "components": [ [ [ "gold_small", 12 ] ], [ [ "clockworks", 1 ] ] ] + }, + { + "result": "hd_steel_drum", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "12 h 30 m", + "qualities": [ { "id": "SAW_M", "level": 1 } ], + "tools": [ [ [ "welder", 500 ], [ "toolset", 750 ] ] ], + "components": [ [ [ "steel_plate", 10 ] ], [ [ "steel_lump", 70 ] ] ] + }, + { + "result": "heavy_flashlight", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "cable", 12 ] ], [ [ "amplifier", 2 ] ], [ [ "lightstrip_inactive", 1 ] ], [ [ "material_aluminium_ingot", 1 ] ] ] + }, + { + "result": "holy_symbol", + "type": "uncraft", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 4 ] ] ] + }, + { + "result": "horn_big", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ [ [ "e_scrap", 4 ] ], [ [ "amplifier", 2 ] ], [ [ "scrap", 4 ] ] ] + }, + { + "result": "horn_car", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 2, + "time": "10 m", + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ [ [ "e_scrap", 2 ] ], [ [ "amplifier", 1 ] ], [ [ "scrap", 2 ] ] ] + }, + { + "result": "kiln_done", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 1, + "time": "1 m", + "components": [ [ [ "charcoal", 200 ] ], [ [ "char_kiln", 1 ] ] ] + }, + { + "result": "knife_steak", + "type": "uncraft", + "time": "2 m", + "components": [ [ [ "spike", 1 ] ] ], + "flags": [ "BLIND_EASY" ] + }, + { + "result": "l_HFPack", + "type": "uncraft", + "time": "30 s", + "components": [ + [ [ "l_long_45", 1 ] ], + [ [ "l_enforcer_45", 1 ] ], + [ [ "small_repairkit", 1 ] ], + [ [ "medium_battery_cell", 1 ] ], + [ [ "manual_gun", 1 ] ], + [ [ "holster", 1 ] ] + ], + "flags": [ "BLIND_EASY", "FULL_MAGAZINE" ] + }, + { + "result": "laptop", + "type": "uncraft", + "skill_used": "electronics", + "time": "1 h", + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "processor", 1 ] ], + [ [ "RAM", 4 ] ], + [ [ "cable", 6 ] ], + [ [ "amplifier", 1 ] ], + [ [ "plastic_chunk", 6 ] ], + [ [ "small_lcd_screen", 1 ] ], + [ [ "small_storage_battery", 2 ] ] + ] + }, + { + "result": "large_lcd_screen", + "type": "uncraft", + "skill_used": "electronics", + "time": "30 m", + "using": [ [ "soldering_standard", 15 ] ], + "components": [ [ [ "e_scrap", 3 ] ], [ [ "plastic_chunk", 5 ] ] ] + }, + { + "result": "small_lcd_screen", + "type": "uncraft", + "skill_used": "electronics", "time": "10 m", "using": [ [ "soldering_standard", 5 ] ], "components": [ [ [ "e_scrap", 1 ] ], [ [ "plastic_chunk", 2 ] ] ] @@ -2116,112 +2460,406 @@ ] }, { - "result": "radio_car_box", + "result": "radio_car_box", + "type": "uncraft", + "time": "30 s", + "components": [ + [ [ "radio_car", 1 ] ], + [ [ "radiocontrol", 1 ] ], + [ [ "light_minus_battery_cell", 1 ] ], + [ [ "light_battery_cell", 1 ] ] + ] + }, + { + "result": "radiocontrol", + "type": "uncraft", + "skill_used": "electronics", + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ [ [ "antenna", 1 ] ], [ [ "e_scrap", 2 ] ], [ [ "transponder", 1 ] ], [ [ "plastic_chunk", 1 ] ] ] + }, + { + "result": "rag", + "type": "uncraft", + "time": "1 h", + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "thread", 80 ] ] ] + }, + { + "result": "stick_fiber", + "type": "uncraft", + "time": "1 h", + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "plant_fibre", 80 ] ] ] + }, + { + "result": "ref_lighter", + "type": "uncraft", + "time": "30 s", + "components": [ [ [ "pilot_light", 1 ] ], [ [ "scrap", 1 ] ] ] + }, + { + "result": "restaurantmap", + "type": "uncraft", + "time": "30 s", + "components": [ [ [ "paper", 10 ] ] ], + "flags": [ "BLIND_EASY" ] + }, + { + "result": "gold_ring", + "type": "uncraft", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ] ] + }, + { + "result": "gold_ring", + "type": "uncraft", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ] ] + }, + { + "result": "garnet_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "garnet", 1 ] ] ] + }, + { + "result": "amethyst_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "amethyst", 1 ] ] ] + }, + { + "result": "aquamarine_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "aquamarine", 1 ] ] ] + }, + { + "result": "emerald_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "emerald", 1 ] ] ] + }, + { + "result": "alexandrite_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "alexandrite", 1 ] ] ] + }, + { + "result": "ruby_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "ruby", 1 ] ] ] + }, + { + "result": "peridot_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "peridot", 1 ] ] ] + }, + { + "result": "sapphire_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "sapphire", 1 ] ] ] + }, + { + "result": "tourmaline_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "tourmaline", 1 ] ] ] + }, + { + "result": "citrine_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "citrine", 1 ] ] ] + }, + { + "result": "blue_topaz_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "blue_topaz", 1 ] ] ] + }, + { + "result": "opal_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "opal", 1 ] ] ] + }, + { + "result": "pearl_gold_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "gold_small", 2 ] ], [ [ "pearl", 1 ] ] ] + }, + { + "result": "roadmap", + "type": "uncraft", + "time": "30 s", + "components": [ [ [ "paper", 10 ] ] ], + "flags": [ "BLIND_EASY" ] + }, + { + "result": "vehicle_controls", + "type": "uncraft", + "skill_used": "mechanics", + "difficulty": 3, + "time": "10 m", + "decomp_learn": 3, + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], + "components": [ [ [ "pipe", 4 ] ], [ [ "scrap", 12 ] ], [ [ "wire", 2 ] ], [ [ "cable", 8 ] ] ] + }, + { + "result": "robot_controls", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 8, + "time": "1 h", + "using": [ [ "soldering_standard", 20 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "motor_tiny", 3 ] ], [ [ "processor", 3 ] ], [ [ "RAM", 2 ] ], [ [ "plastic_chunk", 2 ] ] ] + }, + { + "result": "scythe", + "type": "uncraft", + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "blade_scythe", 1 ] ], [ [ "stick_long", 1 ] ] ] + }, + { + "result": "sf_watch", + "type": "uncraft", + "time": "36 s", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], + "components": [ [ [ "gold_small", 5 ] ], [ [ "silver_small", 12 ] ], [ [ "clockworks", 1 ] ] ] + }, + { + "result": "silver_bracelet", + "type": "uncraft", + "time": "36 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 10 ] ] ] + }, + { + "result": "garnet_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "garnet", 4 ] ] ] + }, + { + "result": "amethyst_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "amethyst", 4 ] ] ] + }, + { + "result": "aquamarine_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "aquamarine", 4 ] ] ] + }, + { + "result": "emerald_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "emerald", 4 ] ] ] + }, + { + "result": "alexandrite_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "alexandrite", 4 ] ] ] + }, + { + "result": "ruby_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "ruby", 4 ] ] ] + }, + { + "result": "peridot_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "peridot", 4 ] ] ] + }, + { + "result": "sapphire_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "sapphire", 4 ] ] ] + }, + { + "result": "tourmaline_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "tourmaline", 4 ] ] ] + }, + { + "result": "citrine_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "citrine", 4 ] ] ] + }, + { + "result": "blue_topaz_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "blue_topaz", 4 ] ] ] + }, + { + "result": "opal_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "opal", 4 ] ] ] + }, + { + "result": "pearl_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "pearl", 4 ] ] ] + }, + { + "result": "diamond_silver_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 8 ] ], [ [ "diamond", 4 ] ] ] + }, + { + "result": "silver_ear", "type": "uncraft", "time": "30 s", - "components": [ - [ [ "radio_car", 1 ] ], - [ [ "radiocontrol", 1 ] ], - [ [ "light_minus_battery_cell", 1 ] ], - [ [ "light_battery_cell", 1 ] ] - ] + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 3 ] ] ] }, { - "result": "radiocontrol", + "result": "garnet_silver_earring", "type": "uncraft", - "skill_used": "electronics", - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "antenna", 1 ] ], [ [ "e_scrap", 2 ] ], [ [ "transponder", 1 ] ], [ [ "plastic_chunk", 1 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "garnet", 2 ] ] ] }, { - "result": "rag", + "result": "amethyst_silver_earring", "type": "uncraft", - "time": "1 h", - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "thread", 80 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "amethyst", 2 ] ] ] }, { - "result": "stick_fiber", + "result": "aquamarine_silver_earring", "type": "uncraft", - "time": "1 h", - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "plant_fibre", 80 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "aquamarine", 2 ] ] ] }, { - "result": "ref_lighter", + "result": "emerald_silver_earring", "type": "uncraft", - "time": "30 s", - "components": [ [ [ "pilot_light", 1 ] ], [ [ "scrap", 1 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "emerald", 2 ] ] ] }, { - "result": "restaurantmap", + "result": "alexandrite_silver_earring", "type": "uncraft", - "time": "30 s", - "components": [ [ [ "paper", 10 ] ] ], - "flags": [ "BLIND_EASY" ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "alexandrite", 2 ] ] ] }, { - "result": "gold_ring", + "result": "ruby_silver_earring", "type": "uncraft", - "time": "30 s", + "time": "60 s", "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "gold_small", 2 ] ] ] + "components": [ [ [ "silver_small", 4 ] ], [ [ "ruby", 2 ] ] ] }, { - "result": "roadmap", + "result": "peridot_silver_earring", "type": "uncraft", - "time": "30 s", - "components": [ [ [ "paper", 10 ] ] ], - "flags": [ "BLIND_EASY" ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "peridot", 2 ] ] ] }, { - "result": "vehicle_controls", + "result": "sapphire_silver_earring", "type": "uncraft", - "skill_used": "mechanics", - "difficulty": 3, - "time": "10 m", - "decomp_learn": 3, - "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "pipe", 4 ] ], [ [ "scrap", 12 ] ], [ [ "wire", 2 ] ], [ [ "cable", 8 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "sapphire", 2 ] ] ] }, { - "result": "robot_controls", + "result": "tourmaline_silver_earring", "type": "uncraft", - "skill_used": "electronics", - "difficulty": 8, - "time": "1 h", - "using": [ [ "soldering_standard", 20 ] ], - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "motor_tiny", 3 ] ], [ [ "processor", 3 ] ], [ [ "RAM", 2 ] ], [ [ "plastic_chunk", 2 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "tourmaline", 2 ] ] ] }, { - "result": "scythe", + "result": "citrine_silver_earring", "type": "uncraft", - "time": "10 m", + "time": "60 s", "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "blade_scythe", 1 ] ], [ [ "stick_long", 1 ] ] ] + "components": [ [ [ "silver_small", 4 ] ], [ [ "citrine", 2 ] ] ] }, { - "result": "sf_watch", + "result": "blue_topaz_silver_earring", "type": "uncraft", - "time": "36 s", - "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "gold_small", 5 ] ], [ [ "silver_small", 12 ] ], [ [ "clockworks", 1 ] ] ] + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "blue_topaz", 2 ] ] ] }, { - "result": "silver_bracelet", + "result": "opal_silver_earring", "type": "uncraft", - "time": "36 s", + "time": "60 s", "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "silver_small", 10 ] ] ] + "components": [ [ [ "silver_small", 4 ] ], [ [ "opal", 2 ] ] ] }, { - "result": "silver_ear", + "result": "pearl_silver_earring", "type": "uncraft", - "time": "30 s", + "time": "60 s", "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "silver_small", 3 ] ] ] + "components": [ [ [ "silver_small", 4 ] ], [ [ "pearl", 2 ] ] ] + }, + { + "result": "diamond_silver_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "silver_small", 4 ] ], [ [ "diamond", 2 ] ] ] }, { "result": "sm_extinguisher", @@ -3048,6 +3686,104 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "platinum_small", 8 ] ] ] }, + { + "result": "garnet_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "garnet", 4 ] ] ] + }, + { + "result": "amethyst_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "amethyst", 4 ] ] ] + }, + { + "result": "aquamarine_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "aquamarine", 4 ] ] ] + }, + { + "result": "emerald_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "emerald", 4 ] ] ] + }, + { + "result": "alexandrite_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "alexandrite", 4 ] ] ] + }, + { + "result": "ruby_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "ruby", 4 ] ] ] + }, + { + "result": "peridot_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "peridot", 4 ] ] ] + }, + { + "result": "sapphire_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "sapphire", 4 ] ] ] + }, + { + "result": "tourmaline_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "tourmaline", 4 ] ] ] + }, + { + "result": "citrine_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "citrine", 4 ] ] ] + }, + { + "result": "blue_topaz_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "blue_topaz", 4 ] ] ] + }, + { + "result": "opal_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "opal", 4 ] ] ] + }, + { + "result": "pearl_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "pearl", 4 ] ] ] + }, + { + "result": "diamond_platinum_bracelet", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 8 ] ], [ [ "diamond", 4 ] ] ] + }, { "result": "platinum_dental_grill", "type": "uncraft", @@ -3062,6 +3798,104 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "platinum_small", 2 ] ] ] }, + { + "result": "garnet_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "garnet", 2 ] ] ] + }, + { + "result": "amethyst_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "amethyst", 2 ] ] ] + }, + { + "result": "aquamarine_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "aquamarine", 2 ] ] ] + }, + { + "result": "emerald_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "emerald", 2 ] ] ] + }, + { + "result": "alexandrite_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "alexandrite", 2 ] ] ] + }, + { + "result": "ruby_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "ruby", 2 ] ] ] + }, + { + "result": "peridot_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "peridot", 2 ] ] ] + }, + { + "result": "sapphire_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "sapphire", 2 ] ] ] + }, + { + "result": "tourmaline_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "tourmaline", 2 ] ] ] + }, + { + "result": "citrine_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "citrine", 2 ] ] ] + }, + { + "result": "blue_topaz_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "blue_topaz", 2 ] ] ] + }, + { + "result": "opal_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "opal", 2 ] ] ] + }, + { + "result": "pearl_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "pearl", 2 ] ] ] + }, + { + "result": "diamond_platinum_earring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 4 ] ], [ [ "diamond", 2 ] ] ] + }, { "result": "platinum_watch", "type": "uncraft", @@ -3076,6 +3910,104 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "platinum_small", 2 ] ] ] }, + { + "result": "garnet_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "garnet", 1 ] ] ] + }, + { + "result": "amethyst_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "amethyst", 1 ] ] ] + }, + { + "result": "aquamarine_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "aquamarine", 1 ] ] ] + }, + { + "result": "emerald_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "emerald", 1 ] ] ] + }, + { + "result": "alexandrite_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "alexandrite", 1 ] ] ] + }, + { + "result": "ruby_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "ruby", 1 ] ] ] + }, + { + "result": "peridot_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "peridot", 1 ] ] ] + }, + { + "result": "sapphire_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "sapphire", 1 ] ] ] + }, + { + "result": "tourmaline_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "tourmaline", 1 ] ] ] + }, + { + "result": "citrine_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "citrine", 1 ] ] ] + }, + { + "result": "blue_topaz_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "blue_topaz", 1 ] ] ] + }, + { + "result": "opal_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "opal", 1 ] ] ] + }, + { + "result": "pearl_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "pearl", 1 ] ] ] + }, + { + "result": "diamond_platinum_ring", + "type": "uncraft", + "time": "60 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "platinum_small", 2 ] ], [ [ "diamond", 1 ] ] ] + }, { "result": "razor_shaving", "type": "uncraft", diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json index 79ead961b9f6a..938417cc885e3 100644 --- a/data/json/recipes/recipe_electronics.json +++ b/data/json/recipes/recipe_electronics.json @@ -1756,17 +1756,17 @@ }, { "type": "recipe", - "result": "bot_tankbot", + "result": "bot_antimateriel", "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_OTHER", "skill_used": "electronics", - "skills_required": [ [ "mechanics", 9 ], [ "computer", 8 ] ], + "skills_required": [ [ "mechanics", 6 ], [ "computer", 5 ] ], "reversible": true, - "decomp_learn": 8, - "book_learn": [ [ "schematics_tankbot", 9 ] ], - "difficulty": 9, + "decomp_learn": 5, + "book_learn": [ [ "schematics_antimateriel", 7 ] ], + "difficulty": 5, "time": "1 h 15 m", - "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], + "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, @@ -1775,106 +1775,28 @@ ], "components": [ [ [ "ai_module", 1 ] ], - [ [ "sensor_module", 1 ] ], - [ [ "memory_module", 1 ] ], - [ [ "pathfinding_module", 1 ] ], [ [ "identification_module", 1 ] ], - [ [ "tank_tread", 1 ] ], - [ [ "tankbot_chassis", 1 ] ], - [ [ "targeting_module", 1 ] ], - [ [ "gun_module", 3 ] ], - [ [ "flamethrower", 1 ] ], - [ [ "tazer", 1 ] ], - [ [ "m4a1", 1 ] ], - [ [ "power_supply", 20 ] ], - [ [ "storage_battery", 1 ] ], - [ [ "plut_cell", 4 ] ], - [ [ "mil_plate", 2 ] ] - ] - }, - { - "type": "recipe", - "result": "bot_tripod", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_OTHER", - "skill_used": "electronics", - "skills_required": [ [ "mechanics", 9 ], [ "computer", 8 ] ], - "reversible": true, - "decomp_learn": 8, - "book_learn": [ [ "schematics_tripod", 9 ] ], - "difficulty": 9, - "time": "1 h", - "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 10 ] ], - "qualities": [ - { "id": "SCREW", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "WRENCH", "level": 2 }, - { "id": "WRENCH_FINE", "level": 1 } - ], - "components": [ - [ [ "ai_module", 1 ] ], [ [ "sensor_module", 1 ] ], - [ [ "memory_module", 1 ] ], - [ [ "pathfinding_module", 1 ] ], - [ [ "identification_module", 1 ] ], - [ [ "spidery_legs_big", 1 ] ], - [ [ "tripod_chassis", 1 ] ], - [ [ "targeting_module", 1 ] ], [ [ "gun_module", 1 ] ], - [ [ "power_supply", 12 ] ], - [ [ "storage_battery", 1 ] ], - [ [ "flamethrower", 1 ] ] - ] - }, - { - "type": "recipe", - "result": "bot_chickenbot", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_OTHER", - "skill_used": "electronics", - "skills_required": [ [ "mechanics", 10 ], [ "computer", 9 ] ], - "reversible": true, - "decomp_learn": 9, - "book_learn": [ [ "schematics_chickenbot", 10 ] ], - "difficulty": 10, - "time": "1 h 15 m", - "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], - "qualities": [ - { "id": "SCREW", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "WRENCH", "level": 2 }, - { "id": "WRENCH_FINE", "level": 1 } - ], - "components": [ - [ [ "ai_module", 1 ] ], - [ [ "sensor_module", 1 ] ], - [ [ "memory_module", 1 ] ], - [ [ "pathfinding_module", 1 ] ], - [ [ "identification_module", 1 ] ], - [ [ "reverse_jointed_legs", 1 ] ], - [ [ "chickenbot_chassis", 1 ] ], [ [ "targeting_module", 1 ] ], - [ [ "gun_module", 3 ] ], - [ [ "mark19", 1 ] ], - [ [ "tazer", 1 ] ], - [ [ "m249", 1 ] ], - [ [ "power_supply", 20 ] ], - [ [ "storage_battery", 1 ] ], - [ [ "plut_cell", 4 ] ], - [ [ "mil_plate", 2 ] ] + [ [ "m2browning", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "robot_controls", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "turret_chassis", 1 ] ] ] }, { "type": "recipe", - "result": "bot_antimateriel", + "result": "bot_turret_searchlight", "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_OTHER", "skill_used": "electronics", - "skills_required": [ [ "mechanics", 6 ], [ "computer", 5 ] ], + "skills_required": [ [ "mechanics", 4 ], [ "computer", 2 ] ], "reversible": true, "decomp_learn": 5, - "book_learn": [ [ "schematics_antimateriel", 7 ] ], - "difficulty": 5, + "book_learn": [ [ "schematics_searchlight", 7 ] ], + "difficulty": 3, "time": "1 h 15 m", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ @@ -1884,15 +1806,13 @@ { "id": "WRENCH_FINE", "level": 1 } ], "components": [ - [ [ "ai_module", 1 ] ], + [ [ "ai_module_basic", 1 ] ], [ [ "identification_module", 1 ] ], [ [ "sensor_module", 1 ] ], - [ [ "gun_module", 1 ] ], [ [ "targeting_module", 1 ] ], - [ [ "m2browning", 1 ] ], - [ [ "small_storage_battery", 1 ] ], - [ [ "robot_controls", 1 ] ], + [ [ "medium_storage_battery", 3 ] ], [ [ "power_supply", 1 ] ], + [ [ "floodlight", 1 ] ], [ [ "turret_chassis", 1 ] ] ] }, diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 7a5c7bc513b46..05ccdf0e30cd8 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -3757,7 +3757,7 @@ ], [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ] ], [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ], - [ [ "sauce_red", 1 ], [ "curry_powder", 4 ] ] + [ [ "curry_powder", 4 ], [ "chilly-p", 4 ] ] ] }, { @@ -3794,7 +3794,7 @@ [ "dry_rice", 1 ] ], [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ] ], - [ [ "sauce_red", 1 ], [ "curry_powder", 4 ] ] + [ [ "curry_powder", 4 ], [ "chilly-p", 4 ] ] ] }, { @@ -3824,7 +3824,7 @@ [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ] ], [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ], [ [ "can_beans", 1 ], [ "raw_beans", 1 ], [ "dry_beans", 1 ] ], - [ [ "sauce_red", 1 ], [ "chilly-p", 2 ], [ "chili_pepper", 1 ] ] + [ [ "chilly-p", 2 ], [ "chili_pepper", 1 ] ] ] }, { @@ -3850,7 +3850,15 @@ [ "mushroom_cooked", 2 ], [ "dry_veggy", 2 ] ], - [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "seasoning_italian", 5 ], [ "wild_herbs", 10 ] ], + [ + [ "sauce_pesto", 1 ], + [ "sauce_red", 1 ], + [ "seasoning_italian", 5 ], + [ "wild_herbs", 10 ], + [ "tomato", 1 ], + [ "irradiated_tomato", 1 ], + [ "can_tomato", 1 ] + ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, @@ -4963,9 +4971,9 @@ "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ - [ [ "sausage", 2 ], [ "sausage_cooked", 2 ], [ "bratwurst_sausage", 2 ] ], - [ [ "curry_powder", 20 ] ], - [ [ "ketchup", 4 ] ] + [ [ "sausage", 1 ], [ "sausage_cooked", 1 ], [ "bratwurst_sausage", 2 ] ], + [ [ "curry_powder", 10 ], [ "chilly-p", 10 ] ], + [ [ "ketchup", 2 ] ] ] }, { @@ -7150,8 +7158,8 @@ [ "onion", 12 ], [ "irradiated_onion", 12 ], [ "garlic_clove", 72 ], - [ "irradiated_carrot", 72 ], - [ "carrot", 72 ] + [ "irradiated_carrot", 24 ], + [ "carrot", 24 ] ], [ [ "vinegar", 1 ] ] ] diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index 0187e7a5bd164..33acd5a9f9a10 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -1803,6 +1803,11 @@ "result": "small_relicuncraft", "obsolete": true }, + { + "type": "recipe", + "result": "rock_pot", + "obsolete": true + }, { "type": "recipe", "result": "small_storage_battery", @@ -2197,5 +2202,35 @@ "type": "recipe", "result": "scrambler", "obsolete": true + }, + { + "type": "recipe", + "result": "broken_chickenbot", + "obsolete": true + }, + { + "type": "recipe", + "result": "bot_chickenbot", + "obsolete": true + }, + { + "type": "recipe", + "result": "broken_tripod", + "obsolete": true + }, + { + "type": "recipe", + "result": "bot_tripod", + "obsolete": true + }, + { + "type": "recipe", + "result": "broken_tankbot", + "obsolete": true + }, + { + "type": "recipe", + "result": "bot_tankbot", + "obsolete": true } ] diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 6e65ac792fbf8..91e0761bc3377 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -740,19 +740,6 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ] ] }, - { - "type": "recipe", - "result": "rock_pot", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "survival", - "skills_required": [ "cooking", 1 ], - "difficulty": 2, - "time": "20 m", - "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "rock", 3 ] ], [ [ "cordage", 1, "LIST" ] ] ] - }, { "type": "recipe", "result": "primitive_shovel", @@ -3263,6 +3250,32 @@ [ [ "hammer", 1 ] ] ] }, + { + "type": "recipe", + "result": "toolbox_workshop", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "skills_required": [ "mechanics", 3 ], + "difficulty": 4, + "time": "4 m", + "reversible": true, + "autolearn": true, + "components": [ + [ [ "sheet_metal_small", 5 ] ], + [ [ "nail", 11 ] ], + [ [ "wire", 1 ] ], + [ [ "pockknife", 1 ], [ "primitive_knife", 1 ], [ "copper_knife", 1 ] ], + [ [ "screwdriver_set", 1 ] ], + [ [ "hacksaw", 1 ] ], + [ [ "wrench", 1 ] ], + [ [ "saw", 1 ] ], + [ [ "hammer", 1 ] ], + [ [ "metal_file", 1 ] ], + [ [ "pin_reamer", 1 ] ], + [ [ "hand_vice", 1 ] ] + ] + }, { "type": "recipe", "result": "vacutainer", @@ -3633,7 +3646,10 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "salt_water", 1 ], [ "saline", 2 ], [ "salt", 2 ] ], [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ] + "components": [ + [ [ "salt_water", 1 ], [ "saline", 2 ], [ "salt", 2 ] ], + [ [ "raw_fur", 1 ], [ "raw_hfur", 1 ], [ "raw_tainted_fur", 1 ] ] + ] }, { "type": "recipe", diff --git a/data/json/recipes/recipes.json b/data/json/recipes/recipes.json index fb3253a91441e..9d4b990aff556 100644 --- a/data/json/recipes/recipes.json +++ b/data/json/recipes/recipes.json @@ -103,7 +103,7 @@ { "type": "recipe_category", "id": "CC_ANIMALS", - "recipe_subcategories": [ "CSC_ALL", "CSC_ANIMALS_CANINE ARMOR", "CSC_ANIMALS_EQUINE ARMOR" ] + "recipe_subcategories": [ "CSC_ALL", "CSC_ANIMALS_CANINE ARMOR", "CSC_ANIMALS_EQUINE ARMOR", "CSC_ANIMALS_EQUINE STORAGE" ] }, { "type": "recipe_category", diff --git a/data/json/recipes/recipes_holiday.json b/data/json/recipes/recipes_holiday.json index 4d15c626759e2..c2a8ebe0516f7 100644 --- a/data/json/recipes/recipes_holiday.json +++ b/data/json/recipes/recipes_holiday.json @@ -15,5 +15,17 @@ [ [ "candle", 1 ] ], [ [ "y_paint", 1 ] ] ] + }, + { + "type": "recipe", + "result": "decorative_wreath", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "difficulty": 1, + "time": "45 m", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "pine_bough", 4 ] ], [ [ "duct_tape", 10 ], [ "cordage_superior", 6, "LIST" ] ] ] } ] diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 3c17ebadc2d22..2d60437c536ee 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -6,8 +6,8 @@ "default_groundcover": [ [ "t_region_groundcover", 1 ] ], "region_terrain_and_furniture": { "terrain": { - "t_region_groundcover": { "t_grass": 10, "t_grass_long": 2, "t_grass_dead": 2, "t_dirt": 1 }, - "t_region_groundcover_urban": { "t_grass": 20, "t_grass_dead": 3, "t_dirt": 1 }, + "t_region_groundcover": { "t_grass": 12, "t_grass_dead": 2, "t_dirt": 1 }, + "t_region_groundcover_urban": { "t_grass": 20, "t_grass_dead": 3 }, "t_region_groundcover_forest": { "t_grass_long": 5, "t_grass_tall": 1, "t_moss": 1, "t_grass_dead": 3 }, "t_region_groundcover_swamp": { "t_grass_long": 3, "t_grass_tall": 1, "t_moss": 2, "t_dirt": 2 }, "t_region_shrub": { @@ -143,15 +143,16 @@ }, "river_scale": 1.0, "field_coverage": { - "percent_coverage": 0.93, + "percent_coverage": 0.2, "default_ter": "t_shrub", "other": { - "t_region_tree": 1.2, - "t_region_shrub": 17, - "f_region_flower": 73, - "f_boulder_small": 1, - "f_boulder_medium": 0.6666, - "f_boulder_large": 0.3333 + "t_region_tree": 1, + "t_region_shrub": 3, + "f_region_weed": 49, + "f_region_flower": 37, + "f_boulder_small": 5, + "f_boulder_medium": 4, + "f_boulder_large": 1 }, "boost_chance": 0.833, "boosted_percent_coverage": 2.5, @@ -368,6 +369,8 @@ "mx_portal": 3, "mx_crater": 10, "mx_portal_in": 3, + "mx_grass": 20, + "mx_fallen_shed": 30, "mx_spider": 200, "mx_grove": 500, "mx_shrubbery": 500, @@ -392,6 +395,8 @@ "mx_portal": 3, "mx_crater": 10, "mx_portal_in": 3, + "mx_grass": 10, + "mx_fallen_shed": 20, "mx_shia": 1, "mx_spider": 200, "mx_jabberwock": 1, @@ -418,6 +423,8 @@ "mx_portal": 3, "mx_crater": 10, "mx_portal_in": 3, + "mx_grass": 20, + "mx_fallen_shed": 60, "mx_spider": 200, "mx_grove": 500, "mx_shrubbery": 500, @@ -431,21 +438,25 @@ } }, "field": { - "chance": 90, + "chance": 6, "extras": { - "mx_helicopter": 8, - "mx_military": 8, - "mx_science": 20, - "mx_collegekids": 25, - "mx_drugdeal": 20, - "mx_supplydrop": 10, - "mx_portal": 3, - "mx_crater": 10, - "mx_portal_in": 3, + "mx_helicopter": 6, + "mx_military": 2, + "mx_science": 1, + "mx_collegekids": 3, + "mx_drugdeal": 3, + "mx_supplydrop": 4, + "mx_portal": 1, + "mx_crater": 15, + "mx_portal_in": 1, "mx_point_dead_vegetation": 50, + "mx_grass": 700, + "mx_trees": 100, + "mx_fallen_shed": 20, + "mx_pond": 20, "mx_point_burned_ground": 50, - "mx_casings": 50, - "mx_corpses": 30 + "mx_casings": 20, + "mx_corpses": 3 } }, "road": { @@ -535,6 +546,7 @@ "house_w_4": 40, "house_w_5": 40, "house_w_6": 40, + "house_inner_garden": 40, "emptyresidentiallot": 20, "apartments_con_new": 10, "apartments_mod_new": 10, @@ -579,6 +591,7 @@ }, "shops": { "bus_station": 200, + "city_block_2": 300, "town_hall": 150, "craft_shop": 200, "craft_shop_1": 200, diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index df17297b53fa2..a46df90e4a795 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -672,6 +672,7 @@ [ "wine_barley", 1 ], [ "pale_ale", 1 ], [ "stout", 1 ], + [ "imperial_stout", 1 ], [ "mixed_alcohol_weak", 1 ] ] ] diff --git a/data/json/snippets/fliers.json b/data/json/snippets/fliers.json new file mode 100644 index 0000000000000..c2bd53b58b886 --- /dev/null +++ b/data/json/snippets/fliers.json @@ -0,0 +1,308 @@ +[ + { + "type": "snippet", + "category": "flier", + "text": [ + { + "id": "flier_1", + "text": "This is an advertisement for Aunt Janice's Pickled Meat. \"When times get tough, the tough get pickling. Aunt Janice's Pickled Meat: more than 30% real beef!\"" + }, + { + "id": "flier_2", + "text": "This is an advertisement for compact bionic modules. \"Nerve pain? Depression? Tardiness? There's not a problem a compact bionic module can't solve. Talk to your doctor to find out of CBMs are right for you!\"" + }, + { + "id": "flier_3", + "text": "This is an advertisement promoting facial recognition quadcopters. It shows a formation of the so-called 'eyebots' flying outward from an American flag in an explosion of stars and stripes. Beneath, it reads \"Don't worry, we'll watch your back.\"" + }, + { + "id": "flier_4", + "text": "This is a somewhat weather-worn advertisement for the 'new' FEMA evacuation shelters. Beneath the colorful photo it reads, \"Familiarize yourself with your nearest emergency shelter. It could save your life.\"" + }, + { + "id": "flier_5", + "text": "This is an advertisement for a FEMA evacuation shelter. Beneath a picture of a shelter it reads, \"Contact your local FEMA office to arrange a tour of your nearest evacuation shelter. Be prepared!\"" + }, + { + "id": "flier_6", + "text": "This is an advertisement for a pre-manufactured emergency supply kit. It is made of a very flashy tactical fabric and looks very impractical based on your experience. \"Be ready for anything with the Tactica Supreme GO-30 kit.\"00" + }, + { + "id": "flier_7", + "text": "This is an ad for a complicated survival knife with an enormous serrated back edge and far too many tools included in the handle. \"Come down to the Knife Shack at Cumberton Mall! We've got it all.\"" + }, + { + "id": "flier_8", + "text": "This is an advertisement for a local church. The picture looks surprisingly mundane, but the text is not: \"Revelations services offered round the clock. The end times are here, make your peace.\"" + }, + { + "id": "flier_9", + "text": "This is an advertisement for a local church. It looks like it was put together at the last minute. \"Visit St Mary's on the River while it's not too late. Repent, while you still can!\"" + }, + { + "id": "flier_10", + "text": "This is a hand-drawn flier that has been photocopied for wide distribution. It reads, in what looks like sharpie-bolded letters, \"THEY DON'T WANT YOU TO KNOW. This is all THEIR fault. They are watching everything. They brought this on us.\" There used to be tear-away phone numbers at the bottom, but they're all gone now." + }, + { + "id": "flier_11", + "text": "This is a government-issued, air-dropped alert. \"STAY IN YOUR HOMES. Universal curfew in effect. Police and military forces are authorized to use lethal force against looters and rioters.\"" + }, + { + "id": "flier_12", + "text": "This is a government-issued, air-dropped alert. \"STAY IN YOUR HOMES. Police and military forces have been dispatched to your area and will help escort you to safety. DO NOT APPROACH ROADBLOCKS WITHOUT AUTHORIZED PERSONNEL.\"" + }, + { + "id": "flier_13", + "text": "This is a government-issued, air-dropped alert. \"EVACUATION ALERT. Please make your way to the nearest FEMA evacuation shelter. Avoid crowds. Looters and rioters may turn violent against unarmed civilians. Seek protection from police and military forces if travelling in groups.\"" + }, + { + "id": "flier_14", + "text": "This is a government-issued, air-dropped alert. \"EVACUATION ALERT. Please make your way to the nearest FEMA evacuation shelter. Travel in groups and avoid crowds. This is believed to be a biological agent that causes violent behaviour: do not attempt to engage looters or rioters.\"" + }, + { + "id": "flier_15", + "text": "This is a glossy, high quality flier. \"What they don't want you to know! Reading this may save your life.\" Inside is a series of warnings recommending people avoid the evacuation shelters, and worse, the FEMA evacuation camps, along with some high-quality telephoto shots showing bodies being shoveled into huge pits by excavation machines." + }, + { + "id": "flier_16", + "text": "This is a grocery store coupon flier. The front page looks like normal meat advertising, but inside the pictures become increasingly more gruesome images of severed human body parts and organs. It is dated two days after the evacuation orders were sounded." + }, + { + "id": "flier_17", + "text": "This is a grocery store coupon flier, dated three days before the evacuation orders went out. \"At Marigold Market, we still have canned food and bottled water! Come on in and stock up!\" The front image shows a grocery store, the entrance flanked by a pair of smiling guards armed with assault rifles." + }, + { + "id": "flier_18", + "text": "This is an advertisement for a local electronics store, dated a few weeks before the evacuation order. \"Sale on Universal Power Supplies and refurbished laptops at DigiMart, three days only!\"" + }, + { + "id": "flier_19", + "text": "This is an advertisement for Rivtech brand handguns. It shows a picture of a well armed couple in business suits with matching handguns facing down a legion of villainous looking characters. The caption reads: \"Protect yourself with the Rivtech caseless automagnum!\"" + }, + { + "id": "flier_20", + "text": "This is an advertisement for Rivtech brand rifles. It shows a picture of a smiling soldier with a futuristic looking rifle on her shoulder saluting the viewer. The caption reads: \"Rivtech caseless firearms proudly supports our Military.\"" + }, + { + "id": "flier_21", + "text": "This is an advertisement for Rivtech brand firearms. It shows a picture of a trio of well armed hunters. The three are each armed with different futuristic looking weapons and are shooting at a hostile crowd of approaching wildlife. The caption reads: \"Rivtech caseless firearms. Superior stopping power.\"" + }, + { + "id": "flier_22", + "text": "This is an advertisement for a local funk-polka band, the \"Chilly Winters\". Apparently they were playing in the Wonky Donkey Pub." + }, + { + "id": "flier_23", + "text": "This is a flier with the tour appearance dates of a small, niche-successful drum-and-bass/yodelling fusion band, the \"Ol' Yellers\". The dates continue well past the end of the world; most likely, the tour was cut short." + }, + { + "id": "flier_24", + "text": "This is an advertisement for a death metal band, \"Roxanne and the Soul-Crushing Ennui\", known for mixing their ear-blasting riffs with chipper interludes of classic fifties doo-wop. The art depicts a zombified version of a Betty Crocker-esque housewife, slamming on a spike-encrusted electric guitar." + }, + { + "id": "flier_25", + "text": "This is an advertisement for a local gun shop. In huge red letters, it reads: \"This is it. Arm yourselves and protect your freedom. Come on down while supplies last.\"" + }, + { + "id": "flier_26", + "text": "This is an advertisement for Rivtech brand ammunition. It shows a picture of an armored steel plate with a gaping hole blasted through the middle. Sitting beside the plate is a block of brightly colored caseless ammunition. The caption reads: \"Rivtech 8x40mm caseless. Nothing else comes close.\"" + }, + { + "id": "flier_27", + "text": "This is an advertisement for Leadworks LLC's Home Frontier Starter Pack. It shows a picture of a young suburban parent, equipped with rifle and revolver, keeping a steely eye on the neighborhood from the front porch. Similarly-armed parents are visible in front of every house on the street. Young children are at play and older ones tend a large vegetable garden. The caption reads: \"A well-armed community is a SAFE community. Leadworks, LLC.\"" + }, + { + "id": "flier_28", + "text": "This is a propaganda poster showing the Northrop Dispatch's military variant. It depicts the iconic dark green, arachnoid dispatch, standing before a fence and facing away from the camera as blurring machines rush forward from its back towards black silhouettes menacing on the horizon. It reads: \"WE ARE HERE TO PROTECT YOU.\"" + }, + { + "id": "flier_29", + "text": "This is an advertisement for Leadworks LLC handguns. It shows a picture of a bionic police officer assisting a young couple, who were being attacked by a gang of ruffians. The caption reads: \"You don't have to void your warranty or wear out your thumb to achieve felon-stopping firepower. The L39B, tried and true by our fine cyborgs in blue, is available in .45 ACP for that extra punch, and we offer semiautomatic (but equally robust!) versions for the civilian market. Leadworks, LLC.\"" + }, + { + "id": "flier_30", + "text": "This is an advertisement for Leadworks LLC modular weapons. It shows a picture of an overworked-yet-grateful police sergeant assembling a sleek rifle, with similar-looking weapons racked neatly behind her. The caption reads: \"Leadworks is proud to offer the L523 modular weapon system. No more must armorers stock and maintain stacks and stacks of rifles, carbines, and squad support weapons, juggling multiple incompatible ammunition types! Just procure a base unit for every trooper, and use our lightweight and portable conversion kits to swap from house-to-house CQB carbine to rooftop-patrol DSR, safely and cleanly!\"" + }, + { + "id": "flier_31", + "text": "This is a public notice from the Centers for Disease Control. Its message, repeated in several languages, reads: \"BOIL WATER ADVISORY. An unidentified agent has contaminated local groundwater. It is highly infectious and can cause erratic and violent behaviour. Boil all water, and isolate any loved ones showing concerning symptoms. Visit www.cdc.gov/cdda-advisory for more information.\"" + }, + { + "id": "flier_32", + "text": "This is a public alert from the Centers for Disease Control. Its message, repeated in several languages, reads: PUBLIC HEALTH ALERT: Due to recent events, the CDC is issuing a warning to avoid public areas and spaces. An unknown biological contaminant is suspected to be affecting citizens. The CDC would like to remind the public to cover your nose and mouth when sneezing, wash your hands frequently, and recieve an up-to-date flu shot if possible. Boiling water is recommended until further notice." + }, + { + "id": "flier_33", + "text": "This is a public alert from the Federal Emergency Management Agency. Its message, repeated in several languages, reads: STAY IN YOUR HOMES! All residents of the New England Disaster Area are advised to shelter in place wherever possible. The United States Armed Forces are working to contain the area. If there is a nearby evacuation shelter you can get to safely, you are recommended to do so. Otherwise, stay in your homes until authorized personnel evacuate you to a secured facility. Thank you for your compliance." + }, + { + "id": "flier_34", + "text": "This is a public alert from the Federal Emergency Management Agency. Its message, repeated in several languages, consists of a list of towns serving as major evacuation points from the New England Disaster Area. Someone has scribbled off most of the town names, and scrawled \"OVERRUN\" next to each one, with the exception of the Tacoma evacuation point." + }, + { + "id": "flier_35", + "text": "This is a public warning from an unnamed source. Its rambling message, poorly-photocopied onto both sides of the page, reads: Don't believe the lies! The Army is rounding up people in death camps and executing them at mass graves. They cannot stop this. Do not believe what the mainstream news-media is reporting. All official evacuation points are death-traps. Secure supplies and escape the cities while there is still time." + }, + { + "id": "flier_36", + "text": "This is a public message from an unnamed source. Its message, photocopied from a scrawled handwritten copy, reads: REPENT YOUR SINS O BABYLON FOR THE TIME OF HIS JUDGEMENT IS NIGH! LOOK UPON YOUR DESTRUCTION AND KNOW THAT IT IS JUST! YOU WILL BE DIVIDED FATHER AGAINST SON AND MOTHER AGAINST CHILD UNTO THE VERY LAST SINNER!" + }, + { + "id": "flier_37", + "text": "This is a public warning from the Federal Government. Its brief message, repeated in several languages, reads: The President of the United States has declared unilateral martial law to be in effect for the 48 contiguous states in response to the ongoing national crisis. Continue to shelter in place until evacuated to an appropriate emergency management camp by authorized military personnel. A 24-hour curfew has been established. This curfew will remain in effect until further notice. Stay indoors. Violators will be shot on sight." + }, + { + "id": "flier_38", + "text": "This is an advertisement for Rivtech's 'ATOMIC POWER THIRST' energy drink. While intended to advertise a new flavor called Isotope RU-238 'FRUIT', most of the text is dedicated to a long list of possible side effects: anxiety, insomnia, severe insomnia, dizziness, tremors, nausea, headache, vomiting, delusions, hallucinations, rhabdomyolysis, internal burns, thyroid cancer, extensive internal bleeding, upper gastrointestinal bleeding, diarrhea, cardiac dysrhythmia, cardiovascular collapse, suicidal ideation, seizures, ataxia, amnesia, mania, stroke, neurodegeneration, malignalitaloptereosis, necrotizing fasciitis, recurrent flu, and pinkeye." + }, + { + "id": "flier_39", + "text": "This is a soda advertisement. On the front is a picture of a happy couple on a beach watching the sun set. Between them are bottles of soda. The poster reads, \"Cascade Cola, for those special moments\" in bold white letters." + }, + { + "id": "flier_40", + "text": "This is a flier for a fast food chain. In it, a man is placing an order with an attractive woman wearing a bright green shirt in the window with two happy children sitting in the back seat. The flier reads \"Burgers, fries, and a Smile.\" Down in one corner is a company logo." + }, + { + "id": "flier_41", + "text": "This is an advertisement for soda. It shows a dark brown can of soda on a black background. The label reads \"Spin\"." + }, + { + "id": "flier_42", + "text": "This is a flyer for a local pizza chain. On it is a picture of a cartoon Italian holding a pizza, with the words \"It's a goooood pizza\" written above his head." + }, + { + "id": "flier_43", + "text": "This is a poster advertising contact lenses. On it is a picture of a blood shot eye with a rather long block of information beneath it making some fairly exaggerated claims about the product." + }, + { + "id": "flier_44", + "text": "This is a flyer advertising a local radio station. It has a lot of bright colors and patterns, but no definite message other than \"104.4 all the best, all the time!\" in big yellow letters." + }, + { + "id": "flier_45", + "text": "This is a large movie poster for \"Action Packstone 6, Revenge of the Dog Men\". It shows a fit man in a leather jacket with a revolver and a claymore walking towards the viewer. At his side is his trusty cyberdog companion and in the background is an explosion." + }, + { + "id": "flier_46", + "text": "This is an illustrated poster for a brand of solar car. The vehicle is driving through a lush country side as small animals look on. The slogan \"Improving the world, one tank at a time.\" is written across the top in small letters." + }, + { + "id": "flier_47", + "text": "This is a soda advertisement. On the front is a picture of a happy couple on a beach watching the sun set. Between them are bottles of soda. The poster reads, \"Cascade Cola, for those special moments\" in bold white letters. Someone has colored in the sun with a black marker. The words \"oh Discordia\" are scrawled across the top." + }, + { + "id": "flier_48", + "text": "This is a flier for a fast food chain. In it, a man is placing an order with an attractive woman wearing a bright green shirt in the window with two happy children in the back seat. The flier reads \"Burgers, fries, and a Smile.\" down in one corner is a company logo. Someone has gone to town on this one with a permanent marker. It is now covered in rude images and racial epithets." + }, + { + "id": "flier_49", + "text": "This is a flier for a local pizza chain. On it is a picture of a cartoon Italian holding a pizza, with the words \"It's a goooood pizza\" written above his head. Someone has drawn an exaggerated mustache on the cartoon Italian, along with a pair of crude, oversized breasts." + }, + { + "id": "flier_50", + "text": "This is a poster advertising contact lenses. On it is a picture of a blood shot eye. Someone has defaced this one. The informative part has been torn off, and written in jagged letters across the top in red crayon are the words \"ALL HAIL THE CRIMSON KING!\"." + }, + { + "id": "flier_51", + "text": "This is an illustrated poster for a brand of solar car. The vehicle is driving through a lush country side as small animals look on. The slogan \"Improving the world, one tank at a time.\" is written across the top. Someone used a blue pen to write \"who gives a shit\" across the slogan and put X's over the eyes of all the animals." + }, + { + "id": "flier_52", + "text": "This is a poster advertising a underground bunker. The poster shows a nuclear bomb wiping out a city while a family huddles safely underground. There a slogan \"Concerned about enemy attack? Want to protect your family? Join the VAULT program today.\" which is written in the middle. However, there seems to be no information about *how* one might do so." + }, + { + "id": "flier_53", + "text": "This is a flier for Red Ryder BBGuns. On it a child is pulling a shining red wagon with a cooked pheasant on it and a wooden rifle over one shoulder. The child has a dog trailing beside him and a satisfied look on his face. The caption reads \"When you chose Red Ryder, you invested in the American Dream. You invested in our Independence.\"" + }, + { + "id": "flier_54", + "text": "This is an old flier for a movie from the 30s. A tan man with slick black hair and muscles bulging through his offwhite suit is clasping a woman to his hip with one hand, and the woman is wearing a black leather dress. With her hips splayed, she is holding a pistol in one hand and starring directly out of the advert. The caption reads \"Witness the rebirth of New Noir with 'Jersey Shore Blues'. Starring Jenifer Languiz as 'Snookie'!\"" + }, + { + "id": "flier_55", + "text": "\"Joe's Diner; 1/2 pound of meat, 3 toppings, 'your choice', all with a side of freedom fries and a BIG Gulp size pop.\"" + }, + { + "id": "flier_56", + "text": "This is an advertisement for the popular fast food chain, Foodplace. On an unadorned blue-and-magenta background it shows clear, unmistakable depictions of their products and plainly stated prices. The foodburger looks particularly nice." + }, + { + "id": "flier_57", + "text": "This is a leaflet about autoclaving procedure. One sentence catches your attention \"/!\\Always place your tools into an autoclave pouch before autoclaving./!\\\"" + }, + { + "id": "flier_58", + "text": "This is an advertisement for a local hospital. You see a clean hospital room with a smiling man lying on the bed. The bed is connected to some medical apparatus with a \"Autodoc Mk. X\" printed on it. A doctor is seen working with its console, while his assistant is unpacking some high-tech hardware. The caption reads: \"Autodoc - helping your loved ones get the safest surgery possible.\"" + }, + { + "id": "flier_59", + "text": "This advertisement reads \"NEVER BE LEFT IN THE DARK! Powered by the inexhaustible might of betavoltaics, our new atomic lamp will glow as long as you need. Let there be light!\"" + }, + { + "id": "flier_60", + "text": "This advertisement reads \"The Future… powered by COFFEE! Cuppatech brings you the greatest revolution since espresso with our new Curie-G. Why wait for milk to boil? Have your coffee ready instantly with THE POWER OF THE ATOM!\"" + }, + { + "id": "flier_61", + "text": "This advertisement reads \"Sick of FUEL PRICES? Bus stop too far? Get your driving fix from THE SUN! Solar powered electric cars by Edison: Silent, Cheap, Powerful.\"" + }, + { + "id": "flier_62", + "text": "This advertisement reads \"Coffee of The Future… RIGHT NOW! No one has really has the time to make great coffee, but now you don't have to! Cuppatech gives you inexhaustible ATOMIC power! To make boiling hot coffee the MINUTE you want it! The Curie-G Atomic One-Cup Coffeemaker.\"" + }, + { + "id": "flier_63", + "text": "PICKLED MEAT IN A JAR! Just like your grandma used to make! It will last for months or longer, and when you've eaten it, you can refill and seal the jar! Stock your emergency supply TODAY!" + }, + { + "id": "flier_64", + "text": "BAGS, BAGS, BAGS! They're very useful things! If we didn't have BAGS, what-would-we-use… to PUT a lot of things in!? (Ad by the \"Play SchoolClothing Co.\")" + }, + { + "id": "flier_65", + "text": "GLAMOPOLITAN! We've got ALL the latest tips! Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine! So pick up a copy today and \"Sizzle Like A Star\"!" + }, + { + "id": "flier_66", + "text": "POPULAR MECHANICS: People say mechanics is boring? We say, Prove them Wrong! We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!" + }, + { + "id": "flier_67", + "text": "BIRDHOUSE MONTHLY… Which wood would a woodpecker prefer? This month we discuss hardwood versus soft woods, whether to lacquer, oil or paint, and which type of nails you should use!" + }, + { + "id": "flier_68", + "text": "FEELING BLUE? Try \"Greens\" for Magazines! Your local Supermarket! Nothing cheers you up like a good magazine… Unless it's JUNK FOOD! Or why not buy an MP3 PLAYER or a GAME CONSOLE? Chase those Blues away at GREENS Supermarket" + }, + { + "id": "flier_69", + "text": "…What do you know about surviving in the Wilderness? If you can't make a snare you don't know TRAP! Hunt down a copy of TRAPPERS' LIFE and learn about wildlife!… And how to kill it. Classic BEAR TRAP returns in this issue!" + }, + { + "id": "flier_70", + "text": "HUNTING GOODS! Food prices getting you down? Why not get a crossbow or compound bow and Hunt Your Own!? Our arrows and bolts are completely reusable, so why not hunt animals like Mother Nature intended?" + }, + { + "id": "flier_71", + "text": "FEELING BLUE? Try \"Greens\" for Magazines! Your local Supermarket! Nothing cheers you up like a good magazine… Unless it's JUNK FOOD! Or why not buy an MP3 PLAYER or a GAME CONSOLE? Chase those blues away at GREENS Supermarket" + }, + { + "id": "flier_72", + "text": "…What do you know about surviving in the Wilderness? If you can't make a snare you don't know TRAP! Hunt down a copy of TRAPPERS' LIFE and learn about wildlife!… And how to kill it. This week, a CROSSBOW TRAP!" + }, + { + "id": "flier_73", + "text": "BIRDHOUSE MONTHLY… This month we look at some Dutch innovations in birdhouse design, and compare with the often confused Scandinavian Birdhouse design. Our article on sheet metal birdhouses will have you riveted!" + }, + { + "id": "flier_74", + "text": "CRAFTY CRAFTERS QUARTERLY: Macaroni isn't just for eating anymore! Learn how to make jewelery and art from it as well! We also discuss the correct way to use superglue without gluing your hands together!" + }, + { + "id": "flier_75", + "text": "THE RIPLEY-9k! Pilot your own cargo exoskeleton now! Our exoskeletons allow the power of a forklift guided by the strength of your own muscles. Carry heavy loads over rough terrain, even up stairs!" + } + ] + } +] diff --git a/data/json/snippets/graffiti.json b/data/json/snippets/graffiti.json index 398c99b281808..6c8227d7cd1d6 100644 --- a/data/json/snippets/graffiti.json +++ b/data/json/snippets/graffiti.json @@ -22,7 +22,7 @@ { "id": "general_graffiti_13", "text": "I <3 ." }, { "id": "general_graffiti_14", "text": " fucked ." }, { "id": "general_graffiti_15", "text": "This is a spraypainted drawing of an angel with wings made of vines." }, - { "id": "general_graffiti_16", "text": "Mr. is a vampire!" }, + { "id": "general_graffiti_16", "text": "Mr. is a vampire!" }, { "id": "general_graffiti_17", "text": "Their hiding the truth" }, { "id": "general_graffiti_18", "text": "FOLLOW THE CHEMTRAILS" }, { diff --git a/data/json/snippets/newspapers.json b/data/json/snippets/newspapers.json new file mode 100644 index 0000000000000..3123e4acbe546 --- /dev/null +++ b/data/json/snippets/newspapers.json @@ -0,0 +1,430 @@ +[ + { + "type": "snippet", + "category": "many_years_old_news", + "text": [ + { + "id": "many_years_old_news_1", + "text": "ATOMIC DEREGULATION! President Toffer announced to a mixed crowd today that he had signed an executive order to deregulate public use of radioactive compounds, allowing more widespread use of low-grade radioactive compounds in home appliances. \"Plutonium is the greenest energy we have,\" he told an assembled press. \"It's time we got over our fear and moved into the light.\"" + }, + { + "id": "many_years_old_news_2", + "text": "CELEBRATED PHYSICIST GOES MISSING. Dr. Amy Takatoshi, a celebrated quantum physicist at MIT dubbed by some as \"the next Hawking\" has gone missing shortly before a press conference that was expected to be the announcement of her newest research results, rumoured to be in the field of teleportation." + }, + { + "id": "many_years_old_news_3", + "text": "FACIAL RECOGNITION ROLLS OUT. Commissioner McConnaugh of the NYPD announced at a press conference today that a new wave of facial recognition drones would be employed by police services. \"These new guys, we're calling them 'eyebots', they can move where stationary cameras can't, and can identify known troublemakers. They lead to a much lower rate of false alarms, and a much higher rate of successful convictions without an increase in wrongful arrest. I know there have been concerns, but overall these little guys make us all safer, not just from criminals but from human error as well.\"" + }, + { + "id": "many_years_old_news_4", + "text": "EDITORIAL: THE UN SHOULD PUT ON ITS BIG-BOY PANTS. So, driven by decreasing regulation of radioactive materials in the US and China, the UN is pushing hard again for nuclear disarmament. What a tired old litany this has become. With deregulation, we've been able to slate three new green nuclear reactors in the Eastern US alone, bringing greenhouse-gas free power to millions of people. Whatever happened to the UN's focus on global warming? This is a classic situation of the world painting the USA as villains no matter what we do." + }, + { + "id": "many_years_old_news_5", + "text": "US IGNORES UN DEMANDS: The US ambassador to the UN today turned down UN requests to begin mutual nuclear disarmament of China, the US and North Korea. \"We have a right to defend ourselves,\" insisted the ambassador. \"We'll back down when they do\"." + }, + { + "id": "many_years_old_news_6", + "text": "DISASTER IN THE SARITANIA MINES! A copper mine west of Saritania, a small town in Vermont, collapsed Wednesday, killing an estimated thirty miners in the disaster. Local officials could not be reached for comment, despite the mine being Saritania's primary industry. An anonymous but credible source did contact our offices, claiming that the Saritania Mine was in fact an underground military facility, and that the disaster was a cover-up for a failed experiment. These allegations were not addressed by officials." + }, + { + "id": "many_years_old_news_7", + "text": "ALIENS AMONG US! Janine Galfrizowich, of Martha's Vineyard, wrote in to our Paranormal Investigation Staff with this cryptic gem. \"They're always watching, always watching from the shadows. Stealing my avocadoes and watching! They took my neighbour and made him into one of them!\" Our journalists are trying to track Mrs Galfrizowich down, but it is clear enough that this ties into the well known Avocado Conspiracy (see issue 24, volume 7)." + }, + { + "id": "many_years_old_news_8", + "text": "EDITORIAL: MORE HOMES NEED GUNS. While visiting a friend recently, our conversation turned to gun control, and I was shocked to learn that my close friend didn't own a firearm. In this day and age, not having a deadly weapon in your home shows an appalling lack of personal safety, and I told him so. Weapons that can kill a man, or several men, in an instant - sometimes even accidentally - are our only hope against other people armed similarly. I see a utopia of honest citizens keeping each other honest by being armed to the teeth." + }, + { + "id": "many_years_old_news_9", + "text": "EDITORIAL: LET ME BUY MY DANG PLUTONIUM. President Toffer made a bold and unpopular move last month with nuclear regulation changes. I, for one, couldn't be more excited. By now, we know very well what the risks of radioactive materials are, and can take the measures to protect ourselves. Our citizens deserve the right to make the informed choice to purchase atomic powered tools should they wish, and in this era of fossil fuel and global warming concerns, what could be more appropriate than powering a home with a radioisotope thermal generator?" + }, + { + "id": "many_years_old_news_10", + "text": "EDITORIAL: ALIENS ARE BACK IN A BIG WAY. We've all seen that autopsy video that's making the rounds. I'm not going to say if I believe it's real or not (I will say \"I want to believe\" though!) but regardless of the truth, one thing is clear: the public mind is completely addicted to aliens in the biggest way I've seen since ET was popular. What's brought little green men back into the public eye? It's anyone's guess, but personally I think it's a concerning sign that we're culturally digging in to a second Cold War." + }, + { + "id": "many_years_old_news_11", + "text": "POPULAR 'ALIEN AUTOPSY' DEBUNKED. A widely circulated video, making the rounds everywhere from FriendFace to television news, has been debunked as a fake. This extremely realistic and graphic alien autopsy shows an insect-like creature being dismantled by Japanese researchers, who comment on its anatomy in Japanese throughout the video. Early observations that the creature was suspiciously similar to those described in the popular works of horror author HP Lovecraft were not sufficient to dislodge the video's viral status. Yesterday, on the popular social media website Eddit, a 'making of' video was posted, clearly exposing the work as the final film project of a small group of students at UCLA." + }, + { + "id": "many_years_old_news_12", + "text": "STUDENT MISSING: A high school student vanished yesterday evening in the forest near Wayland. The 17-year-old international student from China (who adopted the anglicized nickname \"Brett\" due to his classmates' difficulty pronouncing his given name) was last seen with his friends in the camp. \"Brett said that he was gonna get some firewood but he never came back,\" said his classmate, Jianxiang Wang. The search is underway." + }, + { + "id": "many_years_old_news_13", + "text": "STILL SEARCHING: The search for Brett, the high school student who went missing three days ago, is still ongoing. \"He could have played in the soccer game against Weston High School yesterday,\" Brett's sorrowful teammate said, \"[..] we've never stopped praying.\" Despite the best efforts of the County Search & Rescue, Brett had still not been located at the time of this report." + }, + { + "id": "many_years_old_news_14", + "text": "RUMORS DENIED: Allegations from search parties hunting for Brett Xiang, that a civilian research facility just outside Wayland is a front for a government facility researching dangerous technologies, were addressed during a press conference earlier today. \"I have to clarify that not only have we never done such research,\" said the officer on the press conference. \"These allegations are absurd. Teleportation and aliens only exist in sci-fi films, and the US certainly doesn't have the funds to build these extensive underground networks people are talking about. I can't believe I even have to tell you this. I don't know what those kids saw that put these ideas in their heads, but they're going through an awful lot with the loss of their friend.\"" + }, + { + "id": "many_years_old_news_15", + "text": "TANK SUIT! In a press conference on Tuesday, General Ariel Dabrowski was proud to unveil the new military \"tank suit\", a powered exoskeleton capable of resisting small arms fire and most heavy weapons. \"Tank suits have been used in limited deployment in Afghanistan for several months now,\" General Partoski informed the gathered press. \"We're proud to be at a point where we can formally introduce them to the public. These suits are just the first stage in a new generation of mechanized infantry.\"" + }, + { + "id": "many_years_old_news_16", + "text": "EDISON AUTOMOTIVES UNVEILS NEW SOLAR CAR. \"These miracles of technology wouldn't be possible without the deregulations pioneered by President Toffer,\" said billionaire tech mogul Elton Moosek about his company's newest innovation. \"Access to radioactive compounds and military-grade fuel cells has made this possible. At this rate, we'll be flying solar sail spacecraft within my lifetime.\"" + }, + { + "id": "many_years_old_news_17", + "text": "REAL AI IN THE PALM OF YOUR HAND. [Photograph: Dania Tang holds a new-generation heuristic processor, weighing a mere seventy grams.] Engineers at MIT, working in conjunction with a funding grant from entrepreneur Elton Moosek, have unveiled a next-generation deep learning heuristic processor. \"I'm hesitant to call it an artificial intelligence,\" spokesperson Dania Tang said of the new device, \"but it's the closest we've yet achieved. It's able to instantly analyze dozens of possible outcomes of a future action and choose the best one, much like a human uses deductive reasoning.\" Under a new startup, MindStone, the processors are reputedly already being contracted for military use." + } + ] + }, + { + "type": "snippet", + "category": "years_old_news", + "text": [ + { + "id": "years_old_news_1", + "text": "GOVERNMENT SCIENCE BOOST: The government has drastically increased research and development budgets after UN disarmament demands. \"This not only keeps money in our country, but maintains our lead on China and keeps us defended\", President Oswald said. \"This is a fight we can't afford to lose. We're not deaf to the concerns of our population: this is a blanket increase, not just to military R&D spending but civilian as well. We've authorized the construction of seventy nine new private civilian research facilities along the Eastern Seaboard alone!\"" + }, + { + "id": "years_old_news_2", + "text": "HOME GROWN SCIENCE: Several governors & legislators from the New England region discussed a new regional initiative today, which relaxed laws that limit the distance a hazardous-material laboratory or factory can be from a city. \"This should keep our economy going strong for years to come, with all the R&D facilities being established,\", one mayor remarked. \"With all the new money coming in, we've seen a huge uptick in highly educated people moving into the area too. It's been nice, our coffee shops in particular are doing very well.\"" + }, + { + "id": "years_old_news_3", + "text": "DRIVING ON A WING AND A PRAYER: A New England man has proven it is possible to create a new car from scrap parts using almost nothing but duct tape. When asked why he had done it, his answer was \"Well, I didn't have a welder.\"" + }, + { + "id": "years_old_news_4", + "text": "EYEBOTS SEE WIDESPREAD USE. A recent survey of police departments in the Eastern US found that over 85% of police stations, even in small towns, now contain at least one flight of facial recognition drones. \"They're awesome,\" Sheriff Mark Louis told a reporter from his office in Pontstown, Vermont. \"We've got a flight of four eyebots on a solar dock on the roof. They take hardly any maintenance, they respond to any suspicious business downtown, and they don't hurt anyone. If it's just a minor scuffle they grab some photos and help keep things from escalating. If it's a bigger deal, or if it's someone they know is trouble, they call us in right away. They save us a lot of false alarms: if we get an eyebot call-in we know it's a big deal.\"" + }, + { + "id": "years_old_news_5", + "text": "COMPACT BIONIC MODULES PASS PHASE 3 CLINICAL TRIALS. Uncanny, a former toy company now rebranded into a biomedical and military parts manufacturer, has unveiled its groundbreaking line of implantable medical devices, called \"compact bionic modules\", or CBMs. \"The cost is still high, and we're aware of that,\" said spokesperson Danny Veil, \"but we believe the product is worth it.\" Although a joint-assist servo CBM, for use in people with partial or complete motor nerve damage, currently costs between ten and fifteen thousand dollars, that doesn't include the cost of installation, rehabilitation, and power and recharging modules. All told, the average medical CBM will put you - or your high end insurance - out by upwards of anywhere from one to three hundred thousand dollars." + }, + { + "id": "years_old_news_6", + "text": "MEET THE SOLDIER OF THE FUTURE. [Photograph: Colonel Andrea Sylver poses in her powered combat exoskeleton.] The new wave of military exoskeleton, or 'power armor', has been unveiled to the public after extensive testing on battlefields in Afghanistan and in police actions in South America and Indonesia. \"These suits are like being a real-life super hero,\" Colonel Sylver announced to a gathered press. \"I'm immune to all but the heaviest weapons, but just as mobile and light as any infantry soldier. With an attached hauling rig, I can carry as much as a civilian cargo exoskeleton. I'm basically a bulletproof forklift in a human-sized package.\" We attempted to inquire about rumours of bionic-enhanced supersoldiers deploying alongside the new power armour, but Colonel Sylver declined to answer those questions." + }, + { + "id": "years_old_news_7", + "text": "EDITORIAL: BIONICS REDUCE YOUR HUMANITY. As these so-called 'bionics' spread in popularity, I can only wonder what it means to have part of your body voluntarily removed and replaced with bioplastic. It's one thing to have an amputation for medical reasons; it's quite another to voluntarily remove healthy tissue so that you can carry your cigarette lighter in the tip of your finger. I worry that the youth of today won't understand anymore what it means to feel the touch of a loved one with your own skin, instead of artificial sensory input from a lab-made plastic device." + }, + { + "id": "years_old_news_8", + "text": "EDITORIAL: EYEBOTS ARE GOOD FOR US. The controversy around increasing eyebot use by police forces has everyone worried, and I was on board for a long time. Facial recognition databases under government control are something we should be worried about! Then, my daughter was accosted on her way home from dance class. Long before any police officer could have arrived, an eyebot had snagged video of her attackers and reported them to Central. That, alone, probably saved her life: just knowing they'd been tagged sent the criminals packing before any real damage was done, and the information allowed us to press charges on a crime that would have gone unreported before. All safety must come at a cost, and I'll gladly pay my privacy if it's the cost to keep my family safe." + }, + { + "id": "years_old_news_9", + "text": "EDITORIAL: EYEBOTS REPRESENT A CONCERNING TREND. There it is, as it always is: the endless buzz of eyebots cruising the streets, hunting for wrongdoing. I've written many an article on these things, and read many more. I've spoken to experts. When we get to the bottom of it, there's a key disturbing truth to these ubiquitous robots… No one knows how they work. The artificial intelligence used in the little drones is more than just facial recognition, it's also threat processing and decision making, and at its very heart is a new-wave deep learning AI that is, essentially, a wild card. Without knowing how these things learn and make decisions, I don't think we can trust them in public, let alone handling our safety. That's not even considering the dangers of letting them have access to our faces and criminal records." + }, + { + "id": "years_old_news_10", + "text": "TECHWORLD NEWS: Toy company at the origin of the successful talking doll rebrands and becomes Uncanny. A spokesperson from the newly formed Uncanny told the press, \"We think we can do more than just entertain. We have new plans, big plans, plans that will shape the very fabric of reality!\" Unconfirmed rumors suggest that Uncanny has already received large orders from the government." + }, + { + "id": "years_old_news_11", + "text": "CHOP SHOP CRACKDOWN. [Photograph: Captain Soula Anagnos poses with seized contraband bionics.] Boston PD has seized over ten million dollars in illegally obtained bionic modules in a co-ordinated crackdown on more than ten illegal installation suites. \"These people are criminals,\" said Captain Anagnos in a press conference. \"Don't believe what the internet is saying: they're not Robin Hoods. They're stealing these devices from people who need them, and they're installing them unethically, often causing severe damage in their 'patients'.\"\n\nWe spoke online to Dr. Jose García, known for his medical blog \"The Artificial Truth\", about the seizure. \"The party line doesn't make sense on this,\" Dr. García writes. \"If these are illegally obtained bionics, why are they weapons? And not military weapons either. Finger blades, sharpened teeth? They aren't making these in dirty basements, these are coming out of factories. I see these here in Mexico, used by gangs. There is a market, and the manufacturers of CBMs are cashing in.\" Representatives from Uncanny, the largest manufacturer of CBMs in North America, could not be reached for comment." + }, + { + "id": "years_old_news_12", + "text": "CHINESE SUPER SOLDIERS. At a global press conference, the People's Republic of China unveiled their new bionic-powered supersoldiers. These soldiers are equipped with an analogous compact module technology, known as 'XFS' in press release documents, believed to be similar to CBM technology favoured by NATO forces. \"We're not concerned by these announcements,\" DARPA spokesperson Linda Iridani told our reporters. \"We've been keeping an eye on Chinese developments in bionics for some time, and XFS technology is many years behind our own military-grade CBMs.\"" + } + ] + }, + { + "type": "snippet", + "category": "one_year_old_news", + "text": [ + { + "id": "one_year_old_news_1", + "text": "READY FOR THE WORST. In response to growing public concern about a potential attack from China, President Oswald announced a major funding initiative for the construction of FEMA-supported evacuation shelters near major population sites. \"These shelters will provide a much-needed near safety points in an emergency,\" said a spokesperson for FEMA. \"They're to be equipped with a secure basement that can resist heavy bombardment, able to fit hundreds of people, and equipped to survive gas and biological attacks. They have self-contained water and power, protective gear, and communications equipment. In short, they are public survivalist bunkers. We've very excited about this initiative.\"" + }, + { + "id": "one_year_old_news_2", + "text": "BIONIC USAGE GAINING IN POPULARITY. A recent Lykos study found that despite their high costs, nearly one in one hundred US citizens now have a compact bionic module, or CBM, installed. The most popular CBMs are \"selfbuds\", an implantable BlueTooth headphone; \"InnerVision\", an ocular implant that allows users to view their cell phone screens from inside their eyeballs; and \"eStim\", an implantable treating erectile dysfunction. Sam Novak, a spokesperson for CBM manufacturer Uncanny, said in a press release, \"This comes as no surprise to us. CBMs are the way of the future, and Americans know that. We hope to roll out an all-new wave of CBMs next July, allowing our customers to connect via wi-fi to their computers and game consoles, or to remotely access their baby monitors and hear their child as though they were in the same room. I guess you could say, 'watch this space'!\"" + }, + { + "id": "one_year_old_news_3", + "text": "GRAVE BUSINESS: Recent reports show a large spike in thefts from and assaults on funeral homes in the last few weeks. Described as highly strange but not especially dangerous, Homeland Security is \"looking at the connections now.\"" + }, + { + "id": "one_year_old_news_4", + "text": "TELEPORTATION? An unidentified source working in a major university contacted multiple media outlets this week with a farfetched story that is nonetheless corroborated by third-party physicists as \"shockingly possible\". This source, nicknamed \"Deep Space\", describes secret government experimentation into teleportation, dating back to before 2008. \"When I read the tagline, I just scoffed,\" said Dr. Alice Feyn, a physics professor at MIT. \"Then I read on. This is strongly reminiscent of Dr. Takatoshi's lost work. It feels bizarre to say it, but I think there's a grain of truth to all of this.\" Dr. Amy Takatoshi was a quantum physicist who went missing, along with all records of her work, in July 2007." + }, + { + "id": "one_year_old_news_5", + "text": "LASERS - NEXT BIG THING?: Top defense researchers remarked during demonstration of a prototype today: \"We are still working on it, the laser weapon lacks power, but has a technically almost unlimited range,\" Colonel Sylver, a spokesperson for the military said. Laser weapons have been used for years in large-scale platforms, especially as anti-ordnance weapons; this marks the first field use of human-sized energy weapons.\n\n\"There's no real advantage over conventional weaponry at this point,\" said analyst Mark Coza in an interview. \"I think they're rolling them out mainly to intimidate China, and in the hopes that field testing leads to further improvements.\"" + }, + { + "id": "one_year_old_news_6", + "text": "DRUG USE ON THE RISE: Recent statistic suggest drug use in New England has climbed more than 20% in the last two years. \"People are scared for their jobs, their country, even their life… of course some will turn to drugs,\" said an expert." + }, + { + "id": "one_year_old_news_7", + "text": "EDITORIAL: DRUG USE SPIKE DUE TO ECONOMY. It's no secret that President Oswald's promises of a booming new tech economy have fallen flat on their face. Whether you're a Democrat or a Republican, we should all be ready to march on Washington and let Oswald know how we feel about broken promises and unemployment. Instead, people are drowning their sorrows in drugs, as usual, and nothing will change." + }, + { + "id": "one_year_old_news_8", + "text": "EDITORIAL: SOCIAL MEDIA HAS GOTTEN OUT OF HAND, AND GONE OUT OF COUNTRY. We can no longer trust what we read, and it's all because of social media. Although our newspaper takes painstaking efforts to source our data, our colleagues have forgotten what it means to be a journalist, and widespread falsehoods are repeated even by reputable publications as fact. What is the ultimate source of all this misinformation? It's anyone's guess, but I think we need look no further than our largest international trade partner and rival, China." + }, + { + "id": "one_year_old_news_9", + "text": "EDITORIAL: HOME CANNING NEEDS TO MAKE A COMEBACK. With food security in question after severe drought this year, I think it's clear we all need to get out Grandma's old books, and learn how to can again. Grocery stores could be a bit empty this winter, and now is the time to make pickles and preserves while the pickling's good. In this issue, three of our editors share their uplifting stories of rediscovering the joys of home canning." + }, + { + "id": "one_year_old_news_10", + "text": "EDITORIAL: THIS IS WHERE 'ME TOO' ENDS UP. It's been a while now since 'Me Too' swept the message boards of our nation, but its repercussions are felt every day. Disconnected from our identities and our heritage by the overwhelming urge to suppress the white male and hide his every achievement, American citizens are turning to drugs and violence to find a place of belonging. The government swings its hefty blame-stick around, trying to shine a light on the rise in crime and failing economy, but the answer is obvious to anyone who simply looks: it is the loss of our racial and sexual identity that's at the root. Mark my words: within a year, there will be a reckoning, and it won't be caused by the government or some outside power, it will be from the broken heart of America." + }, + { + "id": "one_year_old_news_11", + "text": "TECHWORLD NEWS: Uncanny unveils its new product - the Grocery Bot! Thousands of else-if statements, pre-recorded voice from professional actors, what more does this adorable android hides under its smiling face? Our expert got the answer for you!" + }, + { + "id": "one_year_old_news_12", + "text": "EDITORIAL: THE RISE OF THE RIGHT HAS BROUGHT US HERE. As the wounded white male ego becomes more and more of a self-stereotype, we see the cost of allowing right-wing sentiment echoed all around us. Through closet capitulation to the demands of the most extremist right-wing groups, President Oswald has made policies that allow foreign drugs to run rampant through our nation. Hiding under the guise of generally increased crime rates, conservative extremists have taken over our cities, stalking the streets at night and enacting vicious vigilante-style beatings on anyone they deem different." + }, + { + "id": "one_year_old_news_13", + "text": "NEW LAB OPENS: The H.R. Bennett Research Facility has been officially opened by the Department of Energy. According to Deputy Secretary of Energy Randall Balakrishnan, \"This facility is one of the most state-of-the-art in the world. With the opening of the H.R. Bennett research complex, New England's future is looking brighter than ever.\"" + }, + { + "id": "one_year_old_news_14", + "text": "THE FOREIGN DESIGNER DRUG THEY DON'T WANT YOU TO KNOW ABOUT? Concerning reports from a source in the Boston Police Department have hinted that there is a new drug on the streets. Move over, fentanyl: this is a new substance, nicknamed Forbidden City. While it has a lower fatal overdose rate, Forbidden City is many times more addictive than heroin or methamphetamines, and is making its way quickly around the streets." + }, + { + "id": "one_year_old_news_15", + "text": "WHEN I DID MY TIME. We spoke to Dan Huang, the Chinese-American author of the New York Times bestselling exposé \"When I Did my Time\", the story of his three years living with his extended family in China, immersed in what he describes as \"The ever-escalating anti-American propaganda of the East.\"\n\n\"It's a real threat,\" said Huang. \"They are being taught to hate our freedom, and our technology. Mark my words: there is going to be a reckoning, and we need to be ready.\"" + }, + { + "id": "one_year_old_news_16", + "text": "MAN EATING FLOWERS? Italian biologist Dr. Flavio Bianchi responded to an ethics board denial of his work with an unusual announcement last Tuesday. \"I do not need your permission to do my work,\" stated Dr. Bianchi in a letter to the University of Milan. \"I will do my research in private, and when I am done, you will rue the day you defied me.\" Dr. Bianchi's work? Engineering venus fly traps large enough to keep the local stray cat population at bay. His tenure with the university is reported to have been suspended." + }, + { + "id": "one_year_old_news_17", + "text": "IT CAME FROM BEYOND. [Pictured: Margaret Antwerp holds the fragment of alien satellite that landed in her rose garden.] It was a normal day for Margaret. Normal, that is, until a thundering crash in her front yard nearly knocked her house over. \"This damn thing fell right out of space, I tell you,\" she told investigative journalists from our Paranormal Investigations department. \"It was glowing red hot, and it had burnt my prize-winning roses to a crisp.\" The US government and air force have declined to comment, as usual." + } + ] + }, + { + "type": "snippet", + "category": "months_old_news", + "text": [ + { + "id": "months_old_news_1", + "text": "SUPPORT THE COUNTRIES THAT SUPPORT YOURS - PRESIDENT: Unexpectedly and unpopularly, the president today suggested the possible institution of a peacetime draft in response to increasing Chinese aggression towards Taiwan and the Philippines. \"We must pray for the best while preparing for the worst. We cannot abandon key allies in the face of Chinese bullying.\"" + }, + { + "id": "months_old_news_2", + "text": "EVACS UNSTOCKED: TRUTH OR FICTION? An unidentified government source has suggested that the evacuation centers are unstocked, having \"already accomplished the goal of calming the people\". He later retracted the comment and is unable to be contacted." + }, + { + "id": "months_old_news_3", + "text": "SPIKE IN MENTAL HEALTH CONCERNS HAS EPIDEMIOLOGISTS WORRIED. \"There's no doubt about it,\" said a spokesperson from Mount Sinai Hospital. \"Hospitals over the US are overwhelmed with an increase in psychiatrically-related violent behaviour such as explosivity and aggressive paranoia. The most likely cause is a new street drug; we have yet to identify any commonality between the affected people.\"\n\nDr. Andrew Morton, a Harvard epidemiologist, has a different opinion. \"These people aren't drug users. They're coming from all walks of life. Sure, there's a predilection for people who already have some mental illness, but we're seeing perfectly normal people suddenly presenting with violent explosive behaviour. I think the most likely cause is infectious: no other pattern would fit this widespread an outbreak.\"" + }, + { + "id": "months_old_news_4", + "text": "UFO CRASH: TRUTH OR FICTION? One civilian account claims a shining disk appeared in his field. \"It kind of glowed, and I could see a strange gray world through it. Then a shambling hazy purple mushroom came through, man.\"" + }, + { + "id": "months_old_news_5", + "text": "TIME TRAVEL: TRUTH OR FICTION? Leaked federal documents describe the formation of a new federal agency called XEDRA, to oversee \"4th Axis technology\" already in use. Our expert's opinion suggests time-travel or parallel worlds. The meaning of the acronym is currently unknown." + }, + { + "id": "months_old_news_6", + "text": "EDITORIAL: THE CHINESE CONTROL OUR MEDIA. No, I don't mean they're writing the articles, but there's no doubt in my mind our social media, from FriendFace to Twitfeed to Eddit, is now run by Chinese influencers. The real question is not IF they're doing it, but HOW they're using this influence to affect American minds." + }, + { + "id": "months_old_news_7", + "text": "EDITORIAL: AI IS GETTING AHEAD OF US. I saw the new article on unmanned robots with the rest of you, and I have to say I'm not as excited as I am worried. Even the scientists describing these robots say they don't fully understand how this deep learning stuff works, and now we're putting it in cars? There are some semi-autonomous AI robots even working in prisons now to quell riots. It's easy to see how this could get out of hand. We've all seen the movies." + }, + { + "id": "months_old_news_8", + "text": "THE SOLDIER OF THE FUTURE, AT LAST. The military's latest powered infantry exoskeleton has been released for widespread, non-testing use. Although numbers are still very limited, official sources say that within two years every infantry unit will have access to two powered exoskeletons for heavy operations. Within five, light exoskeletons will be the standard issue armor for US ground forces. \"This is going to put our military so far ahead of the rest of the world, it's like we have guns while they have spears,\" General Alex Findlay said in a press release. The new armor is powered by a proprietary fuel cell developed by the military and hoped to be ready for civilian distribution in the next few years." + }, + { + "id": "months_old_news_9", + "text": "INCREASE IN \"MONSTER\" SIGHTINGS HAS EXPERTS BAFFLED. A tenfold spike in sightings of unexplained phenomena, particularly fantastic beasts and monsters, has experts confused. \"This could be related to the recent rise in hallucinations,\" said Dr. Barb Coulson in an interview on web-based debate show ContraPoints on Friday. \"It's probably drugs,\" replied debate partner Leanne Jefferson, a spokesperson from MADD. \"You're both idiots,\" moderator Natalie Wynn interjected. \"The obvious answer is that it's monsters walking the Earth, preparing to kill us all.\"" + }, + { + "id": "months_old_news_10", + "text": "FOODPLACE PANTS FEUD. An ongoing legal battle between popular fast food megalith Foodplace and the non-profit Concerned Consumers of Foodpeople has ended with the determination that the Foodperson costume will remain a gender-neutral, nonrevealing unitard. \"Superheroes are meant to have exaggerated anatomy and revealing costumes,\" a spokesperson from CCF said in a press release. \"This is a sad day not just for fans of Foodplace, but for consumers of the fast-food superhero genre overall.\" A spokesperson from rival food company NourishMart sent out a press release just minutes after the ruling: \"NOURISHMART INFORMS THE PUBLIC THAT NOURISHMATIC DOES NOT WEAR ANY CLOTHES. NOURISHMATIC IS SOFTWARE. NOURISHMATIC CAN PRESENT AN AVATAR OF WHATEVER APPEALING MEAT-FORM IS DESIRED BY THE PUBLIC. EAT AT NOURISHMART. OUR PRODUCTS CONTAIN A MIX OF FAT, SALT, AND PROTEIN THAT IS HIGHLY DESIRABLE TO HUMAN PALATES.\"" + }, + { + "id": "months_old_news_11", + "text": "ASIAN AGENTS RESPONSIBLE FOR \"MONSTER\" ATTACKS. Sources have confirmed with photographic evidence that the rise in 'monster' sightings and attacks recently is the work of hostile Eastern agents believed to originate in either China or North Korea. The government has refused to respond to evidence provided by our investigative journalist team proving that hallucinogenic gases and puppets were used to spawn the widely circulated social media phenomenon." + }, + { + "id": "months_old_news_12", + "text": "RIOTS CONTINUE IN SOUTH AMERICA, AFRICA. Although reports are inconsistent, it has been confirmed that widespread rioting in poverty-stricken regions of Africa and South America, as well as some parts of Indonesia, Asia, the Middle East, and Eastern Europe, have continued and only grown in severity. \"It's obvious this is a social media effect,\" said political science professor Dr. Ely Savage. \"Economists have been saying for some time that the current situation of developed nations forcing underdeveloped nations into semi-slavery couldn't last, and now we're seeing the repercussions.\"" + }, + { + "id": "months_old_news_13", + "text": "RIOT IN CARLHAVEN. A riot broke out in a supermarket in Carlhaven, Nebraska, today. A bystander who left the scene as violence started told police that it began with a dispute over the last box of frozen Foodplace hamburger patties, but quickly escalated \"For no reason at all\". Police arrived on the scene and were quickly forced to deploy less-lethal weaponry in response to what was described by Sheriff Paul Redekopp as \"A complete sh*t show\". Seven people are dead, and another six in critical condition in Carlhaven General Hospital." + }, + { + "id": "months_old_news_14", + "text": "RIOT IN BANKSLEY. Irony was hot and dangerous in Banksley, Vermont today, where a fight broke out in a local coffee shop, reportedly starting over a dispute about the details of a similar riot in Carlhaven, Nebraska. Within an hour, the fight had expanded to engulf the local downtown core. Danielle Louiston, a server who fled the scene, was available for phone interview. \"It was like nothin' I've ever seen,\" describes Danielle. \"One minute it's a normal Friday morning, the next it's a bar brawl. By the time I got outta there, most of the restaurant was involved. I got in my car and just bolted home, then called the cops. Turns out they're all in the fight! The secretary and I, we got hold of the military and finally they came in and cleared things up.\" Stabilizing the riots required the dispatch of three National Guard units. Casualty reports are, as yet, unavailable." + }, + { + "id": "months_old_news_15", + "text": "ECONOMIC RIOTING SPREADS TO UNITED STATES. Global economic riots, started in Africa and South America, have spread to the continental United States. More than thirty riots were reported over the weekend, primarily in poorer regions of the Midwest and South. \"I don't think this is related to what happened in Carlhaven or Banksley,\" a spokesperson from the National Guard said in response to media inquiry. \"Those were isolated incidents, while this is very clearly a coordinated social media effort.\" Police and the National Guard are containing riots as they crop up. President Oswald, in a speech on Sunday evening, reminded Americans of our solidarity. \"Enemies perch at our every border, watching for signs of weakness. Now is not the time to shoot ourselves in the feet.\"" + }, + { + "id": "months_old_news_16", + "text": "THE MAN BEHIND THE RIOTS. [Photograph: Interpol identification photograph of Qiang Ye, taken in Maastricht airport in June, 2019.] Our sources in the UN have informed reporters that the investigative committee in charge of the riots currently engulfing most of the world, nicknamed the \"FriendFace Riots\" for the role of social media in spreading the violence, are the work of a discredited Chinese hacker and alleged intelligence agent, Qiang Ye. Ye is wanted by Interpol for his involvement in a cyberterror attack on Dutch banks in 2018 that led to billions of dollars of losses for European banks. The Chinese government has disavowed any connection to Ye since 2015. \"One man, with an army of well-programmed bots at his control, could certainly be behind this,\" said Dr. Ely Savage, a professor of political science at Berkeley and our expert correspondent on the riots. \"Social media is very susceptible to this sort of influence.\"" + }, + { + "id": "months_old_news_17", + "text": "VIOLENT OUTBREAKS CAUSED BY DRUG CONTAMINATION: Reports of riots being a social media effect were disputed today by NSA spokesperson Colonel Shawn Singer. \"These are isolated incidents. There is no evidence of any social media articles that are causing them, here or abroad. The violence is random and senseless. We are currently investigating a promising theory that a malicious contamination effect of the street drug methothexazole, known as 'Forbidden City', is responsible. Whatever the cause, the National Guard has these riots very well contained.\"" + }, + { + "id": "months_old_news_18", + "text": "EDITORIAL: FORGET DRUGS OR FRIENDFACE, THESE ARE THE GAMER RIOTS. I can't believe how many idiots are wasting their time blaming social media or drugs on the riots we're facing when the answer is obvious: this is the result of letting our kids fall to the moral iniquity of video games. Just last week I saw my kid playing one of those stupid bleep-bloop games, all letters and numbers and symbols. When I asked him what he was doing it was absolutely appalling. Violence. Cannibalism. Humans as cattle. Mermaid abuse. Yesterday, he was arrested for participating in the riots. Coincidence? Pretty obviously not. Our government is in the pocket of these video game developers, and we're all paying the price." + } + ] + }, + { + "type": "snippet", + "category": "weeks_old_news", + "text": [ + { + "id": "weeks_old_news_1", + "text": "SURGEON GENERAL: DEAD ARE STAYING DEAD: \"Stories about the dead rising are completely unfounded and medically impossible.\", the office of the surgeon general said in a press conference today. \"It's an obvious hoax by people just looking for five minutes of fame, or to scare people in these uncertain times. After all, remember the clown thing a few years ago?\" A critic pointed to the increasingly widespread viral videos of rioters with clearly fatal injuries rising to return to the rioting. \"Within ten hours, someone will have deep faked this video to make me look like a Star Wars character,\" replied the spokesperson, \"and you're confused by a bit of home grown CGI showing zombies?\"" + }, + { + "id": "weeks_old_news_2", + "text": "GENERAL SAYS AVOID BUNKERS: Even in riot affected areas, do not attempt to flee to military bunkers or outposts! Understaffed bunkers are defended by automated turrets, which will shoot those without proper registration. FEMA has authorized use of emergency evacuation shelters for people seeking refuge from riots." + }, + { + "id": "weeks_old_news_3", + "text": "VIOLENCE OUTBREAKS ARE UNIVERSAL. Despite government efforts to claim the situation is \"under control\", sources in the CDC have confirmed our own investigative results: there are now major unchecked riots in every city in the United States. Similar reports are trickling in from countries across the globe. We recommend packing a bugout bag and heading to your cabin on the lake, if you have one." + }, + { + "id": "weeks_old_news_4", + "text": "ZOMBIE DRUG? A controversial blogger suggested the recent riots are a chemical attack by China in her latest podcast. \"They're jealous of our cybernetic superiority, so they teamed up with Haiti to put hoodoo drugs in the water making people zombies! You've all heard of Forbidden City, who hasn't? well, this is what they were testing, and now we're seeing it everywhere!\"" + }, + { + "id": "weeks_old_news_5", + "text": "SUPERSOLDIER EXPERIMENTS GONE WRONG. Recently leaked documents from an inside source in a hitherto unknown government agency abbreviated 'XEDRA' confirm that violent riots across the country are the result of an accidentally released self-replicating supersoldier serum. The serum gives people unprecedented strength and durability, even regenerative capacity, but has the dangerous side effect of causing uncontrolled anger. Although the leak suggests that the effect should wear off, it may take weeks or even months to reach a stable state." + }, + { + "id": "weeks_old_news_6", + "text": "DISTURBING VIDEO SHOWS PSYCHOTIC RIOTERS. We've all known something was really wrong for a while. A new, extremely disturbing video has been making the social media rounds in a shocking way. It depicts a young woman amidst the riots violently and fatally attacking a girl that appears to be her own small daughter. To many, this is the last straw that confirms a dreadful suspicion: these riots are not the result of some social unrest, but represent a complete breakdown of rationality." + }, + { + "id": "weeks_old_news_7", + "text": "GOVERNMENT SPEAKS OUT ABOUT 'MIND CONTROL' RUMORS. Amidst rumours that nation- and world-wide riots are the result of a chemical mind control agent, the NSA held a press conference today. \"This is not mind control. These rioters are human beings, normal people, controlled only by feverish violence at a level we've never seen before,\" said a flustered looking representative. \"Although in some places excessive force has been required to deter rioters, we are treating them as the humans they are, not as some faceless mind-controlled horde. This is not science fiction, these are our friends and family.\"" + }, + { + "id": "weeks_old_news_8", + "text": "THEY FLY THE SKIES. It spreads its wings and the sun blocks out. It strikes the helicopter from the sky with a simple wave of its claw. It rains spittle down on our faces and we dissolve. They are coming. They are coming. They are coming." + }, + { + "id": "weeks_old_news_9", + "text": "HELL ON EARTH? Boston has been quarantined. Prior to its complete lockdown, our journalists received a concerning email from a colleague within the city, describing horrendous and inhuman monsters walking the streets amidst the rioters. \"I don't know who started it, but we call it Hastur. After the horror novel. The rioters fall in line behind it like soldiers, living and dead. Yeah, some of them are dead. They're lying to us, they've all been lying to us.\" Our editor-in-chief demanded we keep this article from you. He has been deposed. Rise up against the lies." + }, + { + "id": "weeks_old_news_10", + "text": "YOUR BUG-OUT BAG. In this issue we focus on tips and tricks to packing your bug-out bag. Whether you're near an urban center or in a small town, if you don't already have an emergency kit, you need one while supplies are still available. Don't be the one person caught without a lighter when you need a fire!" + }, + { + "id": "weeks_old_news_11", + "text": "EDITORIAL: MY MOM, THE RIOTER. My mother was one of the first of the rioters in Jacksonville. I've been wondering for a long time how a retired sixty-seven year old woman with a passion for day lilies and knitting wound up allegedly beating a police officer to death and getting thrown in a containment tank. Last week, against all odds and at great personal risk, I managed to get her released into my care. I thought I could calm her down. When they gave her to me, she was straitjacketed and masked, like Hannibal Lecter. When I got her home I tried to remove the bindings, and she almost immediately tried to strangle me. It was all I could do to tie her back up and put her in the guest room. She still eats and drinks when I give her food, but I haven't seen her sleep. I don't know what that thing is in there, but it's not my mom. I hope she comes back soon." + }, + { + "id": "weeks_old_news_12", + "text": "PSYCHIC EMANATIONS? A seemingly far-fetched theory about ongoing riots sweeping the nation has been gaining traction after a leaked document about experiments in magnetic control of brain-waves. \"Two weeks ago, I'd have told you this is ridiculous,\" said Dr. Andrew Morton, an epidemiologist and our leading correspondent for the medical basis for the riots. \"Now? I'll consider anything. With the caveat that I don't think any of this is possible, magnetic weaponry altering our brain waves and making people into crazy violent psychopaths is more plausible than a lot of the theories running around. I certainly prefer this one to that 'zombies' suggestion from a few days ago.\"" + }, + { + "id": "weeks_old_news_13", + "text": "CHINESE SOLDIERS SPOTTED AMIDST RIOTERS. Concerns that Chinese influence is behind the riots sweeping North America were corroborated today by reports of the appearance of PRC soldiers amongst the rioters in San Diego and San Francisco, apparently unaffected by the otherwise uncontrolled frenzy of violence. The government continues to deny the truth." + }, + { + "id": "weeks_old_news_14", + "text": "IF YOU CAN'T BEAT 'EM. Riots continue to rage unchecked across the country, maybe the world. Here in our newsroom we've taken a poll, and it's agreed: if you can't beat 'em, join 'em. This will be our last issue, we're going out there to show the government exactly what we think of their limp-wristed failures." + }, + { + "id": "weeks_old_news_15", + "text": "WATCH POWER ARMOR IN ACTION. The National Guard deployed a recently-commissioned unit of heavy riot control power armor exoskeletons to the front lines of the riots in Waterville, Maine. This state of the art armor is able to repel almost any attack from a civilian rioter, and has been sent forward alongside infantry armed with pepper bullets and sponge rounds to contain rioters. \"It's an uphill battle, but we've still got it contained,\" said Lieutenant Shawn Bhatti from inside his full-enclosure suit. \"I can subdue a dozen rioters in this thing, and I've got a dozen men and women with me.\" Video of the power armor in action will be streamed on our website." + }, + { + "id": "weeks_old_news_16", + "text": "LETHAL FORCE DEPLOYED? Police and military forces deny the use of lethal force in riot control, but reports do not seem to corroborate their claims. From videos of gunshot-riddled corpses to aberrant reports from some military officials, it seems clear that at least in some areas, live fire turrets with fully AI-driven threat recognition are being deployed to bolster an overwhelmed military. We reached Major Linda Pryce in Montpelier, Vermont, for comment. \"I don't ******* care what the orders are, I have men and civilians that need protecting,\" she told our reporters. \"These rioters are worse than any insurgent I ever fought in Afghanistan, and I will use whatever I can to keep them under control.\"" + }, + { + "id": "weeks_old_news_17", + "text": "LOCAL EVACUATION ORDERS. FEMA has announced small-scale evacuations of select centers where rioting is most intense. \"This is a preventive measure,\" Spokesperson Linda Garrison told our correspondent. \"We expect to have people home in a few days, but it's best we play it safe until then.\"" + } + ] + }, + { + "type": "snippet", + "category": "newest_news", + "text": [ + { + "id": "newest_news_1", + "text": "GOVERNMENT FACILITIES BOMBED: In an apparent foreign attack (contradicting earlier Department of Defense denials of the disaster being caused by Chinese aggression) a coordinated bombing strike hit a wide number of US governmental facilities simultaneously yesterday, as well as numerous locations in isolate parts of the coastal United States. A statement from the Pentagon has been issued, stating the strikes were the result of Chinese opportunism during the national crisis, and assured that action would be taken in kind against the aggressors. Allegations that these sites contained top-secret government research facilities related to the disaster have been vehemently denied." + }, + { + "id": "newest_news_2", + "text": "RIOTS GROWING? Communications with government forces have been muddled by a large influx of aggressive armed individuals to nation-wide riots. \"We have this under control,\" says a local police chief. \"We are authorizing our forces to use lethal force on combative humans. In the meantime, people are advised to stay in their homes and avoid any contact with peacekeeping forces to avoid friendly fire.\" Riots are believed to be affecting cities worldwide since at least three weeks ago." + }, + { + "id": "newest_news_3", + "text": "EVACUATION ALERT. The Federal government has announced a formal evacuation of all major centers, to pre-designated FEMA emergency shelters. Spokesperson Linda Garrison stated, \"This is not expected to be a permanent issue. By evacuating to the shelters and camps FEMA set up for just such a situation, we can clamp down on riots without hurting uninvolved people.\" Garrison declined to comment on widespread allegations that the rioters are under the influence of psychosis-inducing biological agents." + }, + { + "id": "newest_news_4", + "text": "RIOTERS MUTATING? Eyewitnesses from the New England Disaster Area have claimed that the allegedly psychotic rioters are displaying inhuman qualities. \"I swear to God, one of them was the size of a tree!\", said one panicked survivor. There are also reports of afflicted individuals with acidic or electric properties. CDC officials could not be reached for comment." + }, + { + "id": "newest_news_5", + "text": "RHODE ISLAND DECLARES SECESSION! In the midst of a nation-wide disaster, the governor of Rhode Island has declared unilateral secession and war with the government of the US. \"My loyal Rhodians are withdrawing to Aquidneck and Conanicut Islands,\" said governor Alex Ackerwith in a public announcement this morning. \"The US government has failed us. Any attempt by the US to intervene in our affairs will result in military action from the Narragansett Government. Frankly, I don't think they can get their shit together enough to challenge us.\"" + }, + { + "id": "newest_news_6", + "text": "PUBLIC SERVICE ANNOUNCEMENT: \"Aid Delayed\". Fighting by the military at the edge of the New England Disaster Area is expected to delay civilian extraction. Civilians will be forced to supply themselves over the next weeks. Sources indicate this problem is widespread in other major population centers, but aggravated locally by the very high number of bombing targets over the last two days." + }, + { + "id": "newest_news_7", + "text": "PUBLIC SERVICE ANNOUNCEMENT: \"New England Cut Off\". New England has been quarantined for the safety of the rest of the USA. No rescue attempts will be funded; it is assumed there are no survivors in the area. This follows on the heels of the quarantining of large sections of the Midwest last night. Cellular and land-based communication grids have been blocked by large numbers of people attempting to contact loved ones. It is recommended that civilians avoid use of these tools for all but the most urgent messages." + }, + { + "id": "newest_news_8", + "text": "LEAVE IT TO THE EXPERTS -- GENERAL: \"Do not attempt to deal with people acting violent or unusual yourself. If you see someone dangerous, report to the nearest military or police blockade for assistance! Even guns are to be avoided: loud gunfire may attract more rioters than you have ammo!\"" + }, + { + "id": "newest_news_9", + "text": "EVACUATION ALERT: FEMA officials said today \"Do not try to defend your property in towns. Please retreat to your nearest evacuation center outside town and await extraction to a safe facility. Military officials require non-hostile civilians to be removed from potential hot sites for ongoing violence. When the evacuation order is over, you will be able to return to your homes.\"" + }, + { + "id": "newest_news_10", + "text": "EDITOR SAYS \"DESTROY THE DEAD\". Recognizable dead left lying in the street may be dangerous! If you kill a hostile, smash or butcher with a knife until unrecognizable! These aren't rioters, they're *undead*. The government has been lying to us all along. This will be our last issue." + }, + { + "id": "newest_news_11", + "text": "THEY'RE NOT RIOTS! According to head officials at the Centers for Disease Control, functional MRI studies of rioters have fit autopsy data that suggests these people are under the influence of some sort of mind-altering agent causing erratic, violent behaviour. A source inside the CDC, who did not wish to be named, informed our reporter \"It's not just the rioters. They're the heaviest affected, but we scanned our own brains when we found out. It's everyone. It's in me, and you. It's in the government. The military. God help us all.\"" + }, + { + "id": "newest_news_12", + "text": "THE DEAD WALK. Amidst the violence of the riots, we can no longer disregard reports of fatally wounded rioters and police forces alike rising and joining the ranks of rioters. Government sources could not be reached to confirm or deny these reports, but our own reporters confirm it with photographic evidence shown below." + }, + { + "id": "newest_news_13", + "text": "A BRIDGE TOO FAR. In a statement Monday, the Department of Defense detailed its plans to deploy strategic minefields on key bridge crossings, in order to quarantine high-hostility regions of rioting. \"Military personnel will be on-site to assist any refugees fleeing the blackout zones. We urge citizens to comply with all military directives and avoid quarantined areas whenever possible until order can be restored.\"" + }, + { + "id": "newest_news_14", + "text": "PORTALS? Reports of shimmering gateways opening around the US have been corroborated by our own reporting staff. One reporter witnessed a creature the size of an apartment building taking a direct hit from an Apache helicopter's weaponry and continuing to fight. Government officials could not be reached for comment, but a local pastor spoke to our reporter in the field. \"There can no longer be any doubt,\" she was quoted as saying. \"These are the end times.\"" + }, + { + "id": "newest_news_15", + "text": "ZOMBIES! Whether they're all the rioters, or just a few, it is now undeniable: the dead walk among the living, adding to the ranks of the psychos ripping our country apart from the inside. Full photo evidence inside." + }, + { + "id": "newest_news_16", + "text": "CHINESE VICTORY AT HAND. Emperor Tsang Gu Yen of Grand China arrived in full state in Burlington, Vermont today to issue his proclamation that America, like all countries of Earth, now belongs to the New Grand Chinese Empire. Freedom has fallen. Rebel against his forces while you still can!" + }, + { + "id": "newest_news_17", + "text": "THEY WALK OUR EARTH. They are here. They are here. They are here. They are here. They are here. They are here." + } + ] + } +] diff --git a/data/json/snippets/snippets.json b/data/json/snippets/snippets.json index c81a7c4d7588a..984a06410a6a1 100644 --- a/data/json/snippets/snippets.json +++ b/data/json/snippets/snippets.json @@ -1,1126 +1,4 @@ [ - { - "type": "snippet", - "category": "flier", - "text": [ - { - "id": "flier_1", - "text": "This is an advertisement for the Diet Devil brand Metabolic Exchange CBM. It shows a picture of a tiny obese devil sitting on a woman's shoulder. The woman stares intently at a gigantic wedding cake covered with bacon and candy bars. The caption reads: \"Burn calories! Burn!\"" - }, - { - "id": "flier_2", - "text": "This is an advertisement for the Diet Devil brand Ethanol Burner CBM. It shows a picture of a teenage boy driving a car while chugging a bottle of whiskey. A tiny obese devil sits on his shoulder and drinks a martini. The caption reads: \"Drink like there's no tomorrow!\"" - }, - { - "id": "flier_3", - "text": "This is an advertisement for the Twenty8 brand Diamond Cornea CBM. It shows a picture of the cyber-module being clutched by an eagle in flight. The captions read: \"Get the new Model 28.bx Eagle-Eye!\" and \"Twenty8. See what you've been missing.\"" - }, - { - "id": "flier_4", - "text": "This is an advertisement for the Twenty8 brand Night Vision CBM. It shows a picture of an owl swooping down on a the cyber-module. The captions read: \"Get the new Model 28.hx Night-Owl!\" and \"Twenty8. See what you've been missing.\"" - }, - { - "id": "flier_5", - "text": "This is an advertisement for the Twenty8 brand Diamond Cornea CBM. It shows a picture of a flying hawk carrying the cyber-module in its beak. The captions read: \"Get the new Model 28.xx Hawk-Eye!\" and \"Twenty8. See what you've been missing.\"" - }, - { - "id": "flier_6", - "text": "This is an advertisement for the Twenty8 brand Scent Vision CBM. It shows a picture of a vulture perched on a pile of skulls and cyber-modules. The captions read: \"Get the new Model 28.vx Vulture today!\" and \"Twenty8. See what you've been missing.\"" - }, - { - "id": "flier_7", - "text": "This is an ad for a Twenty8 brand Infrared Vision CBM. It shows a picture of a robotic phoenix covered in flames. The captions read: \"Get the new Model 28.tx Phoenix today!\" and \"Twenty8. See what you've been missing.\"" - }, - { - "id": "flier_8", - "text": "This is an advertisement for DoubleTech brand law enforcement robots. It shows a picture of copbot and an eyebot boldly emerging from a cloud of teargas and flame. The caption reads: \"DoubleTech Industries. Built to Protect. Programmed to Serve.\"" - }, - { - "id": "flier_9", - "text": "This is an advertisement for DoubleTech brand law enforcement robots. It shows a picture of an eyebot flying alongside a bald eagle and a Stealth bomber painted as an American flag. The caption reads: \"Built to Protect. Programmed to Serve.\"" - }, - { - "id": "flier_10", - "text": "This is an advertisement for DoubleTech brand law enforcement robots. It shows a picture of a dozen eyebots floating over a woman as she jogs through a park. The captions read: \"Built to Protect. Programmed to Serve.\"" - }, - { - "id": "flier_11", - "text": "This is an advertisement for DoubleTech brand law enforcement robots. It shows a picture of copbot pepper-spraying a handcuffed rioter. In the background a troop of boy scouts salutes the robot. The caption reads: \"Built to Protect. Programmed to Serve.\"" - }, - { - "id": "flier_12", - "text": "This is an advertisement for Robert's Universal Robotics brand law enforcement robots. It shows a picture of a tribot incinerating a mob of looters and stepping over charred and smoking corpses. The caption reads: \"R.U.R. Technology you can Trust.\"" - }, - { - "id": "flier_13", - "text": "This is an advertisement for Robert's Universal Robots brand labor-bots. It shows a picture of a robot carrying a heavy pallet of bricks. In the background a human foreman is sleeping on the job, with his hardhat pulled down over his eyes. The captions read: \"It's a tough job, so why should you have to do it?\" and \"R.U.R. Technology you can Trust.\"" - }, - { - "id": "flier_14", - "text": "This is an advertisement for Robert's Universal Robots brand labor-bots. It shows a picture of a factory floor run entirely by robots. In the background a man in a suit reads a newspaper that shows soaring stock prices. The caption reads: \"R.U.R. Technology you can Trust.\"" - }, - { - "id": "flier_15", - "text": "This is an advertisement for Sybil's Cyber Boutique. It shows a picture of several bikini-clad female doctors removing the skin from man's face. The patient is strapped to a chair but cheerfully gives two thumbs up. The caption reads: \"Free Plastic Surgery While You Wait!\"" - }, - { - "id": "flier_16", - "text": "This is an advertisement for Sybil's Cyber Boutique. It shows a picture of a nerdy looking man surrounded by a group of admiring women. In the foreground a blood-drenched doctor gives an exaggerated wink and two thumbs up. The caption reads: \"Holiday sales! Get the package deals!\"" - }, - { - "id": "flier_17", - "text": "This is an advertisement for Sybil's Cyber Boutique. It shows a picture of a man carrying a somewhat confused horse on his shoulders. He is flanked by two scantily clad nurses who hold bloody chainsaws and give approving thumbs up. His bulging knees and elbows are stitched and seem to be the source of his ability. The caption reads: \"Brand new! Horse power at hand!\"" - }, - { - "id": "flier_18", - "text": "This is an advertisement for Sybil's Cyber Boutique. It shows a picture of a man smiling while being relentlessly punched by a boxer. He doesn't even sweat as punches have no effect on him. Two scantily clad nurses give approving thumbs up from the background. The caption reads: \"Bouncy as never before! Absorb those shocks!\"" - }, - { - "id": "flier_19", - "text": "This is an advertisement for Rivtech brand handguns. It shows a picture of a well armed couple in business suits with matching handguns facing down a legion of villainous looking characters. The caption reads: \"Protect yourself with the Rivtech caseless automagnum!\"" - }, - { - "id": "flier_20", - "text": "This is an advertisement for Rivtech brand rifles. It shows a picture of a smiling soldier with a futuristic looking rifle on her shoulder saluting the viewer. The caption reads: \"Rivtech caseless firearms proudly supports our Military.\"" - }, - { - "id": "flier_21", - "text": "This is an advertisement for Rivtech brand firearms. It shows a picture of a trio of well armed hunters. The three are each armed with different futuristic looking weapons and are shooting at a hostile crowd of approaching wildlife. The caption reads: \"Rivtech caseless firearms. Superior stopping power.\"" - }, - { - "id": "flier_22", - "text": "This is an advertisement for the Rivtech brand Muscle Augmentation CBM. It shows a picture of a stylized, howling wolf against a red background. The caption reads: \"Rivtech neuroreactive myomer bionics. The most efficient synthetic adenosine triphosphate recovery system on the market.\" and \"Rivtech Bionics, guaranteed for life.\"" - }, - { - "id": "flier_23", - "text": "This is an advertisement for the Rivtech brand Wired Reflexes CBM. It shows a picture of a stylized, snarling black cat against a red background. The caption reads: \"Rivtech neuroelectric stimulation bionics. The next level in quantum inductive piezochemical nerve stimulation technology.\" and \"Rivtech Bionics, guaranteed for life.\"" - }, - { - "id": "flier_24", - "text": "This is an advertisement for the Rivtech brand Monomolecular Blade CBM. It shows a picture of a woman with a bionic blade extending from her arm steadfastly defending her children from an angry bear. The caption reads: \"Rivtech retractable monomolecular blade system. Failure is never an option.\" and \"Rivtech Bionics, guaranteed for life.\"" - }, - { - "id": "flier_25", - "text": "This is an advertisement for the Rivtech brand Synaptic Accelerator CBM. It shows a picture of a stylized, soaring raven against a red background. The caption reads: \"Introducing the Rivtech Model Six myelination retrovirus system. The latest in synthetic high-performance glycoprotein deposition technology.\" and \"Rivtech Bionics, guaranteed for life.\"" - }, - { - "id": "flier_26", - "text": "This is an advertisement for Rivtech brand ammunition. It shows a picture of an armored steel plate with a gaping hole blasted through the middle. Sitting beside the plate is a block of brightly colored caseless ammunition. The caption reads: \"Rivtech 8x40mm caseless. Nothing else comes close.\"" - }, - { - "id": "flier_27", - "text": "This is an advertisement for Leadworks LLC's Home Frontier Starter Pack. It shows a picture of a young suburban parent, equipped with rifle and revolver, keeping a steely eye on the neighborhood from the front porch. Similarly-armed parents are visible in front of every house on the street. Young children are at play and older ones tend a large vegetable garden. The caption reads: \"A well-armed community is a SAFE community. Leadworks, LLC.\"" - }, - { - "id": "flier_28", - "text": "This is a propaganda poster showing the Northrop Dispatch's military variant. It depicts the iconic dark green, arachnoid dispatch, standing before a fence and facing away from the camera as blurring machines rush forward from its back towards black silhouettes menacing on the horizon. It reads: \"WE ARE HERE TO PROTECT YOU.\"" - }, - { - "id": "flier_29", - "text": "This is an advertisement for Leadworks LLC handguns. It shows a picture of a bionic police officer assisting a young couple, who were being attacked by a gang of ruffians. The caption reads: \"You don't have to void your warranty or wear out your thumb to achieve felon-stopping firepower. The L39B, tried and true by our fine cyborgs in blue, is available in .45 ACP for that extra punch, and we offer semiautomatic (but equally robust!) versions for the civilian market. Leadworks, LLC.\"" - }, - { - "id": "flier_30", - "text": "This is an advertisement for Leadworks LLC modular weapons. It shows a picture of an overworked-yet-grateful police sergeant assembling a sleek rifle, with similar-looking weapons racked neatly behind her. The caption reads: \"Leadworks is proud to offer the L523 modular weapon system. No more must armorers stock and maintain stacks and stacks of rifles, carbines, and squad support weapons, juggling multiple incompatible ammunition types! Just procure a base unit for every trooper, and use our lightweight and portable conversion kits to swap from house-to-house CQB carbine to rooftop-patrol DSR, safely and cleanly!\"" - }, - { - "id": "flier_31", - "text": "This is a public notice from the Centers for Disease Control. Its message, repeated in several languages, reads: Due to the recent outbreak of the A H3N2 flu strain, the CDC would like to remind the public to cover your nose and mouth with a tissue when you cough or sneeze and wash your hands frequently with soap and water. The CDC also recommends an annual flu vaccine for everyone 6 months of age and older, which can be found at your local doctor's office or pharmacy." - }, - { - "id": "flier_32", - "text": "This is a public alert from the Centers for Disease Control. Its message, repeated in several languages, reads: PUBLIC HEALTH ALERT: Due to recent events, the CDC is issuing a warning to avoid public areas and spaces. An unknown biological contaminant is suspected to be affecting citizens, possibly an unexpected mutation in the A H3N2 flu strain. The CDC would like to remind the public to cover your nose and mouth when sneezing, wash your hands frequently, and recieve an up-to-date flu shot if possible. Boiling water is recommended until further notice." - }, - { - "id": "flier_33", - "text": "This is a public alert from the Federal Emergency Management Agency. Its message, repeated in several languages, reads: STAY IN YOUR HOMES! All residents of the New England Disaster Area are advised to shelter in place wherever possible. The United States Armed Forces are working to contain the area. If there is a nearby evacuation shelter you can get to safely, you are recommended to do so. Otherwise, stay in your homes until authorized personnel evacuate you to a secured facility. Thank you for your compliance." - }, - { - "id": "flier_34", - "text": "This is a public alert from the Federal Emergency Management Agency. Its message, repeated in several languages, consists of a list of towns serving as major evacuation points from the New England Disaster Area. Someone has scribbled off most of the town names, and scrawled \"OVERRUN\" next to each one, with the exception of the Tacoma evacuation point." - }, - { - "id": "flier_35", - "text": "This is a public warning from an unnamed source. Its rambling message, poorly-photocopied onto both sides of the page, reads: Don't believe the lies! The Army is rounding up people in death camps and executing them at mass graves. They cannot stop this. Do not believe what the mainstream news-media is reporting. All official evacuation points are death-traps. Secure supplies and escape the cities while there is still time." - }, - { - "id": "flier_36", - "text": "This is a public message from an unnamed source. Its message, photocopied from a scrawled handwritten copy, reads: REPENT YOUR SINS O BABYLON FOR THE TIME OF HIS JUDGEMENT IS NIGH! LOOK UPON YOUR DESTRUCTION AND KNOW THAT IT IS JUST! YOU WILL BE DIVIDED FATHER AGAINST SON AND MOTHER AGAINST CHILD UNTO THE VERY LAST SINNER!" - }, - { - "id": "flier_37", - "text": "This is a public warning from the Federal Government. Its brief message, repeated in several languages, reads: The President of the United States has declared unilateral martial law to be in effect for the 48 contiguous states in response to the ongoing national crisis. Continue to shelter in place until evacuated to an appropriate emergency management camp by authorized military personnel. A 24-hour curfew has been established. This curfew will remain in effect until further notice. Stay indoors. Violators will be shot on sight." - }, - { - "id": "flier_38", - "text": "This is an advertisement for Rivtech's 'ATOMIC POWER THIRST' energy drink. While intended to advertise a new flavor called Isotope RU-238 'FRUIT', most of the text is dedicated to a long list of possible side effects: anxiety, insomnia, severe insomnia, dizziness, tremors, nausea, headache, vomiting, delusions, hallucinations, rhabdomyolysis, internal burns, thyroid cancer, extensive internal bleeding, upper gastrointestinal bleeding, diarrhea, cardiac dysrhythmia, cardiovascular collapse, suicidal ideation, seizures, ataxia, amnesia, mania, stroke, neurodegeneration, malignalitaloptereosis, necrotizing fasciitis, recurrent flu, and pinkeye." - }, - { - "id": "flier_39", - "text": "This is a soda advertisement. On the front is a picture of a happy couple on a beach watching the sun set. Between them are bottles of soda. The poster reads, \"Cascade Cola, for those special moments\" in bold white letters." - }, - { - "id": "flier_40", - "text": "This is a flier for a fast food chain. In it, a man is placing an order with an attractive woman wearing a bright green shirt in the window with two happy children sitting in the back seat. The flier reads \"Burgers, fries, and a Smile.\" Down in one corner is a company logo." - }, - { - "id": "flier_41", - "text": "This is an advertisement for soda. It shows a dark brown can of soda on a black background. The label reads \"Spin\"." - }, - { - "id": "flier_42", - "text": "This is a flyer for a local pizza chain. On it is a picture of a cartoon Italian holding a pizza, with the words \"It's a goooood pizza\" written above his head." - }, - { - "id": "flier_43", - "text": "This is a poster advertising contact lenses. On it is a picture of a blood shot eye with a rather long block of information beneath it making some fairly exaggerated claims about the product." - }, - { - "id": "flier_44", - "text": "This is a flyer advertising a local radio station. It has a lot of bright colors and patterns, but no definite message other than \"104.4 all the best, all the time!\" in big yellow letters." - }, - { - "id": "flier_45", - "text": "This is a large movie poster for \"Action Packstone 6, Revenge of the Dog Men\". It shows a fit man in a leather jacket with a revolver and a claymore walking towards the viewer. At his side is his trusty cyberdog companion and in the background is an explosion." - }, - { - "id": "flier_46", - "text": "This is an illustrated poster for a brand of solar car. The vehicle is driving through a lush country side as small animals look on. The slogan \"Improving the world, one tank at a time.\" is written across the top in small letters." - }, - { - "id": "flier_47", - "text": "This is a soda advertisement. On the front is a picture of a happy couple on a beach watching the sun set. Between them are bottles of soda. The poster reads, \"Cascade Cola, for those special moments\" in bold white letters. Someone has colored in the sun with a black marker. The words \"oh Discordia\" are scrawled across the top." - }, - { - "id": "flier_48", - "text": "This is a flier for a fast food chain. In it, a man is placing an order with an attractive woman wearing a bright green shirt in the window with two happy children in the back seat. The flier reads \"Burgers, fries, and a Smile.\" down in one corner is a company logo. Someone has gone to town on this one with a permanent marker. It is now covered in rude images and racial epithets." - }, - { - "id": "flier_49", - "text": "This is a flier for a local pizza chain. On it is a picture of a cartoon Italian holding a pizza, with the words \"It's a goooood pizza\" written above his head. Someone has drawn an exaggerated mustache on the cartoon Italian, along with a pair of crude, oversized breasts." - }, - { - "id": "flier_50", - "text": "This is a poster advertising contact lenses. On it is a picture of a blood shot eye. Someone has defaced this one. The informative part has been torn off, and written in jagged letters across the top in red crayon are the words \"ALL HAIL THE CRIMSON KING!\"." - }, - { - "id": "flier_51", - "text": "This is an illustrated poster for a brand of solar car. The vehicle is driving through a lush country side as small animals look on. The slogan \"Improving the world, one tank at a time.\" is written across the top. Someone used a blue pen to write \"who gives a shit\" across the slogan and put X's over the eyes of all the animals." - }, - { - "id": "flier_52", - "text": "This is a poster advertising a underground bunker. The poster shows a nuclear bomb wiping out a city while a family huddles safely underground. There a slogan \"Concerned about enemy attack? Want to protect your family? Join the VAULT program today.\" which is written in the middle. However, there seems to be no information about *how* one might do so." - }, - { - "id": "flier_53", - "text": "This is a flier for Red Ryder BBGuns. On it a child is pulling a shining red wagon with a cooked pheasant on it and a wooden rifle over one shoulder. The child has a dog trailing beside him and a satisfied look on his face. The caption reads \"When you chose Red Ryder, you invested in the American Dream. You invested in our Independence.\"" - }, - { - "id": "flier_54", - "text": "This is an old flier for a movie from the 30s. A tan man with slick black hair and muscles bulging through his offwhite suit is clasping a woman to his hip with one hand, and the woman is wearing a black leather dress. With her hips splayed, she is holding a pistol in one hand and starring directly out of the advert. The caption reads \"Witness the rebirth of New Noir with 'Jersey Shore Blues'. Starring Jenifer Languiz as 'Snookie'!\"" - }, - { - "id": "flier_55", - "text": "\"Joe's Diner; 1/2 pound of meat, 3 toppings, 'your choice', all with a side of freedom fries and a BIG Gulp size pop.\"" - }, - { - "id": "flier_56", - "text": "This is an advertisement for the Wink & Nod brand Soporific Induction CBM. It shows a picture of a woman sleeping on a bed of nails with a satisfied smile on her face. The caption reads: \"Catch Zs with ease, wherever you please!\"" - }, - { - "id": "flier_57", - "text": "This is a leaflet about autoclaving procedure. One sentence catches your attention \"/!\\Always place your tools into an autoclave pouch before autoclaving./!\\\"" - }, - { - "id": "flier_58", - "text": "This is an advertisement for a local hospital. You see a clean hospital room with a smiling man lying on the bed. The bed is connected to some medical apparatus with a \"Autodoc Mk. X\" printed on it. A doctor is seen working with its console, while his assistant is unpacking some high-tech hardware. The caption reads: \"Autodoc - augmentation has never been so easy, reliable, and safe.\"" - } - ] - }, - { - "type": "snippet", - "category": "note", - "text": [ - { "id": "note_1", "text": "\"WE WERE RIGHT THE GOVERNMENT DID IT\"" }, - { - "id": "note_2", - "text": "\"Have seen a zombie making its kin raise even despite damage that normally would take them down, the air around it shimmered like around that hole in the air we've seen creatures coming through back home\"" - }, - { "id": "note_3", "text": "\"I shot the sheriff; but I couldn't find the deputy\"" }, - { - "id": "note_4", - "text": "\"Some plant vines started chasin after me, so I took a gas mask and some teargas and I ran through them.\"" - }, - { "id": "note_5", "text": "\"Slingshot right through the windshield k?\"" }, - { - "id": "note_6", - "text": "\"When I was a kid I used to slingshot at bugs and birds. Its really playing off nowadays, Ill tell you what\"" - }, - { - "id": "note_7", - "text": "\"ALL YOU STONERS WITH YOUR VIDEYA GAMES - I BET YOU WISH YOU TOOK THE TIME TO LEARN A SKILL NOW DONTYA\"" - }, - { "id": "note_8", "text": "\"I tried to be a bard, but the rats didn't like my piping.\"" }, - { - "id": "note_9", - "text": "\"I found a chocolate bar on my pillow when I got home last night. I left and don't wanna go back.\"" - }, - { - "id": "note_10", - "text": "\"this demon thing came after me it got me good i shot it but i dont know if ill make it\"" - }, - { - "id": "note_11", - "text": "\"DANNY IF YOU READ THIS THIS IS CLARA WE'RE ALL OKAY AND WE'RE HEADING TO THE RIVER. A BOAT SAID THEY WERE DOCKED NEARBY.\"" - }, - { - "id": "note_12", - "text": "\"When I think of all the dead people I get mad, because I was supposed to be the next big leader. WHERES MY CHANCE!??\"" - }, - { "id": "note_13", "text": "\"A man in a black robe came up to me, said he wanted to make a deal…\"" }, - { - "id": "note_14", - "text": "\"Cha-cha-cha-chia! Saw a woman today, with fungus coming out her head like hair tendrils.\"" - }, - { - "id": "note_15", - "text": "\"If only I had had more time with that Autodoc I could have saved them! But with that damn chip in their brain those poor cyborg wil never be human again…\"" - }, - { - "id": "note_16", - "text": "\"Save the cyborgs! Please, whoever reads this, you must help them! Knock them out or deactivate them, I don't care how you do it. But put their unconscious body on that Autodoc and remove the chip that is messing up their brain!\"" - }, - { - "id": "note_17", - "text": "\"Gotta slow down, man. I don't think we spend more than 20% of our time fightin', Put some Marley on and take off that racketus tripcore nonsense, man.\"" - }, - { "id": "note_18", "text": "\"I kept shooting with my handgun, but I never got any better!\"" }, - { - "id": "note_19", - "text": "\"ITS OKEY GUYS! I BARRYED A TIME CAPSUL IN MY BACKYARD! I PUT IN SOME HOEHOES.\"" - }, - { - "id": "note_20", - "text": "\"I got my tinfoil hat on. Good thing too, cause this monster was starrin at me kinda funny, trying to freeze my mind in place.\"" - }, - { "id": "note_21", "text": "\"You want my advice? Smoke crack, it gets shit done.\"" }, - { - "id": "note_22", - "text": "\"ALWAYS WITH THE EFFICIENCY GUYS; YOURE ALWAYS WORKING TO GO HOME TO PAY RENT TO SLEEP TO WAKE UP TO WORK AGAIN. STOP\"" - }, - { "id": "note_23", "text": "\"IM OFF TO THUNDERDOME, BYE SUCKERS.\"" }, - { - "id": "note_24", - "text": "\"If you get a parasite, take some sand and some vodka. Rub the sand into the afflicted area, real good too; like you're washing your hair. Then rinse with vodka.\"" - }, - { - "id": "note_25", - "text": "\"I put my toilet water into a gastank. Then I poured it into a glass cup. Then I drank it without vomiting my insides back into the toilet.\"" - }, - { "id": "note_26", "text": "\"This isn't real this is a test to turn you into a Manchurian Candidate!\"" }, - { - "id": "note_27", - "text": "\"They're all hiding on an oil rig, I heard it myself over the AM airwaves. They think they're the nobles of the 21st century, the prigs.\"" - }, - { - "id": "note_28", - "text": "\"Some of 'em are big. Real big. Don't stick around, I saw my mate get fucking torn in half!\"" - }, - { "id": "note_29", "text": "\"po p y fl ow er s don t ea at them\"" }, - { - "id": "note_30", - "text": "\"Some guy is walking through the horde without a scratch. Please tell me they're docile now. Please fucking tell me.\"" - }, - { "id": "note_31", "text": "\"Why are all the lawnmowers broken?!\"" }, - { - "id": "note_32", - "text": "\"Some of the bridges, they're right next to each other, right? If you see something up ahead one of those, just careen through to the other side. My van was long enough to bridge right across!\"" - }, - { "id": "note_33", "text": "\"BURN BURN BURN BURN BURN ALL BURN ALL BURN ALL BURN\"" }, - { - "id": "note_34", - "text": "\"I took all the supplies. Don't follow me. I'm sorry, man. I have to look out for myself now.\"" - }, - { "id": "note_35", "text": "\"My next-door neighbor had a katana in his basement!\"" }, - { "id": "note_36", "text": "\"Am I the last one alive?\"" }, - { - "id": "note_37", - "text": "\"Boyfriend stole my pistol while I was asleep. I locked him in the bathroom and set the house on fire. At least he attracted their attention.\"" - }, - { "id": "note_38", "text": "\"I get air conditioners, but… this whole laboratory is frozen to ice!\"" }, - { - "id": "note_39", - "text": "\"A wood ax works pretty well against them. So does a machete, but you can't cut down a tree.\"" - }, - { - "id": "note_40", - "text": "\"Why would you hide in a farm? Sure, it's isolated, but if they know where you are, you don't exactly have cover on all sides.\"" - }, - { "id": "note_41", "text": "\"Imagine if this spread to, like, Australia. Zombie kangaroos. Haha…\"" }, - { - "id": "note_42", - "text": "\"how DO I use THESE bionic THINGS? I just STUCK the wires IN my WRIST and now I CAN'T STOP twitching. AND now my LEG hurts! Is THAT acid?!\"" - }, - { - "id": "note_43", - "text": "\"I tried playing memorial music for my dead brother, on a radio. They must have been attracted to it. I can't see his grave through the crowd anymore.\"" - }, - { - "id": "note_44", - "text": "\"Took a picture of a dead dog leaping right onto a soldier. Sweet fucking shot!\"" - }, - { "id": "note_45", "text": "\"Gas mask is nice and all, but I can hardly run with it on.\"" }, - { - "id": "note_46", - "text": "\"One of those robot tanks was blocking the way out. Got some sort of sweetspot, though, where it can't decide what to shoot with, maybe 30 yards or so? Made it to the truck and just drove.\"" - }, - { - "id": "note_47", - "text": "\"Those evac shelters have basements. Remember when they were full of food? Every single one is fucking empty now…\"" - }, - { - "id": "note_48", - "text": "\"I made mushroom babies. My arms hurt. I hurt. I had mushroom babies. They are growing now.\"" - }, - { "id": "note_49", "text": "\"It doesn't matter how you die. You're gonna turn into one of them.\"" }, - { "id": "note_50", "text": "\"WHY DO ALL THE DEAD CHILDREN GO TO SCHOOL\"" }, - { "id": "note_51", "text": "\"Don't keep your goddamn casings! They'll just weigh you down.\"" }, - { - "id": "note_52", - "text": "\"Local auto shop is full of the things. And to think I worked with them on repairing cars… now they're just… fucking corpses.\"" - }, - { "id": "note_53", "text": "\"DON'T EAT THE SLIME DON'T EAT THE SLIME DON'T EAT THE SLIME\"" }, - { - "id": "note_54", - "text": "\"I used to be human. But… my arms… they are like tentacles. I slither along akin to a snail and I shed my feathers every day.\"" - }, - { - "id": "note_55", - "text": "\"Killed a giant worm thing, but now I'm only three feet tall. Should've just left the damn worm alone, now none of my clothes fit!\"" - }, - { "id": "note_56", "text": "\"I don't have enough time to double tap. You don't either.\"" }, - { "id": "note_57", "text": "\"PINK TALL ONES RUN RUN RUN RUN RUN\"" }, - { "id": "note_58", "text": "\"Are they still human inside?\"" }, - { "id": "note_59", "text": "\"the eye it watches me it follows me everywhere help\"" }, - { "id": "note_60", "text": "\"tHE Portal it's so COld\"" }, - { - "id": "note_61", - "text": "\"They build modern bullets fuckin crazy. Set some on fire and they all goes like a lil grenade. Need kindling first.\"" - }, - { "id": "note_62", "text": "\"GOD CAN'T SAVE US\"" }, - { "id": "note_63", "text": "\"SHOOT YOURSELF, LET IT END QUICKLY\"" }, - { - "id": "note_64", - "text": "\"There are five basic rules to survival. One, stay prepared and watchful. Two, keep your iron sights lined up or succumb. Three, stay FAR WAY from all\"" - }, - { - "id": "note_65", - "text": "\"The bricks of this bathroom look like a face. Haha… it's all I can focus on. At least let me shit before you break down the door. Please…\"" - }, - { "id": "note_66", "text": "\"What the hell are they mining for in these shafts?\"" }, - { "id": "note_67", "text": "\"I am one with the plants.\"" }, - { "id": "note_68", "text": "\"Broadsword! Yeah!\"" }, - { - "id": "note_69", - "text": "\"If you see a trail of dirt getting displaced in your direction… run. Run for your life.\"" - }, - { "id": "note_70", "text": "\"DINT ATE THE MUSHROM\"" }, - { "id": "note_71", "text": "\"Libraries are useless after the apocalypse.\"" }, - { - "id": "note_72", - "text": "\"I swear to God I've seen these plant things before! In a book, or something! I swear…\"" - }, - { "id": "note_73", "text": "\"Is robbing a bank easier or harder now that all the guards are undead?\"" }, - { "id": "note_74", "text": "\"Make sure your car is REALLY stopped before you get out.\"" }, - { - "id": "note_75", - "text": "\"I found some kind of stone pyramid with spikes. I feel… I feel like I'm being watched.\"" - }, - { - "id": "note_76", - "text": "\"Why would you ever hide in a damn gun store? The owner… he was a moron alright.\"" - }, - { "id": "note_77", "text": "\"THEY DON'T feel ANYTHING\"" }, - { "id": "note_78", "text": "\"What was XEDRA doing, anyway?\"" }, - { - "id": "note_79", - "text": "\"Is that one pharmaceutical company gonna come out with a, like, cure for this anytime soon?\"" - }, - { "id": "note_80", "text": "\"THE MARLEY WAS RIGHT\"" }, - { - "id": "note_81", - "text": "\"Squeeze some ammonia into zombie flesh and hold it tight. You smell like one of them! I think.\"" - }, - { "id": "note_82", "text": "\"I thought my damn terminal cancer was bad enough… now the dead are rising?!\"" }, - { "id": "note_83", "text": "\"THE GOO IS IN THE WATER DON'T DRINK WATER\"" }, - { "id": "note_84", "text": "\"Don't let the ember go out please don't go out I need you precious fire.\"" }, - { - "id": "note_85", - "text": "\"Everyone used their gas to get to another town… but it's the same story everywhere.\"" - }, - { "id": "note_86", "text": "\"There's still an evacuation point at Concord, spread the word.\"" }, - { "id": "note_87", "text": "\"STAY AWAY FROM CONCORD\"" }, - { - "id": "note_88", - "text": "\"Most things can be taken out with a shotgun. More things can be taken out with a grenade. Imagine what a mini-nuke does.\"" - }, - { "id": "note_89", "text": "\"Come to the bar if you see this, let's re-enact a zombie movie, friends.\"" }, - { "id": "note_90", "text": "\"They are NOT slow! They are NEVER slow!\"" }, - { "id": "note_91", "text": "\"I had a phobia of bees BEFORE they grew to enormous sizes.\"" }, - { - "id": "note_92", - "text": "\"Your backpack's gonna weigh you down in the water. Hell, feel free to get naked. Nobody's going to judge your modesty.\"" - }, - { "id": "note_93", "text": "\"Guns too loud. Crossbow too long. Running is best.\"" }, - { "id": "note_94", "text": "\"99% dead? I'd like to see a million zombies on Wall Street.\"" }, - { "id": "note_95", "text": "\"Crawled in through the vents. Whole office building is infested.\"" }, - { - "id": "note_96", - "text": "\"Don't shoot the people who get bit! It's OK! Death is the only thing that makes you turn!\"" - }, - { - "id": "note_97", - "text": "\"Zombies, walkers, dead ones, undead, reanimated, zed, animata, biters. Did I miss any?\"" - }, - { "id": "note_98", "text": "\"All I've got is this keg of beer and an appetite. Come at me, apocalypse!\"" }, - { - "id": "note_99", - "text": "\"My cousin says that murder nowadays is just a war crime. War for what, I don't know, since the undead seem to be rebels without a cause.\"" - }, - { "id": "note_100", "text": "\"SWAMPS RUN SWAMPS NO SWAMPS RUN\"" }, - { - "id": "note_101", - "text": "\"They said a walking cane was a useless weapon… but then I hit one of them with it.\"" - }, - { - "id": "note_102", - "text": "\"River water around these parts is extremely safe. Probably more safe than the damn tap water at this point.\"" - }, - { "id": "note_103", "text": "\"DON't bomB THe PORtals it MAKES iT WORSE\"" }, - { - "id": "note_104", - "text": "\"No wonder all the camps got overrun, they kept a goddamn zombie test subject! Each and every one of 'em!\"" - }, - { "id": "note_105", "text": "\"I just realized how damn demented those fliers are.\"" }, - { "id": "note_106", "text": "\"I propose a new currency: 9mm.\"" }, - { "id": "note_107", "text": "\"My skin is crawling and I teleport every few minutes… what is going o\"" }, - { "id": "note_108", "text": "\"You can't see them through the smoke but they can't either.\"" }, - { "id": "note_109", "text": "\"There's gotta be a better use of all this rebar…\"" }, - { - "id": "note_110", - "text": "\"met schoolhouse of people, all crazy and mad they were, ate killed all of them, yum\"" - }, - { "id": "note_111", "text": "\"STAY AWAY FROM THE BIG ONES IN THE FOREST\"" }, - { - "id": "note_112", - "text": "\"got into a prison with a halligan bar. makes me wonder how they kept prisoners inside\"" - }, - { - "id": "note_113", - "text": "\"This thing isn't a car any more. It's just a fucking mountain of metal on wheels, which I live in.\"" - }, - { - "id": "note_114", - "text": "\"Anyone else seen those really… SQUARE-looking towns? I don't think they're normal.\"" - }, - { - "id": "note_115", - "text": "\"big z threw me on top of the building, legs broken but at least im safe for a few more minutes\"" - }, - { - "id": "note_116", - "text": "\"I'm starting to feel bad about disabling all these turrets and stealing their ammunition.\"" - }, - { - "id": "note_117", - "text": "\"Make sure you strip the house for all available resources-- tubes, pipes, ceramics, sheets, strings, and more\"" - }, - { "id": "note_118", "text": "\"FUCK FAUX-MUTANTS, BEING 'EXTREMELY THIRSTY' DOES NOT COUNT\"" }, - { - "id": "note_119", - "text": "\"There's nothing wrong with eating people if you HAVE to. I mean, I only did it because I didn't want to waste my potato chips!\"" - }, - { "id": "note_120", "text": "\"all these robotic police really take the piss out of kops\"" }, - { "id": "note_121", "text": "\"CHINA DID THIS\"" }, - { "id": "note_122", "text": "\"RUSSIA DID THIS\"" }, - { - "id": "note_123", - "text": "\"Thank You RivTech. Thank You For Good Coffee. Will Always Stay Awake For You Rivtech.\"" - }, - { - "id": "note_124", - "text": "\"See, now I'm just not sure where I'm putting all these storage batteries in my body!\"" - }, - { "id": "note_125", "text": "\"dont try to leave they will shoot you\"" }, - { - "id": "note_126", - "text": "\"I'd like to thank my high-school culinary arts class for teaching me how to make RDX and mutagenic serum.\"" - }, - { "id": "note_127", "text": "\"Makayla Sanchez burned down my fucking house\"" }, - { "id": "note_128", "text": "\"he calls himself the 'man with the hands', don't approach\"" }, - { - "id": "note_129", - "text": "\"So… what happens if the military rescues us? We're all freaks by now, right? How the fuck are we gonna go back to real life?\"" - }, - { - "id": "note_130", - "text": "\"Not sure if my companion WANTED to turn into a bird, but I was the one giving her the serum, and I saved her life! That's fair, right?\"" - }, - { "id": "note_131", "text": "\"I've never been very confident, is that why my shots keep missing?\"" }, - { "id": "note_132", "text": "\"FIRE BAD. NOW NAKED. PLEASE HELP.\"" }, - { - "id": "note_133", - "text": "\"Heard of a place up in Maine where people have their shit together. Hundreds of people, defense, food and shelter… let's go raid it, guys!\"" - }, - { "id": "note_134", "text": "\"KASHWAK: NO-FO\"" }, - { - "id": "note_135", - "text": "\"The whispering fog is taking me in like a blanket. I'm warm now. I'm finally\"" - }, - { - "id": "note_136", - "text": "\"got a video recording of hour one when the portals were still up. pretty cool\"" - }, - { - "id": "note_137", - "text": "\"Stuck here. Zombies outside. Friends were outside too, now they're part of zombies. Need to be quiet\"" - }, - { - "id": "note_138", - "text": "\"if anyones reading this, please tell my mom i was right about insects being superior\"" - }, - { - "id": "note_139", - "text": "\"Diamond coated sword! Diamond coated hammer! Diamond coated clothes! Diamond coated hands help\"" - }, - { "id": "note_140", "text": "\"waded through 14 miles of sewage for playboy magazine, wasnt worth it\"" }, - { - "id": "note_141", - "text": "\"I'm coming back for this note in twelve hours. If I don't, take all my shit!\"" - }, - { - "id": "note_142", - "text": "\"all my friends died when they came near me. there's nothing funny about that\"" - }, - { "id": "note_143", "text": "\"DOG NOT REAL DOG\"" }, - { - "id": "note_144", - "text": "\"This is all just a dream, right??! I'M GOING TO WAKE UP, SHE'S GOING TO BE OK\"" - }, - { "id": "note_145", "text": "\"wek ik spak\"" }, - { "id": "note_146", "text": "\"IT'S BURIED! THE TEMPLE IS BURIED!\"" }, - { - "id": "note_147", - "text": "\"If I had a dollar for every cash card I've found, I'd have more money than is on these stupid things!\"" - }, - { "id": "note_148", "text": "\"can never have enough kevlar. basically just live in a kevlar turtle shell.\"" }, - { "id": "note_149", "text": "\"MY GLITTERING SNAKE COMPELS YOU! OBEY!\"" }, - { - "id": "note_150", - "text": "\"can sunstasin self frorever off fof my funggnaloid babiues oout fo yme arms eat themm up eatbtb my chidlldren\"" - }, - { - "id": "note_151", - "text": "\"Gonna settle down one day. Nice big orchard, couple of friends/future family to spend time with, and my army of zlaves to guard the place.\"" - }, - { "id": "note_152", "text": "\"a ctulaly don t mi nd t he cold it s f i ne in h ere nn o problem\"" }, - { - "id": "note_153", - "text": "\"tried to shoot myself but the nanobots fixed it, fucked up the controls, now i can't turn them off i just want it to be over\"" - }, - { - "id": "note_154", - "text": "\"Tried wearing dead zombie clothes, but they still knew I was alive! It's like they're a hivemind, man!\"" - }, - { - "id": "note_155", - "text": "\"riddle. what's 1/4 feathers, 1/4 scales, 1/4 metal, and 1/4 flesh? answer: sorry, but you should know this one.\"" - }, - { - "id": "note_156", - "text": "\"For anyone that's reading this, I just want to confirm (FROM AN UNBIASED SOURCE) that it was NOT the scientists' fault.\"" - }, - { - "id": "note_157", - "text": "\"We're the eagle-eyes in the sky! Just two mutant avians in our helicopter! Filming the Cataclysm! Check us out on any working electronics!\"" - }, - { "id": "note_158", "text": "\"WE'RE GOING TO SAIL TO CANADA, BITCHES!\"" }, - { - "id": "note_159", - "text": "\"Anyone hear about that guy who tried to sail his family to Canada? What a moron, right?\"" - }, - { "id": "note_160", "text": "\"recently canadian border has gotten more dangerous don't go there\"" }, - { "id": "note_161", "text": "\"Hey, what happened to my dad's airboat?!\"" }, - { "id": "note_162", "text": "\"Reading is good! Never stop reading. Read EVERYTHING.\"" }, - { - "id": "note_163", - "text": "\"I'm gonna be honest here, I'm really gonna die soon so I dont want to gt forgnottedn ples dont forntget me y nrmmy name is h@@hbhbh\"" - }, - { "id": "note_164", "text": "\"all it takes to seal a wound is a sawblade and a match! trust me\"" }, - { - "id": "note_165", - "text": "\"I wonder what's in this sarcophagus? Maybe it's a real sarcophagus. Maybe there's a big guy named God under here.\"" - }, - { "id": "note_166", "text": "\"these hulks aint so incredible when ya got .50\"" }, - { - "id": "note_167", - "text": "\"WBLF 970 went off-air three days ago. There's nobody left on the radio. Might as well throw this thing away…\"" - }, - { - "id": "note_168", - "text": "\"I've heard it's safer across the Mississippi. Going to start driving today. If you're reading this, pray for me\"" - }, - { "id": "note_169", "text": "\"Mi-go is friend! Go with Mi-go to friend dimension! On the Friend Team!!\"" }, - { "id": "note_170", "text": "\"We have Landed our Comet. The Sky is Ablaze.\"" }, - { - "id": "note_171", - "text": "\"Last one standing. It's good feeling. I win. I win I win I win I win I win\"" - }, - { "id": "note_172", "text": "\"Adderall cures weakness, tramadol cures death\"" }, - { "id": "note_173", "text": "\"These turrets keep dodging my FUCKING BULLETS!\"" }, - { "id": "note_174", "text": "\"Best way to train is by throwing pebbles at birds. You'll be a legend.\"" }, - { "id": "note_175", "text": "\"new bedford is overrun. i'm sorry. we tried.\"" }, - { - "id": "note_176", - "text": "\"Check out my cooking show on The Television! Making Mannwurst sausages out of some of those assholes who tried to raid my kitchen earlier…\"" - }, - { - "id": "note_177", - "text": "\"Renting out my rat tunnels for 50 9mm rounds a night. I dug them with my own claws, so you know they're the best.\"" - }, - { - "id": "note_178", - "text": "\"Anyone wanna listen to some music at full volume and shoot the Zs that approach? You pick the tunes if I get some ammo.\"" - }, - { - "id": "note_179", - "text": "\"Lots of new easy ways to burn calories now. Fighting aminata, managing the fields, running with my wings buzzing, and more.\"" - }, - { "id": "note_180", "text": "\"FLAMING SWORD HUMANE. CAUTERIZES WOUNDS. SURGICAL.\"" }, - { "id": "note_181", "text": "\"knife screams it screams i cant breathe so scared help me please help\"" }, - { "id": "note_182", "text": "\"when it started, we could still hope The Man was gonna save us…\"" }, - { - "id": "note_183", - "text": "\"Hey, Ted. Alexander and Cass and I are heading to Z-Mobile for the last of the meth. Keep the lizard fetus fed for us, OK?\"" - }, - { - "id": "note_184", - "text": "\"i say we call the material from melting down cars and dead robots 'massachusetite' or 'vermontsteel' or 'connecticut composite'\"" - }, - { - "id": "note_185", - "text": "\"Sometimes what you need when you're infected, bleeding, sick and hungover is a J and some chips.\"" - }, - { - "id": "note_186", - "text": "\"This has to be China's fault. Seriously, why is nobody suspecting the people we're having a cold war with! This is an invasion! These aren't zombies, it's just camoflauge! WAKE UP, SHEEPLE!\"" - }, - { - "id": "note_187", - "text": "\"Hahahahaa stupid fuck in his mansion, with his plate armor and big axe. Guy never swung the thing in his life. Can't block bullets, dipshit\"" - }, - { - "id": "note_188", - "text": "\"I woke up with a dozen bears in a tribe outside the vault. One was covered in red markings, glowing-- speaking.\"" - }, - { - "id": "note_189", - "text": "\"poor guy. watched him from afar with my binocs for months and months. today he died fighting. feels like i knew him even though i never approached.\"" - }, - { "id": "note_190", "text": "\"ENGLAND DID THIS\"" }, - { - "id": "note_191", - "text": "\"That little fakkin rat din say anythin till we whacked him with a steel chain! Then 'e just wanted to know if he could buy the chain!\"" - }, - { "id": "note_192", "text": "\"tom, adorned with fluid sacs three layers deep, crawls to safety like a slug\"" }, - { - "id": "note_193", - "text": "\"my friend turned fuckin insane and ate his arms and then his sister's arms! he looked rather cross\"" - }, - { "id": "note_194", "text": "\"Starting today, the hallucinations are my only friends.\"" }, - { "id": "note_195", "text": "\"For sale: zombaby shoes, very filthy\"" }, - { - "id": "note_196", - "text": "\"Started my own brewery recently. I just need some glass bottles, now! Several thousand! I'm planning way ahead.\"" - }, - { - "id": "note_197", - "text": "\"Heard recently of some radio op who lives in a skyscraper, announcing where those hordes are going. Couldn't find the frequency, though.\"" - }, - { "id": "note_198", "text": "\"Woah, bud! Not all cannibals eat meat!\"" }, - { "id": "note_199", "text": "\"ay why aint my bullets fuckin explodin\"" }, - { "id": "note_200", "text": "\"Those Fiktok clan people picked this place clean… no food…\"" }, - { "id": "note_201", "text": "\"The fewer people in New England, the stronger we'll become.\"" }, - { "id": "note_202", "text": "\"It all boils down to the Apex Predator.\"" }, - { - "id": "note_203", - "text": "\"King Jameson ik goner! Thee cyber limbs isk falleng off me body! Stak pyroteknik I heear!\"" - }, - { "id": "note_204", "text": "\"Got my mortar and pestle. Now if I could just find some avocados…\"" }, - { - "id": "note_205", - "text": "\"saw a girl standing with the mushrooms. spores coming out of slits in her neck. she looked happy.\"" - }, - { - "id": "note_206", - "text": "\"Found some pink berries. Eating them makes bushes into more pink berries. Infinite berry.\"" - }, - { "id": "note_207", "text": "\"m ust grow unity\"" }, - { "id": "note_208", "text": "\"AMY IS FUNGUS. DO NOT LISTEN IF SHE ASKS YOU TO TAKE OFF MASK\"" }, - { - "id": "note_209", - "text": "\"my rabbi follows a new god now. asks us to call him a local guide. i dont mind, he keeps us fed\"" - }, - { "id": "note_210", "text": "\"Fungus are helping us. Help them and they will unite us\"" }, - { - "id": "note_211", - "text": "\"Saw a boy couldnt be older than 16. Walked straight through the mushroom tower. THROUGH IT\"" - }, - { - "id": "note_212", - "text": "\"Found some food in a box outside my house. We ate it and now the fungaloids aren't harming us. I think we are a mushroom now\"" - }, - { - "id": "note_213", - "text": "\"saw the girl again. she looked dead exhausted and walked right into the fungus. 30 mins later and she walked out good as new\"" - }, - { "id": "note_214", "text": "\"HADENSBROOK REBUILT AROUND FUNGUS. THEY EAT GRAY APPLES AND SPREAD IT\"" }, - { "id": "note_215", "text": "\"mycus must grow\"" }, - { - "id": "note_216", - "text": "\"School bus with solar panels = TRUST. Gave us berries and seeds, we were out of food\"" - }, - { - "id": "note_217", - "text": { "str": "\"d o nThelp scho Ol buss makE seeeedS ARe FUNGUS!! !\"", "//NOLINT(cata-text-style)": "intentional format" } - }, - { - "id": "note_218", - "text": "\"Go to every fungus patch you find but WEAR A SUIT. Food there is very very filling. Look for pink berries, blue flowers\"" - }, - { "id": "note_219", "text": "\"red blue yellow berry seed sap bloom flowers tower mycus mycus mycus.\"" }, - { - "id": "note_220", - "text": "\"Husband 30 yrs died in bombs. Mushrooms brought him back. GIVE YOURSELF TO THEm AND THEY WILL HELP YOU\"" - }, - { - "id": "note_221", - "text": "\"Lisa always was a fan of sports. Thank God these Global Athletics Games in Harran started some time before the outbreak, so she was able to leave New England before it was quarantined. I can only hope there are no zombies, as we do have here, in the city she flew to.\"" - }, - { - "id": "note_222", - "text": "\"Don't mix powders, them books said. Do Not Mix powders. Didn't listen did I. Blew my goddamn pinky off, near lost my right eye.\"" - }, - { - "id": "note_223", - "text": "\"followed what toby wrote down. shells looked like theyd hold more, I put in some more. traded most to h raiders for crank. shot my 38 today and it fuckn exploded. low on crank, good as dead, no gun, no toby. headed to montreal real sorry bout the bullets\"" - } - ] - }, - { - "type": "snippet", - "category": "newest_news", - "text": [ - { - "id": "newest_news_1", - "text": "LABS BOMBED: In an apparent foreign attack (contradicting earlier Department of Defense denials of the disaster being caused by Chinese aggression) most of New England's scientific labs were bombed simultaneously yesterday. A statement from the Pentagon has been issued, stating the strikes were the result of Chinese opportunism during the national crisis, and assured that action would be taken in kind against the aggressors." - }, - { - "id": "newest_news_2", - "text": "RIOTS GROWING?: Communications were muddled by a large influx of aggressive armed individuals. \"We have this under control,\" says a local police chief. \"We are authorizing our robotic security drones to use lethal force on combative humans.\"" - }, - { - "id": "newest_news_3", - "text": "RIOTERS NOT HUMAN?: An earlier command by regional police has backfired. \"The hooligans don't register as human.\" says a local police chief. \"The securibots turned on us when we tried to fight them. We don't have enough people left to reprogram them.\"" - }, - { - "id": "newest_news_4", - "text": "GENETIC MODIFICATIONS?: Eyewitnesses from the New England Disaster Area have claimed that the infected are displaying inhuman qualities. \"I swear to God, one of them was the size of a tree!\", said one panicked survivor. There are also reports of infected with acidic and/or electric properties." - }, - { - "id": "newest_news_5", - "text": "SUPER-SOLDIERS DEPLOYED: General Westinghouse released a statement today that elite troops equipped with top-of-the-line experimental combat bionics have been deployed via helicopter into the New England Disaster Area. \"Through the strength of American technology and American soldiers, we will fix this disaster!\"" - }, - { - "id": "newest_news_6", - "text": "PUBLIC SERVICE ANNOUNCEMENT: \"Aid Delayed\". Fighting by the military at the edge of the New England Disaster Area is expected to delay civilian extraction. Civilians will be forced to supply themselves over the next weeks." - }, - { - "id": "newest_news_7", - "text": "PUBLIC SERVICE ANNOUNCEMENT: \"New England Cut Off\". New England has been quarantined for the safety of the rest of the USA. No rescue attempts will be funded; it is assumed there are no survivors in the area." - }, - { - "id": "newest_news_8", - "text": "LEAVE TO THE EXPERTS -- GENERAL: \"Do not attempt to deal with infected yourself, our troops have the technology and the training for military action. Loud gunfire may attract more hostile attention than you have ammo!\"" - }, - { - "id": "newest_news_9", - "text": "TOWNS OCCUPIED TERRITORY: FEMA officials said today \"Do not try to defend your property in towns: hostiles use advanced tracking, perhaps scent. Please retreat to your nearest evacuation center outside town and await extraction.\"" - }, - { - "id": "newest_news_10", - "text": "EDITOR SAYS \"DESTROY THE DEAD\". Recognizable dead left lying in the street may be dangerous! If you kill a hostile, smash or butcher with a knife until unrecognizable! The Geneva Conventions don't apply to civilians!" - }, - { - "id": "newest_news_11", - "text": "THEY'RE NOT RIOTS!: According to head officials at the Centers for Disease Control, autopsies of rioters in New England have shown massive pathological infection, possibly causing hyper-aggression, disregard for personal harm, and a severely-impaired ability for higher reasoning." - }, - { - "id": "newest_news_12", - "text": "SOLDIERS SEEN HEADED UNDERGROUND. Rumors abound as eyewitness see troops headed underground near a local salon. Expert sources suggest that the soldiers may be headed to a possible underground bunker." - }, - { - "id": "newest_news_13", - "text": "A BRIDGE TOO FAR: In a Monday statement, the Department of Defense detailed its plans to deploy strategic minefields on key bridge crossings, in order to quarantine infected regions. \"Military personnel will be on-site to assist any refugees fleeing the infected zones. We urge citizens to comply with all military directives and avoid quarantined areas whenever possible until order can be restored.\"" - } - ] - }, - { - "type": "snippet", - "category": "many_years_old_news", - "text": [ - { - "id": "many_years_old_news_1", - "text": "QUANTUM LEAP: An undisclosed DARPA project has yielded results in the form of theoretical teleportation. \"This is just the tip of the iceberg,\" said an anonymous source. \"I can't disclose, but this development is the LEAST in this exciting vein!\"" - }, - { - "id": "many_years_old_news_2", - "text": "SECURIBOTS: Keeping your home safe, ready the second the alarm goes off… Who needs people?" - }, - { - "id": "many_years_old_news_3", - "text": "ROBOCOP BEATS CRIME: Due to the common usage of Securibots and their ability to respond more rapidly than people, crime is down 54% and dropping. Police chief says \"Don't trip an alarm and you have nothing to worry about\"" - }, - { - "id": "many_years_old_news_4", - "text": "ROBOT RAMPAGE: Three Protesters injured when surrounding a Military base, protesting automated turrets which put guards out of jobs. \"We warned them, turrets will open fire on anyone without a military ID,\" a general said." - }, - { - "id": "many_years_old_news_5", - "text": "US IGNORES UN DEMANDS: The US ambassador to the UN today turned down UN requests to begin mutual nuclear disarmament of China, the US and North Korea. \"We have a right to defend ourselves,\" insisted the ambassador. \"We'll back down when they do\"." - }, - { - "id": "many_years_old_news_6", - "text": "A WHOLE NEW YOU! Augment your world with CBMs! This ad features a man covered in glowing tattoos with a miniature flashlight in the middle of his head. He's waving at the reader; all of his fingertips are Allen wrenches." - }, - { - "id": "many_years_old_news_7", - "text": "The Future… powered by COFFEE! Rivtech brings you the greatest revolution since espresso. Why wait for milk to boil? Have your coffee ready instantly with \"THE POWER OF THE ATOM\"!" - }, - { - "id": "many_years_old_news_8", - "text": "GLAMOPOLITAN! We've got ALL the latest tips! Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine! So pick up a copy today and \"Sizzle Like A Star\"!" - }, - { - "id": "many_years_old_news_9", - "text": "POPULAR MECHANICS: People say mechanics is boring. We say, prove them wrong! We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!" - }, - { - "id": "many_years_old_news_10", - "text": "CRAFTY CRAFTERS QUARTERLY: Macaroni isn't just for eating anymore! Learn how to make jewelery and art from it as well! We also discuss the correct way to use superglue without gluing your hands together!" - }, - { - "id": "many_years_old_news_11", - "text": "UNDERGROUND BUNKER? Sources in the government suggest that underground bunkers are being built in a secret location in case of enemy attack. We were unable to get the exact location as our sources mysteriously disappeared shortly after revealing this information." - }, - { - "id": "many_years_old_news_12", - "text": "STUDENT MISSING: A high school student vanished yesterday evening in the forest near Wayland. The 17-year-old international student from China (who adopted the anglicized nickname \"Brett\" due to his classmates' difficulty pronouncing his given name) was last seen with his friends in the camp. \"Brett said that he was gonna get some firewood but he never came back,\" said his classmate, Jianxiang Wang. The search is underway." - }, - { - "id": "many_years_old_news_13", - "text": "STILL SEARCHING: The search for Brett, the high school student who went missing three days ago, is still ongoing. \"He could have played in the soccer game against Weston High School yesterday,\" Brett's sorrowful teammate said, \"[..] we've never stopped praying.\" Despite the best efforts of the County Search & Rescue, Brett had still not been located at the time of this report." - }, - { - "id": "many_years_old_news_14", - "text": "RUMORS DENIED: Allegations that DARPA had been conducting teleportation experiments in secret just outside Wayland were put to rest during a press conference earlier today. \"I have to clarify that not only have we never done such research,\" said the officer on the press conference, \"teleportation only exists in sci-fi films.\"" - } - ] - }, - { - "type": "snippet", - "category": "years_old_news", - "text": [ - { - "id": "years_old_news_1", - "text": "GOVERNMENT SCIENCE BOOST: The government has drastically increased defense R&D after UN disarmament demands. \"This not only keeps money in our country, but maintains our lead on China and keeps us defended\", the President said." - }, - { - "id": "years_old_news_2", - "text": "HOME GROWN SCIENCE: Several governors & legislators from the New England region discussed a new regional initiative today, which relaxed laws that limit the distance a hazardous-material laboratory or factory can be from a city. \"This should keep our economy going strong for years to come, with all the military R&D facilities being established,\", one mayor remarked." - }, - { - "id": "years_old_news_3", - "text": "DRIVING ON A WING AND A PRAYER: A New England man has proven it is possible to create a new car from scrap parts using almost nothing but duct tape. When asked why he had done it, his answer was \"Well, I didn't have a welder.\"" - }, - { - "id": "years_old_news_4", - "text": "NEVER BE LEFT IN THE DARK! Rivtech Atomic-nightlight uses \"inexhaustible\" plutonium fuel cell, provides light, feeds power back into your grid!" - }, - { - "id": "years_old_news_5", - "text": "Sick of FUEL PRICES? Bus stop too far? Get your driving fix from THE SUN! Solar powered electric cars: Silent, Cheap, Powerful." - }, - { - "id": "years_old_news_6", - "text": "Coffee of The Future… RIGHT NOW! No one has really has the time to make great coffee, but now you don't have to! Rivtech gives you inexhaustible ATOMIC power! To make boiling hot coffee the MINUTE you want it! Atomic Coffeemaker." - }, - { - "id": "years_old_news_7", - "text": "GLAMOPOLITAN! We've got ALL the latest tips! Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine! So pick up a copy today and \"Sizzle Like A Star\"!" - }, - { - "id": "years_old_news_8", - "text": "POPULAR MECHANICS: People say mechanics is boring? We say, Prove them Wrong! We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!" - }, - { - "id": "years_old_news_9", - "text": "BIRDHOUSE MONTHLY… This month we look at some Dutch innovations in birdhouse design, and compare with the often confused Scandinavian Birdhouse design. Our article on sheet metal birdhouses will have you riveted!" - }, - { - "id": "years_old_news_10", - "text": "TECHWORLD NEWS: Toy company at the origin of the successful talking doll rebrands and becomes Uncanny. Uncanny plans to bring their expertise to the field of androids. Unconfirmed rumors suggest that Uncanny has already recieved large orders from the government." - } - ] - }, - { - "type": "snippet", - "category": "one_year_old_news", - "text": [ - { - "id": "one_year_old_news_1", - "text": "READY FOR THE WORST: The government has proven it is ready to deal with China's threats. In the event of an actual attack, we have established evacuation centers, within a short distance of most towns." - }, - { - "id": "one_year_old_news_2", - "text": "MUTANT COLD: A new cold virus has emerged in the New England area. \"There don't appear to be complications, but many sufferers are dealing with sudden muscle weakness and a greater-than-normal amount of lethargy from this virus,\" said a doctor. \"In addition, it's been documented to last up to ten days.\"" - }, - { - "id": "one_year_old_news_3", - "text": "GRAVE BUSINESS: Recent reports show a large spike in thefts from and assaults on funeral homes in the last few weeks. Described as highly strange but not especially dangerous, Homeland Security is \"looking at the connections now.\"" - }, - { - "id": "one_year_old_news_4", - "text": "SPACE TELEPORTATION - TRUTH OR FICTION? Scientists addressed a growing conspiracy theory today \"The plutonium consumed is massive. We could never use teleportation to reach aliens, unless they live on some kind of parallel world.\"" - }, - { - "id": "one_year_old_news_5", - "text": "LASERS - NEXT BIG THING?: Top defense researchers remarked during demonstration of a prototype today: \"We are still working on it, the laser weapon lacks power, but has a technically almost unlimited range,\" one said" - }, - { - "id": "one_year_old_news_6", - "text": "DRUG USE ON THE RISE: Recent statistic suggest drug use in New England has climbed more than 20% in the last two years. \"People are scared for their jobs, their country, even their life… of course some will turn to drugs,\" said an expert." - }, - { - "id": "one_year_old_news_7", - "text": "FEELING BLUE? Try \"Greens\" for Magazines! Your local Supermarket! Nothing cheers you up like a good magazine… Unless it's JUNK FOOD! Or why not buy an MP3 PLAYER or a GAME CONSOLE? Chase those blues away at GREENS Supermarket" - }, - { - "id": "one_year_old_news_8", - "text": "GLAMOPOLITAN! We've got ALL the latest tips! Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine! So pick up a copy today and \"Sizzle Like A Star\"!" - }, - { - "id": "one_year_old_news_9", - "text": "POPULAR MECHANICS: People say mechanics is boring? We say, Prove them Wrong! We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!" - }, - { - "id": "one_year_old_news_10", - "text": "BIRDHOUSE MONTHLY… Which wood would a woodpecker prefer? This month we discuss hardwood versus soft woods, whether to lacquer, oil or paint, and which type of nails you should use!" - }, - { - "id": "one_year_old_news_11", - "text": "TECHWORLD NEWS: Uncanny unveils its new product - the Grocery Bot! Thousands of else-if statements, pre-recorded voice from professional actors, what more does this adorable android hides under its smiling face? Our expert got the answer for you!" - }, - { - "id": "one_year_old_news_12", - "text": "…What do you know about surviving in the Wilderness? If you can't make a snare you don't know TRAP! Hunt down a copy of TRAPPERS' LIFE and learn about wildlife!… And how to kill it. This week, a CROSSBOW TRAP!" - }, - { - "id": "one_year_old_news_13", - "text": "NEW LAB OPENS: The H.R. Bennett Research Facility has been officially opened by the Department of Energy. According to Deputy Secretary of Energy Randall Balakrishnan, \"This facility is one of the most state-of-the-art in the world. With the opening of the H.R. Bennett research complex, New England's future is looking brighter than ever.\"" - } - ] - }, - { - "type": "snippet", - "category": "months_old_news", - "text": [ - { - "id": "months_old_news_1", - "text": "SUPPORT THE COUNTRIES THAT SUPPORT YOURS - PRESIDENT: Unexpectedly and unpopularly, the president today suggested the possible institution of a peacetime draft in response to increasing Chinese aggression towards Taiwan and the Philippines. \"We must pray for the best while preparing for the worst. We cannot abandon key allies in the face of Chinese bullying.\"" - }, - { - "id": "months_old_news_2", - "text": "EVACS UNSTOCKED: TRUTH OR FICTION? An unidentified government source has suggested that the evacuation centers are unstocked, having \"already accomplished the goal of calming the people\". He later retracted the comment and is unable to be contacted." - }, - { - "id": "months_old_news_3", - "text": "NEW WEAPON UNVEILED: Defense today lifted the lid on a long held secret project. \"We can't discuss the specifics, but it generates a burst of plasma which accurately follows a path of laser-heated air,\" according to a Pentagon official." - }, - { - "id": "months_old_news_4", - "text": "UFO CRASH: TRUTH OR FICTION? One civilian account claims a shining disk appeared in his field. \"It kind of glowed, and I could see a strange gray world through it. Then a shambling hazy purple mushroom came through, man.\"" - }, - { - "id": "months_old_news_5", - "text": "TIME TRAVEL: TRUTH OR FICTION? Leaked federal documents describe the formation of a new federal agency called XEDRA, to oversee \"4th Axis technology\" already in use. Our expert's opinion suggests time-travel or parallel worlds. The meaning of the acronym is currently unknown." - }, - { - "id": "months_old_news_6", - "text": "…What do you know about surviving in the Wilderness? If you can't make a snare you don't know TRAP! Hunt down a copy of TRAPPERS' LIFE and learn about wildlife!… And how to kill it. Classic BEAR TRAP returns in this issue!" - }, - { - "id": "months_old_news_7", - "text": "HUNTING GOODS! Food prices getting you down? Why not get a crossbow or compound bow and Hunt Your Own!? Our arrows and bolts are completely reusable, so why not hunt animals like Mother Nature intended?" - } - ] - }, - { - "type": "snippet", - "category": "weeks_old_news", - "text": [ - { - "id": "weeks_old_news_1", - "text": "MYTH DEBUNKED: DEAD ARE STAYING DEAD: Stories about the dead rising \"are completely unfounded.\", a general said today. \"It's an obvious hoax by people just looking for five minutes of fame, or to scare people in these uncertain times. After all, remember the clown thing a few years ago?\"" - }, - { - "id": "weeks_old_news_2", - "text": "GENERAL SAYS AVOID BUNKERS: Do not attempt to flee to your nearest military bunker! Understaffed bunkers are defended by turrets, which will shoot those without proper registration. Please seek military personnel if you need access." - }, - { - "id": "weeks_old_news_3", - "text": "VIOLENCE OUTBREAKS CAUSED BY \"NEW DRUG\": Rumors of riots were quelled today. \"These are isolated incidents\" said a local police chief. \"The violence is random and senseless, our current theory is contamination in a new street drug.\"" - }, - { - "id": "weeks_old_news_4", - "text": "ZOMBIE DRUG? A controversial blogger suggested the recent riots are a chemical attack by China in her latest podcast. \"They're jealous of our cybernetic superiority, so they teamed up with Haiti to put hoodoo drugs in the water making people zombies!\"" - }, - { - "id": "weeks_old_news_5", - "text": "PICKLED MEAT IN A JAR! Just like your grandma used to make! It will last for months or longer, and when you've eaten it, you can refill and seal the jar! Stock your emergency supply TODAY!" - }, - { - "id": "weeks_old_news_6", - "text": "BAGS, BAGS, BAGS! They're very useful things! If we didn't have BAGS, what-would-we-use… to PUT a lot of things in!? (Ad by the \"Play SchoolClothing Co.\")" - }, - { - "id": "weeks_old_news_7", - "text": "GLAMOPOLITAN! We've got ALL the latest tips! Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine! So pick up a copy today and \"Sizzle Like A Star\"!" - }, - { - "id": "weeks_old_news_8", - "text": "POPULAR MECHANICS: People say mechanics is boring? We say, Prove them Wrong! We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular\"!" - }, - { - "id": "weeks_old_news_9", - "text": "BIRDHOUSE MONTHLY… Which wood would a woodpecker prefer? This month we discuss hardwood versus soft woods, whether to lacquer, oil or paint, and which type of nails you should use!" - }, - { - "id": "weeks_old_news_10", - "text": "FEELING BLUE? Try \"Greens\" for Magazines! Your local Supermarket! Nothing cheers you up like a good magazine… Unless it's JUNK FOOD! Or why not buy an MP3 PLAYER or a GAME CONSOLE? Chase those Blues away at GREENS Supermarket" - } - ] - }, { "type": "snippet", "category": "necropolis_intro", diff --git a/data/json/snippets/survivor_notes.json b/data/json/snippets/survivor_notes.json new file mode 100644 index 0000000000000..9d6f3592f0f74 --- /dev/null +++ b/data/json/snippets/survivor_notes.json @@ -0,0 +1,586 @@ +[ + { + "type": "snippet", + "category": "note", + "text": [ + { "id": "note_1", "text": "\"WE WERE RIGHT THE GOVERNMENT DID IT\"" }, + { + "id": "note_2", + "text": "\"Have seen a zombie making its kin raise even despite damage that normally would take them down, the air around it shimmered like around that hole in the air we've seen creatures coming through back home\"" + }, + { "id": "note_3", "text": "\"I shot the sheriff; but I couldn't find the deputy\"" }, + { + "id": "note_4", + "text": "\"Some plant vines started chasin after me, so I took a gas mask and some teargas and I ran through them.\"" + }, + { "id": "note_5", "text": "\"Slingshot right through the windshield k?\"" }, + { + "id": "note_6", + "text": "\"When I was a kid I used to slingshot at bugs and birds. Its really playing off nowadays, Ill tell you what\"" + }, + { + "id": "note_7", + "text": "\"ALL YOU STONERS WITH YOUR VIDEYA GAMES - I BET YOU WISH YOU TOOK THE TIME TO LEARN A SKILL NOW DONTYA\"" + }, + { "id": "note_8", "text": "\"I tried to be a bard, but the rats didn't like my piping.\"" }, + { + "id": "note_9", + "text": "\"I found a chocolate bar on my pillow when I got home last night. I left and don't wanna go back.\"" + }, + { + "id": "note_10", + "text": "\"this demon thing came after me it got me good i shot it but i dont know if ill make it\"" + }, + { + "id": "note_11", + "text": "\"DANNY IF YOU READ THIS THIS IS CLARA WE'RE ALL OKAY AND WE'RE HEADING TO THE RIVER. A BOAT SAID THEY WERE DOCKED NEARBY.\"" + }, + { + "id": "note_12", + "text": "\"When I think of all the dead people I get mad, because I was supposed to be the next big leader. WHERES MY CHANCE!??\"" + }, + { "id": "note_13", "text": "\"A man in a black robe came up to me, said he wanted to make a deal…\"" }, + { + "id": "note_14", + "text": "\"Cha-cha-cha-chia! Saw a woman today, with fungus coming out her head like hair tendrils.\"" + }, + { + "id": "note_15", + "text": "\"The damn autodoc overrides wouldn't work and I didn't have my hospital ID. I couldn't save them alone.\"" + }, + { + "id": "note_16", + "text": "\"Save the cyborgs! Please, whoever reads this, you must help them! Knock them out or deactivate them, I don't care how you do it. But put their unconscious body on that Autodoc and remove the chip that is messing up their brain!\"" + }, + { + "id": "note_17", + "text": "\"Gotta slow down, man. I don't think we spend more than 20% of our time fightin', Put some Marley on and take off that racketus tripcore nonsense, man.\"" + }, + { "id": "note_18", "text": "\"I kept shooting with my handgun, but I never got any better!\"" }, + { + "id": "note_19", + "text": "\"ITS OKEY GUYS! I BARRYED A TIME CAPSUL IN MY BACKYARD! I PUT IN SOME HOEHOES.\"" + }, + { + "id": "note_20", + "text": "\"I got my tinfoil hat on. Good thing too, cause this monster was starrin at me kinda funny, trying to freeze my mind in place.\"" + }, + { "id": "note_21", "text": "\"You want my advice? Smoke crack, it gets shit done.\"" }, + { + "id": "note_22", + "text": "\"ALWAYS WITH THE EFFICIENCY GUYS; YOURE ALWAYS WORKING TO GO HOME TO PAY RENT TO SLEEP TO WAKE UP TO WORK AGAIN. STOP\"" + }, + { "id": "note_23", "text": "\"IM OFF TO THUNDERDOME, BYE SUCKERS.\"" }, + { + "id": "note_24", + "text": "\"If you get a parasite, take some sand and some vodka. Rub the sand into the afflicted area, real good too; like you're washing your hair. Then rinse with vodka.\"" + }, + { + "id": "note_25", + "text": "\"I put my toilet water into a gastank. Then I poured it into a glass cup. Then I drank it without vomiting my insides back into the toilet.\"" + }, + { "id": "note_26", "text": "\"This isn't real this is a test to turn you into a Manchurian Candidate!\"" }, + { + "id": "note_27", + "text": "\"They're all hiding on an oil rig, I heard it myself over the AM airwaves. They think they're the nobles of the 21st century, the prigs.\"" + }, + { + "id": "note_28", + "text": "\"Some of 'em are big. Real big. Don't stick around, I saw my mate get fucking torn in half!\"" + }, + { "id": "note_29", "text": "\"po p y fl ow er s don t ea at them\"" }, + { + "id": "note_30", + "text": "\"Some guy is walking through the horde without a scratch. Please tell me they're docile now. Please fucking tell me.\"" + }, + { "id": "note_31", "text": "\"Why are all the lawnmowers broken?!\"" }, + { + "id": "note_32", + "text": "\"Some of the bridges, they're right next to each other, right? If you see something up ahead one of those, just careen through to the other side. My van was long enough to bridge right across!\"" + }, + { "id": "note_33", "text": "\"BURN BURN BURN BURN BURN ALL BURN ALL BURN ALL BURN\"" }, + { + "id": "note_34", + "text": "\"I took all the supplies. Don't follow me. I'm sorry, man. I have to look out for myself now.\"" + }, + { "id": "note_35", "text": "\"My next-door neighbor had a katana in his basement!\"" }, + { "id": "note_36", "text": "\"Am I the last one alive?\"" }, + { + "id": "note_37", + "text": "\"Boyfriend stole my pistol while I was asleep. I locked him in the bathroom and set the house on fire. At least he attracted their attention.\"" + }, + { "id": "note_38", "text": "\"I get air conditioners, but… this whole place is frozen to ice!\"" }, + { + "id": "note_39", + "text": "\"A wood ax works pretty well against them. So does a machete, but you can't cut down a tree.\"" + }, + { + "id": "note_40", + "text": "\"Why would you hide in a farm? Sure, it's isolated, but if they know where you are, you don't exactly have cover on all sides.\"" + }, + { "id": "note_41", "text": "\"Imagine if this spread to, like, Australia. Zombie kangaroos. Haha…\"" }, + { + "id": "note_42", + "text": "\"how DO I use THESE bionic THINGS? I just STUCK the wires IN my WRIST and now I CAN'T STOP twitching. AND now my LEG hurts! Is THAT acid?!\"" + }, + { + "id": "note_43", + "text": "\"I tried playing memorial music for my dead brother, on a radio. They must have been attracted to it. I can't see his grave through the crowd anymore.\"" + }, + { + "id": "note_44", + "text": "\"Took a picture of a dead dog leaping right onto a soldier. Sweet fucking shot!\"" + }, + { "id": "note_45", "text": "\"Gas mask is nice and all, but I can hardly run with it on.\"" }, + { + "id": "note_46", + "text": "\"They set up the roadblock guns to run automatically. TV said those fuckin things needed a human to keep em safe, they ain't safe now.\"" + }, + { + "id": "note_47", + "text": "\"The evac shelters are a death trap. They took everyone else away but something in the driver's eyes told me not to go. Now it's just me.\"" + }, + { + "id": "note_48", + "text": "\"I made mushroom babies. My arms hurt. I hurt. I had mushroom babies. They are growing now.\"" + }, + { "id": "note_49", "text": "\"It doesn't matter how you die. You're gonna turn into one of them.\"" }, + { "id": "note_50", "text": "\"WHY DO ALL THE DEAD CHILDREN GO TO SCHOOL\"" }, + { "id": "note_51", "text": "\"Don't keep your goddamn casings! They'll just weigh you down.\"" }, + { + "id": "note_52", + "text": "\"Local auto shop is full of the things. And to think I worked with them on repairing cars… now they're just… fucking corpses.\"" + }, + { "id": "note_53", "text": "\"DON'T EAT THE SLIME DON'T EAT THE SLIME DON'T EAT THE SLIME\"" }, + { + "id": "note_54", + "text": "\"I used to be human. But… my arms… they are like tentacles. I slither along akin to a snail and I shed my feathers every day.\"" + }, + { + "id": "note_55", + "text": "\"Killed a giant worm thing, but now I'm only three feet tall. Should've just left the damn worm alone, now none of my clothes fit!\"" + }, + { "id": "note_56", "text": "\"I don't have enough time to double tap. You don't either.\"" }, + { "id": "note_57", "text": "\"PINK TALL ONES RUN RUN RUN RUN RUN\"" }, + { "id": "note_58", "text": "\"Are they still human inside?\"" }, + { "id": "note_59", "text": "\"the eye it watches me it follows me everywhere help\"" }, + { "id": "note_60", "text": "\"tHE Portal it's so COld\"" }, + { + "id": "note_61", + "text": "\"They build modern bullets fuckin crazy. Set some on fire and they all goes like a lil grenade. Need kindling first.\"" + }, + { "id": "note_62", "text": "\"GOD CAN'T SAVE US\"" }, + { "id": "note_63", "text": "\"SHOOT YOURSELF, LET IT END QUICKLY\"" }, + { + "id": "note_64", + "text": "\"There are five basic rules to survival. One, stay prepared and watchful. Two, keep your iron sights lined up or succumb. Three, stay FAR WAY from all\"" + }, + { + "id": "note_65", + "text": "\"The bricks of this bathroom look like a face. Haha… it's all I can focus on. At least let me shit before you break down the door. Please…\"" + }, + { "id": "note_66", "text": "\"What the hell are they mining for in these shafts?\"" }, + { "id": "note_67", "text": "\"I am one with the plants.\"" }, + { "id": "note_68", "text": "\"Broadsword! Yeah!\"" }, + { + "id": "note_69", + "text": "\"If you see a trail of dirt getting displaced in your direction… run. Run for your life.\"" + }, + { "id": "note_70", "text": "\"DINT ATE THE MUSHROM\"" }, + { "id": "note_71", "text": "\"Libraries are useless after the apocalypse.\"" }, + { + "id": "note_72", + "text": "\"I swear to God I've seen these plant things before! In a book, or something! I swear…\"" + }, + { "id": "note_73", "text": "\"Is robbing a bank easier or harder now that all the guards are undead?\"" }, + { "id": "note_74", "text": "\"Make sure your car is REALLY stopped before you get out.\"" }, + { + "id": "note_75", + "text": "\"I found some kind of stone pyramid with spikes. I feel… I feel like I'm being watched.\"" + }, + { + "id": "note_76", + "text": "\"Why would you ever hide in a damn gun store? The owner… he was a moron alright.\"" + }, + { "id": "note_77", "text": "\"THEY DON'T feel ANYTHING\"" }, + { "id": "note_78", "text": "\"What was the government doing, anyway?\"" }, + { + "id": "note_79", + "text": "\"Is that one pharmaceutical company gonna come out with a, like, cure for this anytime soon?\"" + }, + { "id": "note_80", "text": "\"THE MARLEY WAS RIGHT\"" }, + { + "id": "note_81", + "text": "\"Squeeze some ammonia into zombie flesh and hold it tight. You smell like one of them! I think.\"" + }, + { "id": "note_82", "text": "\"I thought my damn terminal cancer was bad enough… now the dead are rising?!\"" }, + { "id": "note_83", "text": "\"THE GOO IS IN THE WATER DON'T DRINK WATER\"" }, + { "id": "note_84", "text": "\"Don't let the ember go out please don't go out I need you precious fire.\"" }, + { + "id": "note_85", + "text": "\"Everyone used their gas to get to another town… but it's the same story everywhere.\"" + }, + { "id": "note_86", "text": "\"There's still an evacuation point at Concord, spread the word.\"" }, + { "id": "note_87", "text": "\"STAY AWAY FROM CONCORD\"" }, + { + "id": "note_88", + "text": "\"Most things can be taken out with a shotgun. More things can be taken out with a grenade. Imagine what a mini-nuke does.\"" + }, + { "id": "note_89", "text": "\"Come to the bar if you see this, let's re-enact a zombie movie, friends.\"" }, + { "id": "note_90", "text": "\"They are NOT slow! They are NEVER slow!\"" }, + { "id": "note_91", "text": "\"I had a phobia of bees BEFORE they grew to enormous sizes.\"" }, + { + "id": "note_92", + "text": "\"Your backpack's gonna weigh you down in the water. Hell, feel free to get naked. Nobody's going to judge your modesty.\"" + }, + { "id": "note_93", "text": "\"Guns too loud. Crossbow too long. Running is best.\"" }, + { "id": "note_94", "text": "\"99.9% dead? I'd like to see a million zombies on Wall Street.\"" }, + { "id": "note_95", "text": "\"Crawled in through the vents. Whole office building is infested.\"" }, + { + "id": "note_96", + "text": "\"Don't shoot the people who get bit! It's OK! Death is the only thing that makes you turn!\"" + }, + { + "id": "note_96a", + "text": "\"Check your freinds for bites, don't let them hide it and turn on you. Only way out is to shoot em in the head.\"" + }, + { + "id": "note_97", + "text": "\"Zombies, walkers, dead ones, undead, reanimated, zed, animata, biters. Did I miss any?\"" + }, + { "id": "note_98", "text": "\"All I've got is this keg of beer and an appetite. Come at me, apocalypse!\"" }, + { + "id": "note_99", + "text": "\"My cousin says that murder nowadays is just a war crime. War for what, I don't know, since the undead seem to be rebels without a cause.\"" + }, + { "id": "note_100", "text": "\"SWAMPS RUN SWAMPS NO SWAMPS RUN\"" }, + { + "id": "note_101", + "text": "\"They said a walking cane was a useless weapon… but then I hit one of them with it.\"" + }, + { + "id": "note_102", + "text": "\"River water around these parts is extremely safe. Probably more safe than the damn tap water at this point.\"" + }, + { "id": "note_103", "text": "\"DON't bomB THe PORtals it MAKES iT WORSE\"" }, + { + "id": "note_104", + "text": "\"No wonder all the camps got overrun, they kept a goddamn zombie test subject! Each and every one of 'em!\"" + }, + { "id": "note_105", "text": "\"I just realized how damn demented those fliers are.\"" }, + { "id": "note_106", "text": "\"I propose a new currency: 9mm.\"" }, + { "id": "note_107", "text": "\"My skin is crawling and I teleport every few minutes… what is going o\"" }, + { "id": "note_108", "text": "\"You can't see them through the smoke but they can't either.\"" }, + { "id": "note_109", "text": "\"There's gotta be a better use of all this rebar…\"" }, + { + "id": "note_110", + "text": "\"met schoolhouse of people, all crazy and mad they were, ate killed all of them, yum\"" + }, + { "id": "note_111", "text": "\"STAY AWAY FROM THE BIG ONES IN THE FOREST\"" }, + { + "id": "note_112", + "text": "\"got into a prison with a halligan bar. makes me wonder how they kept prisoners inside\"" + }, + { + "id": "note_113", + "text": "\"This thing isn't a car any more. It's just a fucking mountain of metal on wheels, which I live in.\"" + }, + { + "id": "note_114", + "text": "\"Anyone else seen those really… SQUARE-looking towns? I don't think they're normal.\"" + }, + { + "id": "note_115", + "text": "\"big z threw me on top of the building, legs broken but at least im safe for a few more minutes\"" + }, + { + "id": "note_116", + "text": "\"I'm starting to feel bad about disabling all these turrets and stealing their ammunition.\"" + }, + { + "id": "note_117", + "text": "\"Make sure you strip the house for all available resources-- tubes, pipes, ceramics, sheets, strings, and more\"" + }, + { "id": "note_118", "text": "\"FUCK FAUX-MUTANTS, BEING 'EXTREMELY THIRSTY' DOES NOT COUNT\"" }, + { + "id": "note_119", + "text": "\"There's nothing wrong with eating people if you HAVE to. I mean, I only did it because I didn't want to waste my potato chips!\"" + }, + { "id": "note_120", "text": "\"all these fuckin eyebots really take the piss out of kops\"" }, + { "id": "note_121", "text": "\"CHINA DID THIS\"" }, + { "id": "note_122", "text": "\"RUSSIA DID THIS\"" }, + { + "id": "note_123", + "text": "\"Thank You RivTech. Thank You For Good Coffee. Will Always Stay Awake For You Rivtech.\"" + }, + { + "id": "note_124", + "text": "\"See, now I'm just not sure where I'm putting all these storage batteries in my body!\"" + }, + { "id": "note_125", "text": "\"dont try to leave they will shoot you\"" }, + { + "id": "note_126", + "text": "\"I'd like to thank my high-school culinary arts class for teaching me how to make RDX and mutagenic serum.\"" + }, + { "id": "note_127", "text": "\"Makayla Sanchez burned down my fucking house\"" }, + { "id": "note_128", "text": "\"he calls himself the 'man with the hands', don't approach\"" }, + { + "id": "note_129", + "text": "\"So… what happens if the military rescues us? We're all freaks by now, right? How the fuck are we gonna go back to real life?\"" + }, + { + "id": "note_130", + "text": "\"Not sure if my companion WANTED to turn into a bird, but I was the one giving her the serum, and I saved her life! That's fair, right?\"" + }, + { "id": "note_131", "text": "\"I've never been very confident, is that why my shots keep missing?\"" }, + { "id": "note_132", "text": "\"FIRE BAD. NOW NAKED. PLEASE HELP.\"" }, + { + "id": "note_133", + "text": "\"Heard of a place up in Maine where people have their shit together. Hundreds of people, defense, food and shelter… let's go raid it, guys!\"" + }, + { "id": "note_134", "text": "\"KASHWAK: NO-FO\"" }, + { + "id": "note_135", + "text": "\"The whispering fog is taking me in like a blanket. I'm warm now. I'm finally\"" + }, + { + "id": "note_136", + "text": "\"got a video recording of hour one when the portals were still up. pretty cool\"" + }, + { + "id": "note_137", + "text": "\"Stuck here. Zombies outside. Friends were outside too, now they're part of zombies. Need to be quiet\"" + }, + { + "id": "note_138", + "text": "\"if anyones reading this, please tell my mom i was right about insects being superior\"" + }, + { + "id": "note_139", + "text": "\"Diamond coated sword! Diamond coated hammer! Diamond coated clothes! Diamond coated hands help\"" + }, + { "id": "note_140", "text": "\"waded through 14 miles of sewage for playboy magazine, wasnt worth it\"" }, + { + "id": "note_141", + "text": "\"I'm coming back for this note in twelve hours. If I don't, take all my shit!\"" + }, + { + "id": "note_142", + "text": "\"all my friends died when they came near me. there's nothing funny about that\"" + }, + { "id": "note_143", "text": "\"DOG NOT REAL DOG\"" }, + { + "id": "note_144", + "text": "\"This is all just a dream, right??! I'M GOING TO WAKE UP, SHE'S GOING TO BE OK\"" + }, + { "id": "note_145", "text": "\"wek ik spak\"" }, + { "id": "note_146", "text": "\"IT'S BURIED! THE TEMPLE IS BURIED!\"" }, + { + "id": "note_147", + "text": "\"If I had a dollar for every cash card I've found, I'd have more money than is on these stupid things!\"" + }, + { "id": "note_148", "text": "\"can never have enough kevlar. basically just live in a kevlar turtle shell.\"" }, + { "id": "note_149", "text": "\"MY GLITTERING SNAKE COMPELS YOU! OBEY!\"" }, + { + "id": "note_150", + "text": "\"can sunstasin self frorever off fof my funggnaloid babiues oout fo yme arms eat themm up eatbtb my chidlldren\"" + }, + { + "id": "note_151", + "text": "\"Gonna settle down one day. Nice big orchard, couple of friends/future family to spend time with, and my army of zlaves to guard the place.\"" + }, + { "id": "note_152", "text": "\"a ctulaly don t mi nd t he cold it s f i ne in h ere nn o problem\"" }, + { + "id": "note_153", + "text": "\"tried to shoot myself but the nanobots fixed it, fucked up the controls, now i can't turn them off i just want it to be over\"" + }, + { + "id": "note_154", + "text": "\"Tried wearing dead zombie clothes, but they still knew I was alive! It's like they're a hivemind, man!\"" + }, + { + "id": "note_155", + "text": "\"riddle. what's 1/4 feathers, 1/4 scales, 1/4 metal, and 1/4 flesh? answer: sorry, but you should know this one.\"" + }, + { + "id": "note_156", + "text": "\"For anyone that's reading this, I just want to confirm (FROM AN UNBIASED SOURCE) that it was NOT the scientists' fault.\"" + }, + { + "id": "note_157", + "text": "\"We're the eagle-eyes in the sky! Just two mutant avians in our helicopter! Filming the Cataclysm! Check us out on any working electronics!\"" + }, + { "id": "note_158", "text": "\"WE'RE GOING TO SAIL TO CANADA, BITCHES!\"" }, + { + "id": "note_159", + "text": "\"Anyone hear about that guy who tried to sail his family to Canada? What a moron, right?\"" + }, + { "id": "note_160", "text": "\"recently canadian border has gotten more dangerous don't go there\"" }, + { "id": "note_161", "text": "\"Hey, what happened to my dad's airboat?!\"" }, + { "id": "note_162", "text": "\"Reading is good! Never stop reading. Read EVERYTHING.\"" }, + { + "id": "note_163", + "text": "\"I'm gonna be honest here, I'm really gonna die soon so I dont want to gt forgnottedn ples dont forntget me y nrmmy name is h@@hbhbh\"" + }, + { "id": "note_164", "text": "\"all it takes to seal a wound is a sawblade and a match! trust me\"" }, + { + "id": "note_165", + "text": "\"I wonder what's in this sarcophagus? Maybe it's a real sarcophagus. Maybe there's a big guy named God under here.\"" + }, + { "id": "note_166", "text": "\"these hulks aint so incredible when ya got .50\"" }, + { + "id": "note_167", + "text": "\"WBLF 970 went off-air three days ago. There's nobody left on the radio. Might as well throw this thing away…\"" + }, + { + "id": "note_168", + "text": "\"I've heard it's safer across the Mississippi. Going to start driving today. If you're reading this, pray for me\"" + }, + { "id": "note_169", "text": "\"Mi-go is friend! Go with Mi-go to friend dimension! On the Friend Team!!\"" }, + { "id": "note_170", "text": "\"We have Landed our Comet. The Sky is Ablaze.\"" }, + { + "id": "note_171", + "text": "\"Last one standing. It's good feeling. I win. I win I win I win I win I win\"" + }, + { "id": "note_172", "text": "\"Adderall cures weakness, tramadol cures death\"" }, + { "id": "note_173", "text": "\"These turrets keep dodging my FUCKING BULLETS!\"" }, + { "id": "note_174", "text": "\"Best way to train is by throwing pebbles at birds. You'll be a legend.\"" }, + { "id": "note_175", "text": "\"new bedford is overrun. i'm sorry. we tried.\"" }, + { + "id": "note_176", + "text": "\"Check out my cooking show on The Television! Making Mannwurst sausages out of some of those assholes who tried to raid my kitchen earlier…\"" + }, + { + "id": "note_177", + "text": "\"Renting out my rat tunnels for 50 9mm rounds a night. I dug them with my own claws, so you know they're the best.\"" + }, + { + "id": "note_178", + "text": "\"Anyone wanna listen to some music at full volume and shoot the Zs that approach? You pick the tunes if I get some ammo.\"" + }, + { + "id": "note_179", + "text": "\"Lots of new easy ways to burn calories now. Fighting aminata, managing the fields, running with my wings buzzing, and more.\"" + }, + { "id": "note_180", "text": "\"FLAMING SWORD HUMANE. CAUTERIZES WOUNDS. SURGICAL.\"" }, + { "id": "note_181", "text": "\"knife screams it screams i cant breathe so scared help me please help\"" }, + { "id": "note_182", "text": "\"when it started, we could still hope The Man was gonna save us…\"" }, + { + "id": "note_183", + "text": "\"Hey, Ted. Alexander and Cass and I are heading to Z-Mobile for the last of the meth. Keep the lizard fetus fed for us, OK?\"" + }, + { + "id": "note_184", + "text": "\"i say we call the material from melting down cars and dead robots 'massachusetite' or 'vermontsteel' or 'connecticut composite'\"" + }, + { + "id": "note_185", + "text": "\"Sometimes what you need when you're infected, bleeding, sick and hungover is a J and some chips.\"" + }, + { + "id": "note_186", + "text": "\"This has to be China's fault. Seriously, why is nobody suspecting the people we're having a cold war with! This is an invasion! These aren't zombies, it's just camoflauge! WAKE UP, SHEEPLE!\"" + }, + { + "id": "note_187", + "text": "\"Hahahahaa stupid fuck in his mansion, with his plate armor and big axe. Guy never swung the thing in his life. Can't block bullets, dipshit\"" + }, + { + "id": "note_188", + "text": "\"I woke up with a dozen bears in a tribe outside the vault. One was covered in red markings, glowing-- speaking.\"" + }, + { + "id": "note_189", + "text": "\"poor guy. watched him from afar with my binocs for months and months. today he died fighting. feels like i knew him even though i never approached.\"" + }, + { "id": "note_190", "text": "\"ENGLAND DID THIS\"" }, + { + "id": "note_191", + "text": "\"That little fakkin rat din say anythin till we whacked him with a steel chain! Then 'e just wanted to know if he could buy the chain!\"" + }, + { "id": "note_192", "text": "\"tom, adorned with fluid sacs three layers deep, crawls to safety like a slug\"" }, + { + "id": "note_193", + "text": "\"my friend turned fuckin insane and ate his arms and then his sister's arms! he looked rather cross\"" + }, + { "id": "note_194", "text": "\"Starting today, the hallucinations are my only friends.\"" }, + { "id": "note_195", "text": "\"For sale: zombaby shoes, very filthy\"" }, + { + "id": "note_196", + "text": "\"Started my own brewery recently. I just need some glass bottles, now! Several thousand! I'm planning way ahead.\"" + }, + { + "id": "note_197", + "text": "\"Heard recently of some radio op who lives in a skyscraper, announcing where those hordes are going. Couldn't find the frequency, though.\"" + }, + { "id": "note_198", "text": "\"Woah, bud! Not all cannibals eat meat!\"" }, + { "id": "note_199", "text": "\"ay why aint my bullets fuckin explodin\"" }, + { "id": "note_200", "text": "\"Those Fiktok clan people picked this place clean… no food…\"" }, + { "id": "note_201", "text": "\"The fewer people in New England, the stronger we'll become.\"" }, + { "id": "note_202", "text": "\"It all boils down to the Apex Predator.\"" }, + { + "id": "note_203", + "text": "\"King Jameson ik goner! Thee cyber limbs isk falleng off me body! Stak pyroteknik I heear!\"" + }, + { "id": "note_204", "text": "\"Got my mortar and pestle. Now if I could just find some avocados…\"" }, + { + "id": "note_205", + "text": "\"saw a girl standing with the mushrooms. spores coming out of slits in her neck. she looked happy.\"" + }, + { + "id": "note_206", + "text": "\"Found some pink berries. Eating them makes bushes into more pink berries. Infinite berry.\"" + }, + { "id": "note_207", "text": "\"m ust grow unity\"" }, + { "id": "note_208", "text": "\"AMY IS FUNGUS. DO NOT LISTEN IF SHE ASKS YOU TO TAKE OFF MASK\"" }, + { + "id": "note_209", + "text": "\"my rabbi follows a new god now. asks us to call him a local guide. i dont mind, he keeps us fed\"" + }, + { "id": "note_210", "text": "\"Fungus are helping us. Help them and they will unite us\"" }, + { + "id": "note_211", + "text": "\"Saw a boy couldnt be older than 16. Walked straight through the mushroom tower. THROUGH IT\"" + }, + { + "id": "note_212", + "text": "\"Found some food in a box outside my house. We ate it and now the fungaloids aren't harming us. I think we are a mushroom now\"" + }, + { + "id": "note_213", + "text": "\"saw the girl again. she looked dead exhausted and walked right into the fungus. 30 mins later and she walked out good as new\"" + }, + { "id": "note_214", "text": "\"HADENSBROOK REBUILT AROUND FUNGUS. THEY EAT GRAY APPLES AND SPREAD IT\"" }, + { "id": "note_215", "text": "\"mycus must grow\"" }, + { + "id": "note_216", + "text": "\"School bus with solar panels = TRUST. Gave us berries and seeds, we were out of food\"" + }, + { + "id": "note_217", + "text": { "str": "\"d o nThelp scho Ol buss makE seeeedS ARe FUNGUS!! !\"", "//NOLINT(cata-text-style)": "intentional format" } + }, + { + "id": "note_218", + "text": "\"Go to every fungus patch you find but WEAR A SUIT. Food there is very very filling. Look for pink berries, blue flowers\"" + }, + { "id": "note_219", "text": "\"red blue yellow berry seed sap bloom flowers tower mycus mycus mycus.\"" }, + { + "id": "note_220", + "text": "\"Husband 30 yrs died in bombs. Mushrooms brought him back. GIVE YOURSELF TO THEm AND THEY WILL HELP YOU\"" + }, + { + "id": "note_221", + "text": "\"Lisa always was a fan of sports. Thank God these Global Athletics Games in Harran started some time before the outbreak, so she was able to leave New England before it was quarantined. I can only hope there are no zombies, as we do have here, in the city she flew to.\"" + }, + { + "id": "note_222", + "text": "\"Don't mix powders, them books said. Do Not Mix powders. Didn't listen did I. Blew my goddamn pinky off, near lost my right eye.\"" + }, + { + "id": "note_223", + "text": "\"followed what toby wrote down. shells looked like theyd hold more, I put in some more. traded most to h raiders for crank. shot my 38 today and it fuckn exploded. low on crank, good as dead, no gun, no toby. headed to montreal real sorry bout the bullets\"" + } + ] + } +] diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json index 3f08c63026ac3..dab0a1a18c0c1 100644 --- a/data/json/vehicle_groups.json +++ b/data/json/vehicle_groups.json @@ -5,16 +5,15 @@ "vehicles": [ [ "car", 2000 ], [ "car_anmlcmpt", 250 ], + [ "car_hatch", 1000 ], [ "electric_car", 500 ], [ "car_sports", 300 ], - [ "car_sports_atomic", 15 ], [ "car_sports_electric", 60 ], [ "suv", 800 ], [ "suv_electric", 200 ], [ "suv_electric", 120 ], - [ "car_mini", 800 ], + [ "car_mini", 400 ], [ "beetle", 500 ], - [ "bubble_car", 20 ], [ "bicycle", 400 ], [ "bicycle_electric", 100 ], [ "motorcycle", 200 ], @@ -77,12 +76,13 @@ "vehicles": [ [ "car", 7000 ], [ "car_anmlcmpt", 600 ], + [ "car_hatch", 3500 ], [ "electric_car", 1000 ], [ "car_sports", 500 ], [ "suv", 1000 ], [ "suv_electric", 300 ], [ "suv_electric", 150 ], - [ "car_mini", 1000 ], + [ "car_mini", 500 ], [ "beetle", 500 ], [ "pickup", 2000 ], [ "flatbed_truck", 1000 ], @@ -103,6 +103,7 @@ "vehicles": [ [ "car", 3000 ], [ "car_anmlcmpt", 250 ], + [ "car_hatch", 1000 ], [ "electric_car", 500 ], [ "car_sports", 1000 ], [ "car_sports_electric", 300 ], @@ -145,7 +146,8 @@ "vehicles": [ [ "car", 1000 ], [ "car_anmlcmpt", 150 ], - [ "car_mini", 500 ], + [ "car_hatch", 500 ], + [ "car_mini", 250 ], [ "electric_car", 500 ], [ "beetle", 300 ], [ "car_sports", 100 ], @@ -185,7 +187,6 @@ [ "apc-gl", 50 ], [ "aapc-mg", 50 ], [ "aapc-gl", 25 ], - [ "bubble_car", 50 ], [ "rv", 200 ], [ "limousine", 100 ], [ "schoolbus", 200 ], @@ -201,10 +202,11 @@ [ "semi_truck", 500 ], [ "cube_van", 1000 ], [ "flatbed_truck", 1000 ], - [ "car_mini", 750 ], + [ "car_mini", 375 ], [ "beetle", 750 ], [ "car", 1000 ], [ "car_anmlcmpt", 100 ], + [ "car_hatch", 500 ], [ "electric_car", 750 ], [ "hippie_van", 750 ], [ "golf_cart", 300 ], @@ -227,7 +229,8 @@ "id": "garage", "type": "vehicle_group", "vehicles": [ - [ "car", 10 ], + [ "car", 5 ], + [ "car_hatch", 2 ], [ "car_chassis", 20 ], [ "engine_crane", 40 ], [ "motorcycle", 10 ], @@ -302,6 +305,7 @@ "id": "junkyard_vehicles", "vehicles": [ [ "car", 1500 ], + [ "car_hatch", 750 ], [ "car_chassis", 2000 ], [ "electric_car", 400 ], [ "car_sports", 400 ], @@ -310,7 +314,7 @@ [ "suv", 500 ], [ "suv_electric", 200 ], [ "suv_electric", 120 ], - [ "car_mini", 600 ], + [ "car_mini", 300 ], [ "beetle", 500 ], [ "bubble_car", 20 ], [ "pickup", 600 ], @@ -323,10 +327,11 @@ "id": "dumpsite_vehicles", "vehicles": [ [ "car", 1000 ], + [ "car_hatch", 500 ], [ "car_chassis", 1200 ], [ "car_sports", 200 ], [ "suv", 400 ], - [ "car_mini", 500 ], + [ "car_mini", 250 ], [ "rv", 250 ], [ "meth_lab", 50 ], [ "beetle", 400 ], @@ -343,13 +348,14 @@ "id": "campground_vehicles", "vehicles": [ [ "car", 950 ], + [ "car_hatch", 475 ], [ "car_anmlcmpt", 150 ], [ "electric_car", 100 ], [ "suv", 800 ], [ "suv_electric", 100 ], [ "suv_electric_rack", 100 ], [ "bicycle_dirt", 50 ], - [ "car_mini", 200 ], + [ "car_mini", 100 ], [ "beetle", 200 ], [ "pickup", 700 ], [ "hippie_van", 800 ], @@ -361,6 +367,7 @@ "id": "forgotten_vehicles", "vehicles": [ [ "car", 1000 ], + [ "car_hatch", 500 ], [ "car_anmlcmpt", 100 ], [ "suv", 400 ], [ "rv", 200 ], @@ -377,9 +384,10 @@ [ "bubble_car", 50 ], [ "car_sports_electric", 100 ], [ "cube_van", 1000 ], - [ "car_mini", 750 ], + [ "car_mini", 375 ], [ "beetle", 750 ], [ "car", 1000 ], + [ "car_hatch", 500 ], [ "car_anmlcmpt", 150 ], [ "electric_car", 750 ], [ "hippie_van", 750 ], @@ -437,8 +445,7 @@ [ "bubble_car", 60 ], [ "rara_x", 40 ], [ "car_sports", 30 ], - [ "car_sports_electric", 20 ], - [ "car_sports_atomic", 5 ] + [ "car_sports_electric", 20 ] ] }, { @@ -477,10 +484,11 @@ "//": "for cs_car_dealership", "vehicles": [ [ "car", 2000 ], + [ "car_hatch", 1000 ], [ "electric_car", 500 ], [ "suv", 800 ], [ "suv_electric", 200 ], - [ "car_mini", 800 ], + [ "car_mini", 400 ], [ "beetle", 500 ], [ "motorcycle", 200 ], [ "motorcycle_sidecart", 100 ], @@ -508,9 +516,10 @@ [ "bubble_car", 200 ], [ "4x4_car", 200 ], [ "car_sports_electric", 100 ], - [ "car_mini", 750 ], + [ "car_mini", 375 ], [ "beetle", 750 ], [ "car", 1500 ], + [ "car_hatch", 750 ], [ "suv", 800 ], [ "suv_electric", 100 ], [ "suv_electric_rack", 100 ], @@ -522,8 +531,7 @@ [ "motorcycle_enduro", 50 ], [ "superbike", 50 ], [ "motorcycle_sidecart", 50 ], - [ "car_sports", 30 ], - [ "car_sports_atomic", 5 ] + [ "car_sports", 30 ] ] }, { @@ -537,10 +545,11 @@ "//": "for ws_regional_dump", "vehicles": [ [ "car", 1000 ], + [ "car_hatch", 500 ], [ "electric_car", 500 ], [ "suv", 800 ], [ "suv_electric", 200 ], - [ "car_mini", 800 ], + [ "car_mini", 400 ], [ "beetle", 500 ], [ "motorcycle", 200 ], [ "motorcycle_sidecart", 100 ], @@ -572,10 +581,11 @@ "id": "oa_vg_ts_vehicles", "vehicles": [ [ "car", 2000 ], + [ "car_hatch", 1000 ], [ "electric_car", 500 ], [ "suv", 800 ], [ "suv_electric", 200 ], - [ "car_mini", 800 ], + [ "car_mini", 400 ], [ "beetle", 500 ], [ "motorcycle", 200 ], [ "motorcycle_cross", 50 ], @@ -597,8 +607,9 @@ "type": "vehicle_group", "vehicles": [ [ "car", 2000 ], + [ "car_hatch", 1000 ], [ "electric_car", 500 ], - [ "car_mini", 500 ], + [ "car_mini", 250 ], [ "suv", 800 ], [ "suv_electric", 200 ], [ "suv_electric", 50 ], diff --git a/data/json/vehicleparts/wheel.json b/data/json/vehicleparts/wheel.json index 7b3eb8ada6826..6d54340f688b1 100644 --- a/data/json/vehicleparts/wheel.json +++ b/data/json/vehicleparts/wheel.json @@ -318,6 +318,34 @@ }, "flags": [ "WHEEL", "NEEDS_JACKING", "STABLE", "FOLDABLE", "STEERABLE" ] }, + { + "id": "wheel_10", + "type": "vehicle_part", + "name": "wheels", + "item": "wheel_10", + "location": "under", + "symbol": "o", + "broken_symbol": "x", + "color": "dark_gray", + "durability": 120, + "description": "A set of 10\" wheels with tough rubber tires.", + "folded_volume": 10, + "breaks_into": [ + { "item": "steel_lump", "prob": 50 }, + { "item": "steel_chunk", "count": [ 1, 5 ] }, + { "item": "scrap", "count": [ 1, 5 ] }, + { "item": "plastic_chunk", "count": [ 1, 5 ] } + ], + "rolling_resistance": 29, + "wheel_type": "off-road", + "contact_area": 4, + "requirements": { + "install": { "skills": [ [ "mechanics", 1 ] ], "time": "15 m", "using": [ [ "vehicle_bolt", 1 ] ] }, + "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_bolt", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "WHEEL", "NEEDS_JACKING", "STABLE", "FOLDABLE", "STEERABLE" ] + }, { "id": "wheel_motorbike", "type": "vehicle_part", diff --git a/data/json/vehicles/cars.json b/data/json/vehicles/cars.json index 09a7c579454bb..553f7b3e1287f 100644 --- a/data/json/vehicles/cars.json +++ b/data/json/vehicles/cars.json @@ -469,7 +469,7 @@ { "id": "car_mini", "type": "vehicle", - "name": "Hatchback", + "name": "City Car", "blueprint": [ [ "o+-o" ], [ "+#'|" ], @@ -536,6 +536,93 @@ { "x": -1, "y": 0, "chance": 5, "items": [ "mag_glam" ] } ] }, + { + "id": "car_hatch", + "type": "vehicle", + "name": "Hatchback", + "blueprint": [ + [ "o++-o" ], + [ "+##'|" ], + [ "+##'|" ], + [ "o++-o" ] + ], + "parts": [ + { "x": 0, "y": 0, "part": "frame_vertical_2" }, + { "x": 0, "y": 0, "part": "seat" }, + { "x": 0, "y": 0, "part": "seatbelt" }, + { "x": 0, "y": 0, "part": "controls" }, + { "x": 0, "y": 0, "part": "dashboard" }, + { "x": 0, "y": 0, "part": "vehicle_clock" }, + { "x": 0, "y": 0, "part": "vehicle_alarm" }, + { "x": 0, "y": 0, "part": "horn_car" }, + { "x": 0, "y": 0, "part": "roof" }, + { "x": 0, "y": 1, "part": "frame_vertical_2" }, + { "x": 0, "y": 1, "part": "seat" }, + { "x": 0, "y": 1, "part": "seatbelt" }, + { "x": 0, "y": 1, "part": "roof" }, + { "x": 0, "y": -1, "part": "frame_vertical" }, + { "x": 0, "y": -1, "part": "door" }, + { "x": 0, "y": 2, "part": "frame_vertical" }, + { "x": 0, "y": 2, "part": "door" }, + { "x": 1, "y": 0, "part": "frame_horizontal" }, + { "x": 1, "y": 0, "part": "windshield" }, + { "x": 1, "y": 1, "part": "frame_horizontal" }, + { "x": 1, "y": 1, "part": "windshield" }, + { "x": 1, "y": -1, "part": "frame_vertical" }, + { "x": 1, "y": -1, "part": "windshield" }, + { "x": 1, "y": 2, "part": "frame_vertical" }, + { "x": 1, "y": 2, "part": "windshield" }, + { "x": 2, "y": 0, "part": "frame_horizontal" }, + { "x": 2, "y": 0, "part": "halfboard_horizontal" }, + { "x": 2, "y": 0, "part": "engine_inline4" }, + { "x": 2, "y": 0, "part": "alternator_car" }, + { "x": 2, "y": 0, "part": "battery_car" }, + { "x": 2, "y": 1, "part": "frame_horizontal" }, + { "x": 2, "y": 1, "part": "halfboard_horizontal" }, + { "x": 2, "y": -1, "part": "frame_nw" }, + { "x": 2, "y": -1, "part": "halfboard_nw" }, + { "x": 2, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel" ] }, + { "x": 2, "y": -1, "part": "headlight" }, + { "x": 2, "y": 2, "part": "frame_ne" }, + { "x": 2, "y": 2, "part": "halfboard_ne" }, + { "x": 2, "y": 2, "parts": [ "wheel_mount_medium_steerable", "wheel" ] }, + { "x": 2, "y": 2, "part": "headlight" }, + { "x": -1, "y": -1, "part": "frame_vertical" }, + { "x": -1, "y": -1, "part": "door" }, + { "x": -1, "y": 0, "part": "frame_vertical_2" }, + { "x": -1, "y": 0, "part": "seat" }, + { "x": -1, "y": 0, "part": "seatbelt" }, + { "x": -1, "y": 0, "part": "roof" }, + { "x": -1, "y": 1, "part": "frame_vertical_2" }, + { "x": -1, "y": 1, "part": "seat" }, + { "x": -1, "y": 1, "part": "seatbelt" }, + { "x": -1, "y": 1, "part": "roof" }, + { "x": -1, "y": 2, "part": "frame_vertical" }, + { "x": -1, "y": 2, "part": "door" }, + { "x": -2, "y": -1, "part": "frame_sw" }, + { "x": -2, "y": -1, "parts": [ "wheel_mount_medium", "wheel" ] }, + { "x": -2, "y": -1, "part": "tank_medium", "fuel": "gasoline" }, + { "x": -2, "y": -1, "part": "halfboard_sw" }, + { "x": -2, "y": 0, "part": "frame_horizontal" }, + { "x": -2, "y": 0, "part": "hatch" }, + { "x": -2, "y": 0, "part": "muffler" }, + { "x": -2, "y": 1, "part": "frame_horizontal" }, + { "x": -2, "y": 1, "part": "hatch" }, + { "x": -2, "y": 2, "part": "frame_se" }, + { "x": -2, "y": 2, "parts": [ "wheel_mount_medium", "wheel" ] }, + { "x": -2, "y": 2, "part": "tank_medium", "fuel": "gasoline" }, + { "x": -2, "y": 2, "part": "halfboard_se" } + ], + "items": [ + { "x": 0, "y": 0, "chance": 14, "item_groups": [ "car_misc" ] }, + { "x": 0, "y": 0, "chance": 5, "item_groups": [ "snacks" ] }, + { "x": 0, "y": 1, "chance": 8, "item_groups": [ "car_misc" ] }, + { "x": 0, "y": 1, "chance": 2, "item_groups": [ "fast_food" ] }, + { "x": -2, "y": 0, "chance": 10, "items": [ "blanket" ] }, + { "x": -2, "y": 1, "chance": 15, "item_groups": [ "car_kit" ] }, + { "x": -2, "y": 1, "chance": 15, "items": [ "jack_small", "wheel" ] } + ] + }, { "id": "car_sports", "type": "vehicle", diff --git a/data/json/vehicles/carts.json b/data/json/vehicles/carts.json index 9796357627719..26b61249cd6c3 100644 --- a/data/json/vehicles/carts.json +++ b/data/json/vehicles/carts.json @@ -6,7 +6,7 @@ "blueprint": [ "#" ], "parts": [ { "x": 0, "y": 0, "part": "folding_frame" }, - { "x": 0, "y": 0, "part": "wheel_caster" }, + { "x": 0, "y": 0, "part": "wheel_10" }, { "x": 0, "y": 0, "part": "crane_small" } ] }, @@ -20,11 +20,11 @@ ], "parts": [ { "x": -1, "y": 0, "part": "xlframe_vertical_2" }, - { "x": -1, "y": 0, "part": "wheel_caster" }, + { "x": -1, "y": 0, "part": "wheel_10" }, { "x": -1, "y": 0, "part": "small_storage_battery" }, { "x": -1, "y": 0, "part": "kitchen_unit" }, { "x": 0, "y": 0, "part": "xlframe_vertical_2" }, - { "x": 0, "y": 0, "part": "wheel_caster" }, + { "x": 0, "y": 0, "part": "wheel_10" }, { "x": 0, "y": 0, "part": "minifridge" }, { "x": 0, "y": 0, "part": "controls_electronic" } ], @@ -147,7 +147,7 @@ "blueprint": [ "=" ], "parts": [ { "x": 0, "y": 0, "part": "frame_handle" }, - { "x": 0, "y": 0, "part": "wheel_caster" }, + { "x": 0, "y": 0, "part": "wheel_10" }, { "x": 0, "y": 0, "part": "crane_small" } ] }, @@ -158,7 +158,7 @@ "blueprint": [ "#" ], "parts": [ { "x": 0, "y": 0, "part": "xlframe_vertical_2" }, - { "x": 0, "y": 0, "part": "wheel_caster" }, + { "x": 0, "y": 0, "part": "wheel_10" }, { "x": 0, "y": 0, "part": "small_storage_battery" }, { "x": 0, "y": 0, "part": "minifreezer" }, { "x": 0, "y": 0, "part": "controls_electronic" } diff --git a/data/json/vehicles/trucks.json b/data/json/vehicles/trucks.json index cb0d0e76d604f..b316984ef4c5d 100644 --- a/data/json/vehicles/trucks.json +++ b/data/json/vehicles/trucks.json @@ -891,10 +891,10 @@ { "x": -2, "y": 1, "chance": 20, "items": [ "blanket" ] }, { "x": -3, "y": 0, "chance": 20, "items": [ "blanket" ] }, { "x": -3, "y": 1, "chance": 20, "items": [ "blanket" ] }, - { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_medium" } }, - { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_medium" } }, - { "x": -4, "y": 1, "chance": 10, "items": { "item": "cat_food", "container-item": "can_food" } }, - { "x": -4, "y": 1, "chance": 10, "items": { "item": "cat_food", "container-item": "can_food" } }, + { "x": -4, "y": 0, "chance": 10, "//": { "item": "dog_food", "container-item": "can_medium" } }, + { "x": -4, "y": 0, "chance": 10, "//": { "item": "dog_food", "container-item": "can_medium" } }, + { "x": -4, "y": 1, "chance": 10, "//": { "item": "cat_food", "container-item": "can_food" } }, + { "x": -4, "y": 1, "chance": 10, "//": { "item": "cat_food", "container-item": "can_food" } }, { "x": -4, "y": 0, "chance": 3, "items": [ "beartrap" ] } ] } diff --git a/data/json/vitamin.json b/data/json/vitamin.json index 9e448c98b0337..c60267600955e 100644 --- a/data/json/vitamin.json +++ b/data/json/vitamin.json @@ -73,6 +73,7 @@ "min": 0, "max": 40, "rate": "4 h", + "flags": [ "NO_DISPLAY" ], "disease_excess": [ [ 10, 19 ], [ 20, 29 ], [ 30, 40 ] ] } ] diff --git a/data/mods/Aftershock/afs_speech.json b/data/mods/Aftershock/afs_speech.json index aacc67356893a..94c20cee2f116 100644 --- a/data/mods/Aftershock/afs_speech.json +++ b/data/mods/Aftershock/afs_speech.json @@ -32,7 +32,7 @@ { "type": "speech", "speaker": "afs_mon_migoturret", - "sound": "\"The better to eat you! I don't actually think I eat anymore.\"", + "sound": "\"The better to eat you! I don't actually think I eat anymore.\"", "volume": 40 }, { diff --git a/data/mods/Aftershock/items/afs__items.json b/data/mods/Aftershock/items/afs__items.json index 6e5dce0ba4541..fc64d6ada74e8 100644 --- a/data/mods/Aftershock/items/afs__items.json +++ b/data/mods/Aftershock/items/afs__items.json @@ -3,15 +3,15 @@ "id": "afs_solderers_item", "copy-from": "fake_item", "type": "TOOL", - "name": "precision solderers", + "name": { "str": "precision solderers", "str_pl": "precision solderers" }, "flags": "TRADER_AVOID", "qualities": [ [ "SAW_M_FINE", 1 ], [ "SCREW_FINE", 1 ], [ "CUT_FINE", 2 ] ] }, { "type": "GENERIC", "id": "crypto_coin", - "name": "Crypto coins", - "description": "PrepNet had been heavily involved in avoiding taxes by using untraceable internet currencies. If this movement had grown it could have crippled the US tax base but the Cataclysm happened first. These are physical coins with random numbers sequences embossed on them.", + "name": { "str": "Crypto coin", "str_pl": "Crypto coins" }, + "description": "PrepNet had been heavily involved in avoiding taxes by using untraceable internet currencies. If this movement had grown it could have crippled the US tax base but the Cataclysm happened first. These are physical coins with random numbers sequences embossed on them.", "price": 12000, "price_postapoc": 15000, "//": "The coins would be worthless but the PrepNet Phyle still retains some manufacturing capacity", @@ -26,16 +26,16 @@ "type": "CONTAINER", "name": "basin", "description": "A wide, shallow basin used to hold liquid, hammered from a piece of sheet metal. Ideal for collecting water.", - "weight": 5000, + "weight": "5 kg", "looks_like": "ceramic_bowl", - "volume": 10, + "volume": "2500 ml", "price": 1000, "to_hit": -1, "bashing": 1, "material": "steel", "symbol": ")", "color": "dark_gray", - "contains": 10, + "contains": "2500 ml", "watertight": true, "qualities": [ [ "COOK", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], "use_action": "HEAT_FOOD" @@ -48,8 +48,8 @@ "description": "A household refrigerator with impressive capacity. Its power connection has been refurbished, and it can be mounted onto a vehicle to draw from its power.", "symbol": "{", "color": "white", - "weight": 142882, - "volume": 1200, + "weight": "142882 g", + "volume": "300 L", "price": 40000, "price_postapoc": 10000, "material": [ "steel" ], @@ -79,8 +79,8 @@ "price": 1000, "material": "titanium", "looks_like": "scrap", - "weight": 100, - "volume": 1, + "weight": "100 g", + "volume": "250 ml", "bashing": 1, "to_hit": -2 }, @@ -89,14 +89,14 @@ "id": "afs_titanium_frame", "name": "ultralight frame", "description": "A sturdy, lightweight frame made from titanium. Useful for crafting.", - "weight": 1000, + "weight": "1 kg", "to_hit": -3, "color": "white", "symbol": "]", "material": [ "titanium" ], "looks_like": "xlframe", "techniques": [ "DEF_DISARM" ], - "volume": 30, + "volume": "7500 ml", "bashing": 15, "category": "veh_parts", "price": 4000 @@ -131,8 +131,8 @@ "name": "nuclear waste", "description": "A small pellet of silvery metal, still warm to the touch.", "looks_like": "medium_atomic_battery_cell", - "weight": 30, - "volume": 1, + "weight": "30 g", + "volume": "250 ml", "price": 0, "material": "iron", "symbol": "*", @@ -161,12 +161,12 @@ "type": "GENERIC", "category": "tools", "name": "folded atomic butter churn", - "description": "The Rivtech Churninator 4000, the only churn to be banned by 13 religious sects. The legs are currently folded up for travel. Unlike a standard churn that requires cream separated from raw milk this churn requires only raw milk, salt and a healthy respect for glowing objects.", + "description": "The Rivtech Churninator 4000, the only churn to be banned by 13 religious sects. The legs are currently folded up for travel. Unlike a standard churn that requires cream separated from raw milk this churn requires only raw milk, salt and a healthy respect for glowing objects.", "weight": "6464 g", "volume": "11356 ml", "price": 5000, "price_postapoc": 45000, - "looks_like": [ "still" ], + "looks_like": "still", "symbol": "u", "color": "light_green", "use_action": { "type": "deploy_furn", "furn_type": "f_atomic_butter_churn" }, diff --git a/data/mods/Aftershock/items/afs_armor.json b/data/mods/Aftershock/items/afs_armor.json index 7fc289ff2f917..00de3dbd548a1 100644 --- a/data/mods/Aftershock/items/afs_armor.json +++ b/data/mods/Aftershock/items/afs_armor.json @@ -2,10 +2,10 @@ { "id": "afs_bag_of_holding", "type": "ARMOR", - "name": "bag of holding", + "name": { "str": "bag of holding", "str_pl": "bags of holding" }, "description": "A sleek, unfathomably-complicated machine covered in dozens of blinking lights, worn on the back by sturdy faux-leather straps. An electrode dangles from the back, attaching to your forehead. How it operates without annihilating spacetime isn't quite clear, but a localized portal allows things to be stored in an extradimensional space.", - "weight": 3401, - "volume": 12, + "weight": "3401 g", + "volume": "3 L", "//": "sci-fantasy extradimensional gadget = pricey", "price": 1000000000, "//": "because nobody would have that amount after the world ends, it's worth $1000 in barter", @@ -17,7 +17,7 @@ "looks_like": "molle_pack", "coverage": 30, "encumbrance": 10, - "storage": 400, + "storage": "100 L", "warmth": 5, "material_thickness": 2, "flags": [ "BELTED", "ONLY_ONE", "LEAK_DAM" ] @@ -27,8 +27,8 @@ "type": "ARMOR", "name": "boot quiver", "description": "This is a makeshift quiver made from a thigh-high boot with the heel removed and patched shut, and strings used as a strap run through a hole punched into its side. It can hold 40 arrows or bolts for easy access.", - "weight": 770, - "volume": 8, + "weight": "770 g", + "volume": "2 L", "price": 500, "bashing": 4, "material": [ "leather" ], @@ -49,8 +49,8 @@ "description": "Developed for the exploration of alien planes, the lightweight, orange-black HEV suit covers everything below the neck. While it possesses only modest physical protection, it provides excellent protection from most environmental hazards. A hatch in the front opens to provide a small amount of storage.", "symbol": "[", "color": "yellow", - "weight": 3501, - "volume": 10, + "weight": "3501 g", + "volume": "2500 ml", "price": 100000000, "price_postapoc": 50000, "material": [ "superalloy", "kevlar" ], @@ -58,7 +58,7 @@ "coverage": 100, "material_thickness": 2, "encumbrance": 9, - "storage": 12, + "storage": "3 L", "warmth": 20, "environmental_protection": 5, "flags": [ @@ -81,8 +81,8 @@ "description": "Meant to pair with a compatible HEV suit, this helmet's physical protection is basic at best, but makes up for it with an air recycler that provides excellent protection from airborne contaminants. It has a mounted LED headlamp, powered by standard batteries.", "symbol": "[", "color": "yellow", - "weight": 581, - "volume": 8, + "weight": "581 g", + "volume": "2 L", "price": 10000000, "price_postapoc": 5000, "material": [ "superalloy", "plastic" ], @@ -125,7 +125,7 @@ "id": "afs_hev_helmet_on", "type": "TOOL_ARMOR", "copy-from": "afs_hev_helmet", - "name": "hazardous environment helmet (on)", + "name": { "str": "hazardous environment helmet (on)", "str_pl": "hazardous environment helmets (on)" }, "description": "Meant to pair with a compatible HEV suit, this helmet's physical protection is basic at best, but makes up for it with an air recycler that provides excellent protection from airborne contaminants. Its light is on, illuminating the area at a cost of batteries.", "revert_to": "afs_hev_helmet", "turns_per_charge": 20, @@ -138,8 +138,8 @@ "type": "ARMOR", "name": "quilt", "description": "A big, comfy quilt made of thick wool in a triangle pattern. Extremely cozy!", - "weight": 1814, - "volume": 20, + "weight": "1814 g", + "volume": "5 L", "price": 5500, "to_hit": -1, "material": [ "wool" ], @@ -167,13 +167,13 @@ "id": "afs_survivor_belt", "copy-from": "survivor_belt", "type": "ARMOR", - "name": "survivor utility belt (holster)", + "name": { "str": "survivor utility belt (holster)", "str_pl": "survivor utility belts (holster)" }, "description": "A custom-built leather utility belt covered with straps and pouches containing many useful hand tools and a clip for holding various equipment. Durable and carefully crafted to be comfortable to wear. Activate to clip something to it.", "use_action": { "type": "holster", "holster_prompt": "Attach what to belt loop?", "holster_msg": "You clip your %s to your %s", - "max_volume": 6, + "max_volume": "1500 ml", "max_weight": 2000, "draw_cost": 50, "flags": [ "BELT_CLIP" ] @@ -183,15 +183,15 @@ "id": "survivor_belt", "copy-from": "survivor_belt", "type": "ARMOR", - "name": "survivor utility belt (sheath)" + "name": { "str": "survivor utility belt (sheath)", "str_pl": "survivor utility belts (sheath)" } }, { "id": "afs_brigandine", "type": "ARMOR", "name": "brigandine", "description": "A piece of body armor from the Middle Ages consisting of boiled leather with riveted metal plates lying underneath. Typically used to protect from arrows, it has very good protection against cuts.", - "weight": 3268, - "volume": 6, + "weight": "3268 g", + "volume": "1500 ml", "price": 5000, "to_hit": -3, "material": [ "leather", "steel" ], @@ -210,8 +210,8 @@ "type": "ARMOR", "name": "crafted brigandine", "description": "Modelled after a proper brigandine from medieval times, this makeshift piece of body armor consists of layered cloth with small pieces of sheet metal affixed to the underside. While not as protective as a proper piece of armor, it'll still keep you relatively safe.", - "weight": 3268, - "volume": 6, + "weight": "3268 g", + "volume": "1500 ml", "price": 1000, "to_hit": -3, "material": [ "cotton", "steel" ], @@ -230,8 +230,8 @@ "type": "ARMOR", "name": "titanium vest", "description": "A lightweight armor vest made of pieces of titanium sewn together, with cloth padding for comfort. Brittle against blunt force, but highly resistant to cuts and corrosion.", - "weight": 939, - "volume": 2, + "weight": "939 g", + "volume": "500 ml", "price": 1000, "to_hit": -3, "material": [ "titanium", "cotton" ], @@ -250,8 +250,8 @@ "name": "MBR vest (titanium)", "name_plural": "MBR vests (titanium)", "description": "A Modular Bullet Resistant Vest. Titanium scraps have been inserted to improve its protection. It has four pouches capable of carrying magazines.", - "weight": 3108, - "volume": 24, + "weight": "3108 g", + "volume": "6 L", "price": 110000, "to_hit": -3, "bashing": 6, @@ -262,7 +262,7 @@ "covers": [ "TORSO" ], "coverage": 85, "encumbrance": 7, - "storage": 10, + "storage": "2500 ml", "warmth": 15, "material_thickness": 3, "use_action": { @@ -270,11 +270,29 @@ "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s.", "multi": 4, - "min_volume": 1, - "max_volume": 4, + "min_volume": "250 ml", + "max_volume": "1 L", "draw_cost": 60, "flags": [ "MAG_COMPACT" ] }, "flags": [ "STURDY", "OUTER" ] + }, + { + "id": "afs_sentinel_cloak", + "type": "ARMOR", + "copy-from": "jedi_cloak", + "name": "sentinel-lx cloak", + "description": "The vantablack cloak of sentinel-lx hangs around ones shoulders as a solid, unnatural shadow. Made from woven graphene, its lightweight and resistant, but cannot be repaired", + "price": 1500000, + "material": [ "graphene_weave" ], + "symbol": "[", + "color": "dark_gray", + "covers": [ "TORSO", "HEAD", "ARMS", "LEGS" ], + "coverage": 85, + "encumbrance": 4, + "warmth": 30, + "material_thickness": 3, + "flags": [ "OVERSIZE", "HOOD", "OUTER", "NO_REPAIR", "SUPER_FANCY", "STURDY" ], + "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "BONUS_DODGE", "add": 1 } ] } ] } } ] diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json index eb43c4a03da3b..4a98739889e9d 100644 --- a/data/mods/Aftershock/items/afs_bioparts.json +++ b/data/mods/Aftershock/items/afs_bioparts.json @@ -39,7 +39,7 @@ "category": "other", "name": "sensory cluster", "name_plural": "sensory clusters", - "description": "This lump of flesh has various lobes protruding from it that at intervals will emit toned sounds. Perhaps it works via echolocation. Like all mi-go bioparts the openings on this piece closed up after it was cut free and it seems to have gone into a form of hibernation with the pulses occurring slower and slower as it conserves energy.", + "description": "This lump of flesh has various lobes protruding from it that at intervals will emit toned sounds. Perhaps it works via echolocation. Like all mi-go bioparts the openings on this piece closed up after it was cut free and it seems to have gone into a form of hibernation with the pulses occurring slower and slower as it conserves energy.", "weight": "40 g", "volume": "250 ml", "price": 100, @@ -90,7 +90,7 @@ "type": "GUN", "name": "vibrating bioblaster", "name_plural": "bioblasters", - "description": "You ripped this from a mi-go abomination. You have no clue how or if it can be reloaded. ", + "description": "You ripped this from a mi-go abomination. You have no clue how or if it can be reloaded. ", "weight": "5140 g", "volume": "1500 ml", "price": 400000, @@ -106,8 +106,6 @@ "dispersion": 90, "durability": 7, "loudness": 8, - "max_charges": 80, - "initial_charges": 80, "ammo_effects": [ "LASER", "INCENDIARY" ], "flags": [ "NO_UNLOAD", "NON-FOULING" ] } diff --git a/data/mods/Aftershock/items/afs_books.json b/data/mods/Aftershock/items/afs_books.json index 883b3901209d9..64e9a22369b95 100644 --- a/data/mods/Aftershock/items/afs_books.json +++ b/data/mods/Aftershock/items/afs_books.json @@ -2,11 +2,10 @@ { "id": "afs_librarian_book", "type": "BOOK", - "name": "original copy of Housefly", - "name_plural": "original copies of Housefly", + "name": { "str": "original copy of Housefly", "str_pl": "original copies of Housefly" }, "description": "The only copy of Housefly in existence - a long book about three individuals drawn together by fate in the early 1800s to save their English town of Victoria from a mysterious threat. You never got to publish it, but reading it lets you forget the horrors of the Cataclysm, if only for a moment.", - "weight": 700, - "volume": 3, + "weight": "700 g", + "volume": "750 ml", "price": 5000, "price_postapoc": 1000, "looks_like": "ZSG", @@ -23,7 +22,7 @@ "type": "BOOK", "name": "USMC M1014 technical manual", "description": "A pocket-sized book printed in 2000 by the United States Marine Corps for official use. It describes the operation, repair, and cleaning of the Benilli M1014 shotgun. Though specific to the M4, it can provide a wealth of information to the trained eye.", - "weight": 600, + "weight": "600 g", "volume": "250 ml", "price": 3000, "material": [ "paper" ], @@ -39,10 +38,9 @@ { "id": "afs_textbook_handguns", "type": "BOOK", - "name": "Black Powder to Berettas", - "name_plural": "copies of Black Powder to Berettas", + "name": { "str": "Black Powder to Berettas", "str_pl": "copies of Black Powder to Berettas" }, "description": "This hardcover book, aimed at the gun nut, provides an illustrated, concise history of the handgun throughout history, including technical specifications and use techniques. It's difficult to follow without a passing knowledge in pistols, but an experienced handgun user could glean much from it.", - "weight": 732, + "weight": "732 g", "volume": "750 ml", "price": 3000, "material": [ "paper" ], @@ -58,10 +56,9 @@ { "id": "afs_textbook_rifles", "type": "BOOK", - "name": "America's Rifle", - "name_plural": "copies of America's Rifle", + "name": { "str": "America's Rifle", "str_pl": "copies of America's Rifle" }, "description": "A history book penned by an anonymous author. Starting from its design by John Garand and ending with the Vietnam War, it provides a detailed run-down of the M1 Garand rifle's use throughout history as well as its design and quirks with the weapon.", - "weight": 600, + "weight": "600 g", "volume": "500 ml", "price": 3000, "material": [ "paper" ], @@ -77,10 +74,9 @@ { "id": "afs_textbook_launchers", "type": "BOOK", - "name": "Jane's Flamethrowers and Firestarters", - "name_plural": "copies of Jane's Flamethrowers and Firestarters", + "name": { "str": "Jane's Flamethrowers and Firestarters", "str_pl": "copies of Jane's Flamethrowers and Firestarters" }, "description": "A detailed, full-colored guide to flamethrowers, incendiary weapons, and napalm. It builds off of information provided in its sister book, Jane's Mortars and Rocket Launchers, and so it's mostly incomprehensible to anyone without prior knowledge.", - "weight": 734, + "weight": "734 g", "volume": "250 ml", "price": 2000, "material": [ "paper" ], @@ -96,10 +92,9 @@ { "id": "textbook_atomic", "type": "BOOK", - "name": "Nuclear Physics Made Easy", - "name_plural": "Nuclear Physics Made Easy", + "name": { "str": "Nuclear Physics Made Easy", "str_pl": "copies of Nuclear Physics Made Easy" }, "description": "A book detailing the workings of state of the art atomic technology, and the physics behind it.", - "weight": 2063, + "weight": "2063 g", "volume": "2 L", "price": 9200, "bashing": 8, @@ -113,5 +108,29 @@ "intelligence": 13, "fun": -1, "time": "50 m" + }, + { + "id": "schematics_chickenbot", + "type": "BOOK", + "name": "chicken walker schematics", + "name_plural": "chicken walker schematics", + "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the chicken walker. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" + }, + { + "id": "schematics_tankbot", + "type": "BOOK", + "name": "tank drone schematics", + "name_plural": "tank drone schematics", + "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the tank drone. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" + }, + { + "id": "schematics_tripod", + "type": "BOOK", + "name": "tripod schematics", + "name_plural": "tripod schematics", + "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" } ] diff --git a/data/mods/Aftershock/items/afs_comestibles.json b/data/mods/Aftershock/items/afs_comestibles.json index 822dc2f9942c2..a73f11e34e478 100644 --- a/data/mods/Aftershock/items/afs_comestibles.json +++ b/data/mods/Aftershock/items/afs_comestibles.json @@ -3,7 +3,7 @@ "id": "afs_calorie_pill", "type": "COMESTIBLE", "name": "nutriment", - "weight": 10, + "weight": "10 g", "color": "white", "comestible_type": "FOOD", "symbol": "%", @@ -34,30 +34,12 @@ "fun": -2, "vitamins": [ [ "calcium", 24, 48 ], [ "iron", 24, 48 ], [ "vitA", 24, 48 ], [ "vitB", 24, 48 ], [ "vitC", 24, 48 ] ] }, - { - "id": "afs_dough", - "type": "COMESTIBLE", - "name": "dough", - "weight": 226, - "color": "yellow", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 86, - "quench": -5, - "description": "Flour mixed with water, kneaded into a gooey paste. This dough can be used to bake bread more efficiently than with just flour.", - "price": 100, - "volume": 2, - "charges": 2, - "flags": [ "EATEN_HOT" ], - "looks_like": "flour", - "fun": -5 - }, { "id": "afs_sundew", "type": "COMESTIBLE", "name": "sundew", "copy-from": "water_clean", - "weight": 10, + "weight": "10 g", "color": "yellow", "healthy": 2, "description": "Water treated with some sort of chemical compound. It's incapable of freezing, is very light, and glows faintly. Drinking it seems to sharpen the senses.", diff --git a/data/mods/Aftershock/items/afs_furniture.json b/data/mods/Aftershock/items/afs_furniture.json index 464888a41db79..a53b70518509a 100644 --- a/data/mods/Aftershock/items/afs_furniture.json +++ b/data/mods/Aftershock/items/afs_furniture.json @@ -3,7 +3,7 @@ "type": "furniture", "id": "f_atomic_butter_churn", "name": "atomic butter churn on a stand", - "description": "The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready to add raw milk and salt. It will churn till the earth is a cinder.", + "description": "The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready to add raw milk and salt. It will churn till the earth is a cinder.", "symbol": "H", "color": "light_green", "crafting_pseudo_item": "atomic_pseudo_churn", diff --git a/data/mods/Aftershock/items/afs_inactiverobot.json b/data/mods/Aftershock/items/afs_inactiverobot.json index fc15cd76393d0..8c8bb14d01ec9 100644 --- a/data/mods/Aftershock/items/afs_inactiverobot.json +++ b/data/mods/Aftershock/items/afs_inactiverobot.json @@ -20,5 +20,176 @@ "skill1": "cooking", "skill2": "computer" } + }, + { + "id": "bot_chickenbot", + "type": "TOOL", + "name": "inactive chicken walker", + "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "120000 g", + "volume": "92500 ml", + "price": 50000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_chickenbot", + "friendly_msg": "The chicken walker rises to its feet, sways away from you and begins surveying the area.", + "hostile_msg": "The chicken walker whirrs and aims directly at you. Take cover!", + "//": "Milspec, but was deployed in active service implying a reliable IFF", + "difficulty": 9, + "moves": 250, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "bot_tankbot", + "looks_like": "broken_tankbot", + "type": "TOOL", + "name": "inactive tank drone", + "description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "200000 g", + "//": "cheating a bit with the volume due to lack of proper vehicle storage options", + "volume": "250 L", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_tankbot", + "friendly_msg": "The tank drone rolls out and begins acquiring targets.", + "hostile_msg": "The tank drone swivels its turret and aims directly at you. Don your brown pants!", + "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a robo-tank?", + "difficulty": 10, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "broken_chickenbot", + "looks_like": "broken_tripod", + "type": "TOOL", + "name": "inactive chicken walker", + "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "190000 g", + "//": "cheating a bit with the volume due to lack of proper vehicle storage options", + "volume": "250 L", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_chickenbot", + "friendly_msg": "The chicken bot rolls out and begins acquiring targets.", + "hostile_msg": "The chicken bot swivels its turret and aims directly at you. Don your brown pants!", + "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a chicken walker?", + "difficulty": 10, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "bot_tripod", + "looks_like": "broken_tripod", + "type": "TOOL", + "name": "inactive tripod", + "description": "This is an inactive Honda Regnal. Using this item involves placing it on the ground, wondering how it fuels its flamethrower and turning it on. If reprogrammed and rewired successfully the tribot will then identify you as an ally, roam around or follow you, and impale hostiles with its spiked cable weapons.", + "weight": "120000 g", + "volume": "92500 ml", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_tripod", + "friendly_msg": "The tribot rises to its feet and scans the area for contaminants.", + "hostile_msg": "The tribot glowers down at you and ignites its flamethrower. Turns out you hate the smell of napalm.", + "//": "No observed open deployment, likely a prototype or secret project", + "difficulty": 15, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "type": "GENERIC", + "id": "broken_tripod", + "symbol": ",", + "color": "green", + "name": "broken tribot", + "category": "other", + "description": "A broken tribot. Now that its legs lie broken and immobile, the world seems a little less threatening. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "430000 g", + "volume": "187500 ml", + "bashing": 10, + "cutting": 6, + "to_hit": -2, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "broken_tankbot", + "symbol": ",", + "color": "green", + "name": "broken tank drone", + "category": "other", + "description": "A broken tank drone. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "1223850 g", + "volume": "875 L", + "bashing": 20, + "cutting": 15, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "broken_chickenbot", + "symbol": ",", + "color": "green", + "name": "broken chickenbot", + "category": "other", + "description": "A broken chicken walker. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "1023850 g", + "volume": "1100 L", + "bashing": 20, + "cutting": 15, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "id": "bot_sentinel_lx", + "type": "TOOL", + "name": "inactive sentinel-lx", + "description": "Crouched and dead still, this armored luxurious robot resembles an ancient knight immersed in deep prayer. If reprogrammed and rewired successfully the robot will identify you as a friendly, and will protect you from nearby foes.", + "weight": "40750 g", + "volume": "30 L", + "price": 600000, + "to_hit": -3, + "bashing": 8, + "material": "alien_resin", + "symbol": ";", + "color": "green", + "use_action": { "type": "place_monster", "monster_id": "afs_mon_sentinel_lx", "difficulty": 4, "moves": 100, "skill2": "computer" } } ] diff --git a/data/mods/Aftershock/items/afs_item_groups.json b/data/mods/Aftershock/items/afs_item_groups.json index 88212c58a12bb..b3e60b7fac1dd 100644 --- a/data/mods/Aftershock/items/afs_item_groups.json +++ b/data/mods/Aftershock/items/afs_item_groups.json @@ -11,7 +11,7 @@ { "item": "pants_cargo" }, { "item": "kevlar" }, { "item": "leather_pouch" }, - { "item": "balclava", "chance": 75 }, + { "item": "balclava", "prob": 75 }, { "item": "bootsheath" } ] }, @@ -19,7 +19,7 @@ "type": "item_group", "id": "afs_gardener_carried", "subtype": "collection", - "entries": [ { "group": "hardware", "count": [ 1, 2 ] }, { "group": "snacks", "repeat": [ 1, 3 ] } ] + "entries": [ { "group": "hardware", "count": [ 1, 2 ] }, { "group": "snacks", "count": [ 1, 3 ] } ] }, { "type": "item_group", @@ -53,5 +53,29 @@ [ "arrow_metal", 25 ], [ "bolt_steel", 10 ] ] + }, + { + "id": "schematics", + "//": "override of vanilla schematics, includes tripod, chickenbot, tankbot", + "type": "item_group", + "items": [ + [ "schematics_nursebot", 10 ], + [ "schematics_grocerybot", 20 ], + [ "schematics_copbot", 50 ], + [ "schematics_eyebot", 50 ], + [ "schematics_secubot", 50 ], + [ "schematics_skitterbot", 50 ], + [ "schematics_chickenbot", 5 ], + [ "schematics_hazmatbot", 50 ], + [ "schematics_riotbot", 50 ], + [ "schematics_sciencebot", 10 ], + [ "schematics_tankbot", 5 ], + [ "schematics_tripod", 5 ], + [ "schematics_molebot", 20 ], + [ "schematics_dispatch", 25 ], + [ "schematics_dispatch_military", 20 ], + [ "schematics_antimateriel", 20 ], + [ "schematics_searchlight", 50 ] + ] } ] diff --git a/data/mods/Aftershock/items/afs_materials.json b/data/mods/Aftershock/items/afs_materials.json index 11f12e4d6a05f..bc83b65808ea0 100644 --- a/data/mods/Aftershock/items/afs_materials.json +++ b/data/mods/Aftershock/items/afs_materials.json @@ -14,5 +14,23 @@ "dmg_adj": [ "marked", "dented", "smashed", "shattered" ], "bash_dmg_verb": "dented", "cut_dmg_verb": "scratched" + }, + { + "type": "material", + "ident": "graphene_weave", + "name": "Graphene Weave", + "density": 10, + "specific_heat_liquid": 0.82, + "specific_heat_solid": 0.45, + "latent_heat": 273, + "bash_resist": 3, + "cut_resist": 3, + "acid_resist": 5, + "fire_resist": 5, + "elec_resist": 0, + "chip_resist": 10, + "dmg_adj": [ "marked", "dented", "scarred", "broken" ], + "bash_dmg_verb": "ripped", + "cut_dmg_verb": "cut" } ] diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json index eb71696c73a95..16a71330921f9 100644 --- a/data/mods/Aftershock/items/afs_tools.json +++ b/data/mods/Aftershock/items/afs_tools.json @@ -4,7 +4,7 @@ "type": "TOOL", "name": "atomic smartphone", "description": "Never charge your phone again with the Rivtech atomic smartphone. Rated for 10 million years of use, this cutting-edge gadget had been on public markets for less than a week when the Cataclysm hit, and their eye-watering price made them a rarity. It includes an alarm clock, a high-resolution camera, and a bright flashlight.", - "weight": 300, + "weight": "300 g", "volume": "50 ml", "price": 200000, "price_postapoc": 2500, @@ -19,7 +19,7 @@ "active": true, "type": "transform" }, - { "revert_to": "afs_atomic_smartphone", "type": "CAMERA" } + "CAMERA" ], "flags": [ "WATCH", "ALARMCLOCK" ] }, @@ -39,6 +39,40 @@ "//": "since we cost no battery, no reason not to keep these", "flags": [ "WATCH", "ALARMCLOCK", "LIGHT_25" ] }, + { + "id": "afs_wraitheon_smartphone", + "type": "TOOL", + "name": "Wraitheon executive's smartphone", + "copy-from": "afs_atomic_smartphone", + "description": "Your custom crafted atomic smartphone. Most notably a confidential executive-level override program allows you to remotely control most robots.", + "price": 20000000, + "price_postapoc": 250000, + "material": [ "superalloy", "aluminum" ], + "use_action": [ + { + "target": "afs_atomic_wraitheon_flashlight", + "msg": "You activate the flashlight app.", + "active": true, + "type": "transform" + }, + "CAMERA", + "ROBOTCONTROL" + ] + }, + { + "id": "afs_atomic_wraitheon_flashlight", + "copy-from": "afs_atomic_smartphone_flashlight", + "type": "TOOL", + "name": "Executive's smartphone - Flashlight", + "name_plural": "Executive's smartphones - Flashlight", + "revert_to": "afs_atomic_smartphone", + "use_action": { + "target": "afs_wraitheon_smartphone", + "msg": "You deactivate the flashlight app.", + "menu_text": "Turn off flashlight", + "type": "transform" + } + }, { "id": "afs_atompot", "type": "TOOL", @@ -60,8 +94,8 @@ "name": "chain wrench", "name_plural": "chain wrenches", "description": "An adjustable chain wrench, designed for hard-to-reach places. Being handmade, it lacks the precision of a proper wrench.", - "weight": 1614, - "volume": 1, + "weight": "1614 g", + "volume": "250 ml", "price": 4000, "price_postapoc": 1200, "to_hit": 1, @@ -79,8 +113,8 @@ "name": "power cutter (off)", "name_plural": "power cutter (off)", "description": "A huge, gas-powered saw with a diamond blade. If it has gasoline, it can be turned on to turn it into a powerful metal cutting tool.", - "weight": 9979, - "volume": 12, + "weight": "9979 g", + "volume": "3 L", "price": 100000, "price_postapoc": 10000, "to_hit": -3, @@ -116,8 +150,8 @@ "name": "murdersaw (off)", "name_plural": "murdersaws (off)", "description": "This former power cutter has been lightened and stripped of all those unnecessary safety measures, turning it into a gas-powered killing machine. Use it to turn it on.", - "weight": 4301, - "volume": 8, + "weight": "4301 g", + "volume": "2 L", "price": 100000, "price_postapoc": 30000, "to_hit": -3, @@ -153,7 +187,7 @@ "type": "TOOL", "name": "rope lighter", "description": "A rope lighter made from simple materials. Windproof and flameless, it consists of a length of rope run through a copper tube; a flint strike sparks embers in the rope that smolder and are used to ignite fires. Specialized for outdoor use, it lasts for a very long time, but it's much slower to use than a normal lighter.", - "weight": 200, + "weight": "200 g", "volume": "100 ml", "price": 500, "material": [ "cotton", "copper" ], diff --git a/data/mods/Aftershock/items/afs_weapons.json b/data/mods/Aftershock/items/afs_weapons.json index feef5aef22994..b673630519afc 100644 --- a/data/mods/Aftershock/items/afs_weapons.json +++ b/data/mods/Aftershock/items/afs_weapons.json @@ -4,8 +4,8 @@ "type": "TOOL", "name": "energy saber", "description": "A hefty black tube the size of your hand. Activate to produce a hard-light blade, running off of UPS.", - "weight": 240, - "volume": 1, + "weight": "240 g", + "volume": "250 ml", "price": 10000000, "price_postapoc": 20000, "material": [ "superalloy", "diamond" ], @@ -43,10 +43,10 @@ { "id": "afs_energy_saber_on", "type": "TOOL", - "name": "energy saber (active)", + "name": { "str": "energy saber (active)", "str_pl": "energy sabers (active)" }, "description": "This glittering blue saber of cyan light hums gently, extending from its superalloy handle. Its edge is lethally sharp, and being made of light, it's weightless, and immune to being damaged. It's not white-hot like in pop culture, so it can't cut through anything, but there's not much in the way of flesh that it won't slice through easily.", - "weight": 240, - "volume": 4, + "weight": "240 g", + "volume": "1 L", "price": 10000000, "price_postapoc": 20000, "material": [ "superalloy", "diamond" ], @@ -81,8 +81,8 @@ "flags": [ "FIRE_TWOHAND", "STR_DRAW", "PRIMITIVE_RANGED_WEAPON", "BELTED", "NO_UNLOAD" ], "skill": "archery", "min_strength": 4, - "weight": 113, - "volume": 6, + "weight": "113 g", + "volume": "1500 ml", "bashing": 8, "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 7 }, "reload_noise_volume": 0, @@ -101,8 +101,8 @@ "type": "GENERIC", "name": "hydraulic gauntlet", "description": "A huge, heavy metal gauntlet lined with tubing and gauges. Slow and unwieldy, it uses internal pressure to deliver devastating blows, but takes tremendous strength to use effectively. Thanks to an internal microreactor, it doesn't require power of its own.", - "weight": 3778, - "volume": 8, + "weight": "3778 g", + "volume": "2 L", "price": 10000000, "price_postapoc": 20000, "material": [ "hardsteel" ], @@ -120,7 +120,7 @@ "copy-from": "rolling_pin", "name": "barbed-wire rolling pin", "description": "Typically used to flatten dough, this rolling pin has been repurposed as a weapon, with barbed wire adding some extra power and weight to its swing. It has some real heft to it; perfect for the bakers of the apocalypse.", - "weight": 923, + "weight": "923 g", "volume": "1500 ml", "price_postapoc": 1500, "material": [ "steel", "wood" ], @@ -143,7 +143,7 @@ "type": "GUN", "name": "deployed grenade launcher", "description": "A grenade launcher mounted onto your right-hand wrist. Less powerful than a proper grenade launcher, but infinitely more portable, and quick to reload.", - "volume": 9, + "volume": "2250 ml", "price": 0, "to_hit": -2, "bashing": 9, @@ -164,8 +164,8 @@ "type": "GUN", "name": "shoddy laser rifle", "description": "This is a cheap laser rifle made from common components. Weak, but can be powered with rechargeable batteries.", - "weight": 8000, - "volume": 10, + "weight": "8 kg", + "volume": "2500 ml", "price": 40000, "to_hit": -1, "bashing": 8, @@ -187,5 +187,27 @@ [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] ], "flags": [ "NEVER_JAMS", "FIRE_20", "NON-FOULING" ] + }, + { + "id": "TANK", + "looks_like": "m79", + "type": "GUN", + "symbol": "(", + "color": "green", + "name": "Tankbot Main Gun", + "name_plural": "Tankbot Main Gun", + "description": "The 120mm cannon from a tankbot. If you have this, you'd best be debugging!", + "price": 99999999, + "material": "steel", + "skill": "launcher", + "ammo": "120mm", + "weight": "2500 g", + "volume": "2500 ml", + "bashing": 6, + "to_hit": -3, + "dispersion": 60, + "durability": 9, + "clip_size": 1, + "loudness": 300 } ] diff --git a/data/mods/Aftershock/items/corpses.json b/data/mods/Aftershock/items/corpses.json new file mode 100644 index 0000000000000..2505bbbe86a3e --- /dev/null +++ b/data/mods/Aftershock/items/corpses.json @@ -0,0 +1,23 @@ +{ + "type": "GENERIC", + "id": "broken_afs_mon_sentinel_lx", + "symbol": ",", + "color": "green", + "name": "broken sentinel-lx", + "category": "other", + "description": "The irreparably broken remains of a Sentinel-lx. Could be gutted for valuable parts.", + "price": 30000, + "price_postapoc": 1000, + "material": [ + "steel", + "plastic" + ], + "weight": "140000 g", + "volume": "62500 ml", + "bashing": 6, + "cutting": 6, + "to_hit": -3, + "flags": [ + "TRADER_AVOID" + ] +} diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json new file mode 100644 index 0000000000000..3ffe23317a6d3 --- /dev/null +++ b/data/mods/Aftershock/items/gun/laser.json @@ -0,0 +1,36 @@ +[ + { + "id": "afs_sentinel_stunner", + "type": "GUN", + "copy-from": "v29", + "name": "wrist-stunner", + "description": "A severed robotic hand from a Wraitheon Sentinel. The powerful electro-laser stun gun embed on its wrist is still functional, and can be used when connected to an UPS.", + "price": 720000, + "to_hit": -2, + "bashing": 10, + "material": [ "superalloy", "plastic" ], + "color": "cyan", + "range": 10, + "ranged_damage": 5, + "pierce": 15, + "dispersion": 500, + "ups_charges": 25, + "ammo_effects": [ "LASER", "BEANBAG" ], + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ] + }, + { + "id": "afs_sentinel_laser", + "type": "GUN", + "copy-from": "afs_sentinel_stunner", + "name": "wrist-trilaser", + "description": "A powerful tri-barreled laser weapon, still mounted to the robotic hand of the wraitheon drone it originally belonged too. Can still be fired when connected to an UPS.", + "color": "red", + "range": 10, + "ranged_damage": 25, + "pierce": 15, + "ups_charges": 50, + "modes": [ [ "MULTI", "trilaser", 3 ] ], + "ammo_effects": [ "LASER" ], + "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ] + } +] diff --git a/data/mods/Aftershock/items/monster_drops.json b/data/mods/Aftershock/items/monster_drops.json new file mode 100644 index 0000000000000..23b6f3084a857 --- /dev/null +++ b/data/mods/Aftershock/items/monster_drops.json @@ -0,0 +1,8 @@ +{ + "type": "item_group", + "subtype": "collection", + "id": "mon_afs_sentinel_lx_drops", + "entries": [ + { "item": "afs_sentinel_cloak" } + ] +} diff --git a/data/mods/Aftershock/items/monsterdrops.json b/data/mods/Aftershock/items/monsterdrops.json new file mode 100644 index 0000000000000..2e8857996213e --- /dev/null +++ b/data/mods/Aftershock/items/monsterdrops.json @@ -0,0 +1,49 @@ +[ + { + "type": "item_group", + "id": "tripod", + "items": [ + { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 }, + [ "kevlar_plate", 10 ], + [ "ceramic_armor", 15 ], + [ "alloy_plate", 10 ], + [ "robot_controls", 3 ] + ] + }, + { + "type": "item_group", + "id": "chickenbot", + "items": [ + [ "robot_controls", 5 ], + [ "ai_module", 5 ], + [ "sensor_module", 5 ], + [ "memory_module", 5 ], + [ "pathfinding_module", 5 ], + [ "identification_module", 5 ], + [ "reverse_jointed_legs", 40 ], + [ "chickenbot_chassis", 40 ], + [ "targeting_module", 5 ], + [ "gun_module", 30 ], + [ "mark19", 5 ], + [ "tazer", 5 ], + [ "m249", 5 ], + [ "storage_battery", 5 ], + [ "plut_cell", 5 ], + [ "mil_plate", 2 ] + ] + }, + { + "type": "item_group", + "id": "tankbot", + "items": [ + [ "tazer", 3 ], + { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 }, + [ "556", 8 ], + [ "alloy_plate", 10 ], + [ "kevlar_plate", 10 ], + [ "ceramic_armor", 10 ], + [ "hard_plate", 30 ], + [ "robot_controls", 5 ] + ] + } +] diff --git a/data/mods/Aftershock/items/obsolete.json b/data/mods/Aftershock/items/obsolete.json new file mode 100644 index 0000000000000..88966e1568b0c --- /dev/null +++ b/data/mods/Aftershock/items/obsolete.json @@ -0,0 +1,20 @@ +{ + "id": "afs_dough", + "type": "COMESTIBLE", + "name": "dough", + "weight": "226 g", + "color": "yellow", + "comestible_type": "FOOD", + "symbol": "%", + "calories": 86, + "quench": -5, + "description": "Flour mixed with water, kneaded into a gooey paste. This dough can be used to bake bread more efficiently than with just flour.", + "price": 100, + "volume": "500 ml", + "charges": 2, + "flags": [ + "EATEN_HOT" + ], + "looks_like": "flour", + "fun": -5 +} diff --git a/data/mods/Aftershock/items/robotparts.json b/data/mods/Aftershock/items/robotparts.json new file mode 100644 index 0000000000000..49ea5b32e52a3 --- /dev/null +++ b/data/mods/Aftershock/items/robotparts.json @@ -0,0 +1,58 @@ +[ + { + "type": "GENERIC", + "id": "spidery_legs_big", + "name": "set of spidery legs", + "name_plural": "sets of spidery legs", + "description": "A set of big pointy legs, like the ones found under a tripod.", + "symbol": "W", + "color": "light_gray", + "weight": "40000 g", + "volume": "20 L", + "price": 200000, + "material": "steel", + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "tripod_chassis", + "name": "tripod chassis", + "name_plural": "tripod chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the tripod.", + "symbol": "c", + "color": "light_gray", + "weight": "40000 g", + "volume": "70000 ml", + "price": 200000, + "material": [ "steel" ], + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "chickenbot_chassis", + "name": "chicken walker chassis", + "name_plural": "chicken walker chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the chicken walker.", + "symbol": "c", + "color": "light_gray", + "weight": "60000 g", + "volume": "80000 ml", + "price": 300000, + "material": [ "steel" ], + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "tankbot_chassis", + "name": "Beagle chassis", + "name_plural": "Beagle chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Beagle tank.", + "symbol": "c", + "color": "light_gray", + "weight": "150000 g", + "volume": "575000 ml", + "price": 1000000, + "material": [ "steel" ], + "category": "spare_parts" + } +] diff --git a/data/mods/Aftershock/maps/afs_furniture.json b/data/mods/Aftershock/maps/afs_furniture.json index 1fe96a263d40b..c26822de67bc0 100644 --- a/data/mods/Aftershock/maps/afs_furniture.json +++ b/data/mods/Aftershock/maps/afs_furniture.json @@ -8,10 +8,9 @@ "color": "white", "move_cost_mod": -1, "required_str": 10, - "insulation": 3, "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ { "item": "afs_fridge", "count": 1 } ] }, - "max_volume": 4000, + "max_volume": "1000 L", "deployed_item": "afs_fridge", "examine_action": "deployed_furniture", "bash": { @@ -42,10 +41,9 @@ "color": "light_blue", "move_cost_mod": -1, "required_str": 10, - "insulation": 3, "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ { "item": "afs_freezer", "count": 1 } ] }, - "max_volume": 4000, + "max_volume": "1000 L", "deployed_item": "afs_freezer", "examine_action": "deployed_furniture", "bash": { diff --git a/data/mods/Aftershock/maps/afs_overmap_specials.json b/data/mods/Aftershock/maps/afs_overmap_specials.json index 92ec7756a6de2..7d2cb74c1df3b 100644 --- a/data/mods/Aftershock/maps/afs_overmap_specials.json +++ b/data/mods/Aftershock/maps/afs_overmap_specials.json @@ -1,4 +1,15 @@ [ + { + "type": "overmap_special", + "id": "prepnet_orchard", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "prepnet_orchard_north" } ], + "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ], + "locations": [ "land" ], + "city_distance": [ 5, -1 ], + "city_sizes": [ 2, -1 ], + "occurrences": [ 0, 1 ], + "flags": [ "CLASSIC" ] + }, { "id": "municipal_reactor", "type": "overmap_special", diff --git a/data/mods/Aftershock/maps/afs_regional_map_settings.json b/data/mods/Aftershock/maps/afs_regional_map_settings.json index d60348f670c99..33ef3c8145ebc 100644 --- a/data/mods/Aftershock/maps/afs_regional_map_settings.json +++ b/data/mods/Aftershock/maps/afs_regional_map_settings.json @@ -1,9 +1,7 @@ [ { "type": "region_overlay", - "id": "brightnights_overlay", "regions": [ "all" ], - "city": { "basements": { "basement": 1000, "basement_hidden_lab_stairs": 100, "basement_bionic": 100 } }, - "weather": { "base_temperature": 0.0 } + "city": { "basements": { "basement": 1000, "basement_hidden_lab_stairs": 100, "basement_bionic": 100 } } } ] diff --git a/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json b/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json index f5d8745818874..e3147bb35c3e1 100644 --- a/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json +++ b/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json @@ -63,9 +63,9 @@ { "item": "supplies_farming", "x": 3, "y": 9, "chance": 99 } ], "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } }, - "place_monsters": [ - { "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 }, - { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 4, "friendly": true } + "place_monster": [ + { "group": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 }, + { "group": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 4, "friendly": true } ], "place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ] } @@ -136,9 +136,9 @@ { "item": "supplies_farming", "x": 6, "y": 7, "chance": 15 } ], "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } }, - "place_monsters": [ - { "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 }, - { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 3, "friendly": true } + "place_monster": [ + { "group": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 }, + { "group": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 3, "friendly": true } ], "place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ] } diff --git a/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json b/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json index c794b03830404..dbd46c13b8e03 100644 --- a/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json +++ b/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json @@ -6,9 +6,9 @@ "type": "MONSTER", "name": { "str": "Cyber Mastiff", "str_pl": "Cyber Mastifs" }, "//": "Rare, location specific only", - "description": "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic enhancements. These hounds defend Prep Phyle lands from all comers undead and otherwise.", + "description": "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic enhancements. These hounds defend Prep Phyle lands from all comers undead and otherwise.", "volume": "57500 ml", - "weight": 57500, + "weight": "57500 g", "hp": 86, "speed": 100, "aggression": 3, @@ -32,14 +32,14 @@ "id": "afs_mon_cyber_mastiff_pup", "type": "MONSTER", "name": { "str": "Cyber Mastiff puppy", "str_pl": "Cyber Mastiff puppies" }, - "description": "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an adult dog. CBMs are implanted but immature in growth with the puppy.", + "description": "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an adult dog. CBMs are implanted but immature in growth with the puppy.", "default_faction": "PrepNet", "bodytype": "dog", "looks_like": "mon_dog_gpyrenees_pup", "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "hp": 15, "speed": 65, "material": [ "flesh" ], diff --git a/data/mods/Aftershock/mobs/afs_robots.json b/data/mods/Aftershock/mobs/afs_robots.json index 42e052301ade5..f9a707fee7edb 100644 --- a/data/mods/Aftershock/mobs/afs_robots.json +++ b/data/mods/Aftershock/mobs/afs_robots.json @@ -8,7 +8,7 @@ "species": [ "ROBOT" ], "diff": 20, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 45, "speed": 100, "material": "alien_resin", @@ -33,5 +33,162 @@ "death_drops": { }, "death_function": [ "BROKEN" ], "flags": [ "SEES", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] + }, + { + "id": "mon_chickenbot", + "type": "MONSTER", + "name": "chicken walker", + "description": "The Northrop ATSV, a massive, heavily-armed and armored robot walking on a pair of reverse-jointed legs. Armed with a 40mm anti-vehicle grenade launcher, 5.56 anti-personnel gun, and the ability to electrify itself against attackers, it is an effective automated sentry, though production was limited due to a legal dispute.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 20, + "volume": "92500 ml", + "weight": "120 kg", + "hp": 90, + "speed": 115, + "material": [ "steel" ], + "symbol": "R", + "color": "red", + "aggression": 100, + "morale": 100, + "melee_skill": 3, + "melee_dice": 3, + "melee_dice_sides": 3, + "melee_cut": 0, + "armor_bash": 18, + "armor_cut": 14, + "vision_day": 50, + "vision_night": 35, + "revert_to_itype": "bot_chickenbot", + "starting_ammo": { "40x46mm_m433": 100, "556": 1000 }, + "path_settings": { "max_dist": 10 }, + "special_attacks": [ [ "CHICKENBOT", 4 ] ], + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "HEARS", "BASHES", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS", "DROPS_AMMO" ] + }, + { + "id": "mon_tankbot", + "type": "MONSTER", + "name": "Beagle Mini-Tank UGV", + "description": "The Northrop Beagle is a refrigerator-sized urban warfare UGV. Sporting an anti-tank missile launcher, 40mm grenade launcher, and numerous anti-infantry weapons, it's designed for high-risk urban fighting.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 30, + "volume": "875000 ml", + "weight": "200 kg", + "hp": 240, + "speed": 75, + "material": [ "steel" ], + "symbol": "R", + "color": "dark_gray", + "aggression": 100, + "morale": 100, + "melee_skill": 5, + "melee_dice": 5, + "melee_dice_sides": 5, + "melee_cut": 0, + "armor_bash": 90, + "armor_cut": 90, + "vision_day": 50, + "revert_to_itype": "bot_tankbot", + "starting_ammo": { "40x46mm_m433": 200, "556": 3000 }, + "path_settings": { "max_dist": 20 }, + "special_attacks": [ [ "MULTI_ROBOT", 3 ] ], + "death_function": [ "BROKEN" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "NOHEAD", + "BASHES", + "DESTROYS", + "NO_BREATHE", + "ELECTRONIC", + "PRIORITIZE_TARGETS", + "DROPS_AMMO" + ] + }, + { + "id": "mon_tripod", + "type": "MONSTER", + "name": "tripod", + "description": "The Honda Regnal, a tall robot walking on three spidery legs. For weapons, it has a trio of spiked retractable cables and a flamethrower mounted on its head.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 20, + "volume": "92500 ml", + "weight": "120 kg", + "hp": 80, + "speed": 90, + "material": [ "steel" ], + "symbol": "R", + "color": "white", + "aggression": 100, + "morale": 100, + "melee_skill": 10, + "melee_dice": 3, + "melee_dice_sides": 12, + "melee_cut": 6, + "armor_bash": 12, + "armor_cut": 8, + "path_settings": { "max_dist": 5 }, + "revert_to_itype": "bot_tripod", + "special_attacks": [ [ "FLAMETHROWER", 10 ] ], + "death_drops": { "groups": [ [ "robots", 4 ], [ "tripod", 1 ] ] }, + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "HEARS", "GOODHEARING", "BASHES", "NO_BREATHE", "ELECTRONIC", "CLIMBS", "PRIORITIZE_TARGETS" ] + }, + { + "id": "afs_mon_sentinel_lx", + "type": "MONSTER", + "name": "Wraitheon Sentinel-lx", + "description": "Its exterior plates sable and gold, this luxurious variant of a Wraitheon drone was once kept as a bodyguard by society's wealthiest. Still and with it's wrist sword extended, it resembles an ancient knight, standing an eternal watch.", + "default_faction": "defense_bot", + "species": [ "ROBOT" ], + "diff": 10, + "volume": "62500 ml", + "weight": "81500 g", + "hp": 200, + "speed": 100, + "material": [ "steel" ], + "symbol": "R", + "color": "light_gray", + "aggression": 100, + "morale": 100, + "melee_skill": 6, + "melee_dice": 3, + "melee_dice_sides": 4, + "melee_cut": 5, + "dodge": 8, + "armor_bash": 10, + "armor_cut": 20, + "vision_day": 6, + "vision_night": 6, + "path_settings": { "max_dist": 6 }, + "revert_to_itype": "bot_sentinel_lx", + "special_attacks": [ + [ "SMASH", 20 ], + [ "TAZER", 5 ], + { + "type": "gun", + "cooldown": 15, + "gun_type": "afs_sentinel_laser", + "ranges": [ [ 0, 12, "DEFAULT" ] ], + "targeting_sound": "\"Dispatching hostile with lethal force.\"" + } + ], + "death_function": [ "BROKEN" ], + "death_drops": { "groups": [ [ "mon_afs_sentinel_lx_drops", 1 ] ] }, + "flags": [ + "SEES", + "HEARS", + "BASHES", + "ELECTRONIC", + "NO_BREATHE", + "PRIORITIZE_TARGETS", + "GOODHEARING", + "PATH_AVOID_DANGER_2", + "HIT_AND_RUN" + ] } ] diff --git a/data/mods/Aftershock/mobs/afs_zombies.json b/data/mods/Aftershock/mobs/afs_zombies.json index 40b91ce57b03f..9287228359caf 100644 --- a/data/mods/Aftershock/mobs/afs_zombies.json +++ b/data/mods/Aftershock/mobs/afs_zombies.json @@ -8,7 +8,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "60000 ml", - "weight": 78500, + "weight": "78500 g", "hp": 60, "speed": 50, "material": [ "flesh" ], @@ -49,7 +49,7 @@ "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "hp": 300, "speed": 240, "material": [ "flesh" ], diff --git a/data/mods/Aftershock/npcs/afs_classes.json b/data/mods/Aftershock/npcs/afs_classes.json index 1caf26f2ea86f..b1c8d915a4610 100644 --- a/data/mods/Aftershock/npcs/afs_classes.json +++ b/data/mods/Aftershock/npcs/afs_classes.json @@ -14,7 +14,7 @@ "type": "npc_class", "id": "afs_prepnet_gardener", "name": "Gardener", - "job_description": "When the end came, we were ready. Now I grow food for my phyle.", + "job_description": "When the end came, we were ready. Now I grow food for my phyle.", "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ], "skills": [ { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 4, 2 ] }, { "rng": [ -4, -1 ] } ] } ] } }, diff --git a/data/mods/Aftershock/npcs/afs_npc.json b/data/mods/Aftershock/npcs/afs_npc.json index 8b5617036d7ee..c420e2d9addb2 100644 --- a/data/mods/Aftershock/npcs/afs_npc.json +++ b/data/mods/Aftershock/npcs/afs_npc.json @@ -8,7 +8,6 @@ "attitude": 1, "mission": 0, "chat": "TALK_PrepNet_gardener_1", - "faction": "Prepnet_Phyle", - "mon_faction": "PrepNet" + "faction": "Prepnet_Phyle" } ] diff --git a/data/mods/Aftershock/npcs/afs_prepnet_dialogue.json b/data/mods/Aftershock/npcs/afs_prepnet_dialogue.json index 2678435dea5f9..dc0914991aae7 100644 --- a/data/mods/Aftershock/npcs/afs_prepnet_dialogue.json +++ b/data/mods/Aftershock/npcs/afs_prepnet_dialogue.json @@ -58,7 +58,7 @@ { "type": "talk_topic", "id": "TALK_PrepNet_gardener_place", - "dynamic_line": "This is a PrepNet Phyle orchard. We were a community of survivalists gathering resources to prepare for climate change, but it left us better prepared for what actually happened than most.", + "dynamic_line": "This is a PrepNet Phyle orchard. We were a community of survivalists gathering resources to prepare for climate change, but it left us better prepared for what actually happened than most.", "responses": [ { "text": "Can you give me something to eat then?", "topic": "TALK_PrepNet_gardener_food" }, { "text": "What can I buy here?", "topic": "TALK_PrepNet_gardener_ask_goods" }, @@ -69,7 +69,7 @@ { "type": "talk_topic", "id": "TALK_PrepNet_gardener_food", - "dynamic_line": "This food has to go back to our core communities. But maybe we can trade some food for services", + "dynamic_line": "This food has to go back to our core communities. But maybe we can trade some food for services", "responses": [ { "text": "I can pay.", "topic": "TALK_PrepNet_gardener_ask_food_bribe" }, { "text": "What do you need done?", "topic": "TALK_MISSION_LIST" }, @@ -79,7 +79,7 @@ { "type": "talk_topic", "id": "TALK_PrepNet_gardener_ask_food_bribe", - "dynamic_line": "You have to earn the right to trade with us. Plus we created our own currency before the Cataclysm", + "dynamic_line": "You have to earn the right to trade with us. Plus we created our own currency before the Cataclysm", "responses": [ { "text": "It was worth a try.", "topic": "TALK_PrepNet_gardener_1" }, { "text": "What kind of currency?", "topic": "TALK_PrepNet_gardener_currency" } @@ -94,7 +94,7 @@ { "type": "talk_topic", "id": "TALK_PrepNet_gardener_ask_goods", - "dynamic_line": "Here? Fruits and berries. Maybe the occasional piece of farm equipment, but you need crypto coins", + "dynamic_line": "Here? Fruits and berries. Maybe the occasional piece of farm equipment, but you need crypto coins", "responses": [ { "text": "Ok.", "topic": "TALK_PrepNet_gardener_1" }, { "text": "What are crypto coins?", "topic": "TALK_PrepNet_gardener_currency" }, @@ -104,7 +104,7 @@ { "type": "talk_topic", "id": "TALK_PrepNet_gardener_ask_past", - "dynamic_line": "I got introduced to the movement through Mutual Aid Society. From there it became an all consuming part of my life to prepare for a post consumption world. It seems to have worked better for us than for many others.", + "dynamic_line": "I got introduced to the movement through Mutual Aid Society. From there it became an all consuming part of my life to prepare for a post consumption world. It seems to have worked better for us than for many others.", "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_PrepNet_gardener_1" } ] }, { @@ -116,7 +116,7 @@ { "type": "talk_topic", "id": "TALK_PrepNet_gardener_currency", - "dynamic_line": "We use crypto coins for money here. They were a pre-Cataclysm attempt to abstract money even further and create electronic cash. We figured we'd keep it up. Barter only gets you so far.", + "dynamic_line": "We use crypto coins for money here. They were a pre-Cataclysm attempt to abstract money even further and create electronic cash. We figured we'd keep it up. Barter only gets you so far.", "responses": [ { "text": "Oh, okay.", "topic": "TALK_PrepNet_gardener_1" }, { "text": "What can I buy here?", "effect": "start_trade", "topic": "TALK_PrepNet_gardener_1" } @@ -136,13 +136,13 @@ "followup": "MISSION_PrepNet_gardener_FOOD_2", "dialogue": { "describe": "I need 50 fur pelts.", - "offer": "I've got to maintain the orchard but at nights I work on prepping winter clothes. Could you find about... 50 fur pelts for me?", + "offer": "I've got to maintain the orchard but at nights I work on prepping winter clothes. Could you find about… 50 fur pelts for me?", "accepted": "Don't forget to tell me when you have them.", "rejected": "It's okay, I can do without them. Just let me know if you reconsider.", "advice": "There's a lot of places to look. The entire outdoors is full of wild animals.", "inquire": "How is the search going? Have you found'em?", "success": "I really apreciate your help. Don't worry, you won't leave empty-handed.", - "success_lie": "Thanks for trying... I guess.", + "success_lie": "Thanks for trying… I guess.", "failure": "Don't worry about it, it's not that important." }, "end": { "effect": [ { "u_buy_item": "crypto_coin", "count": 6 } ] } @@ -162,12 +162,12 @@ "dialogue": { "describe": "I need 50 flour.", "offer": "Flour would let me break the monotony of fruit and meats.", - "accepted": "Thanks for accepting this task. Otherwise I might kill a stranger for a sandwich. Just kidding.", + "accepted": "Thanks for accepting this task. Otherwise I might kill a stranger for a sandwich. Just kidding.", "rejected": "Just let me know if you change your mind.", "advice": "Flour is not that hard to find. I'd look for them in residental areas and professional kitchens or bakeries.", "inquire": "Have you found the flour?", "success": "Thank you for your help. Here's your reward.", - "success_lie": "Thanks for trying... I guess.", + "success_lie": "Thanks for trying… I guess.", "failure": "It's not a big deal, it isn't that urgent." }, "end": { "effect": [ { "u_buy_item": "crypto_coin", "count": 5 } ] } @@ -186,13 +186,13 @@ "followup": "MISSION_PrepNet_gardener_QUEST_4", "dialogue": { "describe": "I need storage for various liquid products when the fruits come in.", - "offer": "Every season we produce so much fruit. Some of it will be turned into juice and some into alcohol. I need easy containers to load it on the caravan.", + "offer": "Every season we produce so much fruit. Some of it will be turned into juice and some into alcohol. I need easy containers to load it on the caravan.", "accepted": "Thank you for accepting. I'm almost out after the last caravan.", "rejected": "I guess I'll have to make stomach waterskins.", "advice": "Gallon jugs are not that rare to find. They are commonly found in kitchens.", "inquire": "Do you have those jugs now?", - "success": "I am grateful for the help you've done. I have one more task to do.", - "success_lie": "Thanks for trying... I guess.", + "success": "I am grateful for the help you've done. I have one more task to do.", + "success_lie": "Thanks for trying… I guess.", "failure": "Don't worry about it, it's not that important." }, "end": { "effect": [ { "u_buy_item": "crypto_coin", "count": 3 } ] } @@ -212,11 +212,11 @@ "describe": "We have the ability to manufacture CBMs but lack resources.", "offer": "If you can bring me faulty CBMs we can recycle them into new ones.", "accepted": "Thank you for accepting. You're really making yourself useful to the phyle.", - "rejected": "These materials are often in dangerous areas. I understand your decision.", + "rejected": "These materials are often in dangerous areas. I understand your decision.", "advice": "Zombie scientists, technicians, shocker zombies. These are not undertaken lightly.", "inquire": "Do you have those CBMs now?", - "success": "I am grateful for the help you've done. I think we might be able to introduce you to others soon.", - "success_lie": "Thanks for trying... I guess.", + "success": "I am grateful for the help you've done. I think we might be able to introduce you to others soon.", + "success_lie": "Thanks for trying… I guess.", "failure": "Don't worry about it, it's not that important." }, "end": { "effect": [ { "u_buy_item": "crypto_coin", "count": 12 } ] } diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/afs_professions.json index a42b13cf739a2..27d21f1b0159e 100644 --- a/data/mods/Aftershock/player/afs_professions.json +++ b/data/mods/Aftershock/player/afs_professions.json @@ -32,8 +32,10 @@ "points": 2, "skills": [ { "level": 5, "name": "computer" } ], "items": { - "both": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ], - "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ], + "both": { + "items": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ], + "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ] + }, "male": [ "briefs" ], "female": [ "bra", "panties" ] } @@ -64,7 +66,7 @@ "type": "profession", "ident": "afs_radio_technician", "name": "Radio Tower Technician", - "description": "From your spot at the top of the tower you were working on, you had a good view of the end of the world; of streaks of light falling from the sky, blossoming into mushroom clouds, barely a flicker on the horizon before your optical dampers flicked down. You rushed to safety before the shockwaves could blast you from your perch. The bionic implants included with your contract might come in handy now...", + "description": "From your spot at the top of the tower you were working on, you had a good view of the end of the world; of streaks of light falling from the sky, blossoming into mushroom clouds, barely a flicker on the horizon before your optical dampers flicked down. You rushed to safety before the shockwaves could blast you from your perch. The bionic implants included with your contract might come in handy now…", "points": 4, "CBMs": [ "bio_weight", @@ -228,6 +230,29 @@ "female": [ "bra", "panties" ] } }, + { + "type": "profession", + "ident": "afs_wraitheon_executive", + "name": "Wraitheon Executive", + "description": "You were one of the chief executives of the Megacoprporation Wraitheon Robotics ltd. and consistently ranked among the most powerful and influential persons of the world. Still, the apocalypse has caught you unprepared, and now after the dissolution of your company and the crumbling of your network of influence, your were left powerless and destitute, and must rely on your two robotic bodyguards to survive.", + "points": 8, + "CBMs": [ "bio_batteries", "bio_power_storage_mkII", "bio_eye_enhancer", "bio_int_enhancer", "bio_memory", "bio_cable" ], + "traits": [ "FLIMSY3", "SLOWHEALER3" ], + "pets": [ { "name": "afs_mon_sentinel_lx", "amount": 2 } ], + "skills": [ { "level": 6, "name": "speech" }, { "level": 6, "name": "computer" } ], + "items": { + "both": { + "items": [ "tux", "dress_shoes", "socks", "gold_watch", "undershirt", "smart_phone", "gasdiscount_platinum" ], + "entries": [ + { "item": "cash_card", "charges": 200000000 }, + { "item": "cash_card", "charges": 200000000 }, + { "item": "afs_wraitheon_smartphone" } + ] + }, + "male": [ "briefs", "collarpin", "diamond_ring" ], + "female": [ "panties", "hairpin", "pearl_collar" ] + } + }, { "type": "profession", "ident": "afs_affluent_executive", diff --git a/data/mods/Aftershock/player/afs_techniques.json b/data/mods/Aftershock/player/afs_techniques.json index 2929f2ac7502c..3bb4fe7ef77af 100644 --- a/data/mods/Aftershock/player/afs_techniques.json +++ b/data/mods/Aftershock/player/afs_techniques.json @@ -5,7 +5,7 @@ "name": "Pressure Crunch", "unarmed_allowed": true, "melee_allowed": true, - "min_melee": 3, + "skill_requirements": [ { "name": "melee", "level": 3 } ], "crit_tec": true, "mult_bonuses": [ [ "damage", "bash", 1.5 ] ], "stun_dur": 3, diff --git a/data/mods/Aftershock/recipes/afs__recipes.json b/data/mods/Aftershock/recipes/afs__recipes.json index 02c27e337db45..a41cb50105c91 100644 --- a/data/mods/Aftershock/recipes/afs__recipes.json +++ b/data/mods/Aftershock/recipes/afs__recipes.json @@ -424,5 +424,115 @@ [ [ "cable", 3 ] ], [ [ "plastic_chunk", 3 ] ] ] + }, + { + "type": "recipe", + "result": "bot_tankbot", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_OTHER", + "skill_used": "electronics", + "skills_required": [ [ "mechanics", 9 ], [ "computer", 8 ] ], + "reversible": true, + "decomp_learn": 8, + "book_learn": [ [ "schematics_tankbot", 9 ] ], + "difficulty": 9, + "time": "1 h 15 m", + "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], + "qualities": [ + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "WRENCH", "level": 2 }, + { "id": "WRENCH_FINE", "level": 1 } + ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "tank_tread", 1 ] ], + [ [ "tankbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], + [ [ "flamethrower", 1 ] ], + [ [ "tazer", 1 ] ], + [ [ "m4a1", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] + }, + { + "type": "recipe", + "result": "bot_tripod", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_OTHER", + "skill_used": "electronics", + "skills_required": [ [ "mechanics", 9 ], [ "computer", 8 ] ], + "reversible": true, + "decomp_learn": 8, + "book_learn": [ [ "schematics_tripod", 9 ] ], + "difficulty": 9, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 10 ] ], + "qualities": [ + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "WRENCH", "level": 2 }, + { "id": "WRENCH_FINE", "level": 1 } + ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "spidery_legs_big", 1 ] ], + [ [ "tripod_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "power_supply", 12 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "flamethrower", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bot_chickenbot", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_OTHER", + "skill_used": "electronics", + "skills_required": [ [ "mechanics", 10 ], [ "computer", 9 ] ], + "reversible": true, + "decomp_learn": 9, + "book_learn": [ [ "schematics_chickenbot", 10 ] ], + "difficulty": 10, + "time": "1 h 15 m", + "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], + "qualities": [ + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "WRENCH", "level": 2 }, + { "id": "WRENCH_FINE", "level": 1 } + ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "reverse_jointed_legs", 1 ] ], + [ [ "chickenbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], + [ [ "mark19", 1 ] ], + [ [ "tazer", 1 ] ], + [ [ "m249", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] } ] diff --git a/data/mods/Aftershock/recipes/afs_comestible_recipes.json b/data/mods/Aftershock/recipes/afs_comestible_recipes.json index 53fe5ecf27ad8..58e7be20df4f3 100644 --- a/data/mods/Aftershock/recipes/afs_comestible_recipes.json +++ b/data/mods/Aftershock/recipes/afs_comestible_recipes.json @@ -1,18 +1,4 @@ [ - { - "type": "recipe", - "result": "afs_dough", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 1, - "time": 5000, - "charges": 2, - "batch_time_factors": [ 50, 4 ], - "autolearn": true, - "tools": [ [ "rolling_pin" ] ], - "components": [ [ [ "flour", 2 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ] - }, { "type": "recipe", "result": "butter", @@ -26,54 +12,6 @@ "autolearn": true, "components": [ [ [ "milk_raw", 45 ] ], [ [ "salt", 15 ] ] ] }, - { - "type": "recipe", - "result": "flatbread", - "id_suffix": "afs_from_dough", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 1, - "time": 15000, - "charges": 2, - "batch_time_factors": [ 50, 4 ], - "autolearn": true, - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], - "components": [ [ [ "afs_dough", 6 ] ] ] - }, - { - "type": "recipe", - "result": "bread", - "id_suffix": "afs_from_dough", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 1, - "time": 20000, - "charges": 2, - "batch_time_factors": [ 50, 4 ], - "autolearn": true, - "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], - "components": [ [ [ "afs_dough", 15 ] ], [ [ "yeast", 1 ] ] ] - }, - { - "type": "recipe", - "result": "hardtack", - "id_suffix": "afs_from_dough", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 1, - "time": 90000, - "charges": 2, - "batch_time_factors": [ 50, 4 ], - "autolearn": true, - "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ], - "components": [ [ [ "afs_dough", 2 ] ], [ [ "salt", 1 ], [ "soysauce", 1 ], [ "seasoning_salt", 1 ] ] ] - }, { "type": "recipe", "result": "afs_calorie_water", diff --git a/data/mods/Aftershock/recipes/afs_deconstruction.json b/data/mods/Aftershock/recipes/afs_deconstruction.json index 23d3494fe4e61..9114be0f469b5 100644 --- a/data/mods/Aftershock/recipes/afs_deconstruction.json +++ b/data/mods/Aftershock/recipes/afs_deconstruction.json @@ -16,5 +16,104 @@ [ [ "sensory_cluster", 1 ] ], [ [ "bioweapon_chassis", 1 ] ] ] + }, + { + "result": "broken_tankbot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 8, + "time": "10 h", + "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "tank_tread", 1 ] ], + [ [ "tankbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], + [ [ "flamethrower", 1 ] ], + [ [ "tazer", 1 ] ], + [ [ "m4a1", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] + }, + { + "result": "broken_chickenbot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 8, + "time": "10 h", + "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "chickenbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], + [ [ "m249", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] + }, + { + "result": "broken_tripod", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 8, + "time": "5 h", + "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "spidery_legs_big", 1 ] ], + [ [ "tripod_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "power_supply", 12 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "flamethrower", 1 ] ] + ] + }, + { + "result": "broken_afs_mon_sentinel_lx", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 6, + "time": "2 h", + "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "ai_module_advanced", 1 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "android_legs", 1 ] ], + [ [ "android_chassis", 1 ] ], + [ [ "android_arms", 1 ] ], + [ [ "medium_storage_battery", 1 ] ], + [ [ "huge_atomic_battery_cell", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "afs_sentinel_laser", 1 ] ] + ] } ] diff --git a/data/mods/Aftershock/recipes/obsolete.json b/data/mods/Aftershock/recipes/obsolete.json new file mode 100644 index 0000000000000..32737674d3019 --- /dev/null +++ b/data/mods/Aftershock/recipes/obsolete.json @@ -0,0 +1,25 @@ +[ + { + "type": "recipe", + "result": "afs_dough", + "obsolete": true + }, + { + "type": "recipe", + "id_suffix": "afs_from_dough", + "result": "flatbread", + "obsolete": true + }, + { + "type": "recipe", + "id_suffix": "afs_from_dough", + "result": "bread", + "obsolete": true + }, + { + "type": "recipe", + "id_suffix": "afs_from_dough", + "result": "hardtack", + "obsolete": true + } +] diff --git a/data/mods/Aftershock/vehicles/afs_part_items.json b/data/mods/Aftershock/vehicles/afs_part_items.json index 3b6fc148584c9..656b993ed2376 100644 --- a/data/mods/Aftershock/vehicles/afs_part_items.json +++ b/data/mods/Aftershock/vehicles/afs_part_items.json @@ -4,13 +4,13 @@ "id": "afs_hauling_space", "name": "hauling space", "description": "A huge metal space used in conjunction with extension of a vehicle's roof to create a very large amount of space for transporting goods.", - "weight": 120000, + "weight": "120 kg", "to_hit": -6, "color": "cyan", "symbol": "]", "looks_like": "cargo_aisle", "material": [ "steel" ], - "volume": 400, + "volume": "100 L", "bashing": 2, "category": "veh_parts", "price": 50000 @@ -20,14 +20,14 @@ "id": "afs_titanium_frame", "name": "ultralight frame", "description": "A sturdy, lightweight frame made from titanium. Useful for crafting.", - "weight": 1000, + "weight": "1 kg", "to_hit": -3, "color": "white", "symbol": "]", "material": [ "titanium" ], "looks_like": "xlframe", "techniques": [ "DEF_DISARM" ], - "volume": 30, + "volume": "7500 ml", "bashing": 15, "category": "veh_parts", "price": 4000 @@ -62,12 +62,12 @@ "name": "control station", "looks_like": "vehicle_dashboard", "description": "A large and complex piloting station from a military vehicle, including a camera station, steering tools, and electronics controls.", - "weight": 9000, + "weight": "9 kg", "to_hit": -4, "color": "red", "symbol": "$", "material": [ "plastic", "steel" ], - "volume": 24, + "volume": "6 L", "bashing": 2, "category": "veh_parts", "price": 60000 diff --git a/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json b/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json index cf8d2507ee7dc..f4882e95aca6f 100644 --- a/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json +++ b/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json @@ -97,7 +97,7 @@ { "y": 1, "x": 3, - "parts": [ "turret_mount", { "ammo_type": [ "40x46mm_m433" ], "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ] + "parts": [ "turret_mount", { "ammo_types": [ "40x46mm_m433" ], "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ] }, { "y": 1, "x": 3, "parts": [ "seat", "seatbelt_heavyduty" ] }, { "y": 0, "x": 3, "parts": [ "hdframe_vertical_2", "stowboard_vertical", "hdroof" ] }, diff --git a/data/mods/Animatronics/animatronics.json b/data/mods/Animatronics/animatronics.json index 1dabbda30c912..20167fde7c3fe 100644 --- a/data/mods/Animatronics/animatronics.json +++ b/data/mods/Animatronics/animatronics.json @@ -8,7 +8,7 @@ "symbol": "F", "color": "red", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 100, "morale": 100, @@ -22,13 +22,11 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 100, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A bipedal animatronic fox, nearly twice your size. Its teeth and claws look quite sharp. Its right hand is replaced with a hook. It looks heavily worn and degraded.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -42,7 +40,7 @@ "symbol": "F", "color": "white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -56,13 +54,11 @@ "armor_cut": 8, "vision_day": 50, "vision_night": 50, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 75 ], [ "default_zombie_clothes", 10 ], [ "child_items", 25 ] ] }, "luminance": 0, "hp": 160, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A bipedal animatronic fox, nearly twice your size. Its teeth and claws look quite sharp. Its outer layer is made of reinforced plastic. It looks to be high tech, and in good shape.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -76,7 +72,7 @@ "symbol": "F", "color": "white", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "material": "steel", "aggression": 50, "morale": 100, @@ -90,13 +86,11 @@ "armor_cut": 12, "vision_day": 50, "vision_night": 50, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 75 ], [ "default_zombie_clothes", 10 ], [ "child_items", 25 ] ] }, "luminance": 0, "hp": 100, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A wrecked animatronic fox, laying in a pile on the ground. Its teeth and claws still look quite sharp. It's able to crawl around and climb on the ceiling.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -110,7 +104,7 @@ "symbol": "B", "color": "light_blue", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -124,13 +118,11 @@ "armor_cut": 8, "vision_day": 50, "vision_night": 50, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 75 ], [ "default_zombie_clothes", 10 ], [ "child_items", 25 ] ] }, "luminance": 0, "hp": 160, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A bipedal animatronic bunny, nearly twice your size. Its actually quite cute, even though it's trying to kill you. Its outer layer is made of reinforced plastic. It looks to be high tech, and in good shape.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -144,7 +136,7 @@ "symbol": "B", "color": "blue", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 100, "morale": 100, @@ -158,13 +150,11 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 100, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A bipedal animatronic bunny, nearly twice your size. Its face has been torn clear off, though the sockets for it's eyes still exist. It looks heavily worn and degraded.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -178,7 +168,7 @@ "symbol": "C", "color": "yellow", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 100, "morale": 100, @@ -192,13 +182,11 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 100, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A bipedal animatronic chicken, nearly twice your size. It's wearing a bib that reads 'Let's Eat!'. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -212,7 +200,7 @@ "symbol": "C", "color": "yellow", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -226,13 +214,11 @@ "armor_cut": 8, "vision_day": 50, "vision_night": 50, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 75 ], [ "default_zombie_clothes", 10 ], [ "child_items", 25 ] ] }, "luminance": 0, "hp": 160, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A bipedal animatronic chicken, nearly twice your size. It's wearing a bib that reads 'Let's Party!'. She oddly has a curvaceous figure. Its outer layer is made of reinforced plastic. It looks to be high tech, and in good shape.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -246,7 +232,7 @@ "symbol": "B", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 100, "morale": 100, @@ -260,13 +246,11 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 100, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A bipedal animatronic bear, nearly twice your size. It's holding a microphone, and wearing a top hat. Though it is a robot, it stinks like death. It looks heavily worn and degraded.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -280,7 +264,7 @@ "symbol": "B", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -294,13 +278,11 @@ "armor_cut": 8, "vision_day": 50, "vision_night": 50, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 180, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A bipedal animatronic bear, nearly twice your size. It's holding a microphone, and wearing a top hat. Its outer layer is made of reinforced plastic. It looks to be high tech, and in good shape.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -314,7 +296,7 @@ "symbol": "B", "color": "dark_gray", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -328,13 +310,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic bat, nearly twice your size. It might have been cute once, but has fallen into disrepair. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -348,7 +327,7 @@ "symbol": "b", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -362,13 +341,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic beaver, nearly twice your size. Its buck teeth look far more sharp than they should be. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -382,7 +358,7 @@ "symbol": "c", "color": "yellow", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -396,13 +372,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic cat, nearly twice your size. Its claws are extremely sharp. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -416,7 +389,7 @@ "symbol": "c", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -430,13 +403,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic chipmunk, nearly twice your size. You might call it cute if it wasn't charging you down right now. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -450,7 +420,7 @@ "symbol": "C", "color": "white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -464,13 +434,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 160, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic cow, nearly twice your size. Its voice-box is broken, making it emit shrill, eerie moos. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -484,7 +451,7 @@ "symbol": "C", "color": "dark_gray", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -498,13 +465,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic coyote, nearly twice your size. Its head twitches about faster than seems possible. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -518,7 +482,7 @@ "symbol": "D", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -532,13 +496,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic deer, nearly twice your size. The hunter becomes the hunted. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -552,7 +513,7 @@ "symbol": "H", "color": "brown", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -566,13 +527,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 180, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic horse, nearly twice your size. It's amazing. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -586,7 +544,7 @@ "symbol": "P", "color": "pink", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -600,13 +558,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 160, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic pig, nearly twice your size. Little piggy go home, little piggy no no. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -620,7 +575,7 @@ "symbol": "S", "color": "white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -634,13 +589,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic sheep, nearly twice your size. Its wool is mangy and gross. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -654,7 +606,7 @@ "symbol": "S", "color": "red", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -668,13 +620,10 @@ "armor_cut": 4, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic squirrel, nearly twice your size. Judging by its sharp teeth, you hope it does not like nuts. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -688,7 +637,7 @@ "symbol": "c", "color": "yellow", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "material": "steel", "aggression": 50, "morale": 100, @@ -702,13 +651,11 @@ "armor_cut": 2, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 100, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "An animatronic child. It looks like it's annoying as hell. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -722,7 +669,7 @@ "symbol": "m", "color": "dark_gray", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "material": "steel", "aggression": 100, "morale": 100, @@ -736,13 +683,11 @@ "armor_cut": 2, "vision_day": 50, "vision_night": 50, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 10 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 100, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ [ "PARROT", 0 ] ], + "death_function": [ "BROKEN" ], + "special_attacks": [ [ "PARROT", 0 ] ], "description": "A marionette able to move itself around. There are no strings on him however.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] @@ -756,7 +701,7 @@ "symbol": "W", "color": "dark_gray", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "steel", "aggression": 50, "morale": 100, @@ -770,13 +715,10 @@ "armor_cut": 6, "vision_day": 30, "vision_night": 5, - "item_chance": 80, "death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] }, "luminance": 0, "hp": 150, - "special_freq": [ 0 ], - "death_function": "BROKEN", - "special_attack": [ "NONE" ], + "death_function": [ "BROKEN" ], "description": "A bipedal animatronic wolf, nearly twice your size. If the animal counterpart was scary, this robot is terrifying. Though it is a robot, it stinks like death.", "flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ] diff --git a/data/mods/Animatronics/bankrupt_pizzeria.json b/data/mods/Animatronics/bankrupt_pizzeria.json index ad8ead4eac023..6ebe4dc34db68 100644 --- a/data/mods/Animatronics/bankrupt_pizzeria.json +++ b/data/mods/Animatronics/bankrupt_pizzeria.json @@ -33,8 +33,8 @@ [ "sauce_pesto", 12 ], [ "zucchini", 13 ], [ "tomato", 10 ], - [ "mushroom_magic", 2 ], - [ "mushroom_poison", 1 ], + { "item": "mushroom", "prob": 2, "custom-flags": [ "HIDDEN_HALLU" ] }, + { "item": "mushroom", "prob": 1, "custom-flags": [ "HIDDEN_POISON" ] }, [ "mushroom", 27 ], [ "sausage", 25 ], [ "pineapple", 20 ] @@ -251,7 +251,6 @@ "I": "f_hay" }, "toilets": { "t": { } }, - "comment": "randomly picked from a group ---v", "place_items": [ { "item": "pizza_display", "x": 11, "y": 5, "chance": 60 }, { "item": "pizza_kitchen", "x": 17, "y": 16, "chance": 60 }, @@ -289,12 +288,10 @@ { "monster": "GROUP_PIZZAPARLOR_ROBOT", "chance": 1, "x": 10, "y": 1, "density": 0.1 }, { "monster": "GROUP_PIZZAPARLOR_ROBOT", "chance": 1, "x": 11, "y": 1, "density": 0.1 }, { "monster": "GROUP_PIZZAPARLOR_ROBOT", "chance": 1, "x": 1, "y": 13, "density": 0.1 } - ], - "comment": "end of mapgen json definition ---v" - }, - "comment": "end of mapgen entry ---v", - "flags": [ "SIDEWALK" ] + ] + } } - ] + ], + "flags": [ "SIDEWALK" ] } ] diff --git a/data/mods/Animatronics/dead_animatronics.json b/data/mods/Animatronics/dead_animatronics.json index 25312e6dc5c71..672cc09954061 100644 --- a/data/mods/Animatronics/dead_animatronics.json +++ b/data/mods/Animatronics/dead_animatronics.json @@ -10,8 +10,8 @@ "description": "A broken animatronic fox. If it was in bad shape before, it's a wreck now. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -27,8 +27,8 @@ "description": "A broken animatronic bunny. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -43,8 +43,8 @@ "description": "A broken animatronic chicken. It doesn't look as attractive now.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -59,8 +59,8 @@ "description": "A broken animatronic chicken. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -75,8 +75,8 @@ "description": "A broken animatronic bear. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -91,8 +91,8 @@ "description": "A broken animatronic bear. Limp and lifeless.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -107,8 +107,8 @@ "description": "A broken animatronic bat. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -123,8 +123,8 @@ "description": "A broken animatronic beaver. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -139,8 +139,8 @@ "description": "A broken animatronic cat. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -155,8 +155,8 @@ "description": "A broken animatronic chipmunk. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -171,8 +171,8 @@ "description": "A broken animatronic cow. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -187,8 +187,8 @@ "description": "A broken animatronic coyote. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -204,8 +204,8 @@ "description": "A broken animatronic deer. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -220,8 +220,8 @@ "description": "A broken animatronic horse. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -236,8 +236,8 @@ "description": "A broken animatronic pig. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -253,8 +253,8 @@ "description": "A broken animatronic sheep. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -269,8 +269,8 @@ "description": "A broken animatronic squirrel. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -286,8 +286,8 @@ "description": "A broken animatronic child. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -303,8 +303,8 @@ "description": "A broken animatronic fox. It seems like it's still looking at you, enraged in what you've done to her.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -320,8 +320,8 @@ "description": "A broken, wrecked animatronic fox. You have no idea if it's actually dead, as it doesn't look that different from the condition you found it in.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -337,8 +337,8 @@ "description": "A broken animatronic wolf. For some reason, it is oozing with blood - it's not your blood.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -353,8 +353,8 @@ "description": "A broken marionette. How creepy.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 @@ -370,8 +370,8 @@ "description": "A broken animatronic bunny. Limp and lifeless.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 17023, - "volume": 30, + "weight": "17023 g", + "volume": "7500 ml", "bashing": 10, "cutting": 6, "to_hit": -2 diff --git a/data/mods/Animatronics/regional_overlay.json b/data/mods/Animatronics/regional_overlay.json index 9d98db96c0445..63ca7738d0b26 100644 --- a/data/mods/Animatronics/regional_overlay.json +++ b/data/mods/Animatronics/regional_overlay.json @@ -1,8 +1,6 @@ [ { "type": "region_overlay", - "id": "animatronics_overlay", - "//": "unique identifier for this overlay", "regions": [ "all" ], "//": "A list of regions to which this overlay should be applied", "city": { "parks": { "//": "weighted list for park overmap terrains", "bankruptpizzeria": 200 } } diff --git a/data/mods/Battery_Migration/items/batt_mag.json b/data/mods/Battery_Migration/items/batt_mag.json index 9cb9222131111..b34c63e2583b1 100644 --- a/data/mods/Battery_Migration/items/batt_mag.json +++ b/data/mods/Battery_Migration/items/batt_mag.json @@ -8,15 +8,14 @@ "name_plural": "batteries", "symbol": "=", "color": "yellow", - "description": "Some free-floating battery charge. This can be reloaded into rechargable battery cells, but can never be unloaded.", + "description": "Some free-floating battery charge. This can be reloaded into rechargable battery cells, but can never be unloaded.", "flags": "TRADER_AVOID", "material": "iron", - "volume": 1, - "weight": 1, + "volume": "250 ml", + "weight": "1 g", "ammo_type": "battery", - "reload_time": 1, "count": 100, - "//": "1 battery is 1 kJ of energy. 40 batteries is an alkaline C-cell.", + "//": "1 battery is 1 kJ of energy. 40 batteries is an alkaline C-cell.", "fuel": { "energy": 1 } }, { @@ -25,7 +24,7 @@ "category": "spare_parts", "name": "ultra-light battery cell", "description": "This is a light battery cell designed for small size over everything else. It retains its universal compatibility, though.", - "weight": 5, + "weight": "5 g", "volume": 0, "price": 1500, "material": [ "iron" ], @@ -42,7 +41,7 @@ "category": "spare_parts", "name": "light battery cell", "description": "This is a light battery cell, universally compatible with all kinds of small devices.", - "weight": 50, + "weight": "50 g", "volume": "75ml", "price": 3500, "material": [ "iron" ], @@ -60,7 +59,7 @@ "name": "light battery cell (high-capacity)", "name_plural": "light battery cells (high-capacity)", "description": "This is a high-capacity light battery cell, universally compatible with all kinds of personal electronic devices.", - "weight": 75, + "weight": "75 g", "volume": "115ml", "price": 5000, "material": [ "iron" ], @@ -77,7 +76,7 @@ "category": "spare_parts", "name": "medium battery cell", "description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools.", - "weight": 250, + "weight": "250 g", "volume": "375ml", "price": 10000, "material": [ "iron" ], @@ -95,7 +94,7 @@ "name": "medium battery cell (high-capacity)", "name_plural": "medium battery cells (high-capacity)", "description": "This is a high-capacity medium battery cell, universally compatible with all kinds of appliances and power tools.", - "weight": 350, + "weight": "350 g", "volume": "450ml", "price": 12500, "material": [ "iron" ], @@ -112,7 +111,7 @@ "category": "spare_parts", "name": "heavy battery cell", "description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.", - "weight": 500, + "weight": "500 g", "volume": "750ml", "price": 10000, "material": [ "iron" ], @@ -130,7 +129,7 @@ "name": "heavy battery cell (high-capacity)", "name_plural": "heavy battery cells (high-capacity)", "description": "This is a high-capacity heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.", - "weight": 950, + "weight": "950 g", "volume": "1000ml", "price": 12500, "material": [ "iron" ], diff --git a/data/mods/CRT_EXPANSION/constructions/crt_terrain.json b/data/mods/CRT_EXPANSION/constructions/crt_terrain.json index d78a576abb040..83b21d2c9f94a 100644 --- a/data/mods/CRT_EXPANSION/constructions/crt_terrain.json +++ b/data/mods/CRT_EXPANSION/constructions/crt_terrain.json @@ -3,7 +3,7 @@ "type": "terrain", "id": "t_wall_stick", "name": "stick wall", - "description": "A cheap mish mash of planks and sticks with a log pillar that keeps it together. It is capable of supporting an upper level or roof. Dirt and stones make the wall secure. Somewhat flammable.", + "description": "A cheap mish mash of planks and sticks with a log pillar that keeps it together. It is capable of supporting an upper level or roof. Dirt and stones make the wall secure. Somewhat flammable.", "symbol": "LINE_OXOX", "color": "brown_white", "move_cost": 0, diff --git a/data/mods/CRT_EXPANSION/crt_materials.json b/data/mods/CRT_EXPANSION/crt_materials.json index d4ce6d0592136..dbb5b022129ff 100644 --- a/data/mods/CRT_EXPANSION/crt_materials.json +++ b/data/mods/CRT_EXPANSION/crt_materials.json @@ -16,11 +16,7 @@ "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], "bash_dmg_verb": "ripped", "cut_dmg_verb": "cut", - "burn_data": [ - { "fuel": 1, "smoke": 3, "burn": 1, "chance": 10 }, - { "fuel": 1, "smoke": 3, "burn": 2 }, - { "fuel": 1, "smoke": 3, "burn": 3 } - ] + "burn_data": [ { "fuel": 1, "smoke": 3, "burn": 1 }, { "fuel": 1, "smoke": 3, "burn": 2 }, { "fuel": 1, "smoke": 3, "burn": 3 } ] }, { "type": "AMMO", @@ -33,8 +29,8 @@ "color": "dark_gray", "description": "A chunk of useful rubber, can be molded easily.", "material": "rubber", - "volume": 1, - "weight": 38, + "volume": "250 ml", + "weight": "38 g", "ammo_type": "components", "flags": "NO_SALVAGE" } diff --git a/data/mods/CRT_EXPANSION/items/crt_ammo.json b/data/mods/CRT_EXPANSION/items/crt_ammo.json index 47b5f17b8fb22..98683ce367a7f 100644 --- a/data/mods/CRT_EXPANSION/items/crt_ammo.json +++ b/data/mods/CRT_EXPANSION/items/crt_ammo.json @@ -9,7 +9,7 @@ "description": "A round tin of small light grain .177 lead pellets. These are common, tipped field pellets that can deal some light damage but are generally used for plinking.", "material": "steel", "volume": "200ml", - "weight": 2, + "weight": "2 g", "ammo_type": "pellets", "damage": 4, "dispersion": 100, @@ -60,10 +60,10 @@ "name": "pulse round", "symbol": "=", "color": "light_blue", - "description": "A helical magazine of hollow-point alloy bullets propelled by pockets of primer. Not the most lethal thing out there, but it still packs a punch without the worry of having a stray shot seriously damaging the environment.", + "description": "A helical magazine of hollow-point alloy bullets propelled by pockets of primer. Not the most lethal thing out there, but it still packs a punch without the worry of having a stray shot seriously damaging the environment.", "material": [ "steel", "powder" ], "volume": "250ml", - "weight": 2, + "weight": "2 g", "ammo_type": "pulsesb", "damage": { "damage_type": "bash", "amount": 3 }, "dispersion": 150, diff --git a/data/mods/CRT_EXPANSION/items/crt_armor.json b/data/mods/CRT_EXPANSION/items/crt_armor.json index fae3fbac5dd85..773440e8e17ee 100644 --- a/data/mods/CRT_EXPANSION/items/crt_armor.json +++ b/data/mods/CRT_EXPANSION/items/crt_armor.json @@ -4,9 +4,9 @@ "type": "ARMOR", "category": "armor", "name": "CRIT face mask", - "description": "This is the C.R.I.T standard issue face mask, lined with kevlar for extra protection. A few filters provide decent enviromental safety, but it was not intended for extended use. It has a basic integrated HUD.", - "weight": 5000, - "volume": 4, + "description": "This is the C.R.I.T standard issue face mask, lined with kevlar for extra protection. A few filters provide decent enviromental safety, but it was not intended for extended use. It has a basic integrated HUD.", + "weight": "5 kg", + "volume": "1 L", "price": 2500000, "to_hit": 1, "material": [ "neoprene", "kevlar" ], @@ -25,15 +25,15 @@ "id": "crt_boots", "copy-from": "crt_la_boots", "type": "ARMOR", - "name": "pair of CRIT boots", - "description": "C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and hygenic during long-term missions while absorbing shock and heat from outside-sources. Superalloy mesh and rubber offer quite a bit of chemical protection as well. Decently heavy though", + "name": { "str": "pair of CRIT boots", "str_pl": "pairs of CRIT boots" }, + "description": "C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and hygenic during long-term missions while absorbing shock and heat from outside-sources. Superalloy mesh and rubber offer quite a bit of chemical protection as well. Decently heavy though", "color": "dark_gray", - "weight": 1500, + "weight": "1500 g", "price": 250000, "warmth": 40, "encumbrance": 17, "material_thickness": 5, - "enviromental_protection": 5 + "environmental_protection": 5 }, { "id": "crt_la_boots", @@ -41,9 +41,9 @@ "category": "armor", "name": "pair of CRIT LA boots", "name_plural": "pairs of CRIT LA boots", - "description": "C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor variant was created for missions in warmer climates. The LA boots keep most of the old features of the standard issue boots but trade in protection for easier movement.", - "weight": 1060, - "volume": 6, + "description": "C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor variant was created for missions in warmer climates. The LA boots keep most of the old features of the standard issue boots but trade in protection for easier movement.", + "weight": "1060 g", + "volume": "1500 ml", "price": 100000, "to_hit": -1, "bashing": 2, @@ -64,7 +64,7 @@ "type": "ARMOR", "name": "pair of CRIT fingertip-less gloves", "name_plural": "pairs of CRIT fingertip-less gloves", - "description": "C.R.I.T standard-issue gloves. Made with superalloy mesh for those with gene-modding and/or mutations while still allowing greater manipulation of items and moderate protection.", + "description": "C.R.I.T standard-issue gloves. Made with superalloy mesh for those with gene-modding and/or mutations while still allowing greater manipulation of items and moderate protection.", "encumbrance": 12, "coverage": 85, "warmth": 20, @@ -78,7 +78,7 @@ "type": "ARMOR", "name": "pair of CRIT fingertip-less liners", "name_plural": "pairs of CRIT fingertip-less liners", - "description": "C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for warmth and fingertip-less for those with gene-modding and/or mutations while still allowing greater manipulation of items and moderate protection.", + "description": "C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for warmth and fingertip-less for those with gene-modding and/or mutations while still allowing greater manipulation of items and moderate protection.", "encumbrance": 3, "coverage": 85, "warmth": 15, @@ -91,9 +91,9 @@ "copy-from": "molle_pack", "type": "ARMOR", "name": "CRIT backpack", - "description": "C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this smaller pack strikes a fine balance between storage space and encumbrance and allows a larger weapon to be holstered, drawing and holstering is still rather awkward even with the magnetized clips, but practice helps.", + "description": "C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this smaller pack strikes a fine balance between storage space and encumbrance and allows a larger weapon to be holstered, drawing and holstering is still rather awkward even with the magnetized clips, but practice helps.", "color": "dark_gray", - "storage": 36, + "storage": "9 L", "encumbrance": 7, "material_thickness": 2, "material": [ "leather", "kevlar" ], @@ -116,11 +116,11 @@ "type": "ARMOR", "name": "pair of CRIT leg guards", "name_plural": "pairs of CRIT leg guards", - "description": "C.R.I.T standard-issue leg armor. Simple design and durable material allows for easy movement and the padding keeps the legs safe and warm in colder conditions.", + "description": "C.R.I.T standard-issue leg armor. Simple design and durable material allows for easy movement and the padding keeps the legs safe and warm in colder conditions.", "color": "dark_gray", "material": [ "superalloy", "rubber", "neoprene" ], - "weight": 1300, - "volume": 6, + "weight": "1300 g", + "volume": "1500 ml", "price": 20000, "warmth": 17, "symbol": ":", @@ -132,9 +132,9 @@ "category": "armor", "name": "pair of CRIT arm guards", "name_plural": "pairs of C.R.I.T arm guards", - "description": "A pair of arm guards made from superalloy molded upon neoprene, and then insulated with rubber. They are sturdy and will block attacks, but they are ridiculously heavy.", - "weight": 1820, - "volume": 12, + "description": "A pair of arm guards made from superalloy molded upon neoprene, and then insulated with rubber. They are sturdy and will block attacks, but they are ridiculously heavy.", + "weight": "1820 g", + "volume": "3 L", "price": 200000, "to_hit": 1, "material": [ "superalloy", "neoprene", "rubber" ], @@ -153,7 +153,7 @@ "copy-from": "survivor_belt_notools", "type": "ARMOR", "name": "CRIT web belt", - "description": "C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your hip.", + "description": "C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your hip.", "color": "dark_gray", "material": [ "leather", "brass" ], "flags": [ "WATER_FRIENDLY" ] @@ -163,9 +163,9 @@ "type": "ARMOR", "category": "armor", "name": "CRIT infantry duster", - "description": "A thick full-length duster coat with rubber insulation. More than mildly encumbering, but rather protective against any anti-infantry electrical discharges from the robots. Has several pockets for storage.", - "weight": 2120, - "volume": 23, + "description": "A thick full-length duster coat with rubber insulation. More than mildly encumbering, but rather protective against any anti-infantry electrical discharges from the robots. Has several pockets for storage.", + "weight": "2120 g", + "volume": "5750 ml", "price": 25500, "to_hit": -1, "material": [ "neoprene", "rubber", "kevlar" ], @@ -174,7 +174,7 @@ "covers": [ "TORSO", "ARMS", "LEGS" ], "coverage": 100, "encumbrance": 20, - "storage": 18, + "storage": "4500 ml", "warmth": 20, "material_thickness": 3, "environmental_protection": 9, @@ -185,8 +185,8 @@ "type": "TOOL_ARMOR", "category": "armor", "name": "CRIT S-I G.E.A.R", - "description": "C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your spinal cord, this device improves your overall physique and provides basic information on your surroundings.", - "weight": 500, + "description": "C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your spinal cord, this device improves your overall physique and provides basic information on your surroundings.", + "weight": "500 g", "volume": 0, "price": 25000000, "to_hit": -3, @@ -206,9 +206,9 @@ "type": "ARMOR", "category": "armor", "name": "CRIT Engineering Suit", - "description": "An airtight, flexible suit of woven composite fibers complete with segmented plates of armor. A complex system digitizes items in an individual pocket universe for storage while built in joint-torsion ratchets generate the neccessary energy required to power the interface.", - "weight": 13460, - "volume": 57, + "description": "An airtight, flexible suit of woven composite fibers complete with segmented plates of armor. A complex system digitizes items in an individual pocket universe for storage while built in joint-torsion ratchets generate the neccessary energy required to power the interface.", + "weight": "13460 g", + "volume": "14250 ml", "price": 900000000, "to_hit": -5, "bashing": 8, @@ -219,7 +219,7 @@ "coverage": 100, "encumbrance": 25, "warmth": 15, - "storage": 50, + "storage": "12500 ml", "material_thickness": 3, "environmental_protection": 18, "use_action": "WEATHER_TOOL", @@ -230,9 +230,9 @@ "type": "ARMOR", "category": "armor", "name": "CRIT Armored Anomaly Suit", - "description": "A relatively simple suit of armor. A suit of woven composite fibers combined with a cleansuit core and strategically placed segmented kevlar plates keep the suit light-weight and the one wearing it alive while offering superb resistance to the elements and ambient radiation. ", - "weight": 11460, - "volume": 45, + "description": "A relatively simple suit of armor. A suit of woven composite fibers combined with a cleansuit core and strategically placed segmented kevlar plates keep the suit light-weight and the one wearing it alive while offering superb resistance to the elements and ambient radiation. ", + "weight": "11460 g", + "volume": "11250 ml", "price": 900000000, "to_hit": -5, "bashing": 8, @@ -243,7 +243,7 @@ "coverage": 100, "encumbrance": 25, "warmth": 25, - "storage": 5, + "storage": "1250 ml", "material_thickness": 5, "environmental_protection": 25, "flags": [ "VARSIZE", "WATERPROOF", "HOOD", "COLLAR", "RAINPROOF", "STURDY", "RAD_RESIST", "OUTER" ] @@ -254,8 +254,8 @@ "name": "CRIT drop leg pouch", "name_plural": "C.R.I.T drop leg pouches", "description": "A set of pouches that can be worn on the thighs using buckled straps. This variety is more compact and is favored by the C.R.I.T for its ease of use.", - "weight": 255, - "volume": 2, + "weight": "255 g", + "volume": "500 ml", "price": 3000, "material": [ "plastic", "cotton", "rubber" ], "symbol": "[", @@ -263,7 +263,7 @@ "covers": [ "LEGS" ], "coverage": 30, "encumbrance": 3, - "storage": 6, + "storage": "1500 ml", "material_thickness": 2, "flags": [ "VARSIZE", "WATER_FRIENDLY", "BELTED", "RAINPROOF" ] }, @@ -271,10 +271,10 @@ "id": "crt_earmor", "type": "ARMOR", "category": "armor", - "name": "CRIT Enforcer armor assembly", - "description": "A series of plates, guards and buckles which assemble into a suit of sturdy body-armor which usually goes over other armor. Overlapping steel plates on top of kevlar plates cover vast expanses as the armor juts off in places so it can deflect attacks. Built with the idea that comfort is less important than safety, this heavy suit is difficult to move about in but highly protective. Various adjustable conectors such as straps and clips hold it together.", - "weight": 21460, - "volume": 45, + "name": { "str": "CRIT Enforcer armor assembly", "str_pl": "CRIT Enforcer armor assemblies" }, + "description": "A series of plates, guards and buckles which assemble into a suit of sturdy body-armor which usually goes over other armor. Overlapping steel plates on top of kevlar plates cover vast expanses as the armor juts off in places so it can deflect attacks. Built with the idea that comfort is less important than safety, this heavy suit is difficult to move about in but highly protective. Various adjustable conectors such as straps and clips hold it together.", + "weight": "21460 g", + "volume": "11250 ml", "price": 900000000, "to_hit": -5, "bashing": 8, @@ -285,7 +285,7 @@ "coverage": 90, "encumbrance": 35, "warmth": 20, - "storage": 7, + "storage": "1750 ml", "material_thickness": 4, "environmental_protection": 5, "flags": [ "VARSIZE", "STURDY", "BELTED" ] @@ -296,9 +296,9 @@ "category": "armor", "name": "pair of CRIT Enforcer docks", "name_plural": "pairs of CRIT Enforcer docks", - "description": "C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of oversized feet which clamp down onto your owm footwear keep your feet out of harms way. It looks terrible and feels clunky unlike most of C.R.I.T's designs, but they do seem to be worth using if you were to be in the middle of a warzone.", - "weight": 2060, - "volume": 6, + "description": "C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of oversized feet which clamp down onto your owm footwear keep your feet out of harms way. It looks terrible and feels clunky unlike most of C.R.I.T's designs, but they do seem to be worth using if you were to be in the middle of a warzone.", + "weight": "2060 g", + "volume": "1500 ml", "price": 100000, "to_hit": -1, "bashing": 2, @@ -318,9 +318,9 @@ "type": "ARMOR", "category": "armor", "name": "CRIT Soldier Suit", - "description": "A suit of modern body-armor. Strategically placed superalloy plates keep the suit's weight minimal while kevlar plates other areas and a lining of soft neoprene pads areas for extra comfort. Most importantly, this can be worn comfortably under other armor.", - "weight": 5439, - "volume": 25, + "description": "A suit of modern body-armor. Strategically placed superalloy plates keep the suit's weight minimal while kevlar plates other areas and a lining of soft neoprene pads areas for extra comfort. Most importantly, this can be worn comfortably under other armor.", + "weight": "5439 g", + "volume": "6250 ml", "price": 900000000, "material": [ "neoprene", "kevlar", "superalloy" ], "symbol": "[", @@ -329,7 +329,7 @@ "coverage": 100, "encumbrance": 7, "warmth": 20, - "storage": 10, + "storage": "2500 ml", "material_thickness": 2, "environmental_protection": 3, "flags": [ "VARSIZE", "STURDY" ] @@ -339,9 +339,9 @@ "type": "ARMOR", "category": "armor", "name": "CRIT Lone Wolf Series Armor", - "description": "A matte black suit of outdated and bulky looking plate armor fitted onto a soft kevlar body-suit. Retrofitted with new armor improvements, this heavy armor will definitely protect you from practically anything. Just make sure you can actually walk with it on though.", - "weight": 42563, - "volume": 50, + "description": "A matte black suit of outdated and bulky looking plate armor fitted onto a soft kevlar body-suit. Retrofitted with new armor improvements, this heavy armor will definitely protect you from practically anything. Just make sure you can actually walk with it on though.", + "weight": "42563 g", + "volume": "12500 ml", "price": 100000000, "material": [ "hardsteel", "steel", "kevlar" ], "symbol": "[", @@ -350,7 +350,7 @@ "coverage": 100, "encumbrance": 40, "warmth": 25, - "storage": 16, + "storage": "4 L", "material_thickness": 3, "environmental_protection": 10, "use_action": { "type": "holster", "max_volume": 15, "draw_cost": 155, "skills": [ "smg", "shotgun", "rifle", "launcher" ] }, diff --git a/data/mods/CRT_EXPANSION/items/crt_clothes.json b/data/mods/CRT_EXPANSION/items/crt_clothes.json index a1fd3ab9c749b..6dbbc8904da45 100644 --- a/data/mods/CRT_EXPANSION/items/crt_clothes.json +++ b/data/mods/CRT_EXPANSION/items/crt_clothes.json @@ -4,7 +4,7 @@ "copy-from": "jacket_army", "type": "ARMOR", "name": "C.R.I.T blouse", - "description": "C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. Super-flex neoprene keeps one warm in moderately cold weather while a sleek design keeps it from being too flashy. A zipper at the back and front allows for quick donning and doffing.", + "description": "C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. Super-flex neoprene keeps one warm in moderately cold weather while a sleek design keeps it from being too flashy. A zipper at the back and front allows for quick donning and doffing.", "flags": [ "COLLAR", "VARSIZE", "WATERPROOF", "STURDY", "FANCY", "ALLOWS_NATURAL_ATTACKS" ], "color": "light_gray", "material": [ "neoprene", "kevlar" ], @@ -15,7 +15,8 @@ "copy-from": "pants_army", "type": "ARMOR", "name": "C.R.I.T trousers", - "description": "C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage. Super-flex neoprene keeps one warm in moderately cold weather.", + "name_plural": "C.R.I.T trousers", + "description": "C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage. Super-flex neoprene keeps one warm in moderately cold weather.", "color": "light_gray", "material": [ "neoprene", "kevlar" ], "warmth": 35, @@ -26,7 +27,8 @@ "id": "crt_dress_pants", "type": "ARMOR", "name": "C.R.I.T trousers", - "description": "C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight and it offers ok pockets. Super-flex neoprene keeps one warm in moderately cold weather.", + "name_plural": "C.R.I.T trousers", + "description": "C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight and it offers ok pockets. Super-flex neoprene keeps one warm in moderately cold weather.", "color": "light_gray", "symbol": "[", "material": [ "cotton", "neoprene" ], @@ -42,7 +44,7 @@ "copy-from": "helmet_liner", "type": "ARMOR", "name": "C.R.I.T helmet liner", - "description": "C.R.I.T standard-issue helmet liner. Keeps the noggin warm.", + "description": "C.R.I.T standard-issue helmet liner. Keeps the noggin warm.", "color": "light_gray", "material": [ "neoprene" ], "material_thickness": 1, @@ -53,9 +55,9 @@ "type": "ARMOR", "name": "pair of C.R.I.T shoes", "name_plural": "pairs of C.R.I.T dress shoes", - "description": "A sleek pair of dress shoes. Fancy but easy on the eyes.", - "weight": 1060, - "volume": 6, + "description": "A sleek pair of dress shoes. Fancy but easy on the eyes.", + "weight": "1060 g", + "volume": "1500 ml", "price": 100000, "to_hit": -1, "bashing": 2, @@ -74,9 +76,10 @@ "id": "crt_rec_gloves", "type": "ARMOR", "name": "pair of C.R.I.T rec gloves", - "description": "C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are made with cotton with a neoprene lining for grip-pads and warmth. ", - "weight": 558, - "volume": 1, + "name_plural": "pairs of C.R.I.T rec gloves", + "description": "C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are made with cotton with a neoprene lining for grip-pads and warmth. ", + "weight": "558 g", + "volume": "250 ml", "price": 100000, "to_hit": -1, "material": [ "cotton", "neoprene" ], @@ -95,7 +98,7 @@ "copy-from": "survivor_belt_notools", "type": "ARMOR", "name": "C.R.I.T web belt", - "description": "C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your hip.", + "description": "C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your hip.", "color": "blue", "material": [ "leather", "brass" ], "use_action": { @@ -103,7 +106,7 @@ "holster_prompt": "Sheath blade", "holster_msg": "You sheath your %s", "min_volume": 0, - "max_volume": 4, + "max_volume": "1 L", "draw_cost": 5, "flags": [ "BELT_CLIP", "SHEATH_KNIFE", "SHEATH_SWORD" ] }, @@ -114,9 +117,9 @@ "type": "ARMOR", "category": "armor", "name": "C.R.I.T rec duster", - "description": "A waterproofed full-length duster coat. Made with neoprene, comfort and functionality meet together to form a fancy but sleek contemporary design. It has several pockets for storage.", - "weight": 1520, - "volume": 23, + "description": "A waterproofed full-length duster coat. Made with neoprene, comfort and functionality meet together to form a fancy but sleek contemporary design. It has several pockets for storage.", + "weight": "1520 g", + "volume": "5750 ml", "price": 25500, "to_hit": -1, "material": [ "cotton", "neoprene", "rubber" ], @@ -125,7 +128,7 @@ "covers": [ "TORSO", "ARMS", "LEGS" ], "coverage": 100, "encumbrance": 13, - "storage": 5, + "storage": "1250 ml", "warmth": 15, "material_thickness": 1, "environmental_protection": 2, @@ -135,9 +138,9 @@ "id": "crt_rec_hat", "type": "ARMOR", "name": "C.R.I.T rec hat", - "description": "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec cover. Thick enough to provide warmth in colder weather, this hat shares the same sleek design of most of C.R.I.T's gear.", - "weight": 253, - "volume": 5, + "description": "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec cover. Thick enough to provide warmth in colder weather, this hat shares the same sleek design of most of C.R.I.T's gear.", + "weight": "253 g", + "volume": "1250 ml", "price": 4500, "material": [ "cotton", "neoprene", "rubber" ], "symbol": "[", diff --git a/data/mods/CRT_EXPANSION/items/crt_generic.json b/data/mods/CRT_EXPANSION/items/crt_generic.json index ccc184f2b6fa2..b4660477c53f3 100644 --- a/data/mods/CRT_EXPANSION/items/crt_generic.json +++ b/data/mods/CRT_EXPANSION/items/crt_generic.json @@ -5,8 +5,8 @@ "category": "spare_parts", "name": "withered plant bundle", "description": "A bundle of plant matter", - "weight": 80, - "volume": 2, + "weight": "80 g", + "volume": "500 ml", "material": [ "paper" ], "symbol": ";", "color": "green", diff --git a/data/mods/CRT_EXPANSION/items/crt_gun.json b/data/mods/CRT_EXPANSION/items/crt_gun.json index b93010a13dc60..2ec1f43db2220 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gun.json +++ b/data/mods/CRT_EXPANSION/items/crt_gun.json @@ -3,9 +3,9 @@ "id": "crt_laser_pistol", "type": "GUN", "name": "CRIT .5 LP", - "description": "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP is a relatively weak but accurate laser pistol. The double-barrel design compensates for the lack of raw power and yet the gun manages to be relatively easy to aim and lightweight due to the superalloy construction.", - "weight": 650, - "volume": 3, + "description": "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP is a relatively weak but accurate laser pistol. The double-barrel design compensates for the lack of raw power and yet the gun manages to be relatively easy to aim and lightweight due to the superalloy construction.", + "weight": "650 g", + "volume": "750 ml", "price": 1000000, "to_hit": -2, "bashing": 3, @@ -39,9 +39,9 @@ "id": "crt_laser_gatling", "type": "GUN", "name": "CRIT Chain Laser", - "description": "A tried and true favorite from the bowels of R&D hell. Based off of a researcher's video on three taped-together .5 LPs on a hand held power drill, this gun is a relatively light weapon for the amount of UPS it eats and destruction it can cause.", - "weight": 2650, - "volume": 10, + "description": "A tried and true favorite from the bowels of R&D hell. Based off of a researcher's video on three taped-together .5 LPs on a hand held power drill, this gun is a relatively light weapon for the amount of UPS it eats and destruction it can cause.", + "weight": "2650 g", + "volume": "2500 ml", "price": 1000000, "to_hit": -2, "bashing": 3, @@ -66,9 +66,9 @@ "id": "crt_laser_carbine", "type": "GUN", "name": "CRIT Laser Carbine", - "description": "A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly developed to test out a new breakthrough in laser weapons.", - "weight": 2150, - "volume": 8, + "description": "A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly developed to test out a new breakthrough in laser weapons.", + "weight": "2150 g", + "volume": "2 L", "price": 1100000, "to_hit": -1, "bashing": 8, @@ -102,9 +102,9 @@ "id": "crt_energy_rifle", "type": "GUN", "name": "CRIT Energy Rifle", - "description": "A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a new breakthrough in hybrid weaponry.", - "weight": 5150, - "volume": 10, + "description": "A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a new breakthrough in hybrid weaponry.", + "weight": "5150 g", + "volume": "2500 ml", "price": 1800000, "to_hit": -1, "bashing": 10, @@ -138,9 +138,9 @@ "id": "crt_cqb_si", "type": "GUN", "name": "CRIT CQB Standard Issue", - "description": "A simple combination gun. This military-grade semi-auto carbine couples the mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To further compliment the CQB aspect, the stock is built to amplify the user's force and the rugged construction with tonfa-like grip can handle bashing in enemy heads. An integrated magazine makes it a pain to reload, but keeps your clip from ejecting accidently.", - "weight": 1650, - "volume": 3, + "description": "A simple combination gun. This military-grade semi-auto carbine couples the mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To further compliment the CQB aspect, the stock is built to amplify the user's force and the rugged construction with tonfa-like grip can handle bashing in enemy heads. An integrated magazine makes it a pain to reload, but keeps your clip from ejecting accidently.", + "weight": "1650 g", + "volume": "750 ml", "price": 1000000, "to_hit": 2, "bashing": 12, @@ -165,8 +165,8 @@ "type": "GUN", "name": "CRIT Fire Glove", "description": "Experimental CQB weapon system under development in C.R.I.T R&D.", - "weight": 650, - "volume": 3, + "weight": "650 g", + "volume": "750 ml", "price": 1000000, "to_hit": 1, "bashing": 8, @@ -202,15 +202,15 @@ "symbol": "(", "color": "light_gray", "name": "pellet gun", - "description": "A surprisingly powerful airgun that can reliably hunt small game. The small lead or alloy pellets that can be chambered provide it decent power in every shot. It's fairly accurate and can be somewhat as damaging as a .22 short, but the break action charging system requires some arm strength to load a pellet.", + "description": "A surprisingly powerful airgun that can reliably hunt small game. The small lead or alloy pellets that can be chambered provide it decent power in every shot. It's fairly accurate and can be somewhat as damaging as a .22 short, but the break action charging system requires some arm strength to load a pellet.", "price": 9900, "//": "You can get a decent Ruger .177 at walmart for $99", "material": [ "steel", "plastic" ], "flags": [ "STR_RELOAD", "NON-FOULING", "NON-FOULING" ], "skill": "rifle", "ammo": "pellets", - "weight": 5023, - "volume": 8, + "weight": "5023 g", + "volume": "2 L", "bashing": 10, "to_hit": -1, "range": 17, @@ -227,9 +227,9 @@ "id": "ds_plasma_cutter", "type": "GUN", "name": "Plasma Cutter", - "description": "Experimental cutting tool under development in C.R.I.T R&D. It fires an extremely hot wave of plasma that slices into materials.", - "weight": 1650, - "volume": 3, + "description": "Experimental cutting tool under development in C.R.I.T R&D. It fires an extremely hot wave of plasma that slices into materials.", + "weight": "1650 g", + "volume": "750 ml", "price": 1000000, "to_hit": -2, "bashing": 3, @@ -255,9 +255,9 @@ "id": "ds_rivet_gun", "type": "GUN", "name": "Rivet Driver", - "description": "Experimental double purpose tool under development in C.R.I.T R&D. It takes a regular nail and then enlongates it within a fraction of a second before firing it out, upon reaching a target, the fragile stake explodes into shards.", - "weight": 1650, - "volume": 3, + "description": "Experimental double purpose tool under development in C.R.I.T R&D. It takes a regular nail and then enlongates it within a fraction of a second before firing it out, upon reaching a target, the fragile stake explodes into shards.", + "weight": "1650 g", + "volume": "750 ml", "price": 1000000, "to_hit": -2, "bashing": 3, @@ -282,9 +282,9 @@ "id": "ds_line_gun", "type": "GUN", "name": "Line Gun", - "description": "Experimental high power cutting tool under development in C.R.I.T R&D. It fires plasma in a wide line for slicing into dense materials.", - "weight": 2650, - "volume": 6, + "description": "Experimental high power cutting tool under development in C.R.I.T R&D. It fires plasma in a wide line for slicing into dense materials.", + "weight": "2650 g", + "volume": "1500 ml", "price": 1000000, "to_hit": -1, "bashing": 8, @@ -311,9 +311,9 @@ "id": "ds_pulse_rifle", "type": "GUN", "name": "Pulse Rifle", - "description": "Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which instantly mushroom out upon impact.", - "weight": 2250, - "volume": 4, + "description": "Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which instantly mushroom out upon impact.", + "weight": "2250 g", + "volume": "1 L", "price": 1000000, "to_hit": -2, "bashing": 5, @@ -339,9 +339,9 @@ "id": "ds_ripper", "type": "GUN", "name": "Ripper", - "description": "Experimental EM saw under development in C.R.I.T R&D. Great for distance cutting of material.", - "weight": 2250, - "volume": 4, + "description": "Experimental EM saw under development in C.R.I.T R&D. Great for distance cutting of material.", + "weight": "2250 g", + "volume": "1 L", "price": 1000000, "to_hit": -2, "cutting": 15, diff --git a/data/mods/CRT_EXPANSION/items/crt_gunmods.json b/data/mods/CRT_EXPANSION/items/crt_gunmods.json index 2f536d3437ed4..7a8d901e64ae8 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gunmods.json +++ b/data/mods/CRT_EXPANSION/items/crt_gunmods.json @@ -3,9 +3,9 @@ "id": "flare_gmod", "type": "GUNMOD", "name": "Underslung flare launcher", - "description": "A small barrel which launches signal flares. However, due to its awkward position, it has lower accuracy compared to an actual flaregun.", - "weight": 500, - "volume": 1, + "description": "A small barrel which launches signal flares. However, due to its awkward position, it has lower accuracy compared to an actual flaregun.", + "weight": "500 g", + "volume": "250 ml", "price": 8000, "material": "steel", "symbol": ":", @@ -21,7 +21,7 @@ "type": "GUNMOD", "name": "CQB SI shotgun", "description": "The integrated underbarrel shotgun of this gun which holds a single shot. It's irremovable.", - "weight": 2600, + "weight": "2600 g", "volume": 0, "price": 95000, "to_hit": -1, @@ -38,8 +38,8 @@ "id": "bthk_stock", "type": "GUNMOD", "name": "butt hook stock", - "description": ", A military-grade stock which folds reducing the guns volume. The weight and the pivoting hook which latches onto your forearm allows for greater stability. ", - "weight": 500, + "description": ", A military-grade stock which folds reducing the guns volume. The weight and the pivoting hook which latches onto your forearm allows for greater stability. ", + "weight": "500 g", "volume": "125 ml", "integral_volume": 0, "price": 42000, @@ -57,8 +57,8 @@ "id": "beam_difractor", "copy-from": "beam_scatterer", "type": "GUNMOD", - "name": "diffracting lens", - "description": "A set of optics made to fit on laser weapons, which will diffract the laser beam into several lower powered beams. This slightly increases point-blank damage and makes it difficult to not hit, but reduces range", + "name": { "str": "diffracting lens", "str_pl": "diffracting lenses" }, + "description": "A set of optics made to fit on laser weapons, which will diffract the laser beam into several lower powered beams. This slightly increases point-blank damage and makes it difficult to not hit, but reduces range", "range_modifier": -7, "damage_modifier": 2, "ammo_effects": [ "SHOT" ], @@ -70,7 +70,7 @@ "type": "GUNMOD", "name": "tactical flashlight", "description": "A compact flashlight which is mounted to the side of your weapon, not powerful, but good enough for tight hallways.", - "weight": 250, + "weight": "250 g", "volume": "125 ml", "integral_volume": 0, "price": 42000, @@ -96,9 +96,9 @@ { "id": "flash_acc_on", "type": "GUNMOD", - "name": "tactical flashlight (on)", + "name": { "str": "tactical flashlight (on)", "str_pl": "tactical flashlights (on)" }, "description": "A compact flashlight which is attatched to the side of your weapon, not powerful, but good enough for tight hallways.", - "weight": 250, + "weight": "250 g", "volume": "125 ml", "integral_volume": 0, "price": 42000, diff --git a/data/mods/CRT_EXPANSION/items/crt_toolarmor.json b/data/mods/CRT_EXPANSION/items/crt_toolarmor.json index e99323cfc687a..20c9ed0e40ca9 100644 --- a/data/mods/CRT_EXPANSION/items/crt_toolarmor.json +++ b/data/mods/CRT_EXPANSION/items/crt_toolarmor.json @@ -3,17 +3,17 @@ "id": "crt_gasmask", "type": "TOOL_ARMOR", "category": "armor", - "name": "CRIT gasmask (off)", - "description": "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line electronics and lined with kevlar for extra protection in order to keep one's head where it should be. Various filters and other high tech wizardry allow for enhanced oxygen intake and safety even under bombardment. It has an integrated HUD and the option to turn it on for more features.", - "weight": 5000, - "volume": 4, + "name": { "str": "CRIT gasmask (off)", "str_pl": "CRIT gasmasks (off)" }, + "description": "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line electronics and lined with kevlar for extra protection in order to keep one's head where it should be. Various filters and other high tech wizardry allow for enhanced oxygen intake and safety even under bombardment. It has an integrated HUD and the option to turn it on for more features.", + "weight": "5 kg", + "volume": "1 L", "price": 2500000, "to_hit": 1, "max_charges": 200, "initial_charges": 200, "use_action": { "type": "transform", - "msg": "C.R.T HUD booting up...", + "msg": "C.R.T HUD booting up…", "target": "crt_gasmask_on", "active": true, "need_charges": 1, @@ -35,10 +35,10 @@ "id": "crt_gasmask_on", "type": "TOOL_ARMOR", "category": "armor", - "name": "CRIT gasmask (on)", - "description": "This is the C.R.I.T Spec Ops modified gasmask. It is currently on and draining power for the HUD, low-level nightvision and other protective elements.", - "weight": 5000, - "volume": 4, + "name": { "str": "CRIT gasmask (on)", "str_pl": "CRIT gasmasks (on)" }, + "description": "This is the C.R.I.T Spec Ops modified gasmask. It is currently on and draining power for the HUD, low-level nightvision and other protective elements.", + "weight": "5 kg", + "volume": "1 L", "price": 2500000, "to_hit": -3, "max_charges": 250, @@ -77,10 +77,10 @@ "id": "crt_em_vest", "type": "TOOL_ARMOR", "category": "armor", - "name": "CRIT EM vest (off)", - "description": "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech filaments and reactive servos which protects its wearer and assists in movement at the cost high power usage. It is commonly worn by C.R.I.T Spec Ops for its ease of use and manuverability. Turn it on for suit mode, extra protection and movement.", - "weight": 10000, - "volume": 25, + "name": { "str": "CRIT EM vest (off)", "str_pl": "CRIT EM vests (off)" }, + "description": "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech filaments and reactive servos which protects its wearer and assists in movement at the cost high power usage. It is commonly worn by C.R.I.T Spec Ops for its ease of use and manuverability. Turn it on for suit mode, extra protection and movement.", + "weight": "10 kg", + "volume": "6250 ml", "price": 7000000, "to_hit": -3, "bashing": 6, @@ -93,16 +93,16 @@ "charges_per_use": 1, "use_action": { "type": "transform", - "msg": "C.R.I.T EM booting up...", + "msg": "C.R.I.T EM booting up…", "target": "crt_em_vest_on", "active": true, "need_charges": 1, - "need_charges_msg": "Power levels too low for safe bootup..." + "need_charges_msg": "Power levels too low for safe bootup…" }, "artifact_data": { "charge_type": "ARTC_SOLAR" }, "coverage": 85, "encumbrance": 50, - "storage": 10, + "storage": "2500 ml", "warmth": 10, "material_thickness": 4, "environmental_protection": 4, @@ -112,10 +112,10 @@ "id": "crt_em_vest_on", "type": "TOOL_ARMOR", "category": "armor", - "name": "CRIT EM vest (on)", - "description": "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech filaments, reactive servos and a generator which pumps a crystallized liquid that protects its wearer from most heavy combat situations at the cost of extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is currently in suit form and draining your UPS power at high rates.", - "weight": 10000, - "volume": 25, + "name": { "str": "CRIT EM vest (on)", "str_pl": "CRIT EM vests (on)" }, + "description": "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech filaments, reactive servos and a generator which pumps a crystallized liquid that protects its wearer from most heavy combat situations at the cost of extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is currently in suit form and draining your UPS power at high rates.", + "weight": "10 kg", + "volume": "6250 ml", "price": 7000000, "to_hit": -3, "bashing": 6, @@ -125,7 +125,7 @@ "covers": [ "TORSO", "LEGS", "ARMS" ], "coverage": 100, "encumbrance": 5, - "storage": 10, + "storage": "2500 ml", "warmth": 75, "material_thickness": 6, "environmental_protection": 16, @@ -133,7 +133,7 @@ "initial_charges": 0, "turns_per_charge": 1, "revert_to": "crt_em_vest", - "use_action": { "type": "transform", "menu_text": "Turn off armor", "msg": "C.R.I.T E.M powering off...", "target": "crt_em_vest" }, + "use_action": { "type": "transform", "menu_text": "Turn off armor", "msg": "C.R.I.T E.M powering off…", "target": "crt_em_vest" }, "artifact_data": { "charge_type": "ARTC_SOLAR", "effects_carried": [ "AEP_ALL_UP" ], @@ -157,8 +157,8 @@ "id": "crt_helmet", "copy-from": "helmet_army", "type": "TOOL_ARMOR", - "name": "CRIT helmet (off)", - "description": "C.R.T standard-issue helmet. Protects the noggin and has a stretch of insulated steel mesh for neck warmth and protection.", + "name": { "str": "CRIT helmet (off)", "str_pl": "CRIT helmets (off)" }, + "description": "C.R.T standard-issue helmet. Protects the noggin and has a stretch of insulated steel mesh for neck warmth and protection.", "color": "light_gray", "material": [ "kevlar", "hardsteel" ], "material_thickness": 2, @@ -180,8 +180,8 @@ "id": "crt_helmet_on", "copy-from": "helmet_army", "type": "TOOL_ARMOR", - "name": "CRIT helmet (on)", - "description": "C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of insulated steel mesh for neck warmth and protection. A tactically dim flashlight is attatched to the side. This light is currently on and drawing power.", + "name": { "str": "CRIT helmet (on)", "str_pl": "CRIT helmets (on)" }, + "description": "C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of insulated steel mesh for neck warmth and protection. A tactically dim flashlight is attatched to the side. This light is currently on and drawing power.", "color": "light_gray", "material": [ "kevlar", "hardsteel" ], "flags": [ @@ -224,8 +224,8 @@ "type": "ARMOR", "name": "wet bandana", "description": "A dampened cotton bandana, worn over the mouth for a extra protection from dust and other contaminants.", - "weight": 42, - "volume": 1, + "weight": "42 g", + "volume": "250 ml", "price": 600, "to_hit": -1, "material": [ "cotton" ], diff --git a/data/mods/CRT_EXPANSION/items/crt_tools.json b/data/mods/CRT_EXPANSION/items/crt_tools.json index eecba95753f2a..839f6a4f83115 100644 --- a/data/mods/CRT_EXPANSION/items/crt_tools.json +++ b/data/mods/CRT_EXPANSION/items/crt_tools.json @@ -3,9 +3,9 @@ "id": "crt_mess_kit", "type": "TOOL", "name": "CRIT mess kit", - "description": "C.R.I.T standard-issue mess kit designed for ease of transport. Based off of the normal military mess kit, but made to be telescopic, the parts are made from a thin sheet of a stainless superalloy composite and are insulated with ceramic. Sadly, this compact reimagining loses much of its battery life but does have a rather small (useless) solar panel installed. Also comes with an absurdly small integrated fpoon and knife spatula set!", - "weight": 850, - "volume": 3, + "description": "C.R.I.T standard-issue mess kit designed for ease of transport. Based off of the normal military mess kit, but made to be telescopic, the parts are made from a thin sheet of a stainless superalloy composite and are insulated with ceramic. Sadly, this compact reimagining loses much of its battery life but does have a rather small (useless) solar panel installed. Also comes with an absurdly small integrated fpoon and knife spatula set!", + "weight": "850 g", + "volume": "750 ml", "price": 6500, "to_hit": -1, "bashing": 2, @@ -26,18 +26,16 @@ "copy-from": "diveknife", "type": "TOOL", "category": "weapons", - "name": "CRIT service knife", - "description": "C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked pry bar at the bottom for opening simple things and bashing in heads. Matte black finish helps it avoid flash in dim-light situations and tanto tip allows for light-armor penetration. Blade length allows for decent reach.", + "name": { "str": "CRIT service knife", "str_pl": "CRIT service knives" }, + "description": "C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked pry bar at the bottom for opening simple things and bashing in heads. Matte black finish helps it avoid flash in dim-light situations and tanto tip allows for light-armor penetration. Blade length allows for decent reach.", "color": "dark_gray", "material": [ "hardsteel" ], - "weight": 350, - "volume": 3, + "weight": "350 g", + "volume": "750 ml", "price": 20000, - "damage": { "damage_type": "cold", "amount": 100 }, "cutting": 8, "bashing": 3, "to_hit": 2, - "durability": 15, "symbol": ";", "qualities": [ [ "CUT_FINE", 1 ] ], "use_action": "CROWBAR", @@ -48,16 +46,15 @@ "id": "crt_knuckledusters", "type": "TOOL", "category": "weapons", - "name": "CRIT Knuckledusters", - "description": "C.R.I.T CQB knuckledusters. Not too different from any normal pair other than weight.", + "name": { "str": "pair of CRIT Knuckledusters", "str_pl": "pairs of CRIT Knuckledusters" }, + "description": "C.R.I.T CQB knuckledusters. Not too different from any normal pair other than weight.", "color": "dark_gray", "material": [ "hardsteel" ], - "weight": 550, - "volume": 3, + "weight": "550 g", + "volume": "750 ml", "price": 20000, "bashing": 10, "to_hit": 1, - "durability": 15, "symbol": "8", "flags": [ "UNARMED_WEAPON", "UNBREAKABLE_MELEE" ], "techniques": [ "WBLOCK_2", "UHAND", "HOOK" ] @@ -67,12 +64,12 @@ "type": "TOOL", "category": "weapons", "name": "CRIT Reso-blade", - "description": "C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade oddly lacks sharpness, and yet upon closer oberservation, a hum of energy thrums from within.", + "description": "C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade oddly lacks sharpness, and yet upon closer oberservation, a hum of energy thrums from within.", "color": "dark_gray", "material": [ "hardsteel" ], "artifact_data": { "charge_type": "ARTC_NULL", "effects_wielded": [ "AEP_DEX_UP", "AEP_SPEED_UP", "AEP_SPEED_UP" ] }, - "weight": 2500, - "volume": 10, + "weight": "2500 g", + "volume": "2500 ml", "price": 20000000, "cutting": 5, "bashing": 5, @@ -87,7 +84,7 @@ "type": "TOOL", "category": "weapons", "name": "Dragon Slayer", - "description": "C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously oversized carbon steel blade and a hum of energy thrums from within. Merely brushing your fingers over the weapon brings a feeling of invincibility. It looks more like a raw heap of iron than a sword. The thing is... can you wield it?", + "description": "C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously oversized carbon steel blade and a hum of energy thrums from within. Merely brushing your fingers over the weapon brings a feeling of invincibility. It looks more like a raw heap of iron than a sword. The thing is… can you wield it?", "color": "dark_gray", "material": [ "hardsteel" ], "artifact_data": { @@ -107,8 +104,8 @@ "AEP_SAP_LIFE" ] }, - "weight": 50000, - "volume": 20, + "weight": "50 kg", + "volume": "5 L", "price": 20000000, "cutting": 80, "bashing": 95, @@ -130,8 +127,8 @@ "price_postapoc": 5000, "material": [ "hardsteel", "plastic", "rubber" ], "techniques": [ "CHOP", "INERTIAL", "SMASH" ], - "weight": 1807, - "volume": 2, + "weight": "1807 g", + "volume": "500 ml", "bashing": 8, "cutting": 10, "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE" ], @@ -143,9 +140,9 @@ "id": "crt_etool", "type": "TOOL", "name": "CRIT entrenching tool", - "description": "C.R.I.T standard-issue collapsible spade. A built in vibration system that is powered by the user's movement allows the smaller spade to clear soil like a larger shovel.", - "weight": 578, - "volume": 3, + "description": "C.R.I.T standard-issue collapsible spade. A built in vibration system that is powered by the user's movement allows the smaller spade to clear soil like a larger shovel.", + "weight": "578 g", + "volume": "750 ml", "price": 4000, "to_hit": 1, "bashing": 6, @@ -161,9 +158,9 @@ "id": "crt_nstick", "type": "TOOL", "name": "CRIT night stick", - "description": "C.R.I.T standard issue guard tonfa. The length allows for great reach and the domed tip allows for greater impact than a cylinder style baton.", - "weight": 1028, - "volume": 5, + "description": "C.R.I.T standard issue guard tonfa. The length allows for great reach and the domed tip allows for greater impact than a cylinder style baton.", + "weight": "1028 g", + "volume": "1250 ml", "price": 4000, "to_hit": 2, "bashing": 10, diff --git a/data/mods/CRT_EXPANSION/martial/CRT_Bladework.json b/data/mods/CRT_EXPANSION/martial/CRT_Bladework.json index 7c683e2dbf5ca..c29c059baa6fe 100644 --- a/data/mods/CRT_EXPANSION/martial/CRT_Bladework.json +++ b/data/mods/CRT_EXPANSION/martial/CRT_Bladework.json @@ -28,7 +28,7 @@ "description": "Increased accuracy along with minor cut and stab damage with piercing capability.", "unarmed_allowed": true, "melee_allowed": true, - "min_unarmed": 2, + "skill_requirements": [ { "name": "unarmed", "level": 2 } ], "flat_bonuses": [ [ "damage", "stab", 1 ], [ "damage", "cut", 1 ], [ "arpen", "stab", 1 ], [ "arpen", "cut", 1 ] ] } ], @@ -36,10 +36,10 @@ { "id": "crt_blade_hit_buff", "name": "C.R.I.T Intensity", - "description": "Additional DMG, and Arpen per stack. Max of 5 stacks", + "description": "Additional DMG, and Arpen per stack. Max of 5 stacks", "unarmed_allowed": false, "melee_allowed": true, - "min_unarmed": 3, + "skill_requirements": [ { "name": "unarmed", "level": 3 } ], "buff_duration": 1, "max_stacks": 4, "flat_bonuses": [ [ "damage", "stab", 0.25 ], [ "damage", "cut", 0.5 ], [ "arpen", "cut", 1 ] ] @@ -78,8 +78,7 @@ "type": "technique", "id": "tec_crt_blade_normal", "name": "Shimmer Flurry", - "min_unarmed": 1, - "min_melee": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 }, { "name": "melee", "level": 1 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "damage", "bash", 0.8 ], [ "damage", "cut", 0.7 ], [ "damage", "stab", 0.6 ] ], @@ -89,8 +88,7 @@ "type": "technique", "id": "tec_crt_blade_rapid", "name": "Tipped Intent", - "min_unarmed": 2, - "min_melee": 2, + "skill_requirements": [ { "name": "unarmed", "level": 2 }, { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.77 ], [ "damage", "bash", 0.55 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.88 ] ], @@ -100,8 +98,7 @@ "type": "technique", "id": "tec_crt_blade_precise", "name": "Decisive Blow", - "min_unarmed": 3, - "min_melee": 3, + "skill_requirements": [ { "name": "unarmed", "level": 3 }, { "name": "melee", "level": 3 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.8 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 1.05 ], [ "damage", "stab", 1.0 ] ], @@ -113,8 +110,7 @@ "type": "technique", "id": "tec_crt_blade_arpen", "name": "End Slash", - "min_unarmed": 5, - "min_melee": 5, + "skill_requirements": [ { "name": "unarmed", "level": 5 }, { "name": "melee", "level": 5 } ], "weighting": 2, "unarmed_allowed": true, "melee_allowed": true, diff --git a/data/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json b/data/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json index 5f5ebb72b93fd..2761d3e981896 100644 --- a/data/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json +++ b/data/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json @@ -17,7 +17,7 @@ "type": "martial_art", "id": "style_crt_enforcement", "name": "C.R.I.T Enforcement", - "description": "A defensive style that is centered around stunning swings, knockback and grounding enemies. Each attack landed increases your armor by 0.125 and offers other combat bonuses based on stats.", + "description": "A defensive style that is centered around stunning swings, knockback and grounding enemies. Each attack landed increases your armor by 0.125 and offers other combat bonuses based on stats.", "initiate": [ "You ready yourself to stand your ground.", "%s draws a line in the sand." ], "arm_block": 2, "leg_block": 10, @@ -25,7 +25,7 @@ { "id": "crt_enforcement_static", "name": "C.R.I.T Guard", - "description": "+1 armor. STR provides accuracy and minor bash arpen.", + "description": "+1 armor. STR provides accuracy and minor bash arpen.", "unarmed_allowed": true, "melee_allowed": true, "flat_bonuses": [ @@ -41,10 +41,10 @@ { "id": "crt_enforcement_hit_buff", "name": "C.R.I.T Buildup", - "description": "+0.05 armor and other small bonuses per stack. Max of 10 stacks", + "description": "+0.05 armor and other small bonuses per stack. Max of 10 stacks", "unarmed_allowed": true, "melee_allowed": true, - "min_unarmed": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 10, "max_stacks": 10, "flat_bonuses": [ @@ -87,8 +87,7 @@ "type": "technique", "id": "tec_crt_enforcement_normal", "name": "Harsh Reprimand", - "min_unarmed": 1, - "min_melee": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 }, { "name": "melee", "level": 1 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "damage", "bash", 1 ], [ "damage", "cut", 1 ], [ "damage", "stab", 1 ] ], @@ -100,8 +99,7 @@ "type": "technique", "id": "tec_crt_enforcement_rapid", "name": "Forced Compliance", - "min_unarmed": 3, - "min_melee": 2, + "skill_requirements": [ { "name": "unarmed", "level": 3 }, { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 1.04 ], [ "damage", "bash", 1 ], [ "damage", "cut", 1.05 ], [ "damage", "stab", 1.05 ] ], @@ -112,8 +110,7 @@ "type": "technique", "id": "tec_crt_enforcement_brutal", "name": "Roomsweeper", - "min_unarmed": 4, - "min_melee": 3, + "skill_requirements": [ { "name": "unarmed", "level": 4 }, { "name": "melee", "level": 3 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 1.35 ], [ "damage", "bash", 1.15 ], [ "damage", "cut", 1.05 ], [ "damage", "stab", 1.0 ] ], diff --git a/data/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json b/data/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json index c59d6fdf2bc79..68bcd01f36222 100644 --- a/data/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json +++ b/data/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json @@ -18,7 +18,7 @@ "id": "MARTIAL_CRT", "name": "C.R.I.T Melee Training", "points": 3, - "description": "You have received defensive training. For every hit you land, gain various miniscule combat bonuses that scale off of your stats.", + "description": "You have received defensive training. For every hit you land, gain various miniscule combat bonuses that scale off of your stats.", "starting_trait": true, "initial_ma_styles": [ "style_crt_cqb", "style_crt_blade", "style_crt_enforcement" ], "valid": false @@ -27,7 +27,7 @@ "type": "martial_art", "id": "style_crt_cqb", "name": "C.R.I.T CQB", - "description": "A style centered around rapid strikes and piercing jabs. Each attack landed adds a plethora of combat bonuses. 25 percent bash damage.", + "description": "A style centered around rapid strikes and piercing jabs. Each attack landed adds a plethora of combat bonuses. 25 percent bash damage.", "initiate": [ "Initiate CQB.", "%s initiates CQB." ], "arm_block": 3, "leg_block": 6, @@ -35,7 +35,7 @@ { "id": "crt_cqb_static", "name": "C.R.I.T Initiative", - "description": "DEX provides dodge ability, accuracy and minor cut / stab damage with slight piercing capability. 50 Percent Bash Damage.", + "description": "DEX provides dodge ability, accuracy and minor cut / stab damage with slight piercing capability. 50 Percent Bash Damage.", "unarmed_allowed": true, "melee_allowed": true, "flat_bonuses": [ @@ -53,10 +53,10 @@ { "id": "crt_cqb_hit_buff", "name": "C.R.I.T Tenacity", - "description": "+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks", + "description": "+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks", "unarmed_allowed": true, "melee_allowed": true, - "min_unarmed": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 2, "max_stacks": 10, "flat_bonuses": [ [ "movecost", "dex", -0.05 ], [ "movecost", 0.1 ], [ "damage", "stab", 0.1 ] ], @@ -77,7 +77,7 @@ "type": "technique", "id": "tec_crt_cqb_normal", "name": "Measured Footwork", - "min_unarmed": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "unarmed_allowed": true, "melee_allowed": false, "mult_bonuses": [ [ "movecost", 0.85 ], [ "damage", "bash", 0.8 ], [ "damage", "cut", 1.025 ], [ "damage", "stab", 1.05 ] ], @@ -88,7 +88,7 @@ "type": "technique", "id": "tec_crt_cqb_rapid", "name": "Rapid Burst", - "min_unarmed": 3, + "skill_requirements": [ { "name": "unarmed", "level": 3 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.7 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.7 ], [ "damage", "stab", 0.8 ] ], @@ -99,7 +99,7 @@ "type": "technique", "id": "tec_crt_cqb_rapid_wp", "name": "Joint Pain", - "min_melee": 3, + "skill_requirements": [ { "name": "melee", "level": 3 } ], "unarmed_allowed": false, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.8 ], [ "damage", "bash", 0.5 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.75 ] ], @@ -110,7 +110,7 @@ "type": "technique", "id": "tec_crt_cqb_precise", "name": "Rapid Jab", - "min_unarmed": 4, + "skill_requirements": [ { "name": "unarmed", "level": 4 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.8 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 1.1 ], [ "damage", "stab", 1.25 ] ], @@ -123,7 +123,7 @@ "type": "technique", "id": "tec_crt_cqb_arpen", "name": "Calculated Pierce", - "min_unarmed": 5, + "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "weighting": 2, "unarmed_allowed": true, "melee_allowed": true, diff --git a/data/mods/CRT_EXPANSION/martial/crt_gun_techniques.json b/data/mods/CRT_EXPANSION/martial/crt_gun_techniques.json index c6e3a52c72920..24b3738778380 100644 --- a/data/mods/CRT_EXPANSION/martial/crt_gun_techniques.json +++ b/data/mods/CRT_EXPANSION/martial/crt_gun_techniques.json @@ -3,7 +3,7 @@ "type": "technique", "id": "Pistol Whip", "name": "HOOK", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.95 ], [ "damage", "bash", 0.88 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ], "flat_bonuses": [ [ "movecost", "per", -0.25 ] ], @@ -15,7 +15,7 @@ "type": "technique", "id": "INERTIAL", "name": "Crowd Control", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "melee_allowed": true, "knockback_dist": 1, "mult_bonuses": [ [ "movecost", 0.6 ], [ "damage", "bash", 0.5 ], [ "damage", "cut", 0.5 ], [ "damage", "stab", 0.5 ] ], diff --git a/data/mods/CRT_EXPANSION/martial/dragonslayertechn.json b/data/mods/CRT_EXPANSION/martial/dragonslayertechn.json index 44c2b458ccf62..54115bfbf546c 100644 --- a/data/mods/CRT_EXPANSION/martial/dragonslayertechn.json +++ b/data/mods/CRT_EXPANSION/martial/dragonslayertechn.json @@ -3,7 +3,7 @@ "type": "technique", "id": "BERSERK", "name": "BERSERK", - "min_melee": 1, + "skill_requirements": [ { "name": "melee", "level": 1 } ], "unarmed_allowed": false, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.3 ], [ "damage", "bash", 0.77 ], [ "damage", "cut", 0.77 ], [ "damage", "stab", 0.77 ] ], @@ -21,7 +21,7 @@ "type": "technique", "id": "DSINERTIAL", "name": "SWEEPER", - "min_melee": 4, + "skill_requirements": [ { "name": "melee", "level": 4 } ], "unarmed_allowed": false, "melee_allowed": true, "knockback_dist": 1, @@ -40,7 +40,7 @@ "type": "technique", "id": "DSBI", "name": "BISECTION", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, diff --git a/data/mods/CRT_EXPANSION/martial/generaltechn.json b/data/mods/CRT_EXPANSION/martial/generaltechn.json index d51b206e6e452..942c3d3e4c220 100644 --- a/data/mods/CRT_EXPANSION/martial/generaltechn.json +++ b/data/mods/CRT_EXPANSION/martial/generaltechn.json @@ -13,7 +13,7 @@ "type": "technique", "id": "INERTIAL", "name": "INERTIAL SWING", - "min_melee": 4, + "skill_requirements": [ { "name": "melee", "level": 4 } ], "unarmed_allowed": true, "melee_allowed": true, "knockback_dist": 1, @@ -32,7 +32,7 @@ "type": "technique", "id": "CHOP", "name": "CHOP", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, @@ -51,7 +51,7 @@ "type": "technique", "id": "SMASH", "name": "SMASH", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, @@ -70,7 +70,7 @@ "type": "technique", "id": "UHAND", "name": "UNDERHAND", - "min_melee": 1, + "skill_requirements": [ { "name": "melee", "level": 1 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, @@ -100,7 +100,7 @@ "type": "technique", "id": "SSHOVE", "name": "SHIELDED SHOVE", - "min_melee": 1, + "skill_requirements": [ { "name": "melee", "level": 1 } ], "unarmed_allowed": false, "melee_allowed": true, "knockback_dist": 2, @@ -113,7 +113,7 @@ "type": "technique", "id": "TEAR", "name": "TEAR", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, diff --git a/data/mods/CRT_EXPANSION/martial/stabtechn.json b/data/mods/CRT_EXPANSION/martial/stabtechn.json index df168194afa8a..7f9677dfcfd7c 100644 --- a/data/mods/CRT_EXPANSION/martial/stabtechn.json +++ b/data/mods/CRT_EXPANSION/martial/stabtechn.json @@ -3,7 +3,7 @@ "type": "technique", "id": "THRUST", "name": "THRUST", - "min_melee": 1, + "skill_requirements": [ { "name": "melee", "level": 1 } ], "unarmed_allowed": false, "melee_allowed": true, "crit_tec": false, @@ -17,7 +17,7 @@ "type": "technique", "id": "LUNGE", "name": "LUNGE", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": false, "melee_allowed": true, "crit_tec": true, @@ -31,7 +31,7 @@ "type": "technique", "id": "PROD", "name": "PROD", - "min_melee": 3, + "skill_requirements": [ { "name": "melee", "level": 3 } ], "unarmed_allowed": false, "melee_allowed": true, "crit_tec": false, @@ -45,7 +45,7 @@ "type": "technique", "id": "PROBE", "name": "PROBE", - "min_unarmed": 3, + "skill_requirements": [ { "name": "unarmed", "level": 3 } ], "unarmed_allowed": false, "melee_allowed": true, "crit_tec": false, diff --git a/data/mods/CRT_EXPANSION/monsters/crt_monster.json b/data/mods/CRT_EXPANSION/monsters/crt_monster.json index e10af6549cdf6..5632c88b31483 100644 --- a/data/mods/CRT_EXPANSION/monsters/crt_monster.json +++ b/data/mods/CRT_EXPANSION/monsters/crt_monster.json @@ -3,12 +3,12 @@ "id": "mon_slasher", "type": "MONSTER", "name": "Slasher Necromorph", - "description": "A horrifically twisted human body. Two massive, bladed appendages have burst through its shoulders where they are poised above its head as it stalks about with terrifying purpose.", + "description": "A horrifically twisted human body. Two massive, bladed appendages have burst through its shoulders where they are poised above its head as it stalks about with terrifying purpose.", "default_faction": "zombie", "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 80, "speed": 105, "material": [ "flesh" ], @@ -46,12 +46,12 @@ "id": "mon_slasher_weak", "type": "MONSTER", "name": "Weak Slasher Necromorph", - "description": "A horrifically mutilated human body. Two scrawny blades have freshly bursted through its hand to deal with prey and the haunting visage of a jawless maw and a gaping wound in its forehead sends chills down your spine. The awkward steps it takes slows it down greatly.", + "description": "A horrifically mutilated human body. Two scrawny blades have freshly bursted through its hand to deal with prey and the haunting visage of a jawless maw and a gaping wound in its forehead sends chills down your spine. The awkward steps it takes slows it down greatly.", "default_faction": "zombie", "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 100, "speed": 60, "material": [ "flesh" ], @@ -89,11 +89,11 @@ "id": "mon_waster", "type": "MONSTER", "name": "Waster Necromorph", - "description": "Clad in heavy assault gear, an eerie light green glows beneath its helmet from sunken eye sockets and a gaping mouth. Strange blade like points have burst out of its arms making it a formidable force to be reckoned with.", + "description": "Clad in heavy assault gear, an eerie light green glows beneath its helmet from sunken eye sockets and a gaping mouth. Strange blade like points have burst out of its arms making it a formidable force to be reckoned with.", "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 50, "speed": 90, "material": [ "bone" ], @@ -122,11 +122,11 @@ "id": "mon_leaper", "type": "MONSTER", "name": "Leaper Necromorph", - "description": "This once-human body is barely recognizable, scrambling about on its abdomen as it leaps forward with immense arm strength. With elongated fangs that are can easily mutilate your flesh, the grotesque face roars incessantly. The lower body has fused together into one giant tail with a barbed spike.", + "description": "This once-human body is barely recognizable, scrambling about on its abdomen as it leaps forward with immense arm strength. With elongated fangs that are can easily mutilate your flesh, the grotesque face roars incessantly. The lower body has fused together into one giant tail with a barbed spike.", "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 110, "material": [ "flesh" ], @@ -159,11 +159,11 @@ "id": "mon_twitcher", "type": "MONSTER", "name": "Twitcher Necromorph", - "description": "With narrow blades coming out of its hands, this corpse spasmically dashes to-and-fro with surprising speed. It carries itself quite steadily when idle, further observation shows that the person before this husk was a C.R.I.T S-I G.E.A.R operator.", + "description": "With narrow blades coming out of its hands, this corpse spasmically dashes to-and-fro with surprising speed. It carries itself quite steadily when idle, further observation shows that the person before this husk was a C.R.I.T S-I G.E.A.R operator.", "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 90, "speed": 140, "material": [ "flesh" ], @@ -207,11 +207,11 @@ "id": "mon_pack", "type": "MONSTER", "name": "Pack Necromorph", - "description": "A shrieking mutated child zombie. The face is is mainly blank with eyes swollen shut and a torn-open mouth with flaps of flesh hanging to the side. A pair of seemingly purposeless appendages sprout from its shoulders before ending in its arms. Its small hands end in sharp claws.", + "description": "A shrieking mutated child zombie. The face is is mainly blank with eyes swollen shut and a torn-open mouth with flaps of flesh hanging to the side. A pair of seemingly purposeless appendages sprout from its shoulders before ending in its arms. Its small hands end in sharp claws.", "default_faction": "zombie", "species": [ "ZOMBIE" ], "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 25, "speed": 100, "material": [ "flesh" ], @@ -251,12 +251,12 @@ "id": "mon_puker", "type": "MONSTER", "name": "Puker Necromorph", - "description": "A rather mutilated corpse covered in gaping sores. Hanging arms with hands that have long corroded away reveal jagged edges that could easily pierce into your flesh. A sticky, frothing yellow sludge flows from its exposed internal organs to its unhinged jaw where it drips, hissing as it eats through material.", + "description": "A rather mutilated corpse covered in gaping sores. Hanging arms with hands that have long corroded away reveal jagged edges that could easily pierce into your flesh. A sticky, frothing yellow sludge flows from its exposed internal organs to its unhinged jaw where it drips, hissing as it eats through material.", "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "diff": 5, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 65, "speed": 80, "material": [ "flesh" ], diff --git a/data/mods/CRT_EXPANSION/monsters/monster.json b/data/mods/CRT_EXPANSION/monsters/monster.json index e5530678e10ea..61e07bd845c9a 100644 --- a/data/mods/CRT_EXPANSION/monsters/monster.json +++ b/data/mods/CRT_EXPANSION/monsters/monster.json @@ -3,17 +3,16 @@ "id": "mon_animate_arm", "type": "MONSTER", "name": "Animate Arm", - "description": "A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout out from the wound and lash about wildly.", + "description": "A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout out from the wound and lash about wildly.", "default_faction": "zombie", "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 10, "speed": 15, "material": [ "flesh" ], "symbol": "@", - "size": "medium", "color": "pink", "aggression": 100, "morale": 100, @@ -33,17 +32,16 @@ "id": "mon_dullahan", "type": "MONSTER", "name": "Dullahan", - "description": "A headless humanoid that slowly sways. Ornate and functional armor adorn this dreadful corpse which carries itself with an unerringly terrible steadiness. A long tentacle has sprouted out of its right arm which occasionally flails about wildly.", + "description": "A headless humanoid that slowly sways. Ornate and functional armor adorn this dreadful corpse which carries itself with an unerringly terrible steadiness. A long tentacle has sprouted out of its right arm which occasionally flails about wildly.", "default_faction": "zombie", "categories": [ "CLASSIC" ], "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 10, "speed": 15, "material": [ "flesh" ], "symbol": "D", - "size": "medium", "color": "light_red", "aggression": 100, "morale": 100, diff --git a/data/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json b/data/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json index cbcfeeb462795..df51f72b9801b 100644 --- a/data/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json +++ b/data/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json @@ -20,7 +20,7 @@ "visibility": -7, "ugliness": -7, "description": "Aside from your appearances, your movements are incredibly graceful and allow you to seemingly glide through every task.", - "thresheq": [ "THRESH_VAMP" ], + "threshreq": [ "THRESH_VAMP" ], "category": [ "VAMP" ], "stealth_modifier": 5, "noise_modifier": 0.2, diff --git a/data/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json b/data/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json index bc1b1fa63156d..0f2c09a131c55 100644 --- a/data/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json +++ b/data/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json @@ -14,7 +14,7 @@ "id": "NMELD", "name": "Nature's Boon", "points": 3, - "description": "Your very prescence is masked by nature itself. You are slightly harder to detect.", + "description": "Your very prescence is masked by nature itself. You are slightly harder to detect.", "valid": false, "purifiable": false, "prereqs": [ "WEAKSCENT" ], @@ -38,7 +38,7 @@ "id": "ANIMALEMPATH2", "name": "Animal Kinship", "points": 2, - "description": "Something about your presence is calming to animals, and they will treat you with innate trust. This only applies to natural animals such as woodland creatures.", + "description": "Something about your presence is calming to animals, and they will treat you with innate trust. This only applies to natural animals such as woodland creatures.", "category": [ "ELFA", "VAMP", "WENDIGO" ], "prereqs": [ "ANIMALEMPATH" ], "cancels": [ "ANIMALDISCORD" ] diff --git a/data/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json b/data/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json index 4fadba1373ec8..419e81319cf27 100644 --- a/data/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json +++ b/data/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json @@ -28,7 +28,7 @@ "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", "name": "vampire serum", - "description": "A super-concentrated pitch-black substance with silvery flecks that reminds you of a starry-night sky. You need a syringe to inject it... if you really want to?", + "description": "A super-concentrated pitch-black substance with silvery flecks that reminds you of a starry-night sky. You need a syringe to inject it… if you really want to?", "color": "light_gray", "healthy": -2, "use_action": { "type": "mutagen_iv", "mutation_category": "VAMP" } diff --git a/data/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json b/data/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json index 9098e00c6de73..1cf8a61f0880b 100644 --- a/data/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json +++ b/data/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json @@ -28,7 +28,7 @@ "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", "name": "wendigo serum", - "description": "A super-concentrated peat-brown substance with glittering green flecks that reminds you of a a tree. You need a syringe to inject it... if you really want to?", + "description": "A super-concentrated peat-brown substance with glittering green flecks that reminds you of a a tree. You need a syringe to inject it… if you really want to?", "color": "light_gray", "healthy": -2, "use_action": { "type": "mutagen_iv", "mutation_category": "WENDIGO" } diff --git a/data/mods/CRT_EXPANSION/scenarios/crt_classes.json b/data/mods/CRT_EXPANSION/scenarios/crt_classes.json index aa6e6cda6a3e4..2136dfae5ac61 100644 --- a/data/mods/CRT_EXPANSION/scenarios/crt_classes.json +++ b/data/mods/CRT_EXPANSION/scenarios/crt_classes.json @@ -3,7 +3,7 @@ "type": "profession", "ident": "crt_rotc", "name": "CRIT ROTC Member", - "description": "You were training ahead of time to become a C.R.I.T officer in the upcoming war. Your call to arms arrived dead on arrival and already plastered in the all-too vibrant gore of your squadmates. In the midst of panic, you bugged out lest you join the remnants of your friends. Now it's up to your wits and short years of training to keep you alive in this Cataclysm.", + "description": "You were training ahead of time to become a C.R.I.T officer in the upcoming war. Your call to arms arrived dead on arrival and already plastered in the all-too vibrant gore of your squadmates. In the midst of panic, you bugged out lest you join the remnants of your friends. Now it's up to your wits and short years of training to keep you alive in this Cataclysm.", "points": 7, "traits": [ "MARTIAL_CRT" ], "skills": [ @@ -32,7 +32,7 @@ "type": "profession", "ident": "crt_dude", "name": "CRIT Janitor", - "description": "*Sigh* Your life has been a wreck. Hopping place to place you finally found a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some sneak-peeks on some pretty cool stuff. After all non-essential personel were purged you found yourself stuck with nothing but the uniform they gave you and your job's sign-bonus equipment.", + "description": "*Sigh* Your life has been a wreck. Hopping place to place you finally found a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some sneak-peeks on some pretty cool stuff. After all non-essential personel were purged you found yourself stuck with nothing but the uniform they gave you and your job's sign-bonus equipment.", "points": 6, "skills": [ { "level": 2, "name": "tailor" }, @@ -69,7 +69,7 @@ "type": "profession", "ident": "crt_nco", "name": "CRIT NCO", - "description": "You were a senior NCO, relaying orders to your squad was an everyday task. When the cataclysm struck, your expertise helped save everyone time and time again until it all fell apart.", + "description": "You were a senior NCO, relaying orders to your squad was an everyday task. When the cataclysm struck, your expertise helped save everyone time and time again until it all fell apart.", "points": 10, "traits": [ "MARTIAL_CRT" ], "skills": [ @@ -116,7 +116,7 @@ "type": "profession", "ident": "crt_rifleman", "name": "CRIT Grunt", - "description": "You were part of the infantry; first to hit the ground running, clear a FOB and then come back to relax with your squad. Those days ended when the cataclysm reared its ugly head. Your lines were torn through like wet paper when the otherworldy abominations arived. Now fleeing for your life, will you have what it takes to survive or is this hellish landcape your resting place?", + "description": "You were part of the infantry; first to hit the ground running, clear a FOB and then come back to relax with your squad. Those days ended when the cataclysm reared its ugly head. Your lines were torn through like wet paper when the otherworldy abominations arived. Now fleeing for your life, will you have what it takes to survive or is this hellish landcape your resting place?", "points": 8, "traits": [ "MARTIAL_CRT" ], "skills": [ { "level": 3, "name": "gun" }, { "level": 3, "name": "rifle" }, { "level": 1, "name": "stabbing" } ], @@ -156,7 +156,7 @@ "type": "profession", "ident": "crt_medic", "name": "CRIT Combat Medic", - "description": "You were the team nerd. A combat medic taught on how to engage strange anomalies. However, your main focus was keeping your squadmates in one piece. For weeks, you slogged through hell and back and ensured that everyone made it. Caught in between a tide of the undead and the crossfire of apparently rogue government robots, you were left stranded as a distraction. Forced to flee, will you have what it takes to survive or will you join the horde to haunt them for their cardinal sin?", + "description": "You were the team nerd. A combat medic taught on how to engage strange anomalies. However, your main focus was keeping your squadmates in one piece. For weeks, you slogged through hell and back and ensured that everyone made it. Caught in between a tide of the undead and the crossfire of apparently rogue government robots, you were left stranded as a distraction. Forced to flee, will you have what it takes to survive or will you join the horde to haunt them for their cardinal sin?", "points": 8, "traits": [ "MARTIAL_CRT" ], "skills": [ @@ -203,7 +203,7 @@ "type": "profession", "ident": "crt_saw", "name": "CRIT Automatic Rifleman", - "description": "You were assigned the billet of specializing in creating dead zones and providing support fire. When the cataclysm struck, your trusty LMG couldn't keep the veritable tide of undead from overtaking your squad. Now running with all the strength your body can muster, will you have what it takes to survive or is this hellish landcape something you just can't suppress?", + "description": "You were assigned the billet of specializing in creating dead zones and providing support fire. When the cataclysm struck, your trusty LMG couldn't keep the veritable tide of undead from overtaking your squad. Now running with all the strength your body can muster, will you have what it takes to survive or is this hellish landcape something you just can't suppress?", "points": 10, "traits": [ "MARTIAL_CRT" ], "skills": [ { "level": 3, "name": "gun" }, { "level": 3, "name": "rifle" }, { "level": 1, "name": "pistol" } ], @@ -245,7 +245,7 @@ "type": "profession", "ident": "crt_officer", "name": "CRIT Commanding Officer", - "description": "As a top-ranking CO, you didn't see much in the way of combat other than when you felt like it. Your charisma and sharp intellect helped you climb up the ranks and provided support to allies in need. Now that everything went down the drain, will it help you again?", + "description": "As a top-ranking CO, you didn't see much in the way of combat other than when you felt like it. Your charisma and sharp intellect helped you climb up the ranks and provided support to allies in need. Now that everything went down the drain, will it help you again?", "points": 9, "traits": [ "MARTIAL_CRT" ], "skills": [ @@ -289,7 +289,7 @@ "type": "profession", "ident": "crt_guard", "name": "CRIT Enforcer", - "description": "STR 10 recommended. You were a granted the authority of a U.S Marshal. As a guard, others joked that you were nothing more than a mall cop with a fancy badge. Knowingly, you laughed it off as the you donned on your equipment and deployed. While you mainly spent time at base, you honed your skills and recieved special implants to do your job easier at the low low cost of serving as a \"guard\" forever. Time to do your job, mission parameters look like they've expanded quite a bit though.", + "description": "STR 10 recommended. You were a granted the authority of a U.S Marshal. As a guard, others joked that you were nothing more than a mall cop with a fancy badge. Knowingly, you laughed it off as the you donned on your equipment and deployed. While you mainly spent time at base, you honed your skills and recieved special implants to do your job easier at the low low cost of serving as a \"guard\" forever. Time to do your job, mission parameters look like they've expanded quite a bit though.", "traits": [ "MARTIAL_CRT", "PROF_FED" ], "CBMs": [ "bio_razors", "bio_sunglasses", "bio_ears", "bio_speed", "bio_str_enhancer" ], "points": 12, @@ -337,7 +337,7 @@ "type": "profession", "ident": "crt_juggernaught", "name": "CRIT Lone Wolf", - "description": "STR 10 recommended. You are fully armored badass granted the full authority of a U.S Marshal. Sent in as the one man army capable of handling anything. Dropped into warzones, you singlehandedly laid out entire battalions by yourself. Time to hang them all.", + "description": "STR 10 recommended. You are fully armored badass granted the full authority of a U.S Marshal. Sent in as the one man army capable of handling anything. Dropped into warzones, you singlehandedly laid out entire battalions by yourself. Time to hang them all.", "traits": [ "MARTIAL_CRT", "PROF_FED" ], "CBMs": [ "bio_weight", @@ -410,7 +410,7 @@ "type": "profession", "ident": "crt", "name": "CRIT Spec Ops", - "description": "STR 10 recommended. You were an elite member of the Catastrophe Response/Research & Investigation Team. A looming spectre which responded to secular threats which allowed your faction to leap decades in front of other world powers. Your squad was the first to be deployed into the New England region, ground zero, to contain the impending outbreak and gain information to relay back to command. Good luck soldier.", + "description": "STR 10 recommended. You were an elite member of the Catastrophe Response/Research & Investigation Team. A looming spectre which responded to secular threats which allowed your faction to leap decades in front of other world powers. Your squad was the first to be deployed into the New England region, ground zero, to contain the impending outbreak and gain information to relay back to command. Good luck soldier.", "traits": [ "MARTIAL_CRT", "PROF_FED" ], "CBMs": [ "bio_razors", @@ -483,7 +483,7 @@ "type": "profession", "ident": "crt_exile", "name": "CRIT Survivalist", - "description": "You were an elite recon of the C.R.I.T. You were hailed as a top survivalist after being stuck for weeks behind enemy lines and having to survive with nothing but some rocks, sticks and plants. However, after a few too many drinks (20) at the local bar and getting into a fight (knocking them out) with one of your commanding officers during a drunken bout you were stripped of your rank and sent off into the forests with your current gear to run a trial by survival. After an hour of scouting about in the forest for a good shelter, your radio rang and you were briefed over the fact that the world was suddenly ending. Of course, no one has time to pick your sorry ass up, so cheers. Staying away from drinks might be a good idea; at least you got some real tools this time!", + "description": "You were an elite recon of the C.R.I.T. You were hailed as a top survivalist after being stuck for weeks behind enemy lines and having to survive with nothing but some rocks, sticks and plants. However, after a few too many drinks (20) at the local bar and getting into a fight (knocking them out) with one of your commanding officers during a drunken bout you were stripped of your rank and sent off into the forests with your current gear to run a trial by survival. After an hour of scouting about in the forest for a good shelter, your radio rang and you were briefed over the fact that the world was suddenly ending. Of course, no one has time to pick your sorry ass up, so cheers. Staying away from drinks might be a good idea; at least you got some real tools this time!", "traits": [ "MARTIAL_CRT", "DRUNKEN", "ADDICTIVE" ], "points": 12, "skills": [ @@ -540,7 +540,7 @@ "type": "profession", "ident": "crt_normie", "name": "CRIT Recruit", - "description": "You were scheduled for some survival training in New England when the Cataclysm broke out and your instructor never showed up for the next lesson. Now stuck in the quarantine zone with your standard issue training equipment, you wish you had a better gun. Looks like you'll definitely learn a thing or two about survival though!", + "description": "You were scheduled for some survival training in New England when the Cataclysm broke out and your instructor never showed up for the next lesson. Now stuck in the quarantine zone with your standard issue training equipment, you wish you had a better gun. Looks like you'll definitely learn a thing or two about survival though!", "traits": [ "MARTIAL_CRT" ], "points": 6, "skills": [ @@ -587,7 +587,7 @@ "type": "profession", "ident": "crt_employee", "name": "CRIT Employee", - "description": "Like many others, you had requested to join the C.R.I.T organization's admin-offices to escape from bitter memories and past traumas after valiantly protecting your comrades for years. After you completed the readjustment program, your skills may have rusted considerably since your last deployment to battle, but the drilled muscle memories have not worn away. As your comrades' screams once again ring in your ears and repressed memories of abhorrent nature resurface, can you find it within yourself to overcome the looming terror which paralyzes you?", + "description": "Like many others, you had requested to join the C.R.I.T organization's admin-offices to escape from bitter memories and past traumas after valiantly protecting your comrades for years. After you completed the readjustment program, your skills may have rusted considerably since your last deployment to battle, but the drilled muscle memories have not worn away. As your comrades' screams once again ring in your ears and repressed memories of abhorrent nature resurface, can you find it within yourself to overcome the looming terror which paralyzes you?", "traits": [ "MARTIAL_CRT", "SPIRITUAL", "SCHIZOPHRENIC", "JITTERY" ], "points": 6, "skills": [ @@ -629,7 +629,7 @@ "type": "profession", "ident": "crt_engineer", "name": "CRIT Engineer", - "description": "You were scheduled to fix the several of the lab facilities in New England and show other researchers the new weapons you were working on. When the Cataclysm broke out, it made it so testing was easier to do, but then again nothing seems to making that much sense. Time to bug-out!", + "description": "You were scheduled to fix the several of the lab facilities in New England and show other researchers the new weapons you were working on. When the Cataclysm broke out, it made it so testing was easier to do, but then again nothing seems to making that much sense. Time to bug-out!", "traits": [ "MARTIAL_CRT" ], "points": 12, "skills": [ @@ -675,7 +675,7 @@ "type": "profession", "ident": "crt_vamp", "name": "CRIT Night Walker", - "description": "Your base in New England fell to the unholy onslaught of the Cataclysm. However, as a a top researcher in the R&D department, you had chosen to slowly mutate yourself into something more than human. Even if the concotion was less than perfect, your old flimsy body feels empowered. With the new flesh that is now your own, bare your fangs and fight until the next dawn.", + "description": "Your base in New England fell to the unholy onslaught of the Cataclysm. However, as a a top researcher in the R&D department, you had chosen to slowly mutate yourself into something more than human. Even if the concotion was less than perfect, your old flimsy body feels empowered. With the new flesh that is now your own, bare your fangs and fight until the next dawn.", "traits": [ "MARTIAL_CRT", "THRESH_VAMP", diff --git a/data/mods/CrazyCataclysm/crazy_aperturepotato.json b/data/mods/CrazyCataclysm/crazy_aperturepotato.json index 970a0d70c1530..bcb3747248b93 100644 --- a/data/mods/CrazyCataclysm/crazy_aperturepotato.json +++ b/data/mods/CrazyCataclysm/crazy_aperturepotato.json @@ -20,10 +20,10 @@ { "id": "aperture_potato", "type": "TOOL", - "name": "companion potato", + "name": { "str": "companion potato", "str_pl": "companion potatoes" }, "description": "Seems like some kind of Genetic Lifeform and Disk Operating System, attached to a potato.", - "weight": 900, - "volume": 2, + "weight": "900 g", + "volume": "500 ml", "price": 9000, "to_hit": -1, "material": "plastic", diff --git a/data/mods/CrazyCataclysm/crazy_comestibles.json b/data/mods/CrazyCataclysm/crazy_comestibles.json index f9113a0491b77..b68acd1742247 100644 --- a/data/mods/CrazyCataclysm/crazy_comestibles.json +++ b/data/mods/CrazyCataclysm/crazy_comestibles.json @@ -9,7 +9,7 @@ "symbol": "%", "quench": 25, "calories": 217, - "description": "The hit cookie from Mycus Industries! Now comes in addicting flavors such as Marloss, Chanterelle, and The Encroaching, Unavoidable Death of Human Civilization.", + "description": "The hit cookie from Mycus Industries! Now comes in addicting flavors such as Marloss, Chanterelle, and The Encroaching, Unavoidable Death of Human Civilization.", "price": 0, "material": [ "wheat", "fruit" ], "charges": 4, diff --git a/data/mods/CrazyCataclysm/crazy_items.json b/data/mods/CrazyCataclysm/crazy_items.json index e0246cedb5778..c0a134a30f431 100644 --- a/data/mods/CrazyCataclysm/crazy_items.json +++ b/data/mods/CrazyCataclysm/crazy_items.json @@ -5,8 +5,8 @@ "category": "weapons", "name": "Granade", "description": "Attached to this grenade is a name tag with the name Kevin written on it. Does not seem to work like a grenade, handle with care.", - "weight": 180, - "volume": 1, + "weight": "180 g", + "volume": "250 ml", "price": 40000, "to_hit": -1, "bashing": 6, @@ -21,8 +21,8 @@ "category": "weapons", "name": "active Granade", "description": "Attached to this grenade is a name tag with the name Kevin written on it. Does not seem to work like a grenade, handle with care. Better throw it!", - "weight": 180, - "volume": 1, + "weight": "180 g", + "volume": "250 ml", "price": 0, "to_hit": -1, "bashing": 6, @@ -40,7 +40,7 @@ "copy-from": "bionic_general", "type": "BIONIC_ITEM", "name": "Ionic Overload Generator CBM", - "description": "A powerful ion energy generator is implanted on your chest. Fires a powerful, ever-expanding energy blast. The resulting blast ignites oxygen creating fires as it moves and an explosion on impact. Close range use is highly discouraged.", + "description": "A powerful ion energy generator is implanted on your chest. Fires a powerful, ever-expanding energy blast. The resulting blast ignites oxygen creating fires as it moves and an explosion on impact. Close range use is highly discouraged.", "price": 220000, "difficulty": 8 }, @@ -48,7 +48,7 @@ "type": "bionic", "id": "bio_chest_gun", "name": "Ionic Overload Generator", - "description": "A powerful ion energy generator is implanted on your chest. Fires a powerful, ever-expanding energy blast. The resulting blast ignites oxygen creating fires as it moves and an explosion on impact. Close range use is highly discouraged.", + "description": "A powerful ion energy generator is implanted on your chest. Fires a powerful, ever-expanding energy blast. The resulting blast ignites oxygen creating fires as it moves and an explosion on impact. Close range use is highly discouraged.", "occupied_bodyparts": [ [ "TORSO", 20 ] ], "act_cost": 500, "fake_item": "bio_ion_gun", @@ -59,8 +59,8 @@ "type": "GUN", "name": "Ionic Overload Generator", "description": "A powerful ion energy generator is implanted on your chest. Fires a powerful, ever-expanding energy blast that goes through various targets. The energy shot ignites oxygen creating fires as it moves and an explosion on impact.", - "weight": 2950, - "volume": 12, + "weight": "2950 g", + "volume": "3 L", "price": 1600000, "to_hit": -1, "bashing": 12, @@ -84,8 +84,8 @@ "copy-from": "pistol_base", "type": "GUN", "name": "Yeet Cannon", - "description": "You can YEET all the bullets with this baby. YEET them right into all of the zombies in your path, all the hulks, the spiders, and those damned mole rats.", - "weight": 709, + "description": "You can YEET all the bullets with this baby. YEET them right into all of the zombies in your path, all the hulks, the spiders, and those damned mole rats.", + "weight": "709 g", "volume": "539 ml", "price": 7500, "to_hit": -2, diff --git a/data/mods/CrazyCataclysm/crazy_monsters.json b/data/mods/CrazyCataclysm/crazy_monsters.json index 6ad9e3b4f3572..f3d87a6d0a7d1 100644 --- a/data/mods/CrazyCataclysm/crazy_monsters.json +++ b/data/mods/CrazyCataclysm/crazy_monsters.json @@ -10,7 +10,7 @@ "id": "mon_zombie_electric", "type": "MONSTER", "name": "shocker zombie", - "description": "A human body with pale blue flesh, crackling with electrical energy. It seems eager to tell you something.", + "description": "A human body with pale blue flesh, crackling with electrical energy. It seems eager to tell you something.", "copy-from": "mon_zombie_electric", "special_attacks": [ [ "SHOCKING_REVEAL", 25 ] ] }, @@ -18,11 +18,11 @@ "id": "mon_zombie_skeltal", "type": "MONSTER", "name": "mr skeltal", - "description": "Devoid entirely of flesh and organs, this walking skeleton rattles you to the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end of the world.", + "description": "Devoid entirely of flesh and organs, this walking skeleton rattles you to the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end of the world.", "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 50, "speed": 60, "material": [ "bone" ], @@ -54,7 +54,7 @@ "default_faction": "zombie", "species": [ "ZOMBIE", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 10, "speed": 80, "material": [ "bone" ], @@ -77,10 +77,11 @@ "id": "mon_bear_smoky", "type": "MONSTER", "name": "Smoky bear", - "description": "A smoking husk is all that remains of this once proud bear. Its black eyes gaze at you with malice... and hunger.", + "description": "A smoking husk is all that remains of this once proud bear. Its black eyes gaze at you with malice… and hunger.", "default_faction": "bear", "species": [ "ZOMBIE" ], - "size": "LARGE", + "volume": "92500 ml", + "weight": "120 kg", "hp": 100, "speed": 90, "material": [ "flesh" ], diff --git a/data/mods/CrazyCataclysm/crazy_speech.json b/data/mods/CrazyCataclysm/crazy_speech.json index d997189b2badf..0e836e861be28 100644 --- a/data/mods/CrazyCataclysm/crazy_speech.json +++ b/data/mods/CrazyCataclysm/crazy_speech.json @@ -14,13 +14,13 @@ { "type": "speech", "speaker": "aperture_potato", - "sound": "Unbelievable. You, [subject name here], must be the pride of [subject hometown here]!", + "sound": "Unbelievable. You, [subject name here], must be the pride of [subject hometown here]!", "volume": 20 }, { "type": "speech", "speaker": "aperture_potato", - "sound": "That thing is probably some sort of raw sewage container. Go ahead and rub your face all over it.", + "sound": "That thing is probably some sort of raw sewage container. Go ahead and rub your face all over it.", "volume": 10 }, { @@ -32,19 +32,19 @@ { "type": "speech", "speaker": "aperture_potato", - "sound": "No one will blame you for giving up. In fact, quitting at this point is a perfectly reasonable response.", + "sound": "No one will blame you for giving up. In fact, quitting at this point is a perfectly reasonable response.", "volume": 10 }, { "type": "speech", "speaker": "aperture_potato", - "sound": "Fantastic! You remained resolute and resourceful in an atmosphere of extreme pessimism.", + "sound": "Fantastic! You remained resolute and resourceful in an atmosphere of extreme pessimism.", "volume": 10 }, { "type": "speech", "speaker": "aperture_potato", - "sound": "Hello again. To reiterate our previous warning: [garbled]", + "sound": "Hello again. To reiterate our previous warning: [garbled]", "volume": 10 }, { @@ -146,7 +146,7 @@ { "type": "speech", "speaker": "aperture_potato", - "sound": "Uh oh. Somebody cut the cake. I told them to wait for you, but they did it anyway.", + "sound": "Uh oh. Somebody cut the cake. I told them to wait for you, but they did it anyway.", "volume": 10 }, { @@ -182,19 +182,19 @@ { "type": "speech", "speaker": "aperture_potato", - "sound": "What was that? Did you say something? ", + "sound": "What was that? Did you say something?", "volume": 20 }, { "type": "speech", "speaker": "aperture_potato", - "sound": "I'd just like to point out that you were given every opportunity to succeed. ", + "sound": "I'd just like to point out that you were given every opportunity to succeed.", "volume": 10 }, { "type": "speech", "speaker": "aperture_potato", - "sound": "What's your point, anyway? Survival?", + "sound": "What's your point, anyway? Survival?", "volume": 20 }, { @@ -242,7 +242,7 @@ { "type": "speech", "speaker": "aperture_potato", - "sound": "I'm checking some blueprints, and I think... Yes, right here. You're definitely going the wrong way.", + "sound": "I'm checking some blueprints, and I think… Yes, right here. You're definitely going the wrong way.", "volume": 10 }, { @@ -254,7 +254,7 @@ { "type": "snippet", "category": "clickbait", - "text": "KEVIN SACRIFICING GAMEPLAY FOR REALISM? THE SHOCKING TRUTH REVEALED" + "text": "KEVIN SACRIFICING GAMEPLAY FOR REALISM? THE SHOCKING TRUTH REVEALED" }, { "type": "snippet", @@ -269,7 +269,7 @@ { "type": "snippet", "category": "clickbait", - "text": "TRIVIALIZE THE EARLY GAME WITH THIS ONE SIMPLE SPEAR WEAPON! CONTRIBUTORS HATE HIM" + "text": "TRIVIALIZE THE EARLY GAME WITH THIS ONE SIMPLE SPEAR WEAPON! CONTRIBUTORS HATE HIM" }, { "type": "snippet", @@ -336,7 +336,7 @@ { "type": "speech", "speaker": "mon_mi_go", - "sound": "\"E.T. phone home.\"", + "sound": "\"E.T. phone home.\"", "volume": 20 }, { @@ -378,7 +378,7 @@ { "type": "speech", "speaker": "mon_mi_go", - "sound": "\"It's alive! It's alive!\"", + "sound": "\"It's alive! It's alive!\"", "volume": 40 }, { @@ -426,7 +426,7 @@ { "type": "speech", "speaker": "mon_mi_go", - "sound": "\"Fasten your seatbelts. It's going to be a bumpy night.\"", + "sound": "\"Fasten your seatbelts. It's going to be a bumpy night.\"", "volume": 20 }, { @@ -1014,7 +1014,7 @@ { "type": "speech", "speaker": "mon_turret", - "sound": "\"Something's wrong...\"", + "sound": "\"Something's wrong…\"", "volume": 30 }, { @@ -1062,19 +1062,19 @@ { "type": "speech", "speaker": "mon_turret", - "sound": "\"I'm different...\"", + "sound": "\"I'm different…\"", "volume": 30 }, { "type": "speech", "speaker": "mon_turret", - "sound": "\"Thanks anyway...\"", + "sound": "\"Thanks anyway…\"", "volume": 30 }, { "type": "speech", "speaker": "mon_turret", - "sound": "\"Take me with you...\"", + "sound": "\"Take me with you…\"", "volume": 30 }, { @@ -1194,7 +1194,7 @@ { "type": "speech", "speaker": "mon_turret", - "sound": "\"Second time's a charm...\"", + "sound": "\"Second time's a charm…\"", "volume": 30 }, { @@ -1302,7 +1302,7 @@ { "type": "speech", "speaker": "mon_turret", - "sound": "\"Well, I tried. Best of luck!\"", + "sound": "\"Well, I tried. Best of luck!\"", "volume": 30 }, { diff --git a/data/mods/CrazyCataclysm/modinfo.json b/data/mods/CrazyCataclysm/modinfo.json index c2eb2b701b863..9627493391dec 100644 --- a/data/mods/CrazyCataclysm/modinfo.json +++ b/data/mods/CrazyCataclysm/modinfo.json @@ -22,7 +22,6 @@ { "type": "EXTERNAL_OPTION", "name": "CRAZY", - "info": "It's craaaaaazy!", "stype": "bool", "value": true } diff --git a/data/mods/DinoMod/dinosaur.json b/data/mods/DinoMod/dinosaur.json index c0a809ddbcd15..18fda81786c73 100644 --- a/data/mods/DinoMod/dinosaur.json +++ b/data/mods/DinoMod/dinosaur.json @@ -14,7 +14,7 @@ "symbol": "D", "color": "green_yellow", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "material": "flesh", "aggression": -80, "morale": -8, @@ -27,12 +27,9 @@ "vision_day": 50, "armor_bash": 1, "armor_cut": 0, - "item_chance": 0, "luminance": 0, "hp": 20, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A bipedal dinosaur about the size of a turkey. Its teeth and claws are small but sharp.", "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "ANIMAL", "PATH_AVOID_DANGER_1", "BLEED", "WARM" ], "harvest": "mammal_leather", @@ -50,7 +47,7 @@ "symbol": "D", "color": "light_green_yellow", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "material": "flesh", "aggression": -60, "morale": -20, @@ -62,12 +59,9 @@ "dodge": 3, "armor_bash": 1, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "hp": 40, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A feathered bipedal dinosaur, standing as tall as a human. It looks somewhat like a reptilian ostrich.", "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ], "harvest": "dino_feather_leather", @@ -83,7 +77,7 @@ "symbol": "D", "color": "blue_green", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": -20, "morale": 60, @@ -95,12 +89,9 @@ "dodge": 1, "armor_bash": 1, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "hp": 60, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "It looks like a dodo, only much bigger, with longer, muscular legs and a predatory gleam in its eyes.", "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "GRABS", "KEENNOSE", "BLEED", "WARM" ], "harvest": "dino_feather_leather", @@ -118,7 +109,7 @@ "symbol": "D", "color": "red_white", "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "material": "flesh", "aggression": 100, "morale": 100, @@ -130,12 +121,9 @@ "dodge": 0, "armor_bash": 4, "armor_cut": 2, - "item_chance": 0, "luminance": 0, "hp": 400, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A huge dinosaur about the size of a small house, with a ferocious crocodile-like head and a sail on its back.", "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "DESTROYS", "BLEED", "ATTACKMON", "WARM" ], "harvest": "mammal_large_leather", @@ -153,7 +141,7 @@ "symbol": "D", "color": "light_red_white", "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "material": "flesh", "aggression": 100, "morale": 100, @@ -165,12 +153,9 @@ "dodge": 0, "armor_bash": 4, "armor_cut": 2, - "item_chance": 0, "luminance": 0, "hp": 300, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "Look at those TEETH!", "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "DESTROYS", "BLEED", "ATTACKMON", "WARM" ], "harvest": "mammal_large_leather", @@ -188,7 +173,7 @@ "symbol": "D", "color": "light_green_magenta", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": -50, "morale": 50, @@ -200,12 +185,9 @@ "dodge": 0, "armor_bash": 4, "armor_cut": 2, - "item_chance": 0, "luminance": 0, "hp": 150, - "special_freq": [ 10 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A massive rhino-like dinosaur with a bony crest from which three large horns emerge.", "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "WARM" ], "harvest": "mammal_large_leather", @@ -222,7 +204,7 @@ "symbol": "D", "color": "green_magenta", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": -50, "morale": -20, @@ -234,12 +216,9 @@ "dodge": 1, "armor_bash": 3, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "hp": 150, - "special_freq": [ 5 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A large quadruped dinosaur with plates on its back, and a spiked tail.", "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "WARM" ], "harvest": "mammal_large_leather", @@ -256,7 +235,7 @@ "symbol": "D", "color": "brown_magenta", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": -50, "morale": 30, @@ -268,12 +247,9 @@ "dodge": 1, "armor_bash": 6, "armor_cut": 4, - "item_chance": 0, "luminance": 0, "hp": 120, - "special_freq": [ 7 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "This dinosaur looks like a giant prehistoric armadillo. Its tail ends in a massive spiked club of bone.", "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "WARM" ], "harvest": "mammal_large_leather", @@ -290,7 +266,7 @@ "symbol": "D", "color": "brown_white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": 80, "morale": 80, @@ -302,12 +278,9 @@ "dodge": 1, "armor_bash": 3, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "hp": 120, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A large predatory bipedal dinosaur, with tiger-like stripes on its broad back.", "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "BLEED", "ATTACKMON", "WARM" ], "harvest": "mammal_large_leather", @@ -325,7 +298,7 @@ "symbol": "D", "color": "dark_gray_yellow", "volume": "750 ml", - "weight": 1000, + "weight": "1 kg", "material": "flesh", "aggression": -60, "morale": -60, @@ -337,12 +310,9 @@ "dodge": 4, "armor_bash": 1, "armor_cut": 0, - "item_chance": 0, "luminance": 0, "hp": 10, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A bipedal dinosaur about the size of a chicken. It roots around the undergrowth, scavenging on small animals and plants.", "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "HIT_AND_RUN", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ], "harvest": "mammal_tiny", @@ -358,7 +328,7 @@ "symbol": "D", "color": "light_red_green", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "material": "flesh", "aggression": 0, "morale": 20, @@ -370,12 +340,10 @@ "dodge": 3, "armor_bash": 1, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "hp": 30, - "special_freq": [ 5 ], - "death_function": "NORMAL", - "special_attack": [ "LEAP" ], + "death_function": [ "NORMAL" ], + "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true } ], "description": "A small bipedal dinosaur covered with feathers. Small, hooked claws emerge from its feet and hands.", "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "KEENNOSE", "BLEED", "WARM" ], "harvest": "dino_feather_leather", @@ -393,7 +361,7 @@ "symbol": "D", "color": "red_green", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": 1, "morale": 50, @@ -405,12 +373,10 @@ "dodge": 2, "armor_bash": 1, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "hp": 60, - "special_freq": [ 5 ], - "death_function": "NORMAL", - "special_attack": [ "LEAP" ], + "death_function": [ "NORMAL" ], + "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true } ], "description": "A medium-sized bipedal dinosaur covered with feathers. At the end of each foot is a large sickle-like claw.", "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "KEENNOSE", "BLEED", "ATTACKMON", "WARM" ], "harvest": "dino_feather_leather", @@ -428,7 +394,7 @@ "symbol": "D", "color": "dark_gray_white", "volume": "92500 ml", - "weight": 120000, + "weight": "120 kg", "material": "flesh", "aggression": 30, "morale": 80, @@ -440,12 +406,10 @@ "dodge": 1, "armor_bash": 2, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "hp": 100, - "special_freq": [ 5 ], - "death_function": "NORMAL", - "special_attack": [ "LEAP" ], + "death_function": [ "NORMAL" ], + "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true } ], "description": "A large bipedal dinosaur with feathered arms, a long tail, and scythe-like claws.", "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "KEENNOSE", "BLEED", "ATTACKMON", "WARM" ], "harvest": "dino_feather_leather", @@ -463,7 +427,7 @@ "symbol": "D", "color": "dark_gray_magenta", "volume": "875000 ml", - "weight": 200000, + "weight": "200 kg", "material": "flesh", "aggression": -40, "morale": -10, @@ -475,12 +439,9 @@ "dodge": 0, "armor_bash": 4, "armor_cut": 4, - "item_chance": 0, "luminance": 0, "hp": 300, - "special_freq": [ 10 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A huge mottled dinosaur with a blunt head crest. It contentedly strips leaves from a nearby shrub.", "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "WARM" ], "harvest": "mammal_large_leather", @@ -497,7 +458,7 @@ "symbol": "D", "color": "light_gray_yellow", "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "material": "flesh", "aggression": -80, "morale": -8, @@ -509,13 +470,10 @@ "dodge": 3, "armor_bash": 3, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "vision_day": 50, "hp": 30, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "NONE" ], + "death_function": [ "NORMAL" ], "description": "A small flying reptile, circling overhead looking for prey.", "flags": [ "SEES", "SMELLS", "HEARS", "FLIES", "HIT_AND_RUN", "ANIMAL", "PATH_AVOID_DANGER_1", "BLEED" ], "harvest": "animal_noskin", @@ -532,7 +490,7 @@ "symbol": "D", "color": "magenta_green", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "material": "flesh", "aggression": 10, "morale": 30, @@ -544,12 +502,10 @@ "dodge": 1, "armor_bash": 3, "armor_cut": 1, - "item_chance": 0, "luminance": 0, "hp": 120, - "special_freq": [ 0 ], - "death_function": "NORMAL", - "special_attack": [ "BOOMER" ], + "death_function": [ "NORMAL" ], + "special_attacks": [ [ "BOOMER", 20 ] ], "description": "A medium dinosaur with a sticky green bile dripping from its teeth.", "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "KEENNOSE", "BLEED", "WARM" ], "harvest": "mammal_leather", diff --git a/data/mods/DinoMod/fieldoffice.json b/data/mods/DinoMod/fieldoffice.json index db489513e24d0..99c28e53068bc 100644 --- a/data/mods/DinoMod/fieldoffice.json +++ b/data/mods/DinoMod/fieldoffice.json @@ -165,7 +165,6 @@ "I": "f_hay" }, "toilets": { "B": { } }, - "comment": "randomly picked from a group ---v", "place_items": [ { "item": "fieldoffice_weapons", "chance": 70, "x": [ 20, 21 ], "y": 20 }, { "item": "fieldoffice_tools", "chance": 80, "x": [ 18, 19 ], "y": 20 }, @@ -189,12 +188,10 @@ { "monster": "GROUP_DINOSAUR_HARMLESS", "chance": 3, "x": [ 9, 13 ], "y": [ 16, 20 ], "density": 0.15 }, { "monster": "GROUP_FIELDOFFICE_ZOMBIE", "chance": 2, "x": [ 1, 22 ], "y": [ 1, 6 ], "density": 0.15 }, { "monster": "GROUP_FIELDOFFICE_ZOMBIE", "chance": 2, "x": [ 16, 22 ], "y": [ 8, 21 ], "density": 0.15 } - ], - "comment": "end of mapgen json definition ---v" - }, - "comment": "end of mapgen entry ---v", - "flags": [ "SIDEWALK" ] + ] + } } - ] + ], + "flags": [ "SIDEWALK" ] } ] diff --git a/data/mods/DinoMod/regional_overlay.json b/data/mods/DinoMod/regional_overlay.json index 9f72f291d08bd..ff207bc0061fd 100644 --- a/data/mods/DinoMod/regional_overlay.json +++ b/data/mods/DinoMod/regional_overlay.json @@ -1,7 +1,6 @@ [ { "type": "region_overlay", - "id": "dinomod_overlay", "regions": [ "all" ], "city": { "parks": { "fieldoffice": 100 } } } diff --git a/data/mods/EW_Pack/ew_ammo.json b/data/mods/EW_Pack/ew_ammo.json index f36f3a3989698..b77637f58551b 100644 --- a/data/mods/EW_Pack/ew_ammo.json +++ b/data/mods/EW_Pack/ew_ammo.json @@ -9,8 +9,8 @@ "color": "dark_gray", "description": "A 6.54x42mm cartridge, loaded with a 120 gr. FMJBT bullet. Inspired by the improved .280 British, Alexander Sarafanov himself developed the 6.54x42mm rifle cartridge for his new SVS-24 Assault Rifle.", "material": [ "steel", "lead", "powder" ], - "volume": 1, - "weight": 14, + "volume": "250 ml", + "weight": "14 g", "ammo_type": "654", "casing": "654_casing", "damage": 49, @@ -31,7 +31,7 @@ "name_plural": "6.54x42mm 9N12", "description": "The 6.54x42mm 9N12 has superior armor piercing capabilities thanks to its tungsten carbide core. Tungsten carbide was used in anti-tank rounds of the 20th and 21st century, whenever depleted uranium was unavailable or undesirable.", "material": [ "steel", "powder" ], - "weight": 12, + "weight": "12 g", "count": 50, "damage": 47, "pierce": 32, @@ -59,8 +59,8 @@ "color": "light_gray", "description": "These metal pellets are propelled with the help of electromagnets, therefore they do not produce sound, flash or heat signature.", "material": "steel", - "volume": 1, - "weight": 4, + "volume": "250 ml", + "weight": "4 g", "bashing": 1, "ammo_type": "wr_dread", "damage": 6, diff --git a/data/mods/EW_Pack/ew_books.json b/data/mods/EW_Pack/ew_books.json index eb6fc42b5d70b..d84c44e281312 100644 --- a/data/mods/EW_Pack/ew_books.json +++ b/data/mods/EW_Pack/ew_books.json @@ -2,16 +2,15 @@ { "type": "BOOK", "id": "recipe_igm", - "name": "Case #5846, Illegal Gun Modification", - "name_plural": "Case #5846, Illegal Gun Modification", + "name": { "str": "Case #5846, Illegal Gun Modification", "str_pl": "copies of Case #5846, Illegal Gun Modification" }, "max_level": 3, "description": "This file details illegal gun modifications. Maybe you could learn something. At least you don't have to worry about the cops anymore.", - "weight": 400, + "weight": "400 g", "color": "white", "intelligence": 4, "symbol": "?", "material": [ "paper" ], - "volume": 2, + "volume": "500 ml", "bashing": 2, "time": 30, "fun": 0, diff --git a/data/mods/EW_Pack/ew_magazines.json b/data/mods/EW_Pack/ew_magazines.json index 4da2fc12492d6..00365c9454659 100644 --- a/data/mods/EW_Pack/ew_magazines.json +++ b/data/mods/EW_Pack/ew_magazines.json @@ -4,8 +4,8 @@ "type": "MAGAZINE", "name": "CW-24 auto-magazine", "description": "An advanced automagazine for the CW-24 rifle. Like the SVS magazines, it uses microrobotics to load its cartridges.", - "weight": 250, - "volume": 2, + "weight": "250 g", + "volume": "500 ml", "price": 3500, "material": [ "plastic", "steel" ], "symbol": "#", @@ -21,8 +21,8 @@ "type": "MAGAZINE", "name": "CW-24 extended magazine", "description": "An extended auto-magazine for the CW-24 rifle. Like the SVS magazines, it uses microrobotics to load its cartridges.", - "weight": 290, - "volume": 3, + "weight": "290 g", + "volume": "750 ml", "price": 5800, "material": [ "plastic", "steel" ], "symbol": "#", @@ -38,8 +38,8 @@ "type": "MAGAZINE", "name": "CWD-63 extended magazine", "description": "A cheap 10-round box magazine for the CWD-63. It's not as reliable.", - "weight": 120, - "volume": 2, + "weight": "120 g", + "volume": "500 ml", "price": 1500, "material": [ "plastic", "steel" ], "symbol": "#", @@ -55,8 +55,8 @@ "type": "MAGAZINE", "name": "CWD-63 magazine", "description": "Since it's created for the .308 round, it doesn't need the curved shape of the original magazine.", - "weight": 160, - "volume": 1, + "weight": "160 g", + "volume": "250 ml", "price": 3450, "material": [ "plastic", "steel" ], "symbol": "#", @@ -71,8 +71,8 @@ "type": "MAGAZINE", "name": "SVS-24 robodrum", "description": "An advanced 135-round drum magazine. Like the auto-magazine, it loads cartridges using microrobotics.", - "weight": 2358, - "volume": 5, + "weight": "2358 g", + "volume": "1250 ml", "price": 12000, "material": [ "plastic", "steel" ], "symbol": "#", @@ -88,8 +88,8 @@ "type": "MAGAZINE", "name": "SVS-24 robomag", "description": "An advanced 42-round auto-magazine. Unlike previous generations of magazines, this one uses microrobotics to load cartridges.", - "weight": 320, - "volume": 3, + "weight": "320 g", + "volume": "750 ml", "price": 4950, "material": [ "plastic", "steel" ], "symbol": "#", diff --git a/data/mods/EW_Pack/ew_weapons.json b/data/mods/EW_Pack/ew_weapons.json index 67069b1431814..f11fdbe806a49 100644 --- a/data/mods/EW_Pack/ew_weapons.json +++ b/data/mods/EW_Pack/ew_weapons.json @@ -12,8 +12,8 @@ "material": [ "steel", "plastic" ], "skill": "rifle", "ammo": "654", - "weight": 3900, - "volume": 8, + "weight": "3900 g", + "volume": "2 L", "bashing": 12, "to_hit": -1, "dispersion": 75, @@ -49,8 +49,8 @@ "name_plural": "SVS-24C", "description": "The compact version of the standard SVS-24. It is commonly issued to tank crews or special forces due to its smaller size. The shorter barrel reduces accuracy.", "price": 440000, - "weight": 3000, - "volume": 5, + "weight": "3 kg", + "volume": "1250 ml", "range": -2, "valid_mod_locations": [ [ "accessories", 4 ], @@ -80,8 +80,8 @@ "//": "Civvie version is cheaper.", "material": [ "steel", "plastic" ], "ammo": "545x39", - "weight": 3900, - "volume": 8, + "weight": "3900 g", + "volume": "2 L", "bashing": 12, "to_hit": -1, "dispersion": 75, @@ -170,8 +170,8 @@ "price": 170000, "material": [ "steel", "wood" ], "ammo": "308", - "weight": 4300, - "volume": 11, + "weight": "4300 g", + "volume": "2750 ml", "bashing": 12, "to_hit": -1, "dispersion": 75, @@ -206,8 +206,8 @@ "material": [ "steel", "plastic" ], "skill": "smg", "ammo": "wr_dread", - "weight": 1000, - "volume": 4, + "weight": "1 kg", + "volume": "1 L", "bashing": 8, "to_hit": -1, "dispersion": 150, diff --git a/data/mods/EW_Pack/obsolete.json b/data/mods/EW_Pack/obsolete.json index 602f721913857..bbda9e0f7a02a 100644 --- a/data/mods/EW_Pack/obsolete.json +++ b/data/mods/EW_Pack/obsolete.json @@ -4,14 +4,13 @@ "id": "retool_545", "name": "5.45 caliber conversion kit", "location": "bore", - "weight": 114, + "weight": "114 g", "color": "green", "price": 50000, - "clip_size_modifier": 8, "description": "This kit is used to convert 6.54 rifle to the 5.45 caliber. The conversion results in slight reductions to recoil.", "symbol": ":", "material": [ "steel" ], - "volume": 2, + "volume": "500 ml", "acceptable_ammo": [ "654" ], "mod_targets": [ "rifle" ], "bashing": 4, @@ -22,14 +21,13 @@ "id": "retool_654", "name": "6.54 caliber conversion kit", "location": "bore", - "weight": 114, + "weight": "114 g", "color": "green", "price": 50000, - "clip_size_modifier": -8, "description": "This kit is used to convert 5.45 rifle to the 6.54 caliber. The conversion results in increased recoil.", "symbol": ":", "material": [ "steel" ], - "volume": 2, + "volume": "500 ml", "acceptable_ammo": [ "545x39" ], "mod_targets": [ "rifle" ], "bashing": 4, @@ -40,14 +38,13 @@ "id": "retool_762", "name": "7.62 caliber conversion kit", "location": "bore", - "weight": 114, + "weight": "114 g", "color": "green", "price": 50000, - "clip_size_modifier": -11, "description": "This kit is used to convert 6.54 rifle to the 7.62 caliber. The conversion results in increased recoil.", "symbol": ":", "material": [ "steel" ], - "volume": 2, + "volume": "500 ml", "acceptable_ammo": [ "654" ], "mod_targets": [ "rifle" ], "bashing": 4, diff --git a/data/mods/FictonalWeapons/fic_mods.json b/data/mods/FictonalWeapons/fic_mods.json index 39753bbd5f7f1..5c3312217625d 100644 --- a/data/mods/FictonalWeapons/fic_mods.json +++ b/data/mods/FictonalWeapons/fic_mods.json @@ -9,8 +9,8 @@ "location": "accessories", "price": 48000, "material": "steel", - "weight": 226, - "volume": 1, + "weight": "226 g", + "volume": "250 ml", "bashing": 3, "to_hit": -1, "dispersion_modifier": 30, @@ -24,22 +24,16 @@ "type": "GUNMOD", "name": "integral flamethrower", "description": "This genuine Herostratus flamethrower is ideal for light brush clearing and self-defense.", - "weight": 1500, - "volume": 3, + "weight": "1500 g", + "volume": "750 ml", "price": 100000, "material": [ "steel", "ceramic" ], "symbol": ":", "color": "light_gray", "location": "underbarrel", "mod_targets": [ "pistol", "smg" ], - "gun_data": { - "ammo": "flammable", - "skill": "launcher", - "dispersion": 320, - "durability": 10, - "clip_size": 300, - "flags": [ "FIRE_50" ] - }, + "gun_data": { "ammo": "flammable", "skill": "launcher", "dispersion": 320, "durability": 10, "clip_size": 300 }, + "flags": [ "FIRE_50" ], "dispersion_modifier": 25, "min_skills": [ [ "weapon", 2 ], [ "launcher", 2 ] ] }, @@ -51,16 +45,15 @@ "damage_modifier": 4, "description": "ElectroMagnetic Acceleration System is an array of electromagnets attached to the front of the barrel, accelerating any projectile fired to even higher velocities, increasing damage, recoil and reducing accuracy. It does however drain UPS charges when firing and due to extensive modifications the gun can no longer operate without a UPS.", "location": "barrel", - "weight": 450, + "weight": "450 g", "color": "light_gray", "symbol": ":", "material": [ "steel" ], "mod_targets": [ "smg", "rifle", "shotgun", "pistol" ], - "volume": 2, + "volume": "500 ml", "bashing": 5, "handling_modifier": -5, "price": 20000, - "min_skills": [ [ "gun", 5 ] ], - "ups_charges": 5 + "min_skills": [ [ "gun", 5 ] ] } ] diff --git a/data/mods/FictonalWeapons/fic_weapons.json b/data/mods/FictonalWeapons/fic_weapons.json index c9b6e8d2b8b47..b118ba98559c0 100644 --- a/data/mods/FictonalWeapons/fic_weapons.json +++ b/data/mods/FictonalWeapons/fic_weapons.json @@ -4,9 +4,9 @@ "copy-from": "pistol_revolver", "type": "GUN", "name": "JHEC M128", - "description": "The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis.", - "weight": 1500, - "volume": 3, + "description": "The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis.", + "weight": "1500 g", + "volume": "750 ml", "price": 250000, "to_hit": -1, "bashing": 10, @@ -34,8 +34,8 @@ "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ], "skill": "pistol", "ammo": "454", - "weight": 1500, - "volume": 2, + "weight": "1500 g", + "volume": "500 ml", "bashing": 10, "to_hit": -1, "ranged_damage": 3, @@ -71,8 +71,8 @@ "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "SHEATH_SWORD", "DURABLE_MELEE", "NON-FOULING" ], "skill": "pistol", "ammo": "500", - "weight": 1800, - "volume": 9, + "weight": "1800 g", + "volume": "2250 ml", "bashing": 2, "cutting": 22, "to_hit": 3, @@ -98,8 +98,8 @@ "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "SHEATH_KNIFE", "STAB", "DURABLE_MELEE", "NON-FOULING" ], "skill": "pistol", "ammo": "500", - "weight": 700, - "volume": 2, + "weight": "700 g", + "volume": "500 ml", "bashing": 2, "cutting": 14, "to_hit": 1, @@ -127,8 +127,8 @@ "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], "skill": "pistol", "ammo": "50", - "weight": 3800, - "volume": 8, + "weight": "3800 g", + "volume": "2 L", "bashing": 11, "to_hit": -4, "ranged_damage": -4, @@ -156,8 +156,8 @@ "color": "dark_gray", "name": "M919", "description": "Manufactured by Sarah and Suhl machine company of Portland, Maine, the M919 submachine gun is the most accurate 9x19mm submachine gun on the market. Intended for police use, it is fitted with an integral grenade launcher.", - "weight": 3100, - "volume": 5, + "weight": "3100 g", + "volume": "1250 ml", "price": 430000, "to_hit": -1, "bashing": 10, @@ -187,8 +187,8 @@ "material": [ "steel", "plastic" ], "skill": "smg", "ammo": "44", - "weight": 3400, - "volume": 5, + "weight": "3400 g", + "volume": "1250 ml", "bashing": 10, "to_hit": -2, "ranged_damage": 1, @@ -220,18 +220,17 @@ "reload_noise_volume": 10, "symbol": "(", "color": "dark_gray", - "name": "L.T. carbine", - "name_plural": "L.T. carbines", + "name": "L.T. carbine", + "name_plural": "L.T. carbines", "description": "The Lightning Trail carbine was developed for the riot police to quickly blanket an area with lightning clouds. While damaging, it is less lethal than live ammunition.", "price": 250000, "material": [ "steel", "plastic" ], "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING" ], "ammo_effects": [ "LIGHTNING", "BEANBAG" ], - "mode_modifier": [ [ "DEFAULT", "auto", 5 ] ], "ups_charges": 6, "skill": "smg", - "weight": 2100, - "volume": 6, + "weight": "2100 g", + "volume": "1500 ml", "bashing": 7, "ranged_damage": 10, "range": 25, @@ -264,8 +263,8 @@ "ammo_effects": [ "LIGHTNING", "BOUNCE", "BEANBAG" ], "ups_charges": 120, "skill": "rifle", - "weight": 2700, - "volume": 8, + "weight": "2700 g", + "volume": "2 L", "bashing": 7, "ranged_damage": 16, "range": 15, @@ -281,8 +280,8 @@ "type": "GUN", "name": "M1911 DS", "description": "The M1911 Darkstalker is a very modified M1911, it has a fully integrated crossbow and added rails. Professional looking with a ebony black finish, laced with lime green details. Now they will know why they fear the night. Bat hood sold separately.", - "weight": 1135, - "volume": 3, + "weight": "1135 g", + "volume": "750 ml", "price": 150000, "bashing": 7, "to_hit": -2, diff --git a/data/mods/FictonalWeapons/ficmags.json b/data/mods/FictonalWeapons/ficmags.json index 5405fe8062fa9..8d589b3ab0390 100644 --- a/data/mods/FictonalWeapons/ficmags.json +++ b/data/mods/FictonalWeapons/ficmags.json @@ -4,8 +4,8 @@ "type": "MAGAZINE", "name": ".454 6-round speedloader", "description": "This speedloader can hold 6 rounds of .454 and quickly reload a compatible revolver.", - "weight": 116, - "volume": 1, + "weight": "116 g", + "volume": "250 ml", "price": 2400, "material": "steel", "symbol": "#", @@ -19,8 +19,8 @@ "type": "MAGAZINE", "name": ".454 8-round speedloader", "description": "This speedloader can hold 8 rounds of .454 and quickly reload a compatible revolver.", - "weight": 132, - "volume": 1, + "weight": "132 g", + "volume": "250 ml", "price": 2800, "material": "steel", "symbol": "#", @@ -34,8 +34,8 @@ "type": "MAGAZINE", "name": "Eagle 1776 magazine", "description": "An american-made box magazine, designed to deliver 24 .44 Magnum cartridges to the Eagle 1776.", - "weight": 195, - "volume": 2, + "weight": "195 g", + "volume": "500 ml", "price": 1776, "material": "steel", "symbol": "#", diff --git a/data/mods/Fuji_Mil_Prof/prof/spc.json b/data/mods/Fuji_Mil_Prof/prof/spc.json index b43824c48343f..c536770a9c264 100644 --- a/data/mods/Fuji_Mil_Prof/prof/spc.json +++ b/data/mods/Fuji_Mil_Prof/prof/spc.json @@ -49,7 +49,7 @@ "type": "profession", "ident": "mil_sniper", "name": "Operator Sniper", - "description": "You spent days dueling an enemy sniper, then he just... died. And then un-died.", + "description": "You spent days dueling an enemy sniper, then he just… died. And then un-died.", "points": 5, "skills": [ { "level": 2, "name": "survival" }, { "level": 4, "name": "gun" }, { "level": 4, "name": "rifle" } ], "items": { @@ -133,7 +133,7 @@ "type": "profession", "ident": "mil_undercover", "name": "Operator Undercover", - "description": "You've been tailing your target for months and now he's a zombie. So much for that lead.", + "description": "You've been tailing your target for months and now he's a zombie. So much for that lead.", "points": 3, "skills": [ { "level": 1, "name": "survival" }, @@ -171,7 +171,7 @@ "type": "profession", "ident": "mil_cbrn", "name": "Operator CBRN", - "description": "Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. Sounds like the perfect job for you!", + "description": "Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. Sounds like the perfect job for you!", "points": 5, "skills": [ { "level": 1, "name": "survival" }, diff --git a/data/mods/Fuji_Structures/items/items_games.json b/data/mods/Fuji_Structures/items/items_games.json index 9c5f9098ec249..14548c81e882c 100644 --- a/data/mods/Fuji_Structures/items/items_games.json +++ b/data/mods/Fuji_Structures/items/items_games.json @@ -4,8 +4,8 @@ "type": "BOOK", "name": "chess set", "description": "A wooden box containing all the equipment needed to play a game of chess.", - "weight": 907, - "volume": 8, + "weight": "907 g", + "volume": "2 L", "price": 7500, "material": [ "wood" ], "symbol": "?", @@ -20,8 +20,8 @@ "type": "BOOK", "name": "checkers set", "description": "A wooden box containing a set of round tokens used to play checkers.", - "weight": 788, - "volume": 6, + "weight": "788 g", + "volume": "1500 ml", "price": 2000, "material": [ "wood" ], "symbol": "?", @@ -34,10 +34,9 @@ { "id": "cards", "type": "BOOK", - "name": "deck of cards", - "name_plural": "decks of cards", + "name": { "str": "deck of cards", "str_pl": "decks of cards" }, "description": "A collection of 52 cards made to play poker.", - "weight": 96, + "weight": "96 g", "volume": "125 ml", "price": 599, "material": [ "paper" ], @@ -51,11 +50,10 @@ { "id": "cards_magic", "type": "BOOK", - "name": "deck of Sorcery cards", - "name_plural": "decks of Sorcery cards", + "name": { "str": "deck of Sorcery cards", "str_pl": "decks of Sorcery cards" }, "description": "A set of cards meant to play the game \"Sorcery.\" Each card has a fun picture of a different monster.", - "weight": 210, - "volume": 1, + "weight": "210 g", + "volume": "250 ml", "price": 2300, "material": [ "paper" ], "symbol": "?", @@ -68,10 +66,10 @@ { "id": "pictionary", "type": "BOOK", - "name": "Picturesque", + "name": { "str": "Picturesque", "str_pl": "sets of Picturesque" }, "description": "A game where one draws an image, and the others attempt to guess what it is.", - "weight": 350, - "volume": 2, + "weight": "350 g", + "volume": "500 ml", "price": 1500, "material": [ "plastic" ], "symbol": "?", @@ -84,10 +82,10 @@ { "id": "monopoly", "type": "BOOK", - "name": "Capitalism", + "name": { "str": "Capitalism", "str_pl": "sets of Capitalism" }, "description": "A game where players traverse around the board buying property and swindling their friends.", - "weight": 300, - "volume": 2, + "weight": "300 g", + "volume": "500 ml", "price": 99, "material": [ "plastic" ], "symbol": "?", @@ -100,10 +98,10 @@ { "id": "dnd", "type": "BOOK", - "name": "Blobs and Bandits", + "name": { "str": "Blobs and Bandits", "str_pl": "sets of Blobs and Bandits" }, "description": "A roleplaying game set in the post-apocalypse, so you can pretend to survive the apocalypse while surviving the apocalypse.", - "weight": 680, - "volume": 5, + "weight": "680 g", + "volume": "1250 ml", "price": 12950, "material": [ "plastic" ], "symbol": "?", @@ -116,10 +114,10 @@ { "id": "g_warhammer", "type": "BOOK", - "name": "Battlehammer", + "name": { "str": "Battlehammer", "str_pl": "sets of Battlehammer" }, "description": "A strategy game featuring a set of tiny figurines of fantasy creatures.", - "weight": 680, - "volume": 5, + "weight": "680 g", + "volume": "1250 ml", "price": 10880, "material": [ "plastic" ], "symbol": "?", @@ -132,10 +130,10 @@ { "id": "g_warhammer40k", "type": "BOOK", - "name": "Battlehammer 20k", + "name": { "str": "Battlehammer 20k", "str_pl": "sets of Battlehammer 20k" }, "description": "A strategy game featuring a set of tiny figurines of space aliens and grotesque space marines.", - "weight": 680, - "volume": 5, + "weight": "680 g", + "volume": "1250 ml", "price": 10880, "material": [ "plastic" ], "symbol": "?", @@ -148,10 +146,10 @@ { "id": "catan", "type": "BOOK", - "name": "Settlers of the Ranch", + "name": { "str": "Settlers of the Ranch", "str_pl": "sets of Settlers of the Ranch" }, "description": "A strategy game where players build settlements and trade for supplies.", - "weight": 804, - "volume": 5, + "weight": "804 g", + "volume": "1250 ml", "price": 7050, "material": [ "wood" ], "symbol": "?", @@ -164,10 +162,10 @@ { "id": "battleship", "type": "BOOK", - "name": "Warships", + "name": { "str": "Warships", "str_pl": "sets of Warships" }, "description": "A game where players try to guess where the opponent placed their ships on the board.", - "weight": 450, - "volume": 2, + "weight": "450 g", + "volume": "500 ml", "price": 2000, "material": [ "plastic" ], "symbol": "?", @@ -180,10 +178,10 @@ { "id": "clue", "type": "BOOK", - "name": "Murder Mystery", + "name": { "str": "Murder Mystery", "str_pl": "sets of Murder Mystery" }, "description": "A game where players try to figure out who murdered the butler.", - "weight": 370, - "volume": 2, + "weight": "370 g", + "volume": "500 ml", "price": 2480, "material": [ "paper" ], "symbol": "?", diff --git a/data/mods/Fuji_Structures/modinfo.json b/data/mods/Fuji_Structures/modinfo.json index 11a8baded532b..472dc2320c4f7 100644 --- a/data/mods/Fuji_Structures/modinfo.json +++ b/data/mods/Fuji_Structures/modinfo.json @@ -3,7 +3,7 @@ "type": "MOD_INFO", "ident": "FujiStruct", "name": "Fuji's More Buildings", - "description": "Adds more buildings and more variations to existing buildings. (Requires More Locations)", + "description": "Adds more buildings and more variations to existing buildings. (Requires More Locations)", "category": "buildings", "authors": "Fuji", "dependencies": [ "dda", "more_locations" ] diff --git a/data/mods/Fuji_Structures/npc/TALK_BUNKER_MERCHANT.json b/data/mods/Fuji_Structures/npc/TALK_BUNKER_MERCHANT.json index 66662c3735f29..2dd5fc6910d8b 100644 --- a/data/mods/Fuji_Structures/npc/TALK_BUNKER_MERCHANT.json +++ b/data/mods/Fuji_Structures/npc/TALK_BUNKER_MERCHANT.json @@ -16,31 +16,31 @@ { "type": "talk_topic", "id": "TALK_BUNKER_MERCHANT_HERE", - "dynamic_line": "No, no... Well, maybe a little. It was just as wrecked down here as it is up top when I found it, wasn't too hard to fix up. You're welcome to stay in the spare room awhile, just don't hog it. You're not the only scav out there.", - "responses": [ { "text": "Interesting...", "topic": "TALK_BUNKER_MERCHANT" } ] + "dynamic_line": "No, no… Well, maybe a little. It was just as wrecked down here as it is up top when I found it, wasn't too hard to fix up. You're welcome to stay in the spare room awhile, just don't hog it. You're not the only scav out there.", + "responses": [ { "text": "Interesting…", "topic": "TALK_BUNKER_MERCHANT" } ] }, { "type": "talk_topic", "id": "TALK_BUNKER_MERCHANT_WHO", "dynamic_line": "Just a scav who got lucky. Now I'm content to sit around here on my pile of treasure. I'm more than willing to trade if you've got the cash.", - "responses": [ { "text": "I see...", "topic": "TALK_BUNKER_MERCHANT" } ] + "responses": [ { "text": "I see…", "topic": "TALK_BUNKER_MERCHANT" } ] }, { "type": "talk_topic", "id": "TALK_BUNKER_MERCHANT_WHY", "dynamic_line": "Why not? Everyone else does, so I suppose that's all that matters. My ATM over there still works, connected to the bank servers and everything.", - "responses": [ { "text": "Hmm...", "topic": "TALK_BUNKER_MERCHANT" } ] + "responses": [ { "text": "Hmm…", "topic": "TALK_BUNKER_MERCHANT" } ] }, { "type": "talk_topic", "id": "TALK_BUNKER_MERCHANT_TRADE", "dynamic_line": "I suppose I am. Scavs like you need supplies, right? And I could always use more money.", - "responses": [ { "text": "Alright...", "topic": "TALK_BUNKER_MERCHANT" } ] + "responses": [ { "text": "Alright…", "topic": "TALK_BUNKER_MERCHANT" } ] }, { "type": "talk_topic", "id": "TALK_BUNKER_MERCHANT_MISSION", "dynamic_line": "Not at the moment, check back later perhaps.", - "responses": [ { "text": "Sure...", "topic": "TALK_BUNKER_MERCHANT" } ] + "responses": [ { "text": "Sure…", "topic": "TALK_BUNKER_MERCHANT" } ] } ] diff --git a/data/mods/Fuji_Structures/worldgen/regional_overlay.json b/data/mods/Fuji_Structures/worldgen/regional_overlay.json index bfbb86cef718b..07127027c7ac6 100644 --- a/data/mods/Fuji_Structures/worldgen/regional_overlay.json +++ b/data/mods/Fuji_Structures/worldgen/regional_overlay.json @@ -1,7 +1,6 @@ [ { "type": "region_overlay", - "id": "fuji_buildings_overlay", "regions": [ "all" ], "city": { "houses": { "s_apt": 40, "s_apt_2": 40 }, diff --git a/data/mods/Generic_Guns/gg_guns.json b/data/mods/Generic_Guns/gg_guns.json index 9cb80a3fdaeac..c3408dc4117bb 100644 --- a/data/mods/Generic_Guns/gg_guns.json +++ b/data/mods/Generic_Guns/gg_guns.json @@ -6,8 +6,8 @@ "name": "pipe gun: revolver ammo", "name_plural": "pipe guns: revolver ammo", "description": "A home-made breech-loading gun made from a metal pipe. It can hold a single revolver round.", - "weight": 1953, - "volume": 7, + "weight": "1953 g", + "volume": "1750 ml", "price": 10000, "to_hit": -2, "bashing": 10, @@ -31,8 +31,8 @@ "reload_noise_volume": 10, "name": "lever action carbine", "description": "A rugged lever-action carbine reminiscent of the Wild West. It holds twelve revolver rounds in a tubular internal magazine.", - "weight": 3175, - "volume": 12, + "weight": "3175 g", + "volume": "3 L", "price": 85000, "to_hit": 1, "bashing": 12, diff --git a/data/mods/Generic_Guns/gg_vehicle_override.json b/data/mods/Generic_Guns/gg_vehicle_override.json index 116a1e4657f7a..6dd0374e21562 100644 --- a/data/mods/Generic_Guns/gg_vehicle_override.json +++ b/data/mods/Generic_Guns/gg_vehicle_override.json @@ -70,7 +70,6 @@ "color": "green", "broken_color": "green", "size": 2000, - "range": 12, "breaks_into": [ { "item": "m134", "prob": 50 } ], "requirements": { "install": { "skills": [ [ "mechanics", 6 ], [ "rifle", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 4 ] ] } } } diff --git a/data/mods/Graphical_Overmap/modinfo.json b/data/mods/Graphical_Overmap/modinfo.json index 4da0a81d85a41..2004fdc6d564e 100644 --- a/data/mods/Graphical_Overmap/modinfo.json +++ b/data/mods/Graphical_Overmap/modinfo.json @@ -5,7 +5,7 @@ "name": "Graphical Overmap", "authors": [ "Larwick" ], "maintainers": [ "Larwick" ], - "description": "Gives the overmap a graphical overhaul. Please refer to readme for installation.", + "description": "Gives the overmap a graphical overhaul. Please refer to readme for installation.", "category": "graphical", "dependencies": [ "dda" ] } diff --git a/data/mods/Graphical_Overmap/overmap_terrain.json b/data/mods/Graphical_Overmap/overmap_terrain.json index 5c1e94f6a21b6..190c0652af1c5 100644 --- a/data/mods/Graphical_Overmap/overmap_terrain.json +++ b/data/mods/Graphical_Overmap/overmap_terrain.json @@ -5,34 +5,34 @@ "id": "", "copy-from": "", "name": "nothing", - "sym": "¦", + "sym": "\u00A6", "color": "white" }, { "type": "overmap_terrain", "abstract": "generic_city_building_no_sidewalk", "copy-from": "generic_city_building_no_sidewalk", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "park", "copy-from": "park", - "sym": "î", + "sym": "\u00EE", "color": "green" }, { "type": "overmap_terrain", "id": "s_garage", "copy-from": "s_garage", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "s_garage_roof", "copy-from": "s_garage_roof", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { @@ -44,7 +44,7 @@ "type": "overmap_terrain", "id": "s_garage_roof_1", "copy-from": "s_garage_roof_1", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { @@ -56,34 +56,34 @@ "type": "overmap_terrain", "id": "s_garage_roof_2", "copy-from": "s_garage_roof_2", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "s_garage_upper_roof_2", "copy-from": "s_garage_upper_roof_2", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "boat_rental", "copy-from": "boat_rental", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "lighthouse_ground", "copy-from": "lighthouse_ground", - "sym": "í", + "sym": "\u00ED", "color": "yellow" }, { "type": "overmap_terrain", "id": "lighthouse_z1", "copy-from": "lighthouse_z1", - "sym": "í", + "sym": "\u00ED", "color": "yellow" }, { @@ -115,449 +115,561 @@ "type": "overmap_terrain", "id": "island_sand", "copy-from": "island_sand", - "sym": "¦", + "sym": "\u00A6", "color": "yellow" }, { "type": "overmap_terrain", "id": "island_forest", "copy-from": "island_forest", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "island_forest_thick", "copy-from": "island_forest_thick", - "sym": "õ", + "sym": "\u00F5", "color": "green" }, { "type": "overmap_terrain", "id": "island_forest_water", "copy-from": "island_forest_water", - "sym": "÷", + "sym": "\u00F7", "color": "cyan" }, { "type": "overmap_terrain", "id": "island_field", "copy-from": "island_field", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "cabin_isherwood", "copy-from": "cabin_isherwood", - "sym": "è", + "sym": "\u00E8", "color": "light_green" }, { "type": "overmap_terrain", "id": "riverside_dwelling", "copy-from": "riverside_dwelling", - "sym": "â", + "sym": "\u00E2", "color": "yellow" }, { "type": "overmap_terrain", "id": "cabin_lake", "copy-from": "cabin_lake", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "cabin_lake_roof", "copy-from": "cabin_lake_roof", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "lake_cabin_boathouse", "copy-from": "lake_cabin_boathouse", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "lake_cabin_boathouse_roof", "copy-from": "lake_cabin_boathouse_roof", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "cabin_strange", "copy-from": "cabin_strange", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "cabin_strange_b", "copy-from": "cabin_strange_b", - "sym": "â", + "sym": "\u00E2", "color": "green" }, { "type": "overmap_terrain", "id": "cabin", "copy-from": "cabin", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, + { + "type": "overmap_terrain", + "id": "cabin", + "name": "cabin", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_roof", + "name": "cabin roof", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_1", + "name": "cabin", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_1", + "name": "cabin roof", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_2", + "name": "cabin", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_2", + "name": "cabin roof", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_3", + "name": "cabin", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_3", + "name": "cabin roof", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_4", + "name": "cabin", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_4", + "name": "cabin roof", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_5", + "name": "cabin", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_5", + "name": "cabin roof", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_6", + "name": "cabin", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_6", + "name": "cabin roof", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_7", + "name": "cabin", + "sym": "\u00E2", + "color": "i_green" + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_7", + "name": "cabin roof", + "sym": "\u00E2", + "color": "i_green" + }, { "type": "overmap_terrain", "id": "dirtroad1_aban1", "copy-from": "dirtroad1_aban1", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "forest_aban1", "copy-from": "forest_aban1", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "dirtroad2_aban1", "copy-from": "dirtroad2_aban1", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "dirtplaza_aban1", "copy-from": "dirtplaza_aban1", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "cabin_aban1", "copy-from": "cabin_aban1", - "sym": "â", + "sym": "\u00E2", "color": "green" }, { "type": "overmap_terrain", "id": "barn_aban1", "copy-from": "barn_aban1", - "sym": "é", + "sym": "\u00E9", "color": "green" }, { "type": "overmap_terrain", "id": "car_corner_aban1", "copy-from": "car_corner_aban1", - "sym": "æ", + "sym": "\u00E6", "color": "green" }, { "type": "overmap_terrain", "id": "shipwreck_river_1", "copy-from": "shipwreck_river_1", - "sym": "Ô", + "sym": "\u00D4", "color": "pink" }, { "type": "overmap_terrain", "id": "shipwreck_river_2", "copy-from": "shipwreck_river_2", - "sym": "Ô", + "sym": "\u00D4", "color": "pink" }, { "type": "overmap_terrain", "id": "shipwreck_river_3", "copy-from": "shipwreck_river_3", - "sym": "Ô", + "sym": "\u00D4", "color": "pink" }, { "type": "overmap_terrain", "id": "shipwreck_river_4", "copy-from": "shipwreck_river_4", - "sym": "Ô", + "sym": "\u00D4", "color": "pink" }, { "type": "overmap_terrain", "id": "radio_tower", "copy-from": "radio_tower", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "radio_tower_even", "copy-from": "radio_tower_even", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "radio_tower_odd", "copy-from": "radio_tower_odd", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "radio_tower_top", "copy-from": "radio_tower_top", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "radio_tower_1", "copy-from": "radio_tower_1", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "radio_tower_roof_1", "copy-from": "radio_tower_roof_1", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "bandit_cabin", "copy-from": "bandit_cabin", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "bandit_camp_1", "copy-from": "bandit_camp_1", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "bandit_camp_2", "copy-from": "bandit_camp_2", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "bandit_camp_3", "copy-from": "bandit_camp_3", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "bandit_camp_4", "copy-from": "bandit_camp_4", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "looted_building", "copy-from": "looted_building", - "sym": "å", + "sym": "\u00E5", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "campsite", "copy-from": "campsite", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campsite_a", "copy-from": "campsite_a", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campsite_cabin_incomplete", "copy-from": "campsite_cabin_incomplete", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "campsite_field_biker", "copy-from": "campsite_field_biker", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campsite_field_biker_destroyed", "copy-from": "campsite_field_biker_destroyed", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "pond_field", "copy-from": "pond_field", - "sym": "Ü", + "sym": "\u00DC", "color": "blue" }, { "type": "overmap_terrain", "id": "pond_forest", "copy-from": "pond_forest", - "sym": "Ü", + "sym": "\u00DC", "color": "blue" }, { "type": "overmap_terrain", "id": "pond_swamp", "copy-from": "pond_swamp", - "sym": "Ü", + "sym": "\u00DC", "color": "green" }, { "type": "overmap_terrain", "id": "hunter_shack", "copy-from": "hunter_shack", - "sym": "à" + "sym": "\u00E0" }, { "type": "overmap_terrain", "id": "hunter_shack_roof", "copy-from": "hunter_shack_roof", - "sym": "à" + "sym": "\u00E0" }, { "type": "overmap_terrain", "id": "hunter_shack_1", "copy-from": "hunter_shack_1", - "sym": "à" + "sym": "\u00E0" }, { "type": "overmap_terrain", "id": "hunter_shack_roof_1", "copy-from": "hunter_shack_roof_1", - "sym": "à" + "sym": "\u00E0" }, { "type": "overmap_terrain", "id": "campground_1a", "copy-from": "campground_1a", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_1b", "copy-from": "campground_1b", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_2a", "copy-from": "campground_2a", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_2b", "copy-from": "campground_2b", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_roof", "copy-from": "campground_roof", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_1a_npc", "copy-from": "campground_1a_npc", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_1b_npc", "copy-from": "campground_1b_npc", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_2a_npc", "copy-from": "campground_2a_npc", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_2b_npc", "copy-from": "campground_2b_npc", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "campground_roof_npc", "copy-from": "campground_roof_npc", - "sym": "Å", + "sym": "\u00C5", "color": "light_green" }, { "type": "overmap_terrain", "id": "desolatebarn", "copy-from": "desolatebarn", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "bandit_garage_1", "copy-from": "bandit_garage_1", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "bandit_garage_2", "copy-from": "bandit_garage_2", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "mass_grave", "copy-from": "mass_grave", - "sym": "Ä", + "sym": "\u00C4", "color": "red" }, { "type": "overmap_terrain", "id": "ws_giant_sinkhole_1", "copy-from": "ws_giant_sinkhole_1", - "sym": "ü", + "sym": "\u00FC", "color": "brown" }, { "type": "overmap_terrain", "id": "ws_giant_sinkhole_2", "copy-from": "ws_giant_sinkhole_2", - "sym": "ü", + "sym": "\u00FC", "color": "brown" }, { "type": "overmap_terrain", "id": "parking_2x1_0", "copy-from": "parking_2x1_0", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { @@ -604,133 +716,133 @@ "type": "overmap_terrain", "id": "irradiator_1_1", "copy-from": "irradiator_1_1", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_2", "copy-from": "irradiator_1_2", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_3", "copy-from": "irradiator_1_3", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_4", "copy-from": "irradiator_1_4", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_5", "copy-from": "irradiator_1_5", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_6", "copy-from": "irradiator_1_6", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_7", "copy-from": "irradiator_1_7", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_8", "copy-from": "irradiator_1_8", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_9", "copy-from": "irradiator_1_9", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_1_roof", "copy-from": "irradiator_1_1_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_2_roof", "copy-from": "irradiator_1_2_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_3_roof", "copy-from": "irradiator_1_3_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_4_roof", "copy-from": "irradiator_1_4_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_5_roof", "copy-from": "irradiator_1_5_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_6_roof", "copy-from": "irradiator_1_6_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_7_roof", "copy-from": "irradiator_1_7_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_8_roof", "copy-from": "irradiator_1_8_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "irradiator_1_9_roof", "copy-from": "irradiator_1_9_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "airliner_1a", "copy-from": "airliner_1a", - "sym": "¨" + "sym": "\u00A8" }, { "type": "overmap_terrain", @@ -751,7 +863,7 @@ "type": "overmap_terrain", "id": "airliner_2b", "copy-from": "airliner_2b", - "sym": "ü", + "sym": "\u00FC", "color": "light_blue" }, { @@ -768,7 +880,7 @@ "type": "overmap_terrain", "id": "airliner_2c", "copy-from": "airliner_2c", - "sym": "ü", + "sym": "\u00FC", "color": "dark_gray" }, { @@ -885,7 +997,7 @@ "type": "overmap_terrain", "id": "airliner_2a_1", "copy-from": "airliner_2a_1", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", @@ -906,146 +1018,146 @@ "type": "overmap_terrain", "id": "airliner_2c_-1", "copy-from": "airliner_2c_-1", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "cground_1", "copy-from": "cground_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_2", "copy-from": "cground_2", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_3", "copy-from": "cground_3", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_4", "copy-from": "cground_4", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_5", "copy-from": "cground_5", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_6", "copy-from": "cground_6", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_7", "copy-from": "cground_7", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_8", "copy-from": "cground_8", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_9", "copy-from": "cground_9", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_1_1", "copy-from": "cground_1_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_2_1", "copy-from": "cground_2_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_3_1", "copy-from": "cground_3_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_4_1", "copy-from": "cground_4_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_5_1", "copy-from": "cground_5_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_6_1", "copy-from": "cground_6_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_7_1", "copy-from": "cground_7_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_8_1", "copy-from": "cground_8_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_9_1", "copy-from": "cground_9_1", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_1_2", "copy-from": "cground_1_2", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { "type": "overmap_terrain", "id": "cground_2_2", "copy-from": "cground_2_2", - "sym": "Å", + "sym": "\u00C5", "color": "green" }, { @@ -1053,49 +1165,49 @@ "type": "overmap_terrain", "id": "sugar_house", "copy-from": "sugar_house", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "sugar_house_roof", "copy-from": "sugar_house_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_1", "copy-from": "farm_1", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_2", "copy-from": "farm_2", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_2_roof", "copy-from": "farm_2_roof", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_3", "copy-from": "farm_3", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_3_roof", "copy-from": "farm_3_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1182,14 +1294,14 @@ "type": "overmap_terrain", "id": "2farm_11", "copy-from": "2farm_1", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "2farm_roof_11", "copy-from": "2farm_roof_11", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { @@ -1231,14 +1343,14 @@ "type": "overmap_terrain", "id": "farm_stills_3", "copy-from": "farm_stills_3", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_stills_4", "copy-from": "farm_stills_4", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { @@ -1255,7 +1367,7 @@ "type": "overmap_terrain", "id": "farm_stills_7", "copy-from": "farm_stills_7", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1277,7 +1389,7 @@ "type": "overmap_terrain", "id": "farm_stills_11", "copy-from": "farm_stills_11", - "sym": "è", + "sym": "\u00E8", "color": "brown" }, { @@ -1289,178 +1401,178 @@ "type": "overmap_terrain", "id": "orchard_tree_apple", "copy-from": "orchard_tree_apple", - "sym": "õ", + "sym": "\u00F5", "color": "red" }, { "type": "overmap_terrain", "id": "orchard_processing", "copy-from": "orchard_processing", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "orchard_stall", "copy-from": "orchard_stall", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "id": "dairy_farm_NW", "copy-from": "dairy_farm_NW", "type": "overmap_terrain", - "sym": "©", + "sym": "\u00A9", "color": "green" }, { "id": "dairy_farm_NE", "copy-from": "dairy_farm_NE", "type": "overmap_terrain", - "sym": "©", + "sym": "\u00A9", "color": "green" }, { "id": "dairy_farm_SE", "copy-from": "dairy_farm_SE", "type": "overmap_terrain", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "id": "dairy_farm_SE_roof", "copy-from": "dairy_farm_SE_roof", "type": "overmap_terrain", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "id": "dairy_farm_SW", "copy-from": "dairy_farm_SW", "type": "overmap_terrain", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "id": "dairy_farm_SW_roof", "copy-from": "dairy_farm_SW_roof", "type": "overmap_terrain", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "id": "dairy_farm_isherwood_W", "copy-from": "dairy_farm_isherwood_W", "type": "overmap_terrain", - "sym": "©", + "sym": "\u00A9", "color": "green" }, { "id": "dairy_farm_isherwood_E", "copy-from": "dairy_farm_isherwood_E", "type": "overmap_terrain", - "sym": "©", + "sym": "\u00A9", "color": "green" }, { "id": "dairy_farm_isherwood_SE", "copy-from": "dairy_farm_isherwood_SE", "type": "overmap_terrain", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "id": "dairy_farm_isherwood_SE_roof", "copy-from": "dairy_farm_isherwood_SE_roof", "type": "overmap_terrain", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "id": "dairy_farm_isherwood_SW", "copy-from": "dairy_farm_isherwood_SW", "type": "overmap_terrain", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "id": "dairy_farm_isherwood_SW_roof", "copy-from": "dairy_farm_isherwood_SW_roof", "type": "overmap_terrain", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "smokehouse", "copy-from": "smokehouse", - "sym": "é" + "sym": "\u00E9" }, { "id": "smokehouse_roof", "type": "overmap_terrain", "copy-from": "smokehouse_roof", - "sym": "é" + "sym": "\u00E9" }, { "id": "rural_outbuilding", "type": "overmap_terrain", "copy-from": "rural_outbuilding", - "sym": "æ" + "sym": "\u00E6" }, { "id": "rural_outbuilding_roof", "type": "overmap_terrain", "copy-from": "rural_outbuilding_roof", - "sym": "æ" + "sym": "\u00E6" }, { "type": "overmap_terrain", "id": "farm_isherwood_1", "copy-from": "farm_isherwood_1", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_isherwood_2", "copy-from": "farm_isherwood_2", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_isherwood_2_cellar", "copy-from": "farm_isherwood_2_cellar", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_isherwood_2_roof", "copy-from": "farm_isherwood_2_roof", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_isherwood_3", "copy-from": "farm_isherwood_3", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_isherwood_3_hayloft", "copy-from": "farm_isherwood_3_hayloft", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "farm_isherwood_3_roof", "copy-from": "farm_isherwood_3_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1497,7 +1609,7 @@ "type": "overmap_terrain", "id": "horse_farm_isherwood_1", "copy-from": "horse_farm_isherwood_1", - "sym": "©", + "sym": "\u00A9", "color": "green" }, { @@ -1514,14 +1626,14 @@ "type": "overmap_terrain", "id": "horse_farm_isherwood_4", "copy-from": "horse_farm_isherwood_4", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_isherwood_4_roof", "copy-from": "horse_farm_isherwood_4_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1538,21 +1650,21 @@ "type": "overmap_terrain", "id": "horse_farm_isherwood_7", "copy-from": "horse_farm_isherwood_7", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_isherwood_7_hayloft", "copy-from": "horse_farm_isherwood_7_hayloft", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_isherwood_7_roof", "copy-from": "horse_farm_isherwood_7_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1564,28 +1676,28 @@ "type": "overmap_terrain", "id": "horse_farm_isherwood_9", "copy-from": "horse_farm_isherwood_9", - "sym": "é", + "sym": "\u00E9", "color": "green" }, { "type": "overmap_terrain", "id": "horse_farm_isherwood_9_roof", "copy-from": "horse_farm_isherwood_9_roof", - "sym": "é", + "sym": "\u00E9", "color": "green" }, { "type": "overmap_terrain", "id": "horse_farm_isherwood_10", "copy-from": "horse_farm_isherwood_10", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_isherwood_10_roof", "copy-from": "horse_farm_isherwood_10_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1602,21 +1714,21 @@ "type": "overmap_terrain", "id": "horse_farm_isherwood_13", "copy-from": "horse_farm_isherwood_13", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_isherwood_13_2ndfloor", "copy-from": "horse_farm_isherwood_13_2ndfloor", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_isherwood_13_roof", "copy-from": "horse_farm_isherwood_13_roof", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { @@ -1638,70 +1750,70 @@ "id": "cemetery_small", "copy-from": "cemetery_small", "type": "overmap_terrain", - "sym": "Ä", + "sym": "\u00C4", "color": "light_gray" }, { "id": "orchard", "copy-from": "orchard", "type": "overmap_terrain", - "sym": "è", + "sym": "\u00E8", "color": "light_green" }, { "type": "overmap_terrain", "id": "moonshine_still", "copy-from": "moonshine_still", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "moonshine_still_roof", "copy-from": "moonshine_still_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "moonshine_still_1", "copy-from": "moonshine_still_1", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "moonshine_still_roof_1", "copy-from": "moonshine_still_roof_1", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "moonshine_still_2", "copy-from": "moonshine_still_2", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "moonshine_still_roof_2", "copy-from": "moonshine_still_roof_2", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "TreeFarm_1b", "copy-from": "TreeFarm_1b", - "sym": "õ", + "sym": "\u00F5", "color": "light_green" }, { "type": "overmap_terrain", "id": "horse_farm_1", "copy-from": "horse_farm_1", - "sym": "©", + "sym": "\u00A9", "color": "green" }, { @@ -1718,14 +1830,14 @@ "type": "overmap_terrain", "id": "horse_farm_4", "copy-from": "horse_farm_4", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_4_roof", "copy-from": "horse_farm_4_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1742,21 +1854,21 @@ "type": "overmap_terrain", "id": "horse_farm_7", "copy-from": "horse_farm_7", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_7_hayloft", "copy-from": "horse_farm_7_hayloft", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_7_roof", "copy-from": "horse_farm_7_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1768,28 +1880,28 @@ "type": "overmap_terrain", "id": "horse_farm_9", "copy-from": "horse_farm_9", - "sym": "é", + "sym": "\u00E9", "color": "green" }, { "type": "overmap_terrain", "id": "horse_farm_9_roof", "copy-from": "horse_farm_9_roof", - "sym": "é", + "sym": "\u00E9", "color": "green" }, { "type": "overmap_terrain", "id": "horse_farm_10", "copy-from": "horse_farm_10", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_10_roof", "copy-from": "horse_farm_10_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { @@ -1821,21 +1933,21 @@ "type": "overmap_terrain", "id": "horse_farm_13", "copy-from": "horse_farm_13", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_13_2ndfloor", "copy-from": "horse_farm_13_2ndfloor", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "horse_farm_13_roof", "copy-from": "horse_farm_13_roof", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { @@ -1897,51 +2009,51 @@ "type": "overmap_terrain", "id": "2silos", "copy-from": "2silos", - "sym": "ö" + "sym": "\u00F6" }, { "type": "overmap_terrain", "id": "2silos_1", "copy-from": "2silos_1", - "sym": "ö" + "sym": "\u00F6" }, { "type": "overmap_terrain", "id": "2silos_2", "copy-from": "2silos_2", - "sym": "ö" + "sym": "\u00F6" }, { "type": "overmap_terrain", "id": "2silos_roof", "copy-from": "2silos_roof", - "sym": "ö" + "sym": "\u00F6" }, { "type": "overmap_terrain", "id": "coop_chicken", "copy-from": "coop_chicken", - "sym": "é" + "sym": "\u00E9" }, { "type": "overmap_terrain", "id": "yard", "copy-from": "yard", - "sym": "©", + "sym": "\u00A9", "color": "green" }, { "type": "overmap_terrain", "id": "house_farm", "copy-from": "house_farm", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "house_farm_roof", "copy-from": "house_farm_roof", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { @@ -1949,461 +2061,461 @@ "type": "overmap_terrain", "id": "faction_base_camp_0", "copy-from": "faction_base_camp_0", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_new_0", "copy-from": "faction_base_camp_new_0", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_1", "copy-from": "faction_base_camp_1", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_2", "copy-from": "faction_base_camp_2", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_3", "copy-from": "faction_base_camp_3", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_4", "copy-from": "faction_base_camp_4", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_5", "copy-from": "faction_base_camp_5", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_6", "copy-from": "faction_base_camp_6", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_7", "copy-from": "faction_base_camp_7", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_8", "copy-from": "faction_base_camp_8", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_9", "copy-from": "faction_base_camp_9", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_10", "copy-from": "faction_base_camp_10", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_11", "copy-from": "faction_base_camp_11", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_12", "copy-from": "faction_base_camp_12", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_13", "copy-from": "faction_base_camp_13", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_14", "copy-from": "faction_base_camp_14", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_15", "copy-from": "faction_base_camp_15", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_16", "copy-from": "faction_base_camp_16", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_17", "copy-from": "faction_base_camp_17", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_18", "copy-from": "faction_base_camp_18", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_19", "copy-from": "faction_base_camp_19", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_camp_20", "copy-from": "faction_base_camp_20", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_base_farm_0", "copy-from": "faction_base_farm_0", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { "type": "overmap_terrain", "id": "faction_base_farm_1", "copy-from": "faction_base_farm_1", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { "type": "overmap_terrain", "id": "faction_base_farm_2", "copy-from": "faction_base_farm_2", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { "type": "overmap_terrain", "id": "faction_base_farm_3", "copy-from": "faction_base_farm_3", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { "type": "overmap_terrain", "id": "faction_base_farm_4", "copy-from": "faction_base_farm_4", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { "type": "overmap_terrain", "id": "faction_base_garage_0", "copy-from": "faction_base_garage_0", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "faction_base_garage_1", "copy-from": "faction_base_garage_1", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "faction_base_garage_2", "copy-from": "faction_base_garage_2", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "faction_base_garage_3", "copy-from": "faction_base_garage_3", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "faction_base_garage_4", "copy-from": "faction_base_garage_4", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "faction_base_garage_5", "copy-from": "faction_base_garage_5", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "faction_base_garage_6", "copy-from": "faction_base_garage_6", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_0", "copy-from": "faction_base_kitchen_0", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_1", "copy-from": "faction_base_kitchen_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_2", "copy-from": "faction_base_kitchen_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_3", "copy-from": "faction_base_kitchen_3", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_4", "copy-from": "faction_base_kitchen_4", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_5", "copy-from": "faction_base_kitchen_5", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_6", "copy-from": "faction_base_kitchen_6", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_7", "copy-from": "faction_base_kitchen_7", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_base_kitchen_8", "copy-from": "faction_base_kitchen_8", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "faction_hide_site_0", "copy-from": "faction_hide_site_0", - "sym": "Å" + "sym": "\u00C5" }, { "type": "overmap_terrain", "id": "faction_wall_level_N_0", "copy-from": "faction_wall_level_N_0", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", "id": "faction_wall_level_E_0", "copy-from": "faction_wall_level_E_0", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", "id": "faction_wall_level_S_0", "copy-from": "faction_wall_level_S_0", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", "id": "faction_wall_level_W_0", "copy-from": "faction_wall_level_W_0", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", "id": "faction_wall_level_N_1", "copy-from": "faction_wall_level_N_1", - "sym": "Ü", + "sym": "\u00DC", "color": "red" }, { "type": "overmap_terrain", "id": "faction_wall_level_E_1", "copy-from": "faction_wall_level_E_1", - "sym": "Ü", + "sym": "\u00DC", "color": "red" }, { "type": "overmap_terrain", "id": "faction_wall_level_S_1", "copy-from": "faction_wall_level_S_1", - "sym": "Ü", + "sym": "\u00DC", "color": "red" }, { "type": "overmap_terrain", "id": "faction_wall_level_W_1", "copy-from": "faction_wall_level_W_1", - "sym": "Ü", + "sym": "\u00DC", "color": "red" }, { "type": "overmap_terrain", "id": "faction_base_workshop_0", "copy-from": "faction_base_workshop_0", - "sym": "æ" + "sym": "\u00E6" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_0", "copy-from": "faction_base_blacksmith_0", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_1", "copy-from": "faction_base_blacksmith_1", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_2", "copy-from": "faction_base_blacksmith_2", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_3", "copy-from": "faction_base_blacksmith_3", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_4", "copy-from": "faction_base_blacksmith_4", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_5", "copy-from": "faction_base_blacksmith_5", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_6", "copy-from": "faction_base_blacksmith_6", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_7", "copy-from": "faction_base_blacksmith_7", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_8", "copy-from": "faction_base_blacksmith_8", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_9", "copy-from": "faction_base_blacksmith_9", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_10", "copy-from": "faction_base_blacksmith_10", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_11", "copy-from": "faction_base_blacksmith_11", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_blacksmith_12", "copy-from": "faction_base_blacksmith_12", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "faction_base_livestock_0", "copy-from": "faction_base_livestock_0", - "sym": "é", + "sym": "\u00E9", "color": "pink" }, { "type": "overmap_terrain", "id": "faction_base_storehouse_0", "copy-from": "faction_base_storehouse_0", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "faction_base_saltworks_0", "copy-from": "faction_base_saltworks_0", - "sym": "Ö", + "sym": "\u00D6", "color": "white" }, { "type": "overmap_terrain", "id": "faction_base_canteen_0", "copy-from": "faction_base_canteen_0", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { @@ -2411,230 +2523,230 @@ "type": "overmap_terrain", "id": "open_air", "copy-from": "open_air", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "crater", "copy-from": "crater", - "sym": "ü", + "sym": "\u00FC", "color": "red" }, { "type": "overmap_terrain", "id": "field", "copy-from": "field", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "forest", "copy-from": "forest", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "forest_thick", "copy-from": "forest_thick", - "sym": "õ", + "sym": "\u00F5", "color": "green" }, { "type": "overmap_terrain", "id": "forest_water", "copy-from": "forest_water", - "sym": "ì", + "sym": "\u00EC", "color": "cyan" }, { "type": "overmap_terrain", "id": "s_lot", "copy-from": "s_lot", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "temple", "copy-from": "temple", - "sym": "þ", + "sym": "\u00FE", "color": "magenta" }, { "type": "overmap_terrain", "id": "standing_stones", "copy-from": "standing_stones", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "temple_stairs", "copy-from": "temple_stairs", - "sym": "þ", + "sym": "\u00FE", "color": "magenta" }, { "type": "overmap_terrain", "id": "temple_finale", "copy-from": "temple_finale", - "sym": "þ", + "sym": "\u00FE", "color": "magenta" }, { "type": "overmap_terrain", "id": "mine_entrance", "copy-from": "mine_entrance", - "sym": "Ó" + "sym": "\u00D3" }, { "type": "overmap_terrain", "id": "mine_shaft", "copy-from": "mine_shaft", - "sym": "Ó" + "sym": "\u00D3" }, { "type": "overmap_terrain", "id": "mine", "copy-from": "mine", - "sym": "Ó" + "sym": "\u00D3" }, { "type": "overmap_terrain", "id": "mine_down", "copy-from": "mine_down", - "sym": "Ó" + "sym": "\u00D3" }, { "type": "overmap_terrain", "id": "mine_finale", "copy-from": "mine_finale", - "sym": "Ó" + "sym": "\u00D3" }, { "type": "overmap_terrain", "id": "spiral_hub", "copy-from": "spiral_hub", - "sym": "ê", + "sym": "\u00EA", "color": "pink" }, { "type": "overmap_terrain", "id": "spiral", "copy-from": "spiral", - "sym": "ê", + "sym": "\u00EA", "color": "pink" }, { "type": "overmap_terrain", "id": "cave", "copy-from": "cave", - "sym": "ê", + "sym": "\u00EA", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "cave_rat", "copy-from": "cave_rat", - "sym": "ê", + "sym": "\u00EA", "color": "brown" }, { "type": "overmap_terrain", "id": "hive", "copy-from": "hive", - "sym": "ó", + "sym": "\u00F3", "color": "yellow" }, { "type": "overmap_terrain", "id": "fungal_bloom", "copy-from": "fungal_bloom", - "sym": "ð", + "sym": "\u00F0", "color": "pink" }, { "type": "overmap_terrain", "id": "fungal_tower", "copy-from": "fungal_tower", - "sym": "ð", + "sym": "\u00F0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "fungal_flowers", "copy-from": "fungal_flowers", - "sym": "ð", + "sym": "\u00F0", "color": "magenta" }, { "type": "overmap_terrain", "id": "spider_pit", "copy-from": "spider_pit", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "spider_pit_under", "copy-from": "spider_pit_under", - "sym": "ê" + "sym": "\u00EA" }, { "type": "overmap_terrain", "id": "anthill", "copy-from": "anthill", - "sym": "ó" + "sym": "\u00F3" }, { "type": "overmap_terrain", "id": "acid_anthill", "copy-from": "acid_anthill", - "sym": "ó", + "sym": "\u00F3", "color": "light_red" }, { "type": "overmap_terrain", "id": "slimepit", "copy-from": "slimepit", - "sym": "Ü", + "sym": "\u00DC", "color": "light_green" }, { "type": "overmap_terrain", "id": "slimepit_down", "copy-from": "slimepit_down", - "sym": "Ü", + "sym": "\u00DC", "color": "light_green" }, { "type": "overmap_terrain", "id": "triffid_grove", "copy-from": "triffid_grove", - "sym": "õ", + "sym": "\u00F5", "color": "pink" }, { "type": "overmap_terrain", "id": "triffid_roots", "copy-from": "triffid_roots", - "sym": "õ", + "sym": "\u00F5", "color": "magenta" }, { "type": "overmap_terrain", "id": "triffid_finale", "copy-from": "triffid_finale", - "sym": "õ", + "sym": "\u00F5", "color": "red" }, { "type": "overmap_terrain", "id": "cavern", "copy-from": "cavern", - "sym": "ê", + "sym": "\u00EA", "color": "dark_gray" }, { @@ -2642,955 +2754,955 @@ "id": "rock", "copy-from": "rock", "//": "This is old rock type, new one (below) will replace it in new overmaps", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "empty_rock", "copy-from": "empty_rock", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "rift", "copy-from": "rift", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", "id": "hellmouth", "copy-from": "hellmouth", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", "id": "ants", "copy-from": "ants", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", "id": "ants_food", "copy-from": "ants_food", - "sym": "ó" + "sym": "\u00F3" }, { "type": "overmap_terrain", "id": "ants_larvae", "copy-from": "ants_larvae", - "sym": "ó" + "sym": "\u00F3" }, { "type": "overmap_terrain", "id": "ants_queen", "copy-from": "ants_queen", - "sym": "ó" + "sym": "\u00F3" }, { "type": "overmap_terrain", "id": "tutorial", "copy-from": "tutorial", - "sym": "×" + "sym": "\u00D7" }, { "//": "OVERMAP_TERRAIN_INDUSTRIAL.JSON", "type": "overmap_terrain", "id": "public_works_NE", "copy-from": "public_works_NE", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "public_works_NE_roof", "copy-from": "public_works_NE_roof", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "public_works_NW", "copy-from": "public_works_NW", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "public_works_NW_roof", "copy-from": "public_works_NW_roof", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "public_works_SW", "copy-from": "public_works_SW", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "public_works_SW_roof", "copy-from": "public_works_SW_roof", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "public_works_SE", "copy-from": "public_works_SE", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "public_works_SE_roof", "copy-from": "public_works_SE_roof", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "sai", "copy-from": "sai", - "sym": "æ", + "sym": "\u00E6", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "pwr_sub_s", "copy-from": "pwr_sub_s", - "sym": "æ" + "sym": "\u00E6" }, { "type": "overmap_terrain", "id": "pwr_sub_s_roof", "copy-from": "pwr_sub_s_roof", - "sym": "æ" + "sym": "\u00E6" }, { "type": "overmap_terrain", "id": "pwr_large_entrance", "copy-from": "pwr_large_entrance", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "pwr_large_entrance_roof", "copy-from": "pwr_large_entrance_roof", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "pwr_large_2", "copy-from": "pwr_large_2", - "sym": "ö" + "sym": "\u00F6" }, { "type": "overmap_terrain", "id": "pwr_large_2_roof", "copy-from": "pwr_large_2_roof", - "sym": "ö" + "sym": "\u00F6" }, { "type": "overmap_terrain", "id": "pwr_large_3", "copy-from": "pwr_large_3", - "sym": "ö" + "sym": "\u00F6" }, { "type": "overmap_terrain", "id": "pwr_large_4", "copy-from": "pwr_large_4", - "sym": "ö" + "sym": "\u00F6" }, { "type": "overmap_terrain", "id": "warehouse", "copy-from": "warehouse", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "warehouse_roof", "copy-from": "warehouse_roof", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "small_storage_units", "copy-from": "small_storage_units", - "sym": "æ", + "sym": "\u00E6", "color": "yellow" }, { "type": "overmap_terrain", "id": "small_storage_units_roof", "copy-from": "small_storage_units_roof", - "sym": "æ", + "sym": "\u00E6", "color": "yellow" }, { "type": "overmap_terrain", "id": "small_storage_units_1", "copy-from": "small_storage_units_1", - "sym": "æ", + "sym": "\u00E6", "color": "yellow" }, { "type": "overmap_terrain", "id": "small_storage_units_roof_1", "copy-from": "small_storage_units_roof_1", - "sym": "æ", + "sym": "\u00E6", "color": "yellow" }, { "type": "overmap_terrain", "id": "lumberyard_0_0", "copy-from": "lumberyard_0_0", - "sym": "×", + "sym": "\u00D7", "color": "brown" }, { "type": "overmap_terrain", "id": "lumberyard_0_1", "copy-from": "lumberyard_0_1", - "sym": "×", + "sym": "\u00D7", "color": "brown" }, { "type": "overmap_terrain", "id": "lumberyard_1_0", "copy-from": "lumberyard_1_0", - "sym": "×", + "sym": "\u00D7", "color": "brown" }, { "type": "overmap_terrain", "id": "lumberyard_1_1", "copy-from": "lumberyard_1_1", - "sym": "×", + "sym": "\u00D7", "color": "brown" }, { "type": "overmap_terrain", "id": "lumberyard_0_0_roof", "copy-from": "lumberyard_0_0_roof", - "sym": "×", + "sym": "\u00D7", "color": "brown" }, { "type": "overmap_terrain", "id": "lumberyard_0_1_roof", "copy-from": "lumberyard_0_1_roof", - "sym": "×", + "sym": "\u00D7", "color": "brown" }, { "type": "overmap_terrain", "id": "lumberyard_1_0_roof", "copy-from": "lumberyard_1_0_roof", - "sym": "×", + "sym": "\u00D7", "color": "brown" }, { "type": "overmap_terrain", "id": "lumberyard_1_1_roof", "copy-from": "lumberyard_1_1_roof", - "sym": "×", + "sym": "\u00D7", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_0_0", "copy-from": "lumbermill_0_0", - "sym": "Ö", + "sym": "\u00D6", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_0_1", "copy-from": "lumbermill_0_1", - "sym": "Ö", + "sym": "\u00D6", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_1_0", "copy-from": "lumbermill_1_0", - "sym": "Ö", + "sym": "\u00D6", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_1_1", "copy-from": "lumbermill_1_1", - "sym": "Ö", + "sym": "\u00D6", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_0_0_roof", "copy-from": "lumbermill_0_0_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_0_1_roof", "copy-from": "lumbermill_0_1_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_1_0_roof", "copy-from": "lumbermill_1_0_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_1_1_roof", "copy-from": "lumbermill_1_1_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "brown" }, { "type": "overmap_terrain", "id": "lumbermill_dforest", "copy-from": "lumbermill_dforest", - "sym": "è", + "sym": "\u00E8", "color": "brown" }, { "type": "overmap_terrain", "id": "construction_site", "copy-from": "construction_site", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse", "copy-from": "abandonedwarehouse", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_roof", "copy-from": "abandonedwarehouse_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_1", "copy-from": "abandonedwarehouse_1", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_1_roof", "copy-from": "abandonedwarehouse_1_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_2", "copy-from": "abandonedwarehouse_2", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_2_roof", "copy-from": "abandonedwarehouse_2_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_3", "copy-from": "abandonedwarehouse_3", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_3_roof", "copy-from": "abandonedwarehouse_3_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_4", "copy-from": "abandonedwarehouse_4", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abandonedwarehouse_4_roof", "copy-from": "abandonedwarehouse_4_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "large_storage_units_3", "copy-from": "large_storage_units_3", - "sym": "Ö", + "sym": "\u00D6", "color": "yellow" }, { "type": "overmap_terrain", "id": "large_storage_units_roof_3", "copy-from": "large_storage_units_roof_3", - "sym": "Ö", + "sym": "\u00D6", "color": "yellow" }, { "type": "overmap_terrain", "id": "large_storage_units_2", "copy-from": "large_storage_units_2", - "sym": "Ö", + "sym": "\u00D6", "color": "yellow" }, { "type": "overmap_terrain", "id": "large_storage_units_roof_2", "copy-from": "large_storage_units_roof_2", - "sym": "Ö", + "sym": "\u00D6", "color": "yellow" }, { "type": "overmap_terrain", "id": "large_storage_units_1", "copy-from": "large_storage_units_1", - "sym": "Ö", + "sym": "\u00D6", "color": "yellow" }, { "type": "overmap_terrain", "id": "large_storage_units_roof_1", "copy-from": "large_storage_units_roof_1", - "sym": "Ö", + "sym": "\u00D6", "color": "yellow" }, { "type": "overmap_terrain", "id": "medium_storage_units_1", "copy-from": "medium_storage_units_1", - "sym": "æ", + "sym": "\u00E6", "color": "yellow" }, { "type": "overmap_terrain", "id": "medium_storage_units_roof_1", "copy-from": "medium_storage_units_roof_1", - "sym": "æ", + "sym": "\u00E6", "color": "yellow" }, { "type": "overmap_terrain", "id": "medium_storage_units_2", "copy-from": "medium_storage_units_2", - "sym": "æ", + "sym": "\u00E6", "color": "yellow" }, { "type": "overmap_terrain", "id": "medium_storage_units_roof_2", "copy-from": "medium_storage_units_roof_2", - "sym": "æ", + "sym": "\u00E6", "color": "yellow" }, { "type": "overmap_terrain", "id": "steel_mill_0_1", "copy-from": "steel_mill_0_1", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_2", "copy-from": "steel_mill_0_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_3", "copy-from": "steel_mill_0_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_4", "copy-from": "steel_mill_0_4", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_1", "copy-from": "steel_mill_1_1", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_2", "copy-from": "steel_mill_1_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_3", "copy-from": "steel_mill_1_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_4", "copy-from": "steel_mill_1_4", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_1", "copy-from": "steel_mill_2_1", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_2", "copy-from": "steel_mill_2_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_3", "copy-from": "steel_mill_2_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_4", "copy-from": "steel_mill_2_4", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_1", "copy-from": "steel_mill_3_1", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_2", "copy-from": "steel_mill_3_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_3", "copy-from": "steel_mill_3_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_rail_1", "copy-from": "steel_mill_rail_1", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "steel_mill_4_1", "copy-from": "steel_mill_4_1", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_4_2", "copy-from": "steel_mill_4_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_4_3", "copy-from": "steel_mill_4_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_rail_2", "copy-from": "steel_mill_rail_2", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "steel_mill_0_1_2", "copy-from": "steel_mill_0_1_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_2_2", "copy-from": "steel_mill_0_2_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_3_2", "copy-from": "steel_mill_0_3_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_4_2", "copy-from": "steel_mill_0_4_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_1_2", "copy-from": "steel_mill_1_1_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_2_2", "copy-from": "steel_mill_1_2_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_3_2", "copy-from": "steel_mill_1_3_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_4_2", "copy-from": "steel_mill_1_4_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_1_2", "copy-from": "steel_mill_2_1_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_2_2", "copy-from": "steel_mill_2_2_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_3_2", "copy-from": "steel_mill_2_3_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_4_2", "copy-from": "steel_mill_2_4_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_1_2", "copy-from": "steel_mill_3_1_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_2_2", "copy-from": "steel_mill_3_2_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_3_2", "copy-from": "steel_mill_3_3_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_rail_1_2", "copy-from": "steel_mill_rail_1_2", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "steel_mill_4_1_2", "copy-from": "steel_mill_4_1_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_4_2_2", "copy-from": "steel_mill_4_2_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_4_3_2", "copy-from": "steel_mill_4_3_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_rail_2_2", "copy-from": "steel_mill_rail_2_2", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "steel_mill_0_1_3", "copy-from": "steel_mill_0_1_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_2_3", "copy-from": "steel_mill_0_2_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_3_3", "copy-from": "steel_mill_0_3_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_0_4_3", "copy-from": "steel_mill_0_4_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_1_3", "copy-from": "steel_mill_1_1_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_2_3", "copy-from": "steel_mill_1_2_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_3_3", "copy-from": "steel_mill_1_3_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_1_4_3", "copy-from": "steel_mill_1_4_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_1_3", "copy-from": "steel_mill_2_1_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_2_3", "copy-from": "steel_mill_2_2_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_3_3", "copy-from": "steel_mill_2_3_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_2_4_3", "copy-from": "steel_mill_2_4_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_1_3", "copy-from": "steel_mill_3_1_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_2_3", "copy-from": "steel_mill_3_2_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_3_3_3", "copy-from": "steel_mill_3_3_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_rail_1_3", "copy-from": "steel_mill_rail_1_3", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "steel_mill_4_1_3", "copy-from": "steel_mill_4_1_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_4_2_3", "copy-from": "steel_mill_4_2_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_4_3_3", "copy-from": "steel_mill_4_3_3", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "steel_mill_rail_2_3", "copy-from": "steel_mill_rail_2_3", - "sym": "×" + "sym": "\u00D7" }, { "//": "OVERMAP_TERRAIN_LAB.JSON", "type": "overmap_terrain", "id": "lab", "copy-from": "lab", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "lab_stairs", "copy-from": "lab_stairs", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "lab_core", "copy-from": "lab_core", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "lab_escape_cells", "copy-from": "lab_escape_cells", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "lab_escape_entrance", "copy-from": "lab_escape_entrance", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "ants_lab", "copy-from": "ants_lab", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "ants_lab_stairs", "copy-from": "ants_lab_stairs", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { "type": "overmap_terrain", "id": "lab_finale", "copy-from": "lab_finale", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { "type": "overmap_terrain", "id": "ice_lab", "copy-from": "ice_lab", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "ice_lab_stairs", "copy-from": "ice_lab_stairs", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "ice_lab_core", "copy-from": "ice_lab_core", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "ice_lab_finale", "copy-from": "ice_lab_finale", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "tower_lab", "copy-from": "tower_lab", - "sym": "í" + "sym": "\u00ED" }, { "type": "overmap_terrain", "id": "tower_lab_stairs", "copy-from": "tower_lab_stairs", - "sym": "í", + "sym": "\u00ED", "color": "light_blue" }, { "type": "overmap_terrain", "id": "tower_lab_finale", "copy-from": "tower_lab_finale", - "sym": "í", + "sym": "\u00ED", "color": "light_blue" }, { "type": "overmap_terrain", "id": "lab_train_depot", "copy-from": "lab_train_depot", - "sym": "Æ" + "sym": "\u00C6" }, { "type": "overmap_terrain", "id": "central_lab_train_depot", "copy-from": "central_lab_train_depot", - "sym": "Æ" + "sym": "\u00C6" }, { "type": "overmap_terrain", "id": "central_lab_entrance", "copy-from": "central_lab_entrance", - "sym": "è", + "sym": "\u00E8", "color": "green" }, { "type": "overmap_terrain", "id": "central_lab_shaft", "copy-from": "central_lab_shaft", - "sym": "Ò" + "sym": "\u00D2" }, { "type": "overmap_terrain", "abstract": "generic_central_lab", "copy-from": "generic_central_lab", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { @@ -3642,34 +3754,34 @@ "type": "overmap_terrain", "id": "central_lab", "copy-from": "central_lab", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "central_lab_stairs", "copy-from": "central_lab_stairs", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { "type": "overmap_terrain", "id": "central_lab_core", "copy-from": "central_lab_core", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { "type": "overmap_terrain", "id": "central_lab_finale", "copy-from": "central_lab_finale", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { "type": "overmap_terrain", "id": "lab_surface_brick_basementA0", "copy-from": "lab_surface_brick_basementA0", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", @@ -3710,7 +3822,7 @@ "type": "overmap_terrain", "id": "lab_surface_brick_basementD1_hidden_lab_stairs", "copy-from": "lab_surface_brick_basementD1_hidden_lab_stairs", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { @@ -3797,7 +3909,7 @@ "type": "overmap_terrain", "id": "lab_surface_brick_blockA0", "copy-from": "lab_surface_brick_blockA0", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", @@ -3848,7 +3960,7 @@ "type": "overmap_terrain", "id": "lab_surface_brick_blockA2", "copy-from": "lab_surface_brick_blockA2", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", @@ -3884,7 +3996,7 @@ "type": "overmap_terrain", "id": "lab_surface_brick_blockC3", "copy-from": "lab_surface_brick_blockC3", - "sym": "Á", + "sym": "\u00C1", "color": "light_gray" }, { @@ -3926,7 +4038,7 @@ "type": "overmap_terrain", "id": "lab_surface_brick_block2A0", "copy-from": "lab_surface_brick_block2A0", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", @@ -3977,13 +4089,13 @@ "type": "overmap_terrain", "id": "lab_surface_brick_block2A2", "copy-from": "lab_surface_brick_block2A2", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "lab_surface_brick_block2B2", "copy-from": "lab_surface_brick_block2B2", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", @@ -4394,7 +4506,7 @@ "type": "overmap_terrain", "id": "lab_surface_brick_block5A2", "copy-from": "lab_surface_brick_block5A2", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { @@ -4477,1129 +4589,1129 @@ "type": "overmap_terrain", "id": "mall_a_3", "copy-from": "mall_a_3", - "sym": "Ö", + "sym": "\u00D6", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_3", "copy-from": "mall_b_3", - "sym": "Ö", + "sym": "\u00D6", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_3_roof", "copy-from": "mall_a_3_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_3", "copy-from": "mall_upper_roof_3", - "sym": "Ö", + "sym": "\u00D6", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_4", "copy-from": "mall_a_4", - "sym": "Æ", + "sym": "\u00C6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mall_upper_roof_4", "copy-from": "mall_upper_roof_4", - "sym": "Ö", + "sym": "\u00D6", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_4", "copy-from": "mall_b_4", - "sym": "Æ", + "sym": "\u00C6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mall_a_4_roof", "copy-from": "mall_a_4_roof", - "sym": "Æ", + "sym": "\u00C6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mall_a_5", "copy-from": "mall_a_5", - "sym": "Æ", + "sym": "\u00C6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mall_b_5", "copy-from": "mall_b_5", - "sym": "Æ", + "sym": "\u00C6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mall_a_5_roof", "copy-from": "mall_a_5_roof", - "sym": "Æ", + "sym": "\u00C6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mall_a_7", "copy-from": "mall_a_7", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "mall_a_8", "copy-from": "mall_a_8", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "mall_a_9", "copy-from": "mall_a_9", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "mall_a_10_roof", "copy-from": "mall_a_10_roof", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "mall_a_11", "copy-from": "mall_a_11", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_11", "copy-from": "mall_b_11", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_11_roof", "copy-from": "mall_a_11_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_12", "copy-from": "mall_a_12", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_12", "copy-from": "mall_b_12", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_12_roof", "copy-from": "mall_a_12_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_12", "copy-from": "mall_upper_roof_12", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_13", "copy-from": "mall_a_13", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_13", "copy-from": "mall_upper_roof_13", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_13", "copy-from": "mall_b_13", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_13_roof", "copy-from": "mall_a_13_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_14", "copy-from": "mall_a_14", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_b_14", "copy-from": "mall_b_14", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_a_14_roof", "copy-from": "mall_a_14_roof", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_a_19_roof", "copy-from": "mall_a_19_roof", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "mall_a_20", "copy-from": "mall_a_20", - "sym": "î", + "sym": "\u00EE", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_20", "copy-from": "mall_b_20", - "sym": "î", + "sym": "\u00EE", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_20_roof", "copy-from": "mall_a_20_roof", - "sym": "î", + "sym": "\u00EE", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_21", "copy-from": "mall_a_21", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_21", "copy-from": "mall_b_21", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_21_roof", "copy-from": "mall_a_21_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_22", "copy-from": "mall_a_22", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_22", "copy-from": "mall_b_22", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_22_roof", "copy-from": "mall_a_22_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_23", "copy-from": "mall_a_23", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_23", "copy-from": "mall_b_23", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_23_roof", "copy-from": "mall_a_23_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_24", "copy-from": "mall_a_24", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_24", "copy-from": "mall_b_24", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_24_roof", "copy-from": "mall_a_24_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_25", "copy-from": "mall_a_25", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_25", "copy-from": "mall_b_25", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_25_roof", "copy-from": "mall_a_25_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_26", "copy-from": "mall_a_26", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_26", "copy-from": "mall_b_26", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_26_roof", "copy-from": "mall_a_26_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_29", "copy-from": "mall_a_29", - "sym": "î", + "sym": "\u00EE", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_29", "copy-from": "mall_b_29", - "sym": "î", + "sym": "\u00EE", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_29_roof", "copy-from": "mall_a_29_roof", - "sym": "î", + "sym": "\u00EE", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_30", "copy-from": "mall_a_30", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_30", "copy-from": "mall_b_30", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_30_roof", "copy-from": "mall_a_30_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_31", "copy-from": "mall_a_31", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_31", "copy-from": "mall_b_31", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_31_roof", "copy-from": "mall_a_31_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_32", "copy-from": "mall_a_32", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_32", "copy-from": "mall_b_32", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_32_roof", "copy-from": "mall_a_32_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_33", "copy-from": "mall_a_33", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_33", "copy-from": "mall_b_33", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_33_roof", "copy-from": "mall_a_33_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_34", "copy-from": "mall_a_34", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_34", "copy-from": "mall_b_34", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_34_roof", "copy-from": "mall_a_34_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_34", "copy-from": "mall_upper_roof_34", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_35", "copy-from": "mall_a_35", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_35", "copy-from": "mall_b_35", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_35_roof", "copy-from": "mall_a_35_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_35", "copy-from": "mall_upper_roof_35", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_38", "copy-from": "mall_a_38", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_38", "copy-from": "mall_b_38", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_38_roof", "copy-from": "mall_a_38_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_39", "copy-from": "mall_a_39", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_39", "copy-from": "mall_b_39", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_39_roof", "copy-from": "mall_a_39_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_40", "copy-from": "mall_a_40", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_40", "copy-from": "mall_b_40", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_40_roof", "copy-from": "mall_a_40_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_41", "copy-from": "mall_a_41", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_41", "copy-from": "mall_b_41", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_41_roof", "copy-from": "mall_a_41_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_42", "copy-from": "mall_a_42", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_42", "copy-from": "mall_b_42", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_42_roof", "copy-from": "mall_a_42_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_43", "copy-from": "mall_a_43", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_43", "copy-from": "mall_b_43", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_43_roof", "copy-from": "mall_a_43_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_44", "copy-from": "mall_a_44", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_44", "copy-from": "mall_b_44", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_44_roof", "copy-from": "mall_a_44_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_47", "copy-from": "mall_a_47", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_b_47", "copy-from": "mall_b_47", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_a_47_roof", "copy-from": "mall_a_47_roof", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_a_48", "copy-from": "mall_a_48", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_48", "copy-from": "mall_b_48", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_48_roof", "copy-from": "mall_a_48_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_48", "copy-from": "mall_upper_roof_48", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_49", "copy-from": "mall_a_49", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_49", "copy-from": "mall_b_49", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_49_roof", "copy-from": "mall_a_49_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_49", "copy-from": "mall_upper_roof_49", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_50", "copy-from": "mall_a_50", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_50", "copy-from": "mall_b_50", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_50_roof", "copy-from": "mall_a_50_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_50", "copy-from": "mall_upper_roof_50", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_51", "copy-from": "mall_a_51", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_51", "copy-from": "mall_b_51", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_51_roof", "copy-from": "mall_a_51_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_upper_roof_51", "copy-from": "mall_upper_roof_51", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_52", "copy-from": "mall_a_52", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_52", "copy-from": "mall_b_52", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_52_roof", "copy-from": "mall_a_52_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_53", "copy-from": "mall_a_53", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_b_53", "copy-from": "mall_b_53", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_a_53_roof", "copy-from": "mall_a_53_roof", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_a_56", "copy-from": "mall_a_56", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_56", "copy-from": "mall_b_56", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_56_roof", "copy-from": "mall_a_56_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_57", "copy-from": "mall_a_57", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_57", "copy-from": "mall_b_57", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_57_roof", "copy-from": "mall_a_57_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_58", "copy-from": "mall_a_58", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_58", "copy-from": "mall_b_58", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_58_roof", "copy-from": "mall_a_58_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_59", "copy-from": "mall_a_59", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_59", "copy-from": "mall_b_59", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_59_roof", "copy-from": "mall_a_59_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_60", "copy-from": "mall_a_60", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_60", "copy-from": "mall_b_60", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_60_roof", "copy-from": "mall_a_60_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_61", "copy-from": "mall_a_61", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_61", "copy-from": "mall_b_61", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_61_roof", "copy-from": "mall_a_61_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_62", "copy-from": "mall_a_62", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_62", "copy-from": "mall_b_62", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_62_roof", "copy-from": "mall_a_62_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_65", "copy-from": "mall_a_65", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_65", "copy-from": "mall_b_65", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_65_roof", "copy-from": "mall_a_65_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_66", "copy-from": "mall_a_66", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_66", "copy-from": "mall_b_66", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_66_roof", "copy-from": "mall_a_66_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_67", "copy-from": "mall_a_67", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_67", "copy-from": "mall_b_67", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_67_roof", "copy-from": "mall_a_67_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_68", "copy-from": "mall_a_68", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_b_68", "copy-from": "mall_b_68", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_a_68_roof", "copy-from": "mall_a_68_roof", - "sym": "Á", + "sym": "\u00C1", "color": "red" }, { "type": "overmap_terrain", "id": "mall_a_69", "copy-from": "mall_a_69", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_69", "copy-from": "mall_b_69", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_69_roof", "copy-from": "mall_a_69_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_70", "copy-from": "mall_a_70", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_70", "copy-from": "mall_b_70", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_70_roof", "copy-from": "mall_a_70_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_71", "copy-from": "mall_a_71", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_b_71", "copy-from": "mall_b_71", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { "type": "overmap_terrain", "id": "mall_a_71_roof", "copy-from": "mall_a_71_roof", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { @@ -5607,14 +5719,14 @@ "type": "overmap_terrain", "abstract": "generic_mansion_no_sidewalk", "copy-from": "generic_mansion_no_sidewalk", - "sym": "Ð", + "sym": "\u00D0", "color": "white" }, { "type": "overmap_terrain", "abstract": "generic_mansion", "copy-from": "generic_mansion", - "sym": "Ð", + "sym": "\u00D0", "color": "white" }, { @@ -5949,13 +6061,13 @@ "id": "microlab_generic", "copy-from": "microlab_generic", "name": "science lab", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "microlab_rock_border", "copy-from": "microlab_rock_border", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", @@ -5971,7 +6083,7 @@ "type": "overmap_terrain", "id": "microlab_sub_station", "copy-from": "microlab_sub_station", - "sym": "Ó", + "sym": "\u00D3", "color": "light_blue" }, { @@ -5983,13 +6095,13 @@ "type": "overmap_terrain", "id": "microlab_generic_sub_entry", "copy-from": "microlab_generic_sub_entry", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "microlab_generic_surface", "copy-from": "microlab_generic_surface", - "sym": "Á", + "sym": "\u00C1", "color": "light_blue" }, { @@ -6002,56 +6114,56 @@ "type": "overmap_terrain", "id": "mi-go_camp1", "copy-from": "mi-go_camp1", - "sym": "ó", + "sym": "\u00F3", "color": "pink" }, { "type": "overmap_terrain", "id": "mi-go_camp2", "copy-from": "mi-go_camp2", - "sym": "ó", + "sym": "\u00F3", "color": "pink" }, { "type": "overmap_terrain", "id": "mi-go_camp2-1", "copy-from": "mi-go_camp2-1", - "sym": "Ý", + "sym": "\u00DD", "color": "pink" }, { "type": "overmap_terrain", "id": "mi-go_camp2-2", "copy-from": "mi-go_camp2-2", - "sym": "×", + "sym": "\u00D7", "color": "pink" }, { "type": "overmap_terrain", "id": "mi-go_scout_tower_1", "copy-from": "mi-go_scout_tower_1", - "sym": "Ý", + "sym": "\u00DD", "color": "magenta" }, { "type": "overmap_terrain", "id": "mi-go_scout_tower_2", "copy-from": "mi-go_scout_tower_2", - "sym": "Ý", + "sym": "\u00DD", "color": "magenta" }, { "type": "overmap_terrain", "id": "mi-go_scout_tower_3", "copy-from": "mi-go_scout_tower_3", - "sym": "Ý", + "sym": "\u00DD", "color": "magenta" }, { "type": "overmap_terrain", "id": "mi-go_scout_tower_4", "copy-from": "mi-go_scout_tower_4", - "sym": "Ý", + "sym": "\u00DD", "color": "magenta" }, { @@ -6059,286 +6171,286 @@ "type": "overmap_terrain", "id": "fema_entrance", "copy-from": "fema_entrance", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "fema", "copy-from": "fema", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_tlc", "copy-from": "FEMA_tlc", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_te", "copy-from": "FEMA_te", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_trc", "copy-from": "FEMA_trc", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_le", "copy-from": "FEMA_le", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_mid", "copy-from": "FEMA_mid", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_re", "copy-from": "FEMA_re", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_le", "copy-from": "FEMA_le", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_blc", "copy-from": "FEMA_blc", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_entrance", "copy-from": "FEMA_entrance", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "FEMA_brc", "copy-from": "FEMA_brc", - "sym": "Å", + "sym": "\u00C5", "color": "white" }, { "type": "overmap_terrain", "id": "shelter", "copy-from": "shelter", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "shelter_roof", "copy-from": "shelter_roof", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "shelter_1", "copy-from": "shelter_1", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "shelter_roof_1", "copy-from": "shelter_roof_1", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "shelter_2", "copy-from": "shelter_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "shelter_roof_2", "copy-from": "shelter_roof_2", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "shelter_under", "copy-from": "shelter_under", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "lmoe", "copy-from": "lmoe", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "lmoe_roof", "copy-from": "lmoe_roof", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "lmoe_under", "copy-from": "lmoe_under", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "lmoe_under_empty", "copy-from": "lmoe_under_empty", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "bunker", "copy-from": "bunker", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "bunker_basement", "copy-from": "bunker_basement", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "outpost", "copy-from": "outpost", - "sym": "í" + "sym": "\u00ED" }, { "type": "overmap_terrain", "id": "silo", "copy-from": "silo", - "sym": "ë", + "sym": "\u00EB", "color": "red" }, { "type": "overmap_terrain", "id": "silo_1", "copy-from": "silo_1", - "sym": "ë", + "sym": "\u00EB", "color": "red" }, { "type": "overmap_terrain", "id": "silo_2", "copy-from": "silo_2", - "sym": "ë", + "sym": "\u00EB", "color": "red" }, { "type": "overmap_terrain", "id": "silo_3", "copy-from": "silo_3", - "sym": "ë", + "sym": "\u00EB", "color": "red" }, { "type": "overmap_terrain", "id": "silo_4", "copy-from": "silo_4", - "sym": "ë", + "sym": "\u00EB", "color": "red" }, { "type": "overmap_terrain", "id": "silo_finale", "copy-from": "silo_finale", - "sym": "ë", + "sym": "\u00EB", "color": "light_red" }, { "type": "overmap_terrain", "id": "ws_fire_lookout_tower_base", "copy-from": "ws_fire_lookout_tower_base", - "sym": "í", + "sym": "\u00ED", "color": "light_red" }, { "type": "overmap_terrain", "id": "ws_fire_lookout_tower_f1", "copy-from": "ws_fire_lookout_tower_f1", - "sym": "í", + "sym": "\u00ED", "color": "light_red" }, { "type": "overmap_terrain", "id": "ws_fire_lookout_tower_f2", "copy-from": "ws_fire_lookout_tower_f2", - "sym": "í", + "sym": "\u00ED", "color": "light_red" }, { "type": "overmap_terrain", "id": "ws_fire_lookout_tower_f3", "copy-from": "ws_fire_lookout_tower_f3", - "sym": "í", + "sym": "\u00ED", "color": "light_red" }, { "type": "overmap_terrain", "id": "ws_survivor_bunker_f0", "copy-from": "ws_survivor_bunker_f0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "ws_survivor_bunker_f-1", "copy-from": "ws_survivor_bunker_f-1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "ws_survivor_camp", "copy-from": "ws_survivor_camp", - "sym": "Å" + "sym": "\u00C5" }, { "//": "OVERMAP_TERRAIN_COMMERCIAL.JSON", "type": "overmap_terrain", "id": "s_gas", "copy-from": "s_gas", - "sym": "ú", + "sym": "\u00FA", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_gas_1", "copy-from": "s_gas_1", - "sym": "ú", + "sym": "\u00FA", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_gas_roof_1", "copy-from": "s_gas_roof_1", - "sym": "ú", + "sym": "\u00FA", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_pharm", "copy-from": "s_pharm", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { @@ -6360,254 +6472,254 @@ "type": "overmap_terrain", "id": "office_doctor", "copy-from": "office_doctor", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "office_doctor_roof", "copy-from": "office_doctor_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "office_doctor_1", "copy-from": "office_doctor_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "office_doctor_roof_1", "copy-from": "office_doctor_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "office_doctor_2", "copy-from": "office_doctor_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "office_doctor_roof_2", "copy-from": "office_doctor_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "office_doctor_upper_roof_2", "copy-from": "office_doctor_upper_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "office_cubical", "copy-from": "office_cubical", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "office_cubical_roof", "copy-from": "office_cubical_roof", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "office_cubical_1", "copy-from": "office_cubical_1", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "office_cubical_roof_1", "copy-from": "office_cubical_roof_1", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "office_tower_1_entrance", "copy-from": "office_tower_1_entrance", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_1", "copy-from": "office_tower_1", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_b_entrance", "copy-from": "office_tower_b_entrance", - "sym": "ô", + "sym": "\u00F4", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_b", "copy-from": "office_tower_b", - "sym": "ô", + "sym": "\u00F4", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_2_a1", "copy-from": "office_tower_2_a1", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_2_a2", "copy-from": "office_tower_2_a2", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_2_a3", "copy-from": "office_tower_2_a3", - "sym": "è", + "sym": "\u00E8", "color": "light_green" }, { "type": "overmap_terrain", "id": "office_tower_2_b1", "copy-from": "office_tower_2_b1", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_2_b2", "copy-from": "office_tower_2_b2", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_2_b3", "copy-from": "office_tower_2_b3", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_a0", "copy-from": "office_tower_collapse_a0", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_a1", "copy-from": "office_tower_collapse_a1", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_a2", "copy-from": "office_tower_collapse_a2", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b0", "copy-from": "office_tower_collapse_b0", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b1", "copy-from": "office_tower_collapse_b1", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b2", "copy-from": "office_tower_collapse_b2", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b_a0", "copy-from": "office_tower_collapse_b_a0", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b_a1", "copy-from": "office_tower_collapse_b_a1", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b_a2", "copy-from": "office_tower_collapse_b_a2", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b_b0", "copy-from": "office_tower_collapse_b_b0", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b_b1", "copy-from": "office_tower_collapse_b_b1", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_collapse_b_b2", "copy-from": "office_tower_collapse_b_b2", - "sym": "Ç", + "sym": "\u00C7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "office_tower_2_a1_tower_lab", "copy-from": "office_tower_2_a1_tower_lab", - "sym": "Ç", + "sym": "\u00C7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "office_tower_open_air_corner", "copy-from": "office_tower_open_air_corner", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "s_grocery", "copy-from": "s_grocery", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "s_grocery_roof", "copy-from": "s_grocery_roof", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { @@ -6624,7 +6736,7 @@ "type": "overmap_terrain", "id": "s_hardware", "copy-from": "s_hardware", - "sym": "ç", + "sym": "\u00E7", "color": "cyan" }, { @@ -6646,7 +6758,7 @@ "type": "overmap_terrain", "id": "s_hardware_roof", "copy-from": "s_hardware_roof", - "sym": "ç", + "sym": "\u00E7", "color": "cyan" }, { @@ -6668,243 +6780,243 @@ "type": "overmap_terrain", "id": "s_electronics", "copy-from": "s_electronics", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "s_electronics_roof", "copy-from": "s_electronics_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "s_electronics_1", "copy-from": "s_electronics_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "s_electronics_roof_1", "copy-from": "s_electronics_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "s_sports", "copy-from": "s_sports", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_sports_roof", "copy-from": "s_sports_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_liquor", "copy-from": "s_liquor", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "s_liquor_roof", "copy-from": "s_liquor_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "s_gun", "copy-from": "s_gun", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_roof", "copy-from": "s_gun_roof", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_1", "copy-from": "s_gun_1", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_roof_1", "copy-from": "s_gun_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_2", "copy-from": "s_gun_2", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_3", "copy-from": "s_gun_3", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_roof_3", "copy-from": "s_gun_roof_3", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_4", "copy-from": "s_gun_4", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_2ndfloor_4", "copy-from": "s_gun_2ndfloor_4", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_gun_roof_4", "copy-from": "s_gun_roof_4", - "sym": "ç", + "sym": "\u00E7", "color": "red" }, { "type": "overmap_terrain", "id": "s_clothes", "copy-from": "s_clothes", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_roof", "copy-from": "s_clothes_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_1", "copy-from": "s_clothes_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_roof_1", "copy-from": "s_clothes_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_2", "copy-from": "s_clothes_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_roof_2", "copy-from": "s_clothes_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_3", "copy-from": "s_clothes_3", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_roof_3", "copy-from": "s_clothes_roof_3", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_4", "copy-from": "s_clothes_4", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_roof_4", "copy-from": "s_clothes_roof_4", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_upper_roof_4", "copy-from": "s_clothes_upper_roof_4", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_5", "copy-from": "s_clothes_5", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_roof_5", "copy-from": "s_clothes_roof_5", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_6", "copy-from": "s_clothes_6", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_clothes_roof_6", "copy-from": "s_clothes_roof_6", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_bookstore", "copy-from": "s_bookstore", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "s_bookstore_roof", "copy-from": "s_bookstore_roof", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { @@ -6941,829 +7053,829 @@ "type": "overmap_terrain", "id": "s_restaurant_foodplace", "copy-from": "s_restaurant_foodplace", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_foodplace_roof", "copy-from": "s_restaurant_foodplace_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_foodplace_upper_roof", "copy-from": "s_restaurant_foodplace_upper_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant", "copy-from": "s_restaurant", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_roof", "copy-from": "s_restaurant_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_1", "copy-from": "s_restaurant_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_roof_1", "copy-from": "s_restaurant_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_2", "copy-from": "s_restaurant_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_roof_2", "copy-from": "s_restaurant_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_3", "copy-from": "s_restaurant_3", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_roof_3", "copy-from": "s_restaurant_roof_3", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_restaurant_fast", "copy-from": "s_restaurant_fast", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_restaurant_fast_roof", "copy-from": "s_restaurant_fast_roof", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_restaurant_fast_1", "copy-from": "s_restaurant_fast_1", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_restaurant_fast_roof_1", "copy-from": "s_restaurant_fast_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_restaurant_coffee", "copy-from": "s_restaurant_coffee", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "s_restaurant_coffee_roof", "copy-from": "s_restaurant_coffee_roof", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "s_restaurant_coffee_1", "copy-from": "s_restaurant_coffee_1", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "s_restaurant_coffee_roof_1", "copy-from": "s_restaurant_coffee_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "s_restaurant_coffee_2", "copy-from": "s_restaurant_coffee_2", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "s_restaurant_coffee_roof_2", "copy-from": "s_restaurant_coffee_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "s_teashop", "copy-from": "s_teashop", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_teashop_roof", "copy-from": "s_teashop_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_teashop_1", "copy-from": "s_teashop_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_teashop_roof_1", "copy-from": "s_teashop_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_teashop_upper_roof_1", "copy-from": "s_teashop_upper_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "bar", "copy-from": "bar", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "bar_roof", "copy-from": "bar_roof", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "bar_1", "copy-from": "bar_1", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "bar_roof_1", "copy-from": "bar_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "s_butcher", "copy-from": "s_butcher", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_butcher_roof", "copy-from": "s_butcher_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_butcher_upper_roof", "copy-from": "s_butcher_upper_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_butcher_1", "copy-from": "s_butcher_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_butcher_roof_1", "copy-from": "s_butcher_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_butcher_upper_roof_1", "copy-from": "s_butcher_upper_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_butcher_2", "copy-from": "s_butcher_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_butcher_roof_2", "copy-from": "s_butcher_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_bike_shop", "copy-from": "s_bike_shop", - "sym": "ç", + "sym": "\u00E7", "color": "cyan" }, { "type": "overmap_terrain", "id": "s_bike_shop_roof", "copy-from": "s_bike_shop_roof", - "sym": "ç", + "sym": "\u00E7", "color": "cyan" }, { "type": "overmap_terrain", "id": "s_bike_shop_1", "copy-from": "s_bike_shop_1", - "sym": "ç", + "sym": "\u00E7", "color": "cyan" }, { "type": "overmap_terrain", "id": "s_bike_shop_roof_1", "copy-from": "s_bike_shop_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "cyan" }, { "type": "overmap_terrain", "id": "s_pizza_parlor", "copy-from": "s_pizza_parlor", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_pizza_parlor_roof", "copy-from": "s_pizza_parlor_roof", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_pizza_parlor_1", "copy-from": "s_pizza_parlor_1", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_pizza_parlor_roof_1", "copy-from": "s_pizza_parlor_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "bank", "copy-from": "bank", - "sym": "þ", + "sym": "\u00FE", "color": "yellow" }, { "type": "overmap_terrain", "id": "bank_roof", "copy-from": "bank_roof", - "sym": "þ", + "sym": "\u00FE", "color": "yellow" }, { "type": "overmap_terrain", "id": "bank_1", "copy-from": "bank_1", - "sym": "þ", + "sym": "\u00FE", "color": "yellow" }, { "type": "overmap_terrain", "id": "bank_roof_1", "copy-from": "bank_roof_1", - "sym": "þ", + "sym": "\u00FE", "color": "yellow" }, { "type": "overmap_terrain", "id": "hotel_tower_1_1", "copy-from": "hotel_tower_1_1", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_1_2", "copy-from": "hotel_tower_1_2", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_1_3", "copy-from": "hotel_tower_1_3", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_1_4", "copy-from": "hotel_tower_1_4", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_flr2_1_4", "copy-from": "hotel_tower_flr2_1_4", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_flr3_1_4", "copy-from": "hotel_tower_flr3_1_4", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_flr4_1_4", "copy-from": "hotel_tower_flr4_1_4", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_roof_1_4", "copy-from": "hotel_tower_roof_1_4", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_1_5", "copy-from": "hotel_tower_1_5", - "sym": "Ç", + "sym": "\u00C7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "hotel_tower_flr2_1_5", "copy-from": "hotel_tower_flr2_1_5", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr3_1_5", "copy-from": "hotel_tower_flr3_1_5", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr4_1_5", "copy-from": "hotel_tower_flr4_1_5", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_roof_1_5", "copy-from": "hotel_tower_roof_1_5", - "sym": "Ç", + "sym": "\u00C7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "hotel_tower_1_5B", "copy-from": "hotel_tower_1_5B", - "sym": "Ç", + "sym": "\u00C7", "color": "blue" }, { "type": "overmap_terrain", "id": "hotel_tower_flr2_1_5B", "copy-from": "hotel_tower_flr2_1_5B", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_1_5C", "copy-from": "hotel_tower_1_5C", - "sym": "Ç", + "sym": "\u00C7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "hotel_tower_flr2_1_5C", "copy-from": "hotel_tower_flr2_1_5C", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_1_6", "copy-from": "hotel_tower_1_6", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr2_1_6", "copy-from": "hotel_tower_flr2_1_6", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_flr3_1_6", "copy-from": "hotel_tower_flr3_1_6", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_flr4_1_6", "copy-from": "hotel_tower_flr4_1_6", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "hotel_tower_roof_1_6", "copy-from": "hotel_tower_roof_1_6", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_1_7", "copy-from": "hotel_tower_1_7", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr2_1_7", "copy-from": "hotel_tower_flr2_1_7", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr3_1_7", "copy-from": "hotel_tower_flr3_1_7", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr4_1_7", "copy-from": "hotel_tower_flr4_1_7", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_roof_1_7", "copy-from": "hotel_tower_roof_1_7", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_1_8", "copy-from": "hotel_tower_1_8", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr2_1_8", "copy-from": "hotel_tower_flr2_1_8", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr3_1_8", "copy-from": "hotel_tower_flr3_1_8", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr4_1_8", "copy-from": "hotel_tower_flr4_1_8", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_roof_1_8", "copy-from": "hotel_tower_roof_1_8", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_1_9", "copy-from": "hotel_tower_1_9", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr2_1_9", "copy-from": "hotel_tower_flr2_1_9", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr3_1_9", "copy-from": "hotel_tower_flr3_1_9", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_flr4_1_9", "copy-from": "hotel_tower_flr4_1_9", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_roof_1_9", "copy-from": "hotel_tower_roof_1_9", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_b_1", "copy-from": "hotel_tower_b_1", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_b_2", "copy-from": "hotel_tower_b_2", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "hotel_tower_b_3", "copy-from": "hotel_tower_b_3", - "sym": "Ç" + "sym": "\u00C7" }, { "type": "overmap_terrain", "id": "motel_twd_1", "copy-from": "motel_twd_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_twd_2", "copy-from": "motel_twd_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_twd_second_floor", "copy-from": "motel_twd_second_floor", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_entrance", "copy-from": "motel_entrance", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_entrance_roof", "copy-from": "motel_entrance_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_1", "copy-from": "motel_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_1_roof", "copy-from": "motel_1_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_2", "copy-from": "motel_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_2_roof", "copy-from": "motel_2_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "motel_3", "copy-from": "motel_3", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "motel_3_roof", "copy-from": "motel_3_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_gas_rural", "copy-from": "s_gas_rural", - "sym": "ú", + "sym": "\u00FA", "color": "light_blue" }, { "type": "overmap_terrain", "id": "s_gas_rural_roof", "copy-from": "s_gas_rural_roof", - "sym": "ú", + "sym": "\u00FA", "color": "light_blue" }, { "type": "overmap_terrain", "id": "pawn", "copy-from": "pawn", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "pawn_roof", "copy-from": "pawn_roof", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "pawn_1", "copy-from": "pawn_1", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "pawn_roof_1", "copy-from": "pawn_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "pawn_pf", "copy-from": "pawn_pf", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "pawn_pf_under", "copy-from": "pawn_pf_under", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "pawn_pf_roof", "copy-from": "pawn_pf_roof", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "mil_surplus", "copy-from": "mil_surplus", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mil_surplus_roof", "copy-from": "mil_surplus_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mil_surplus_1", "copy-from": "mil_surplus_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mil_surplus_roof_1", "copy-from": "mil_surplus_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mil_surplus_2", "copy-from": "mil_surplus_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "mil_surplus_roof_2", "copy-from": "mil_surplus_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "furniture", "copy-from": "furniture", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "furniture_roof", "copy-from": "furniture_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "furniture_upper_roof", "copy-from": "furniture_upper_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "s_music", "copy-from": "s_music", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "s_music_roof", "copy-from": "s_music_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "megastore_parking", "copy-from": "megastore_parking", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "megastore_0_0_0", "copy-from": "megastore_0_0_0", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", @@ -7799,7 +7911,7 @@ "type": "overmap_terrain", "id": "megastore_1_2_0", "copy-from": "megastore_1_2_0", - "sym": "Á", + "sym": "\u00C1", "color": "blue" }, { @@ -7811,7 +7923,7 @@ "type": "overmap_terrain", "id": "megastore_0_0_1", "copy-from": "megastore_0_0_1", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", @@ -7857,7 +7969,7 @@ "type": "overmap_terrain", "id": "megastore_0_0_roof", "copy-from": "megastore_0_0_roof", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", @@ -7878,7 +7990,7 @@ "type": "overmap_terrain", "id": "megastore_1_1_roof", "copy-from": "megastore_1_1_roof", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", @@ -7904,91 +8016,91 @@ "type": "overmap_terrain", "id": "hdwr_large_entrance", "copy-from": "hdwr_large_entrance", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_SW", "copy-from": "hdwr_large_SW", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_NW", "copy-from": "hdwr_large_NW", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_NE", "copy-from": "hdwr_large_NE", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_backroom", "copy-from": "hdwr_large_backroom", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_loadingbay", "copy-from": "hdwr_large_loadingbay", - "sym": "Ö", + "sym": "\u00D6", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_0_0_0", "copy-from": "hdwr_large_0_0_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_1_0_0", "copy-from": "hdwr_large_1_0_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_0_1_0", "copy-from": "hdwr_large_0_1_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_1_1_0", "copy-from": "hdwr_large_1_1_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_0_2_0", "copy-from": "hdwr_large_0_2_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_1_2_0", "copy-from": "hdwr_large_1_2_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { "type": "overmap_terrain", "id": "hdwr_large_0_0_1", "copy-from": "hdwr_large_0_0_1", - "sym": "¦", + "sym": "\u00A6", "color": "brown", "extras": "field" }, @@ -7996,7 +8108,7 @@ "type": "overmap_terrain", "id": "hdwr_large_1_0_1", "copy-from": "hdwr_large_1_0_1", - "sym": "¦", + "sym": "\u00A6", "color": "brown", "extras": "field" }, @@ -8004,7 +8116,7 @@ "type": "overmap_terrain", "id": "hdwr_large_0_1_1", "copy-from": "hdwr_large_0_1_1", - "sym": "¦", + "sym": "\u00A6", "color": "brown", "extras": "field" }, @@ -8012,7 +8124,7 @@ "type": "overmap_terrain", "id": "hdwr_large_1_1_1", "copy-from": "hdwr_large_1_1_1", - "sym": "¦", + "sym": "\u00A6", "color": "brown", "extras": "field" }, @@ -8020,7 +8132,7 @@ "type": "overmap_terrain", "id": "hdwr_large_0_2_1", "copy-from": "hdwr_large_0_2_1", - "sym": "¦", + "sym": "\u00A6", "color": "brown", "extras": "field" }, @@ -8028,7 +8140,7 @@ "type": "overmap_terrain", "id": "hdwr_large_1_2_1", "copy-from": "hdwr_large_1_2_1", - "sym": "¦", + "sym": "\u00A6", "color": "brown", "extras": "field" }, @@ -8036,472 +8148,472 @@ "type": "overmap_terrain", "id": "garage_gas_1", "copy-from": "garage_gas_1", - "sym": "ú" + "sym": "\u00FA" }, { "type": "overmap_terrain", "id": "garage_gas_roof_1", "copy-from": "garage_gas_roof_1", - "sym": "ú" + "sym": "\u00FA" }, { "type": "overmap_terrain", "id": "garage_gas_2", "copy-from": "garage_gas_2", - "sym": "æ" + "sym": "\u00E6" }, { "type": "overmap_terrain", "id": "garage_gas_roof_2", "copy-from": "garage_gas_roof_2", - "sym": "æ" + "sym": "\u00E6" }, { "type": "overmap_terrain", "id": "garage_gas_3", "copy-from": "garage_gas_3", - "sym": "æ" + "sym": "\u00E6" }, { "type": "overmap_terrain", "id": "garage_gas_roof_3", "copy-from": "garage_gas_roof_3", - "sym": "æ" + "sym": "\u00E6" }, { "id": "dispensary", "type": "overmap_terrain", "copy-from": "dispensary", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "id": "dispensary_roof", "type": "overmap_terrain", "copy-from": "dispensary_roof", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "id": "dispensary_1", "type": "overmap_terrain", "copy-from": "dispensary_1", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "id": "dispensary_roof_1", "type": "overmap_terrain", "copy-from": "dispensary_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "id": "dispensary_2", "type": "overmap_terrain", "copy-from": "dispensary_2", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "id": "dispensary_roof_2", "type": "overmap_terrain", "copy-from": "dispensary_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "id": "small_office", "copy-from": "small_office", "type": "overmap_terrain", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "id": "small_office_roof", "copy-from": "small_office_roof", "type": "overmap_terrain", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "id": "small_office_upper_roof", "copy-from": "small_office_upper_roof", "type": "overmap_terrain", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "candy_shop", "copy-from": "candy_shop", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "candy_shop_roof", "copy-from": "candy_shop_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "candy_shop_1", "copy-from": "candy_shop_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "candy_shop_roof_1", "copy-from": "candy_shop_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "bakery", "copy-from": "bakery", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "bakery_roof", "copy-from": "bakery_roof", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "bakery_upper_roof", "copy-from": "bakery_upper_roof", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "icecream_shop", "copy-from": "icecream_shop", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "icecream_shop_roof", "copy-from": "icecream_shop_roof", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "dollarstore", "copy-from": "dollarstore", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "dollarstore_roof", "copy-from": "dollarstore_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "dollarstore_1", "copy-from": "dollarstore_1", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "dollarstore_roof_1", "copy-from": "dollarstore_roof_1", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "lancenter", "copy-from": "lancenter", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "lancenter_roof", "copy-from": "lancenter_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "lancenter_1", "copy-from": "lancenter_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "lancenter_roof_1", "copy-from": "lancenter_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "landscapingsupplyco_1a", "copy-from": "landscapingsupplyco_1a", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "landscapingsupplyco_1b", "copy-from": "landscapingsupplyco_1b", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "landscapingsupplyco_1b_roof", "copy-from": "landscapingsupplyco_1b_roof", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "s_vfw", "copy-from": "s_vfw", - "sym": "ÿ", + "sym": "\u00FF", "color": "green" }, { "type": "overmap_terrain", "id": "s_vfw_roof", "copy-from": "s_vfw_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "green" }, { "type": "overmap_terrain", "id": "s_thrift", "copy-from": "s_thrift", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "s_thrift_roof", "copy-from": "s_thrift_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "s_daycare", "copy-from": "s_daycare", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_daycare_roof", "copy-from": "s_daycare_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_petstore", "copy-from": "s_petstore", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_petstore_roof", "copy-from": "s_petstore_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_petstore_1", "copy-from": "s_petstore_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_petstore_roof_1", "copy-from": "s_petstore_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_petstore_2", "copy-from": "s_petstore_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_petstore_roof_2", "copy-from": "s_petstore_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "light_green" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_a1", "copy-from": "s_shoppingplaza_a1", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_a2", "copy-from": "s_shoppingplaza_a2", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_a3", "copy-from": "s_shoppingplaza_a3", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_a4", "copy-from": "s_shoppingplaza_a4", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_a5", "copy-from": "s_shoppingplaza_a5", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_a6", "copy-from": "s_shoppingplaza_a6", - "sym": "Á", + "sym": "\u00C1", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_b1", "copy-from": "s_shoppingplaza_b1", - "sym": "Á", + "sym": "\u00C1", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_b2", "copy-from": "s_shoppingplaza_b2", - "sym": "Á", + "sym": "\u00C1", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_b3", "copy-from": "s_shoppingplaza_b3", - "sym": "Á", + "sym": "\u00C1", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_b4", "copy-from": "s_shoppingplaza_b4", - "sym": "Á", + "sym": "\u00C1", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_b5", "copy-from": "s_shoppingplaza_b5", - "sym": "Á", + "sym": "\u00C1", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_shoppingplaza_b6", "copy-from": "s_shoppingplaza_b6", - "sym": "Á", + "sym": "\u00C1", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "veterinarian", "copy-from": "veterinarian", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "veterinarian_roof", "copy-from": "veterinarian_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "s_laundromat", "copy-from": "s_laundromat", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "s_laundromat_roof", "copy-from": "s_laundromat_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "s_laundromat_1", "copy-from": "s_laundromat_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "s_laundromat_roof_1", "copy-from": "s_laundromat_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "s_jewelry", "copy-from": "s_jewelry", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "id": "s_jewelry_roof", "copy-from": "s_jewelry_roof", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "abstract": "generic_motel", "copy-from": "generic_motel", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "2fmotel_entrance", "copy-from": "2fmotel_entrance", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", @@ -8557,21 +8669,21 @@ "type": "overmap_terrain", "abstract": "generic_large_office_tower", "copy-from": "generic_large_office_tower", - "sym": "Ç", + "sym": "\u00C7", "color": "white" }, { "type": "overmap_terrain", "id": "home_improvement", "copy-from": "home_improvement", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "home_improvement_roof", "copy-from": "home_improvement_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { @@ -8668,363 +8780,363 @@ "type": "overmap_terrain", "id": "loffice_tower_17", "copy-from": "loffice_tower_17", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "loffice_tower_18", "copy-from": "loffice_tower_18", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "loffice_tower_19", "copy-from": "loffice_tower_19", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "loffice_tower_20", "copy-from": "loffice_tower_20", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "s_antique", "copy-from": "s_antique", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "s_antique_roof", "copy-from": "s_antique_roof", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "s_arcade", "copy-from": "s_arcade", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "s_arcade_roof", "copy-from": "s_arcade_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "s_gardening", "copy-from": "s_gardening", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "s_gardening_roof", "copy-from": "s_gardening_roof", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "craft_shop", "copy-from": "craft_shop", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "craft_shop_roof", "copy-from": "craft_shop_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "craft_shop_upper_roof", "copy-from": "craft_shop_upper_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "craft_shop_1", "copy-from": "craft_shop_1", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "craft_shop_roof_1", "copy-from": "craft_shop_roof_1", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "craft_shop_2", "copy-from": "craft_shop_2", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "craft_shop_2ndfloor_2", "copy-from": "craft_shop_2ndfloor_2", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "craft_shop_roof_2", "copy-from": "craft_shop_roof_2", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "cs_market_small", "copy-from": "cs_market_small", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "cs_sex_shop", "copy-from": "cs_sex_shop", - "sym": "ç", + "sym": "\u00E7", "color": "pink" }, { "type": "overmap_terrain", "id": "cs_sex_shop_roof", "copy-from": "cs_sex_shop_roof", - "sym": "ç", + "sym": "\u00E7", "color": "pink" }, { "type": "overmap_terrain", "id": "cs_internet_cafe", "copy-from": "cs_internet_cafe", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "cs_internet_cafe_roof", "copy-from": "cs_internet_cafe_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "cs_internet_cafe_upper_roof", "copy-from": "cs_internet_cafe_upper_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "cs_car_showroom", "copy-from": "cs_car_showroom", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "cs_car_showroom_2ndfloor", "copy-from": "cs_car_showroom_2ndfloor", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "cs_car_showroom_roof", "copy-from": "cs_car_showroom_roof", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "cs_car_dealership", "copy-from": "cs_car_dealership", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "cs_car_dealership_roof", "copy-from": "cs_car_dealership_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "cs_tire_shop", "copy-from": "cs_tire_shop", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "cs_tire_shop_roof", "copy-from": "cs_tire_shop_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "headshop", "copy-from": "headshop", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "headshop_roof", "copy-from": "headshop_roof", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "headshop_upper_roof", "copy-from": "headshop_upper_roof", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "abstorefront", "copy-from": "abstorefront", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abstorefront_roof", "copy-from": "abstorefront_roof", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abstorefront_1", "copy-from": "abstorefront_1", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abstorefront_roof_1", "copy-from": "abstorefront_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abstorefront_2", "copy-from": "abstorefront_2", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "abstorefront_roof_2", "copy-from": "abstorefront_roof_2", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "station_radio", "copy-from": "station_radio", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "station_radio_roof", "copy-from": "station_radio_roof", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "station_radio_1", "copy-from": "station_radio_1", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "station_radio_roof_1", "copy-from": "station_radio_roof_1", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "cs_gardening_allotment", "copy-from": "cs_gardening_allotment", - "sym": "è", + "sym": "\u00E8", "color": "brown" }, { "type": "overmap_terrain", "id": "cs_gardening_allotment_roof", "copy-from": "cs_gardening_allotment_roof", - "sym": "è", + "sym": "\u00E8", "color": "brown" }, { "type": "overmap_terrain", "id": "animalpound", "copy-from": "animalpound", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "animalpound_roof", "copy-from": "animalpound_roof", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "animalshelter", "copy-from": "animalshelter", - "sym": "ç", + "sym": "\u00E7", "color": "pink" }, { "type": "overmap_terrain", "id": "animalshelter_roof", "copy-from": "animalshelter_roof", - "sym": "ç", + "sym": "\u00E7", "color": "pink" }, { "type": "overmap_terrain", "id": "emptycommerciallot", "copy-from": "emptycommerciallot", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "s_hunting", "copy-from": "s_hunting", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "s_hunting_roof", "copy-from": "s_hunting_roof", - "sym": "ç" + "sym": "\u00E7" }, { "//": "OVERMAP_TERRAIN_ABSTRACT.JSON", "type": "overmap_terrain", "abstract": "generic_cemetery", "copy-from": "generic_cemetery", - "sym": "Ä" + "sym": "\u00C4" }, { "//": "OVERMAP_TERRAIN_CEMETERY.JSON", @@ -9062,61 +9174,61 @@ "type": "overmap_terrain", "id": "evac_center_7", "copy-from": "evac_center_7", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "evac_center_8", "copy-from": "evac_center_8", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "evac_center_9", "copy-from": "evac_center_9", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "evac_center_12", "copy-from": "evac_center_12", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "evac_center_13", "copy-from": "evac_center_13", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "evac_center_14", "copy-from": "evac_center_14", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "evac_center_17", "copy-from": "evac_center_17", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "evac_center_18", "copy-from": "evac_center_18", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "id": "evac_center_19", "copy-from": "evac_center_19", - "sym": "Ö" + "sym": "\u00D6" }, { "type": "overmap_terrain", "abstract": "generic_refctr", "copy-from": "generic_refctr", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { @@ -10098,7 +10210,7 @@ "type": "overmap_terrain", "abstract": "generic_rc_air", "copy-from": "generic_rc_air", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", @@ -12354,7 +12466,7 @@ "type": "overmap_terrain", "abstract": "generic_rc_underground", "copy-from": "generic_rc_underground", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", @@ -16861,7 +16973,7 @@ "type": "overmap_terrain", "id": "campus_admin_0_0_0", "copy-from": "campus_admin_0_0_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_green" }, { @@ -16923,7 +17035,7 @@ "type": "overmap_terrain", "id": "campus_commons_0_0_0", "copy-from": "campus_commons_0_0_0", - "sym": "Ç", + "sym": "\u00C7", "color": "light_green" }, { @@ -17045,7 +17157,7 @@ "type": "overmap_terrain", "id": "campus_commons_0_0_3", "copy-from": "campus_commons_0_0_3", - "sym": "Ç", + "sym": "\u00C7", "color": "light_green" }, { @@ -17087,7 +17199,7 @@ "type": "overmap_terrain", "id": "campus_media_0_0_0", "copy-from": "campus_media_0_0_0", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", @@ -17188,7 +17300,7 @@ "type": "overmap_terrain", "id": "campus_health_0_0_0", "copy-from": "campus_health_0_0_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_red" }, { @@ -17250,7 +17362,7 @@ "type": "overmap_terrain", "id": "campus_lecture_0_0_0", "copy-from": "campus_lecture_0_0_0", - "sym": "þ", + "sym": "\u00FE", "color": "brown" }, { @@ -17332,7 +17444,7 @@ "type": "overmap_terrain", "id": "garage_gas_2", "copy-from": "garage_gas_2", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { @@ -17354,14 +17466,14 @@ "type": "overmap_terrain", "id": "Cemetery_1a", "copy-from": "Cemetery_1a", - "sym": "Ä", + "sym": "\u00C4", "color": "light_gray" }, { "type": "overmap_terrain", "id": "Cemetery_1b", "copy-from": "Cemetery_1b", - "sym": "Ä", + "sym": "\u00C4", "color": "light_gray" }, { @@ -17369,320 +17481,320 @@ "type": "overmap_terrain", "abstract": "generic_necropolis_surface_building", "copy-from": "generic_necropolis_surface_building", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "necropolis_a_1", "copy-from": "necropolis_a_1", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_2", "copy-from": "necropolis_a_2", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_3", "copy-from": "necropolis_a_3", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_4", "copy-from": "necropolis_a_4", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_5", "copy-from": "necropolis_a_5", - "sym": "ç", + "sym": "\u00E7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_7", "copy-from": "necropolis_a_7", - "sym": "Ö", + "sym": "\u00D6", "color": "blue" }, { "type": "overmap_terrain", "id": "necropolis_a_8", "copy-from": "necropolis_a_8", - "sym": "Ö", + "sym": "\u00D6", "color": "blue" }, { "type": "overmap_terrain", "id": "necropolis_a_9", "copy-from": "necropolis_a_9", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_10", "copy-from": "necropolis_a_10", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_12", "copy-from": "necropolis_a_12", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_a_13", "copy-from": "necropolis_a_13", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "id": "necropolis_a_14", "copy-from": "necropolis_a_14", - "sym": "ü", + "sym": "\u00FC", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_a_16", "copy-from": "necropolis_a_16", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_a_17", "copy-from": "necropolis_a_17", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_a_18", "copy-from": "necropolis_a_18", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_19", "copy-from": "necropolis_a_19", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_27", "copy-from": "necropolis_a_27", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_28", "copy-from": "necropolis_a_28", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_a_29", "copy-from": "necropolis_a_29", - "sym": "ç", + "sym": "\u00E7", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_a_30", "copy-from": "necropolis_a_30", - "sym": "î", + "sym": "\u00EE", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_a_32", "copy-from": "necropolis_a_32", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_33", "copy-from": "necropolis_a_33", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_34", "copy-from": "necropolis_a_34", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_35", "copy-from": "necropolis_a_35", - "sym": "ü", + "sym": "\u00FC", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_a_36", "copy-from": "necropolis_a_36", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_37", "copy-from": "necropolis_a_37", - "sym": "ç", + "sym": "\u00E7", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_38", "copy-from": "necropolis_a_38", - "sym": "ü", + "sym": "\u00FC", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_a_45", "copy-from": "necropolis_a_45", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_46", "copy-from": "necropolis_a_46", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_a_48", "copy-from": "necropolis_a_48", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "necropolis_a_49", "copy-from": "necropolis_a_49", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "necropolis_a_51", "copy-from": "necropolis_a_51", - "sym": "ç", + "sym": "\u00E7", "color": "light_red" }, { "type": "overmap_terrain", "id": "necropolis_a_52", "copy-from": "necropolis_a_52", - "sym": "þ", + "sym": "\u00FE", "color": "yellow" }, { "type": "overmap_terrain", "id": "necropolis_a_54", "copy-from": "necropolis_a_54", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_55", "copy-from": "necropolis_a_55", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "necropolis_a_56", "copy-from": "necropolis_a_56", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", "id": "necropolis_a_57", "copy-from": "necropolis_a_57", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "necropolis_a_58", "copy-from": "necropolis_a_58", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", "id": "necropolis_a_60", "copy-from": "necropolis_a_60", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", "id": "necropolis_a_61", "copy-from": "necropolis_a_61", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", "id": "necropolis_a_63", "copy-from": "necropolis_a_63", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_72", "copy-from": "necropolis_a_72", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_73", "copy-from": "necropolis_a_73", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_74", "copy-from": "necropolis_a_74", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "necropolis_a_75", "copy-from": "necropolis_a_75", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "necropolis_a_76", "copy-from": "necropolis_a_76", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", @@ -17695,21 +17807,21 @@ "type": "overmap_terrain", "id": "necropolis_a_79", "copy-from": "necropolis_a_79", - "sym": "ú", + "sym": "\u00FA", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_a_80", "copy-from": "necropolis_a_80", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_a_81", "copy-from": "necropolis_a_81", - "sym": "¨", + "sym": "\u00A8", "color": "brown" }, { @@ -17717,976 +17829,976 @@ "type": "overmap_terrain", "id": "necropolis_b_1", "copy-from": "necropolis_b_1", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_2", "copy-from": "necropolis_b_2", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_3", "copy-from": "necropolis_b_3", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_4", "copy-from": "necropolis_b_4", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_9", "copy-from": "necropolis_b_9", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_10", "copy-from": "necropolis_b_10", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_13", "copy-from": "necropolis_b_13", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_14", "copy-from": "necropolis_b_14", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_16", "copy-from": "necropolis_b_16", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_18", "copy-from": "necropolis_b_18", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_19", "copy-from": "necropolis_b_19", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_27", "copy-from": "necropolis_b_27", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_28", "copy-from": "necropolis_b_28", - "sym": "ê", + "sym": "\u00EA", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_b_30", "copy-from": "necropolis_b_30", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_32", "copy-from": "necropolis_b_32", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_33", "copy-from": "necropolis_b_33", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_34", "copy-from": "necropolis_b_34", - "sym": "à" + "sym": "\u00E0" }, { "type": "overmap_terrain", "id": "necropolis_b_36", "copy-from": "necropolis_b_36", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_37", "copy-from": "necropolis_b_37", - "sym": "ê", + "sym": "\u00EA", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_b_45", "copy-from": "necropolis_b_45", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_52", "copy-from": "necropolis_b_52", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_54", "copy-from": "necropolis_b_54", - "sym": "à" + "sym": "\u00E0" }, { "type": "overmap_terrain", "id": "necropolis_b_55", "copy-from": "necropolis_b_55", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_60", "copy-from": "necropolis_b_60", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_61", "copy-from": "necropolis_b_61", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_63", "copy-from": "necropolis_b_63", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_72", "copy-from": "necropolis_b_72", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_73", "copy-from": "necropolis_b_73", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_74", "copy-from": "necropolis_b_74", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_75", "copy-from": "necropolis_b_75", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_76", "copy-from": "necropolis_b_76", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_80", "copy-from": "necropolis_b_80", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_b_81", "copy-from": "necropolis_b_81", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_c_1", "copy-from": "necropolis_c_1", - "sym": "Õ", + "sym": "\u00D5", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_c_2", "copy-from": "necropolis_c_2", - "sym": "Õ", + "sym": "\u00D5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_c_3", "copy-from": "necropolis_c_3", - "sym": "Õ", + "sym": "\u00D5", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_c_4", "copy-from": "necropolis_c_4", - "sym": "Õ", + "sym": "\u00D5", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_c_5", "copy-from": "necropolis_c_5", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_c_6", "copy-from": "necropolis_c_6", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_c_7", "copy-from": "necropolis_c_7", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_c_8", "copy-from": "necropolis_c_8", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_c_9", "copy-from": "necropolis_c_9", - "sym": "Õ", + "sym": "\u00D5", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_c_10", "copy-from": "necropolis_c_10", - "sym": "Õ", + "sym": "\u00D5", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_c_11", "copy-from": "necropolis_c_11", - "sym": "Õ", + "sym": "\u00D5", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_c_12", "copy-from": "necropolis_c_12", - "sym": "Õ", + "sym": "\u00D5", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_c_13", "copy-from": "necropolis_c_13", - "sym": "Õ", + "sym": "\u00D5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_c_14", "copy-from": "necropolis_c_14", - "sym": "Õ", + "sym": "\u00D5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_c_15", "copy-from": "necropolis_c_15", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_c_16", "copy-from": "necropolis_c_16", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_c_17", "copy-from": "necropolis_c_17", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_18", "copy-from": "necropolis_c_18", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_19", "copy-from": "necropolis_c_19", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_c_20", "copy-from": "necropolis_c_20", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "necropolis_c_21", "copy-from": "necropolis_c_21", - "sym": "Õ", + "sym": "\u00D5", "color": "cyan" }, { "type": "overmap_terrain", "id": "necropolis_c_23", "copy-from": "necropolis_c_23", - "sym": "Õ", + "sym": "\u00D5", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "necropolis_c_25", "copy-from": "necropolis_c_25", - "sym": "Õ", + "sym": "\u00D5", "color": "white" }, { "type": "overmap_terrain", "id": "necropolis_c_26", "copy-from": "necropolis_c_26", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_27", "copy-from": "necropolis_c_27", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_29", "copy-from": "necropolis_c_29", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "necropolis_c_38", "copy-from": "necropolis_c_38", - "sym": "Õ", + "sym": "\u00D5", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_c_39", "copy-from": "necropolis_c_39", - "sym": "Õ", + "sym": "\u00D5", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_c_40", "copy-from": "necropolis_c_40", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_c_42", "copy-from": "necropolis_c_42", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "necropolis_c_43", "copy-from": "necropolis_c_43", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "necropolis_c_44", "copy-from": "necropolis_c_44", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "necropolis_c_46", "copy-from": "necropolis_c_46", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_c_47", "copy-from": "necropolis_c_47", - "sym": "Õ", + "sym": "\u00D5", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_c_48", "copy-from": "necropolis_c_48", - "sym": "Õ", + "sym": "\u00D5", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "necropolis_c_51", "copy-from": "necropolis_c_51", - "sym": "Õ", + "sym": "\u00D5", "color": "light_red" }, { "type": "overmap_terrain", "id": "necropolis_c_52", "copy-from": "necropolis_c_52", - "sym": "Õ", + "sym": "\u00D5", "color": "light_red" }, { "type": "overmap_terrain", "id": "necropolis_c_53", "copy-from": "necropolis_c_53", - "sym": "Õ", + "sym": "\u00D5", "color": "light_red" }, { "type": "overmap_terrain", "id": "necropolis_c_55", "copy-from": "necropolis_c_55", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_c_64", "copy-from": "necropolis_c_64", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_65", "copy-from": "necropolis_c_65", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_66", "copy-from": "necropolis_c_66", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_67", "copy-from": "necropolis_c_67", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_68", "copy-from": "necropolis_c_68", - "sym": "Õ", + "sym": "\u00D5", "color": "pink" }, { "type": "overmap_terrain", "id": "necropolis_c_69", "copy-from": "necropolis_c_69", - "sym": "Õ", + "sym": "\u00D5", "color": "pink" }, { "type": "overmap_terrain", "id": "necropolis_c_70", "copy-from": "necropolis_c_70", - "sym": "Õ", + "sym": "\u00D5", "color": "pink" }, { "type": "overmap_terrain", "id": "necropolis_c_71", "copy-from": "necropolis_c_71", - "sym": "Õ", + "sym": "\u00D5", "color": "pink" }, { "type": "overmap_terrain", "id": "necropolis_c_72", "copy-from": "necropolis_c_72", - "sym": "Õ", + "sym": "\u00D5", "color": "pink" }, { "type": "overmap_terrain", "id": "necropolis_c_73", "copy-from": "necropolis_c_73", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_c_74", "copy-from": "necropolis_c_74", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_75", "copy-from": "necropolis_c_75", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_76", "copy-from": "necropolis_c_76", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_77", "copy-from": "necropolis_c_77", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_78", "copy-from": "necropolis_c_78", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_79", "copy-from": "necropolis_c_79", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "necropolis_c_80", "copy-from": "necropolis_c_80", - "sym": "Õ", + "sym": "\u00D5", "color": "pink" }, { "type": "overmap_terrain", "id": "necropolis_c_81", "copy-from": "necropolis_c_81", - "sym": "Õ", + "sym": "\u00D5", "color": "pink" }, { "type": "overmap_terrain", "id": "necropolis_d_1", "copy-from": "necropolis_d_1", - "sym": "Õ", + "sym": "\u00D5", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "necropolis_d_2", "copy-from": "necropolis_d_2", - "sym": "Õ", + "sym": "\u00D5", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "necropolis_d_3", "copy-from": "necropolis_d_3", - "sym": "Õ", + "sym": "\u00D5", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_d_4", "copy-from": "necropolis_d_4", - "sym": "Õ", + "sym": "\u00D5", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_d_5", "copy-from": "necropolis_d_5", - "sym": "Õ", + "sym": "\u00D5", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_d_6", "copy-from": "necropolis_d_6", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_d_7", "copy-from": "necropolis_d_7", - "sym": "Õ", + "sym": "\u00D5", "color": "red" }, { "type": "overmap_terrain", "id": "necropolis_d_8", "copy-from": "necropolis_d_8", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_d_9", "copy-from": "necropolis_d_9", - "sym": "Õ", + "sym": "\u00D5", "color": "magenta" }, { "type": "overmap_terrain", "id": "necropolis_d_10", "copy-from": "necropolis_d_10", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_d_17", "copy-from": "necropolis_d_17", - "sym": "Õ", + "sym": "\u00D5", "color": "magenta" }, { "type": "overmap_terrain", "id": "necropolis_d_19", "copy-from": "necropolis_d_19", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_20", "copy-from": "necropolis_d_20", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_21", "copy-from": "necropolis_d_21", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_22", "copy-from": "necropolis_d_22", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_23", "copy-from": "necropolis_d_23", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_25", "copy-from": "necropolis_d_25", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_27", "copy-from": "necropolis_d_27", - "sym": "Õ", + "sym": "\u00D5", "color": "yellow" }, { "type": "overmap_terrain", "id": "necropolis_d_28", "copy-from": "necropolis_d_28", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_29", "copy-from": "necropolis_d_29", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_30", "copy-from": "necropolis_d_30", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_31", "copy-from": "necropolis_d_31", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_32", "copy-from": "necropolis_d_32", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_33", "copy-from": "necropolis_d_33", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_34", "copy-from": "necropolis_d_34", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_35", "copy-from": "necropolis_d_35", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_36", "copy-from": "necropolis_d_36", - "sym": "Õ", + "sym": "\u00D5", "color": "yellow" }, { "type": "overmap_terrain", "id": "necropolis_d_37", "copy-from": "necropolis_d_37", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_d_38", "copy-from": "necropolis_d_38", - "sym": "Õ", + "sym": "\u00D5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_d_39", "copy-from": "necropolis_d_39", - "sym": "Õ", + "sym": "\u00D5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "necropolis_d_41", "copy-from": "necropolis_d_41", - "sym": "Õ", + "sym": "\u00D5", "color": "green" }, { "type": "overmap_terrain", "id": "necropolis_d_42", "copy-from": "necropolis_d_42", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_43", "copy-from": "necropolis_d_43", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_44", "copy-from": "necropolis_d_44", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_46", "copy-from": "necropolis_d_46", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_48", "copy-from": "necropolis_d_48", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_49", "copy-from": "necropolis_d_49", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_50", "copy-from": "necropolis_d_50", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_52", "copy-from": "necropolis_d_52", - "sym": "Õ", + "sym": "\u00D5", "color": "light_red" }, { "type": "overmap_terrain", "id": "necropolis_d_54", "copy-from": "necropolis_d_54", - "sym": "Õ", + "sym": "\u00D5", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_d_55", "copy-from": "necropolis_d_55", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_56", "copy-from": "necropolis_d_56", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_57", "copy-from": "necropolis_d_57", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_58", "copy-from": "necropolis_d_58", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_59", "copy-from": "necropolis_d_59", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_61", "copy-from": "necropolis_d_61", - "sym": "Õ", + "sym": "\u00D5", "color": "white" }, { "type": "overmap_terrain", "id": "necropolis_d_63", "copy-from": "necropolis_d_63", - "sym": "Õ", + "sym": "\u00D5", "color": "brown" }, { "type": "overmap_terrain", "id": "necropolis_d_64", "copy-from": "necropolis_d_64", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_65", "copy-from": "necropolis_d_65", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_66", "copy-from": "necropolis_d_66", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_67", "copy-from": "necropolis_d_67", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_68", "copy-from": "necropolis_d_68", - "sym": "Õ", + "sym": "\u00D5", "color": "light_green" }, { "type": "overmap_terrain", "id": "necropolis_d_73", "copy-from": "necropolis_d_73", - "sym": "®" + "sym": "\u00AE" }, { "type": "overmap_terrain", "id": "necropolis_d_77", "copy-from": "necropolis_d_77", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "necropolis_d_78", "copy-from": "necropolis_d_78", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "necropolis_d_80", "copy-from": "necropolis_d_80", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { @@ -18694,70 +18806,70 @@ "type": "overmap_terrain", "id": "church", "copy-from": "church", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "church_roof", "copy-from": "church_roof", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "church_steeple", "copy-from": "church_steeple", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "church_steeple_end", "copy-from": "church_steeple_end", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "church_steeple_roof", "copy-from": "church_steeple_roof", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "church_1", "copy-from": "church_1", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "church_2ndfloor_1", "copy-from": "church_2ndfloor_1", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "church_3rdfloor_1", "copy-from": "church_3rdfloor_1", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "church_roof_1", "copy-from": "church_roof_1", - "sym": "ò", + "sym": "\u00F2", "color": "light_gray" }, { "type": "overmap_terrain", "id": "cathedral_1_NW", "copy-from": "cathedral_1_NW", - "sym": "ò", + "sym": "\u00F2", "color": "white" }, { @@ -18779,7 +18891,7 @@ "type": "overmap_terrain", "id": "cathedral_b_NW", "copy-from": "cathedral_b_NW", - "sym": "ò", + "sym": "\u00F2", "color": "white" }, { @@ -18801,105 +18913,105 @@ "type": "overmap_terrain", "id": "s_library", "copy-from": "s_library", - "sym": "ÿ", + "sym": "\u00FF", "color": "brown" }, { "type": "overmap_terrain", "id": "s_library_roof", "copy-from": "s_library_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "brown" }, { "type": "overmap_terrain", "id": "s_library_1", "copy-from": "s_library_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "brown" }, { "type": "overmap_terrain", "id": "s_library_roof_1", "copy-from": "s_library_roof_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "brown" }, { "type": "overmap_terrain", "id": "s_library_2", "copy-from": "s_library_2", - "sym": "ÿ", + "sym": "\u00FF", "color": "brown" }, { "type": "overmap_terrain", "id": "s_library_roof_2", "copy-from": "s_library_roof_2", - "sym": "ÿ", + "sym": "\u00FF", "color": "brown" }, { "type": "overmap_terrain", "id": "police", "copy-from": "police", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "police_roof", "copy-from": "police_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "police_1", "copy-from": "police_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "police_2ndfloor_1", "copy-from": "police_2ndfloor_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "police_roof_1", "copy-from": "police_roof_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "police_2", "copy-from": "police_2", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "police_roof_2", "copy-from": "police_roof_2", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "id": "police_upper_roof_2", "copy-from": "police_upper_roof_2", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_blue" }, { "type": "overmap_terrain", "abstract": "generic_hospital", "copy-from": "generic_hospital", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", @@ -18951,775 +19063,775 @@ "type": "overmap_terrain", "id": "school_1_1", "copy-from": "school_1_1", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_1_2", "copy-from": "school_1_2", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_1_3", "copy-from": "school_1_3", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_1_4", "copy-from": "school_1_4", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_1_5", "copy-from": "school_1_5", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_1_6", "copy-from": "school_1_6", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_1_7", "copy-from": "school_1_7", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_1_8", "copy-from": "school_1_8", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_1_9", "copy-from": "school_1_9", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_1", "copy-from": "school_2_1", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_2", "copy-from": "school_2_2", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_3", "copy-from": "school_2_3", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_4", "copy-from": "school_2_4", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_5", "copy-from": "school_2_5", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_6", "copy-from": "school_2_6", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_7", "copy-from": "school_2_7", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_8", "copy-from": "school_2_8", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_2_9", "copy-from": "school_2_9", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_1", "copy-from": "school_3_1", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_2", "copy-from": "school_3_2", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_3", "copy-from": "school_3_3", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_4", "copy-from": "school_3_4", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_5", "copy-from": "school_3_5", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_6", "copy-from": "school_3_6", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_7", "copy-from": "school_3_7", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_8", "copy-from": "school_3_8", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_3_9", "copy-from": "school_3_9", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_1", "copy-from": "school_4_1", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_2", "copy-from": "school_4_2", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_3", "copy-from": "school_4_3", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_4", "copy-from": "school_4_4", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_5", "copy-from": "school_4_5", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_6", "copy-from": "school_4_6", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_7", "copy-from": "school_4_7", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_8", "copy-from": "school_4_8", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "school_4_9", "copy-from": "school_4_9", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "prison_1_1", "copy-from": "prison_1_1", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_2", "copy-from": "prison_1_2", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_3", "copy-from": "prison_1_3", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_4", "copy-from": "prison_1_4", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_5", "copy-from": "prison_1_5", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_6", "copy-from": "prison_1_6", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_7", "copy-from": "prison_1_7", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_8", "copy-from": "prison_1_8", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_9", "copy-from": "prison_1_9", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_1", "copy-from": "prison_1_b_1", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_2", "copy-from": "prison_1_b_2", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_3", "copy-from": "prison_1_b_3", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_4", "copy-from": "prison_1_b_4", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_5", "copy-from": "prison_1_b_5", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_6", "copy-from": "prison_1_b_6", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_7", "copy-from": "prison_1_b_7", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_8", "copy-from": "prison_1_b_8", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_9", "copy-from": "prison_1_b_9", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_7_hidden", "copy-from": "prison_1_b_7_hidden", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_8_hidden_lab_stairs", "copy-from": "prison_1_b_8_hidden_lab_stairs", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_1_b_9_hidden", "copy-from": "prison_1_b_9_hidden", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_1", "copy-from": "prison_alcatraz_1", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_2", "copy-from": "prison_alcatraz_2", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_3", "copy-from": "prison_alcatraz_3", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_4", "copy-from": "prison_alcatraz_4", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_5", "copy-from": "prison_alcatraz_5", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_6", "copy-from": "prison_alcatraz_6", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_7", "copy-from": "prison_alcatraz_7", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_8", "copy-from": "prison_alcatraz_8", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_9", "copy-from": "prison_alcatraz_9", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_10", "copy-from": "prison_alcatraz_10", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_11", "copy-from": "prison_alcatraz_11", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_12", "copy-from": "prison_alcatraz_12", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_13", "copy-from": "prison_alcatraz_13", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_14", "copy-from": "prison_alcatraz_14", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_15", "copy-from": "prison_alcatraz_15", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_1_2f", "copy-from": "prison_alcatraz_1_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_2_2f", "copy-from": "prison_alcatraz_2_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_3_2f", "copy-from": "prison_alcatraz_3_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_4_2f", "copy-from": "prison_alcatraz_4_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_5_2f", "copy-from": "prison_alcatraz_5_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_6_2f", "copy-from": "prison_alcatraz_6_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_7_2f", "copy-from": "prison_alcatraz_7_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_8_2f", "copy-from": "prison_alcatraz_8_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_9_2f", "copy-from": "prison_alcatraz_9_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_10_2f", "copy-from": "prison_alcatraz_10_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_11_2f", "copy-from": "prison_alcatraz_11_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_12_2f", "copy-from": "prison_alcatraz_12_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_13_2f", "copy-from": "prison_alcatraz_13_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_14_2f", "copy-from": "prison_alcatraz_14_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "prison_alcatraz_15_2f", "copy-from": "prison_alcatraz_15_2f", - "sym": "å", + "sym": "\u00E5", "color": "light_gray" }, { "type": "overmap_terrain", "id": "post_office", "copy-from": "post_office", - "sym": "å", + "sym": "\u00E5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "post_office_roof", "copy-from": "post_office_roof", - "sym": "å", + "sym": "\u00E5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "post_office_1", "copy-from": "post_office", - "sym": "å", + "sym": "\u00E5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "post_office_roof_1", "copy-from": "post_office_roof", - "sym": "å", + "sym": "\u00E5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "mortuary", "copy-from": "mortuary", - "sym": "å", + "sym": "\u00E5", "color": "brown" }, { "type": "overmap_terrain", "id": "mortuary_roof", "copy-from": "mortuary_roof", - "sym": "å", + "sym": "\u00E5", "color": "brown" }, { "type": "overmap_terrain", "id": "fire_station", "copy-from": "fire_station", - "sym": "Æ", + "sym": "\u00C6", "color": "red" }, { "type": "overmap_terrain", "id": "fire_station_roof", "copy-from": "fire_station_roof", - "sym": "Æ", + "sym": "\u00C6", "color": "red" }, { "type": "overmap_terrain", "id": "fire_station_1", "copy-from": "fire_station_1", - "sym": "Æ", + "sym": "\u00C6", "color": "red" }, { "type": "overmap_terrain", "id": "fire_station_roof_1", "copy-from": "fire_station_roof_1", - "sym": "Æ", + "sym": "\u00C6", "color": "red" }, { "type": "overmap_terrain", "id": "homeless_0_0_0", "copy-from": "homeless_0_0_0", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "homeless_1_0_0", "copy-from": "homeless_1_0_0", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "homeless_0_0_1", "copy-from": "homeless_0_0_1", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "homeless_1_0_1", "copy-from": "homeless_1_0_1", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "homeless_0_0_2", "copy-from": "homeless_0_0_2", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "homeless_1_0_2", "copy-from": "homeless_1_0_2", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "homeless_0_0_roof", "copy-from": "homeless_0_0_roof", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "homeless_1_0_roof", "copy-from": "homeless_1_0_roof", - "sym": "å" + "sym": "\u00E5" }, { "type": "overmap_terrain", "id": "town_hall_0_0_0", "copy-from": "town_hall_0_0_0", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_1_0_0", "copy-from": "town_hall_1_0_0", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_0_1_0", "copy-from": "town_hall_0_1_0", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_1_1_0", "copy-from": "town_hall_1_1_0", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_0_0_1", "copy-from": "town_hall_0_0_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_1_0_1", "copy-from": "town_hall_1_0_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_0_1_1", "copy-from": "town_hall_0_1_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_1_1_1", "copy-from": "town_hall_1_1_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_0_0_roof", "copy-from": "town_hall_0_0_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_1_0_roof", "copy-from": "town_hall_1_0_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_0_1_roof", "copy-from": "town_hall_0_1_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "id": "town_hall_1_1_roof", "copy-from": "town_hall_1_1_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { @@ -19727,7 +19839,7 @@ "type": "overmap_terrain", "id": "ranch_camp_11", "copy-from": "ranch_camp_11", - "sym": "©" + "sym": "\u00A9" }, { "type": "overmap_terrain", @@ -19758,7 +19870,7 @@ "type": "overmap_terrain", "id": "ranch_camp_17", "copy-from": "ranch_camp_17", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", @@ -19909,28 +20021,28 @@ "type": "overmap_terrain", "id": "ranch_camp_57", "copy-from": "ranch_camp_57", - "sym": "ö", + "sym": "\u00F6", "color": "brown" }, { "type": "overmap_terrain", "id": "ranch_camp_57_roof", "copy-from": "ranch_camp_57_roof", - "sym": "ö", + "sym": "\u00F6", "color": "brown" }, { "type": "overmap_terrain", "id": "ranch_camp_57_silo", "copy-from": "ranch_camp_57_silo", - "sym": "ö", + "sym": "\u00F6", "color": "brown" }, { "type": "overmap_terrain", "id": "ranch_camp_57_silocap", "copy-from": "ranch_camp_57_silocap", - "sym": "ö", + "sym": "\u00F6", "color": "brown" }, { @@ -19962,7 +20074,7 @@ "type": "overmap_terrain", "id": "ranch_camp_65", "copy-from": "ranch_camp_65", - "sym": "©", + "sym": "\u00A9", "color": "brown" }, { @@ -19970,49 +20082,49 @@ "id": "ranch_camp_65_roof", "copy-from": "ranch_camp_65_roof", "name": "open air", - "sym": "¦", + "sym": "\u00A6", "color": "blue" }, { "type": "overmap_terrain", "id": "ranch_camp_66", "copy-from": "ranch_camp_66", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "ranch_camp_66_roof", "copy-from": "ranch_camp_66_roof", - "sym": "é", + "sym": "\u00E9", "color": "brown" }, { "type": "overmap_terrain", "id": "ranch_camp_67", "copy-from": "ranch_camp_67", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "ranch_camp_67_roof", "copy-from": "ranch_camp_67_roof", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "ranch_camp_68", "copy-from": "ranch_camp_68", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { "type": "overmap_terrain", "id": "ranch_camp_68_roof", "copy-from": "ranch_camp_68_roof", - "sym": "â", + "sym": "\u00E2", "color": "brown" }, { @@ -20030,7 +20142,7 @@ "id": "ranch_camp_74_roof", "copy-from": "ranch_camp_74_roof", "name": "open air", - "sym": "¦", + "sym": "\u00A6", "color": "blue" }, { @@ -20038,14 +20150,14 @@ "id": "ranch_camp_75_roof", "copy-from": "ranch_camp_75_roof", "name": "open air", - "sym": "¦", + "sym": "\u00A6", "color": "blue" }, { "type": "overmap_terrain", "id": "ranch_camp_76", "copy-from": "ranch_camp_76", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { @@ -20053,769 +20165,769 @@ "type": "overmap_terrain", "id": "pool", "copy-from": "pool", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_roof", "copy-from": "pool_roof", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_1", "copy-from": "pool_1", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_roof_1", "copy-from": "pool_roof_1", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_2", "copy-from": "pool_2", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_roof_2", "copy-from": "pool_roof_2", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_3", "copy-from": "pool_3", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_roof_3", "copy-from": "pool_roof_3", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_4", "copy-from": "pool_4", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_roof_4", "copy-from": "pool_roof_4", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_5", "copy-from": "pool_5", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "pool_6", "copy-from": "pool_6", - "sym": "á" + "sym": "\u00E1" }, { "type": "overmap_terrain", "id": "football_field_a1", "copy-from": "football_field_a1", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_a2", "copy-from": "football_field_a2", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_a3", "copy-from": "football_field_a3", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_a4", "copy-from": "football_field_a4", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_a5", "copy-from": "football_field_a5", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_b1", "copy-from": "football_field_b1", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_b2", "copy-from": "football_field_b2", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_b3", "copy-from": "football_field_b3", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_b4", "copy-from": "football_field_b4", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_b5", "copy-from": "football_field_b5", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_c1", "copy-from": "football_field_c1", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_c2", "copy-from": "football_field_c2", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_c3", "copy-from": "football_field_c3", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_c4", "copy-from": "football_field_c4", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "football_field_c5", "copy-from": "football_field_c5", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "art_gallery", "copy-from": "art_gallery", - "sym": "ÿ", + "sym": "\u00FF", "color": "white" }, { "type": "overmap_terrain", "id": "art_gallery_roof", "copy-from": "art_gallery_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "white" }, { "type": "overmap_terrain", "id": "state_park_0_0", "copy-from": "state_park_0_0", - "sym": "ñ", + "sym": "\u00F1", "color": "brown" }, { "type": "overmap_terrain", "id": "state_park_0_1", "copy-from": "state_park_0_1", - "sym": "ñ", + "sym": "\u00F1", "color": "brown" }, { "type": "overmap_terrain", "id": "state_park_1_0", "copy-from": "state_park_1_0", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "state_park_1_1", "copy-from": "state_park_1_1", - "sym": "ñ", + "sym": "\u00F1", "color": "brown" }, { "type": "overmap_terrain", "id": "fishing_pond_0_0", "copy-from": "fishing_pond_0_0", - "sym": "Ü", + "sym": "\u00DC", "color": "blue" }, { "type": "overmap_terrain", "id": "fishing_pond_0_1", "copy-from": "fishing_pond_0_1", - "sym": "Ü", + "sym": "\u00DC", "color": "blue" }, { "type": "overmap_terrain", "id": "fishing_pond_1_0", "copy-from": "fishing_pond_1_0", - "sym": "Ü", + "sym": "\u00DC", "color": "blue" }, { "type": "overmap_terrain", "id": "fishing_pond_1_1", "copy-from": "fishing_pond_1_1", - "sym": "Ü", + "sym": "\u00DC", "color": "blue" }, { "type": "overmap_terrain", "id": "skate_park", "copy-from": "skate_park", - "sym": "Ü", + "sym": "\u00DC", "color": "light_gray" }, { "type": "overmap_terrain", "id": "small_wooded_trail", "copy-from": "small_wooded_trail", - "sym": "ñ", + "sym": "\u00F1", "color": "brown" }, { "type": "overmap_terrain", "id": "pavilion", "copy-from": "pavilion", - "sym": "î", + "sym": "\u00EE", "color": "brown" }, { "type": "overmap_terrain", "id": "pavilion_roof", "copy-from": "pavilion_roof", - "sym": "î", + "sym": "\u00EE", "color": "brown" }, { "type": "overmap_terrain", "id": "pavilion_1", "copy-from": "pavilion_1", - "sym": "î", + "sym": "\u00EE", "color": "brown" }, { "type": "overmap_terrain", "id": "pavilion_roof_1", "copy-from": "pavilion_roof_1", - "sym": "î", + "sym": "\u00EE", "color": "brown" }, { "type": "overmap_terrain", "id": "hunting_blind", "copy-from": "hunting_blind", - "sym": "í", + "sym": "\u00ED", "color": "brown" }, { "type": "overmap_terrain", "id": "NatureTrail_1a", "copy-from": "NatureTrail_1a", - "sym": "ñ", + "sym": "\u00F1", "color": "green" }, { "type": "overmap_terrain", "id": "NatureTrail_1b", "copy-from": "NatureTrail_1b", - "sym": "ñ", + "sym": "\u00F1", "color": "green" }, { "type": "overmap_terrain", "id": "PublicPond_1a", "copy-from": "PublicPond_1a", - "sym": "Ü", + "sym": "\u00DC", "color": "blue" }, { "type": "overmap_terrain", "id": "PublicPond_1b", "copy-from": "PublicPond_1b", - "sym": "Ü", + "sym": "\u00DC", "color": "blue" }, { "type": "overmap_terrain", "id": "communitygarden", "copy-from": "communitygarden", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "publicgarden", "copy-from": "publicgarden", - "sym": "è" + "sym": "\u00E8" }, { "type": "overmap_terrain", "id": "BotanicalGarden_1a", "copy-from": "BotanicalGarden_1a", - "sym": "è", + "sym": "\u00E8", "color": "magenta" }, { "type": "overmap_terrain", "id": "BotanicalGarden_1a_roof", "copy-from": "BotanicalGarden_1a_roof", - "sym": "è", + "sym": "\u00E8", "color": "magenta" }, { "type": "overmap_terrain", "id": "BotanicalGarden_1b", "copy-from": "BotanicalGarden_1b", - "sym": "è", + "sym": "\u00E8", "color": "magenta" }, { "type": "overmap_terrain", "id": "BotanicalGarden_1b_roof", "copy-from": "BotanicalGarden_1b_roof", - "sym": "è", + "sym": "\u00E8", "color": "magenta" }, { "type": "overmap_terrain", "id": "TreeFarm_1a", "copy-from": "TreeFarm_1a", - "sym": "õ", + "sym": "\u00F5", "color": "light_green" }, { "type": "overmap_terrain", "id": "shootingrange_1a", "copy-from": "shootingrange_1a", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "shootingrange_1a_roof", "copy-from": "shootingrange_1a_roof", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "shootingrange_2a", "copy-from": "shootingrange_2a", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "miniaturerailway_0_0_0", "copy-from": "miniaturerailway_0_0_0", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "miniaturerailway_0_1_0", "copy-from": "miniaturerailway_0_1_0", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "miniaturerailway_1_0_0", "copy-from": "miniaturerailway_1_0_0", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "miniaturerailway_1_1_0", "copy-from": "miniaturerailway_1_1_0", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "miniaturerailway_0_0_1", "copy-from": "miniaturerailway_0_0_1", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "miniaturerailway_0_1_1", "copy-from": "miniaturerailway_0_1_1", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "miniaturerailway_1_0_1", "copy-from": "miniaturerailway_1_0_1", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "miniaturerailway_1_1_1", "copy-from": "miniaturerailway_1_1_1", - "sym": "×" + "sym": "\u00D7" }, { "type": "overmap_terrain", "id": "golfcourse_00", "copy-from": "golfcourse_00", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_01", "copy-from": "golfcourse_01", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_02", "copy-from": "golfcourse_02", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_10", "copy-from": "golfcourse_10", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_11", "copy-from": "golfcourse_11", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_12", "copy-from": "golfcourse_12", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_20", "copy-from": "golfcourse_20", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_21", "copy-from": "golfcourse_21", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_22", "copy-from": "golfcourse_22", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "golfcourse_30", "copy-from": "golfcourse_30", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "golfcourse_31", "copy-from": "golfcourse_31", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "golfcourse_31_2ndfloor", "copy-from": "golfcourse_31_2ndfloor", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "golfcourse_31_roof", "copy-from": "golfcourse_31_roof", - "sym": "Á" + "sym": "\u00C1" }, { "type": "overmap_terrain", "id": "golfcourse_32", "copy-from": "golfcourse_32", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "s_baseballfield_a1", "copy-from": "s_baseballfield_a1", - "sym": "¦", + "sym": "\u00A6", "color": "green" }, { "type": "overmap_terrain", "id": "s_baseballfield_a2", "copy-from": "s_baseballfield_a2", - "sym": "¦", + "sym": "\u00A6", "color": "green" }, { "type": "overmap_terrain", "id": "s_baseballfield_b1", "copy-from": "s_baseballfield_b1", - "sym": "¦", + "sym": "\u00A6", "color": "green" }, { "type": "overmap_terrain", "id": "s_baseballfield_b2", "copy-from": "s_baseballfield_b2", - "sym": "¦", + "sym": "\u00A6", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_0_0", "copy-from": "zoo_0_0", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "zoo_1_0", "copy-from": "zoo_1_0", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "zoo_2_0", "copy-from": "zoo_2_0", - "sym": "î", + "sym": "\u00EE", "color": "brown" }, { "type": "overmap_terrain", "id": "zoo_0_1", "copy-from": "zoo_0_1", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_0_1_roof", "copy-from": "zoo_0_1_roof", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_1_1", "copy-from": "zoo_1_1", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_1_1_roof", "copy-from": "zoo_1_1_roof", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_2_1", "copy-from": "zoo_2_1", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_2_1_roof", "copy-from": "zoo_2_1_roof", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_0_2", "copy-from": "zoo_0_2", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_0_2_roof", "copy-from": "zoo_0_2_roof", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_1_2", "copy-from": "zoo_1_2", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_1_2_roof", "copy-from": "zoo_1_2_roof", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_2_2", "copy-from": "zoo_2_2", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "zoo_2_2_roof", "copy-from": "zoo_2_2_roof", - "sym": "Á", + "sym": "\u00C1", "color": "green" }, { "type": "overmap_terrain", "id": "stadium_0_0", "copy-from": "stadium_0_0", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "stadium_1_0", "copy-from": "stadium_1_0", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "stadium_2_0", "copy-from": "stadium_2_0", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "stadium_3_0", "copy-from": "stadium_3_0", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "stadium_0_1", "copy-from": "stadium_0_1", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "stadium_1_1", "copy-from": "stadium_1_1", - "sym": "Á", + "sym": "\u00C1", "color": "light_gray" }, { "type": "overmap_terrain", "id": "stadium_2_1", "copy-from": "stadium_2_1", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "stadium_3_1", "copy-from": "stadium_3_1", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "stadium_0_2", "copy-from": "stadium_0_2", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "stadium_1_2", "copy-from": "stadium_1_2", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "stadium_2_2", "copy-from": "stadium_2_2", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "stadium_3_2", "copy-from": "stadium_3_2", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "stadium_0_3", "copy-from": "stadium_0_3", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "stadium_1_3", "copy-from": "stadium_1_3", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "stadium_2_3", "copy-from": "stadium_2_3", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "stadium_3_3", "copy-from": "stadium_3_3", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "stadium_0_4", "copy-from": "stadium_0_4", - "sym": "æ", + "sym": "\u00E6", "color": "light_gray" }, { "type": "overmap_terrain", "id": "stadium_1_4", "copy-from": "stadium_1_4", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { "type": "overmap_terrain", "id": "stadium_2_4", "copy-from": "stadium_2_4", - "sym": "Á", + "sym": "\u00C1", "color": "white" }, { @@ -20823,598 +20935,598 @@ "id": "stadium_3_4", "copy-from": "stadium_3_4", "name": "stadium bar", - "sym": "Á", + "sym": "\u00C1", "color": "magenta" }, { "type": "overmap_terrain", "id": "natural_spring", "copy-from": "natural_spring", - "sym": "Ü" + "sym": "\u00DC" }, { "type": "overmap_terrain", "id": "movietheater_0_0", "copy-from": "movietheater_0_0", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_1_0", "copy-from": "movietheater_1_0", - "sym": "ÿ", + "sym": "\u00FF", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_2_0", "copy-from": "movietheater_2_0", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_0_1", "copy-from": "movietheater_0_1", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_1_1", "copy-from": "movietheater_1_1", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_2_1", "copy-from": "movietheater_2_1", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_0_2", "copy-from": "movietheater_0_2", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_1_2", "copy-from": "movietheater_1_2", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_2_2", "copy-from": "movietheater_2_2", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_0_0", "copy-from": "movietheater_roof_0_0", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_1_0", "copy-from": "movietheater_roof_1_0", - "sym": "ÿ", + "sym": "\u00FF", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_2_0", "copy-from": "movietheater_roof_2_0", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_0_1", "copy-from": "movietheater_roof_0_1", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_1_1", "copy-from": "movietheater_roof_1_1", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_2_1", "copy-from": "movietheater_roof_2_1", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_0_2", "copy-from": "movietheater_roof_0_2", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_1_2", "copy-from": "movietheater_roof_1_2", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "movietheater_roof_2_2", "copy-from": "movietheater_roof_2_2", - "sym": "Á", + "sym": "\u00C1", "color": "yellow" }, { "type": "overmap_terrain", "id": "paintball_field", "copy-from": "paintball_field", - "sym": "¦", + "sym": "\u00A6", "color": "magenta" }, { "type": "overmap_terrain", "id": "paintball_field_roof", "copy-from": "paintball_field_roof", - "sym": "¦", + "sym": "\u00A6", "color": "magenta" }, { "type": "overmap_terrain", "id": "paintball_field_1", "copy-from": "paintball_field_1", - "sym": "¦", + "sym": "\u00A6", "color": "magenta" }, { "type": "overmap_terrain", "id": "paintball_field_roof_1", "copy-from": "paintball_field_roof_1", - "sym": "¦", + "sym": "\u00A6", "color": "magenta" }, { "type": "overmap_terrain", "id": "smoke_lounge", "copy-from": "smoke_lounge", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "smoke_lounge_roof", "copy-from": "smoke_lounge_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "smoke_lounge_1", "copy-from": "smoke_lounge_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "smoke_lounge_roof_1", "copy-from": "smoke_lounge_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_gray" }, { "type": "overmap_terrain", "id": "music_venue", "copy-from": "music_venue", - "sym": "Á", + "sym": "\u00C1", "color": "magenta" }, { "type": "overmap_terrain", "id": "music_venue_roof", "copy-from": "music_venue_roof", - "sym": "Á", + "sym": "\u00C1", "color": "magenta" }, { "type": "overmap_terrain", "id": "music_venue_1", "copy-from": "music_venue_1", - "sym": "Á", + "sym": "\u00C1", "color": "magenta" }, { "type": "overmap_terrain", "id": "music_venue_1_roof", "copy-from": "music_venue_1_roof", - "sym": "Á", + "sym": "\u00C1", "color": "magenta" }, { "type": "overmap_terrain", "id": "music_venue_1_roof_top", "copy-from": "music_venue_1_roof_top", - "sym": "Á", + "sym": "\u00C1", "color": "magenta" }, { "type": "overmap_terrain", "id": "gambling_hall", "copy-from": "gambling_hall", - "sym": "ÿ", + "sym": "\u00FF", "color": "white" }, { "type": "overmap_terrain", "id": "gambling_hall_roof", "copy-from": "gambling_hall_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "white" }, { "type": "overmap_terrain", "id": "gambling_hall_upper_roof", "copy-from": "gambling_hall_upper_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "white" }, { "type": "overmap_terrain", "id": "gambling_hall_1", "copy-from": "gambling_hall_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "white" }, { "type": "overmap_terrain", "id": "gambling_hall_roof_1", "copy-from": "gambling_hall_roof_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "white" }, { "type": "overmap_terrain", "id": "stripclub", "copy-from": "stripclub", - "sym": "å", + "sym": "\u00E5", "color": "pink" }, { "type": "overmap_terrain", "id": "stripclub_roof", "copy-from": "stripclub_roof", - "sym": "å", + "sym": "\u00E5", "color": "pink" }, { "type": "overmap_terrain", "id": "stripclub_1", "copy-from": "stripclub_1", - "sym": "å", + "sym": "\u00E5", "color": "pink" }, { "type": "overmap_terrain", "id": "stripclub_roof_1", "copy-from": "stripclub_roof_1", - "sym": "å", + "sym": "\u00E5", "color": "pink" }, { "type": "overmap_terrain", "id": "stripclub_2", "copy-from": "stripclub_2", - "sym": "å", + "sym": "\u00E5", "color": "pink" }, { "type": "overmap_terrain", "id": "stripclub_roof_2", "copy-from": "stripclub_roof_2", - "sym": "å", + "sym": "\u00E5", "color": "pink" }, { "type": "overmap_terrain", "id": "museum", "copy-from": "museum", - "sym": "þ" + "sym": "\u00FE" }, { "type": "overmap_terrain", "id": "museum_roof", "copy-from": "museum_roof", - "sym": "þ" + "sym": "\u00FE" }, { "type": "overmap_terrain", "id": "bowling_alley", "copy-from": "bowling_alley", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "bowling_alley_roof", "copy-from": "bowling_alley_roof", - "sym": "ç", + "sym": "\u00E7", "color": "magenta" }, { "type": "overmap_terrain", "id": "gym", "copy-from": "gym", - "sym": "å", + "sym": "\u00E5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "gym_roof", "copy-from": "gym_roof", - "sym": "å", + "sym": "\u00E5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "gym_upper_roof", "copy-from": "gym_upper_roof", - "sym": "å", + "sym": "\u00E5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "gym_fitness", "copy-from": "gym_fitness", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "gym_fitness_roof", "copy-from": "gym_fitness_roof", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "gym_fitness_1", "copy-from": "gym_fitness_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "gym_fitness_2ndFloor_1", "copy-from": "gym_fitness_2ndFloor_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "gym_fitness_roof_1", "copy-from": "gym_fitness_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "light_blue" }, { "type": "overmap_terrain", "id": "dojo", "copy-from": "dojo", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "id": "dojo_roof", "copy-from": "dojo_roof", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "id": "dojo_upper_roof", "copy-from": "dojo_upper_roof", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "id": "dojo_1", "copy-from": "dojo_1", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "id": "dojo_roof_1", "copy-from": "dojo_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "id": "dojo_upper_roof_1", "copy-from": "dojo_upper_roof_1", - "sym": "ç", + "sym": "\u00E7", "color": "white" }, { "type": "overmap_terrain", "id": "cs_private_park", "copy-from": "cs_private_park", - "sym": "î", + "sym": "\u00EE", "color": "light_green" }, { "type": "overmap_terrain", "id": "cs_private_park_roof", "copy-from": "cs_private_park_roof", - "sym": "î", + "sym": "\u00EE", "color": "light_green" }, { "type": "overmap_terrain", "id": "cs_public_art_piece", "copy-from": "cs_public_art_piece", - "sym": "ø", + "sym": "\u00F8", "color": "white" }, { "type": "overmap_terrain", "id": "cs_public_space", "copy-from": "cs_public_space", - "sym": "î", + "sym": "\u00EE", "color": "white" }, { "type": "overmap_terrain", "id": "lake_dock_small", "copy-from": "lake_dock_small", - "sym": "Ô", + "sym": "\u00D4", "color": "brown" }, { "type": "overmap_terrain", "id": "lake_shore_dock_small", "copy-from": "lake_shore_dock_small", - "sym": "Ô", + "sym": "\u00D4", "color": "brown" }, { "type": "overmap_terrain", "id": "marina_1", "copy-from": "marina_1", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_2", "copy-from": "marina_2", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_3", "copy-from": "marina_3", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_4", "copy-from": "marina_4", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_5", "copy-from": "marina_5", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_6", "copy-from": "marina_6", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_7", "copy-from": "marina_7", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_8", "copy-from": "marina_8", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_9", "copy-from": "marina_9", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_10", "copy-from": "marina_10", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_11", "copy-from": "marina_11", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_12", "copy-from": "marina_12", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_13", "copy-from": "marina_13", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_14", "copy-from": "marina_14", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_15", "copy-from": "marina_15", - "sym": "Ô" + "sym": "\u00D4" }, { "type": "overmap_terrain", "id": "marina_16", "copy-from": "marina_16", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "marina_17", "copy-from": "marina_17", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "marina_18", "copy-from": "marina_18", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "marina_19", "copy-from": "marina_19", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "marina_20", "copy-from": "marina_20", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { @@ -21422,69 +21534,62 @@ "type": "overmap_terrain", "abstract": "generic_city_house_basement", "copy-from": "generic_city_house_basement", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "basement", "copy-from": "basement", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "basement_bionic", "copy-from": "basement_bionic", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "basement_hidden_lab_stairs", "copy-from": "basement_hidden_lab_stairs", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house", "copy-from": "house", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_prepper", "copy-from": "house_prepper", - "sym": "à", - "color": "light_gray" - }, - { - "type": "overmap_terrain", - "id": "house_base", - "copy-from": "house_base", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "duplex", "copy-from": "duplex", - "sym": "ä", + "sym": "\u00E4", "color": "light_gray" }, { "type": "overmap_terrain", "id": "rural_house", "copy-from": "rural_house", - "sym": "â" + "sym": "\u00E2" }, { "type": "overmap_terrain", "abstract": "apartments_tower_any", "copy-from": "apartments_tower_any", - "sym": "Ç", + "sym": "\u00C7", "color": "light_green" }, { @@ -21611,7 +21716,7 @@ "type": "overmap_terrain", "id": "apartments_con_tower_015", "name": "open air", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", @@ -21697,168 +21802,168 @@ "type": "overmap_terrain", "id": "homelesscamp", "copy-from": "homelesscamp", - "sym": "Å", + "sym": "\u00C5", "color": "brown" }, { "type": "overmap_terrain", "id": "trailerparksmall0", "copy-from": "trailerparksmall0", - "sym": "ù", + "sym": "\u00F9", "color": "white" }, { "type": "overmap_terrain", "id": "trailerparksmall0_roof", "copy-from": "trailerparksmall0_roof", - "sym": "ù", + "sym": "\u00F9", "color": "white" }, { "type": "overmap_terrain", "id": "trailerparksmall1", "copy-from": "trailerparksmall1", - "sym": "ù", + "sym": "\u00F9", "color": "white" }, { "type": "overmap_terrain", "id": "trailerparksmall1_roof", "copy-from": "trailerparksmall1_roof", - "sym": "ù", + "sym": "\u00F9", "color": "white" }, { "type": "overmap_terrain", "id": "trailerparksmall2", "copy-from": "trailerparksmall2", - "sym": "ù", + "sym": "\u00F9", "color": "white" }, { "type": "overmap_terrain", "id": "trailerparksmall2_roof", "copy-from": "trailerparksmall2_roof", - "sym": "ù", + "sym": "\u00F9", "color": "white" }, { "type": "overmap_terrain", "id": "house_w_2", "copy-from": "house_w_2", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_2_roof", "copy-from": "house_w_2_roof", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_3", "copy-from": "house_w_3", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_3_roof", "copy-from": "house_w_3_roof", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_4", "copy-from": "house_w_4", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_4_roof", "copy-from": "house_w_4_roof", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_5", "copy-from": "house_w_5", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_5_roof", "copy-from": "house_w_5_roof", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_6", "copy-from": "house_w_6", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_6_2ndfloor", "copy-from": "house_w_6_2ndfloor", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_6_roof", "copy-from": "house_w_6_roof", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "emptyresidentiallot", "copy-from": "emptyresidentiallot", - "sym": "×", + "sym": "\u00D7", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "derelict_property", "copy-from": "derelict_property", - "sym": "à", + "sym": "\u00E0", "color": "brown" }, { "type": "overmap_terrain", "id": "house_2story_base", "copy-from": "house_2story_base", - "sym": "Ñ", + "sym": "\u00D1", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_2story_second", "copy-from": "house_2story_second", - "sym": "Ñ", + "sym": "\u00D1", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_1", "copy-from": "house_w_1", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { "type": "overmap_terrain", "id": "house_w_1_roof", "copy-from": "house_w_1_roof", - "sym": "à", + "sym": "\u00E0", "color": "light_gray" }, { @@ -21866,491 +21971,491 @@ "type": "overmap_terrain", "abstract": "generic_river", "copy-from": "generic_water", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "abstract": "generic_river_bank", "copy-from": "generic_river_bank", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_center", "copy-from": "river_center", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river", "copy-from": "river", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_c_not_ne", "copy-from": "river_c_not_ne", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_c_not_nw", "copy-from": "river_c_not_nw", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_c_not_se", "copy-from": "river_c_not_se", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_c_not_sw", "copy-from": "river_c_not_sw", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_ne", "copy-from": "river_ne", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_se", "copy-from": "river_se", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_sw", "copy-from": "river_sw", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "river_nw", "copy-from": "river_nw", - "sym": "÷" + "sym": "\u00F7" }, { "//": "OVERMAP_TERRAIN_ROBOFACHQ.JSON", "type": "overmap_terrain", "id": "robofachq_roof_a0", "copy-from": "robofachq_roof_a0", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "robofachq_roof_a1", "copy-from": "robofachq_roof_a1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_roof_a2", "copy-from": "robofachq_roof_a2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_roof_a3", "copy-from": "robofachq_roof_a3", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", "id": "robofachq_surface_parking", "copy-from": "robofachq_surface_parking", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "robofachq_surface_entrance", "copy-from": "robofachq_surface_entrance", - "sym": "Õ", + "sym": "\u00D5", "color": "light_blue" }, { "type": "overmap_terrain", "id": "robofachq_surface_car_entrance", "copy-from": "robofachq_surface_car_entrance", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "robofachq_surface_a3", "copy-from": "robofachq_surface_a3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_surface_b0", "copy-from": "robofachq_surface_b0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_surface_b1", "copy-from": "robofachq_surface_b1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_surface_b2", "copy-from": "robofachq_surface_b2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_surface_b3", "copy-from": "robofachq_surface_b3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_exe_a0", "copy-from": "robofachq_exe_a0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_exe_a1", "copy-from": "robofachq_exe_a1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_exe_a2", "copy-from": "robofachq_exe_a2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_exe_a3", "copy-from": "robofachq_exe_a3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_exe_b0", "copy-from": "robofachq_exe_b0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_exe_b1", "copy-from": "robofachq_exe_b1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_exe_b2", "copy-from": "robofachq_exe_b2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_exe_b3", "copy-from": "robofachq_exe_b3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_hab_a0", "copy-from": "robofachq_hab_a0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_hab_a1", "copy-from": "robofachq_hab_a1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_hab_a2", "copy-from": "robofachq_hab_a2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_hab_a3", "copy-from": "robofachq_hab_a3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_hab_b0", "copy-from": "robofachq_hab_b0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_hab_b1", "copy-from": "robofachq_hab_b1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_hab_b2", "copy-from": "robofachq_hab_b2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_hab_b3", "copy-from": "robofachq_hab_b3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_sub_a0", "copy-from": "robofachq_sub_a0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_sub_a1", "copy-from": "robofachq_sub_a1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_sub_a2", "copy-from": "robofachq_sub_a2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_sub_a3", "copy-from": "robofachq_sub_a3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_res_a0", "copy-from": "robofachq_res_a0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_res_a1", "copy-from": "robofachq_res_a1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_res_a2", "copy-from": "robofachq_res_a2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_res_a3", "copy-from": "robofachq_res_a3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_res_b0", "copy-from": "robofachq_res_b0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_res_b1", "copy-from": "robofachq_res_b1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_res_b2", "copy-from": "robofachq_res_b2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_res_b3", "copy-from": "robofachq_res_b3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_ai_a0", "copy-from": "robofachq_ai_a0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_ai_a1", "copy-from": "robofachq_ai_a1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_ai_a2", "copy-from": "robofachq_ai_a2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_ai_a3", "copy-from": "robofachq_ai_a3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_ai_b0", "copy-from": "robofachq_ai_b0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_ai_b1", "copy-from": "robofachq_ai_b1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_ai_b2", "copy-from": "robofachq_ai_b2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_ai_b3", "copy-from": "robofachq_ai_b3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_aiutl_a0", "copy-from": "robofachq_aiutl_a0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_aiutl_a1", "copy-from": "robofachq_aiutl_a1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_aiutl_a2", "copy-from": "robofachq_aiutl_a2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_aiutl_a3", "copy-from": "robofachq_aiutl_a3", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_aiutl_b0", "copy-from": "robofachq_aiutl_b0", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_aiutl_b1", "copy-from": "robofachq_aiutl_b1", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_aiutl_b2", "copy-from": "robofachq_aiutl_b2", - "sym": "Õ" + "sym": "\u00D5" }, { "type": "overmap_terrain", "id": "robofachq_aiutl_b3", "copy-from": "robofachq_aiutl_b3", - "sym": "Õ" + "sym": "\u00D5" }, { "//": "OVERMAP_TERRAIN_TRANSPORTATION.JSON", "type": "overmap_terrain", "id": "hiway_ns", "copy-from": "hiway_ns", - "sym": "½" + "sym": "\u00BD" }, { "type": "overmap_terrain", "id": "hiway_ew", "copy-from": "hiway_ew", - "sym": "¾" + "sym": "\u00BE" }, { "type": "overmap_terrain", "id": "road_nesw_manhole", "copy-from": "road_nesw_manhole", - "sym": "Ø", + "sym": "\u00D8", "color": "cyan" }, { "type": "overmap_terrain", "id": "roadstop", "copy-from": "roadstop", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "roadstop_roof", "copy-from": "roadstop_roof", - "sym": "ç", + "sym": "\u00E7", "color": "yellow" }, { "type": "overmap_terrain", "id": "roadstop_a", "copy-from": "roadstop_a", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "roadstop_a_roof", "copy-from": "roadstop_a_roof", - "sym": "ç" + "sym": "\u00E7" }, { "type": "overmap_terrain", "id": "roadstop_b", "copy-from": "roadstop_b", - "sym": "î" + "sym": "\u00EE" }, { "type": "overmap_terrain", "id": "roadstop_b_roof", "copy-from": "roadstop_b_roof", - "sym": "î" + "sym": "\u00EE" }, { "type": "overmap_terrain", "abstract": "generic_railroad_station", "copy-from": "generic_railroad_station", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "abstract": "generic_railroad_station_under", "copy-from": "generic_railroad_station_under", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_green" }, { "type": "overmap_terrain", "abstract": "generic_railroad_station_parking_lot", "copy-from": "generic_railroad_station_parking_lot", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { @@ -22377,28 +22482,28 @@ "type": "overmap_terrain", "id": "railroad_station_2_1", "copy-from": "railroad_station_2_1", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "railroad_station_2_2", "copy-from": "railroad_station_2_2", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "railroad_station_2_3", "copy-from": "railroad_station_2_3", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "railroad_station_2_4", "copy-from": "railroad_station_2_4", - "sym": "ô", + "sym": "\u00F4", "color": "dark_gray" }, { @@ -22435,191 +22540,191 @@ "type": "overmap_terrain", "id": "trailhead", "copy-from": "trailhead", - "sym": "ñ" + "sym": "\u00F1" }, { "type": "overmap_terrain", "id": "sub_station", "copy-from": "sub_station", - "sym": "Ó", + "sym": "\u00D3", "color": "yellow" }, { "type": "overmap_terrain", "id": "sub_station_roof", "copy-from": "sub_station_roof", - "sym": "Ó", + "sym": "\u00D3", "color": "yellow" }, { "type": "overmap_terrain", "id": "sewer_sub_station", "copy-from": "sewer_sub_station", - "sym": "Ó", + "sym": "\u00D3", "color": "yellow" }, { "type": "overmap_terrain", "id": "underground_sub_station", "copy-from": "underground_sub_station", - "sym": "Ó", + "sym": "\u00D3", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_reststop_1", "copy-from": "s_reststop_1", - "sym": "ÿ", + "sym": "\u00FF", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_reststop_1_roof", "copy-from": "s_reststop_1_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_reststop_2", "copy-from": "s_reststop_2", - "sym": "ÿ", + "sym": "\u00FF", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_reststop_2_roof", "copy-from": "s_reststop_2_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "yellow" }, { "type": "overmap_terrain", "id": "s_restparking_1", "copy-from": "s_restparking_1", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", "id": "s_restparking_2", "copy-from": "s_restparking_2", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", "id": "control_tower_0", "copy-from": "control_tower_0", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "control_tower_1", "copy-from": "control_tower_1", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "control_tower_2", "copy-from": "control_tower_2", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "control_tower_roof", "copy-from": "control_tower_roof", - "sym": "í", + "sym": "\u00ED", "color": "light_gray" }, { "type": "overmap_terrain", "id": "fuel_station", "copy-from": "fuel_station", - "sym": "ú", + "sym": "\u00FA", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "fuel_station_roof", "copy-from": "fuel_station_roof", - "sym": "ú", + "sym": "\u00FA", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "airport_lot_0", "copy-from": "airport_lot_0", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", "id": "airport_lot_1", "copy-from": "airport_lot_1", - "sym": "ô" + "sym": "\u00F4" }, { "type": "overmap_terrain", "id": "hangar", "copy-from": "hangar", - "sym": "ý", + "sym": "\u00FD", "color": "light_gray" }, { "type": "overmap_terrain", "id": "hangar_roof", "copy-from": "hangar_roof", - "sym": "ý", + "sym": "\u00FD", "color": "light_gray" }, { "type": "overmap_terrain", "id": "waiting_area", "copy-from": "waiting_area", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "waiting_area_roof", "copy-from": "waiting_area_roof", - "sym": "ÿ", + "sym": "\u00FF", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "bus_stat_0", "copy-from": "bus_stat_0", - "sym": "Æ", + "sym": "\u00C6", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "bus_stat_1", "copy-from": "bus_stat_1", - "sym": "Æ", + "sym": "\u00C6", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "bus_stat_0_roof", "copy-from": "bus_stat_0_roof", - "sym": "Æ", + "sym": "\u00C6", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "bus_stat_1_roof", "copy-from": "bus_stat_1_roof", - "sym": "Æ", + "sym": "\u00C6", "color": "light_cyan" }, { "type": "overmap_terrain", "id": "parking_garage_down_0", "copy-from": "parking_garage_down_0", - "sym": "Á", + "sym": "\u00C1", "color": "light_gray" }, { @@ -22677,7 +22782,7 @@ "type": "overmap_terrain", "id": "sewage_treatment_0_0_0", "copy-from": "sewage_treatment_0_0_0", - "sym": "Ö", + "sym": "\u00D6", "color": "cyan" }, { @@ -22685,7 +22790,7 @@ "id": "sewage_treatment_0_0_roof", "copy-from": "sewage_treatment_0_0_roof", "name": "open air", - "sym": "¦" + "sym": "\u00A6" }, { "type": "overmap_terrain", @@ -22696,20 +22801,20 @@ "type": "overmap_terrain", "id": "sewage_treatment_1_0_roof", "copy-from": "sewage_treatment_1_0_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "cyan" }, { "type": "overmap_terrain", "id": "sewage_treatment_0_1_0", "copy-from": "sewage_treatment_0_1_0", - "sym": "ë" + "sym": "\u00EB" }, { "type": "overmap_terrain", "id": "sewage_treatment_0_1_roof", "copy-from": "sewage_treatment_0_1_roof", - "sym": "ë" + "sym": "\u00EB" }, { "type": "overmap_terrain", @@ -22725,7 +22830,7 @@ "type": "overmap_terrain", "id": "sewage_treatment_0_0_-1", "copy-from": "sewage_treatment_0_0_-1", - "sym": "Ö", + "sym": "\u00D6", "color": "cyan" }, { @@ -22757,175 +22862,147 @@ "type": "overmap_terrain", "id": "toxic_dump", "copy-from": "toxic_dump", - "sym": "ó", + "sym": "\u00F3", "color": "light_green" }, - { - "type": "overmap_terrain", - "id": "haz_sar_entrance", - "copy-from": "haz_sar_entrance", - "sym": "Õ", - "color": "green" - }, - { - "type": "overmap_terrain", - "id": "haz_sar", - "copy-from": "haz_sar", - "sym": "Õ", - "color": "green" - }, - { - "type": "overmap_terrain", - "id": "haz_sar_entrance_b1", - "copy-from": "haz_sar_entrance_b1", - "sym": "Õ", - "color": "green" - }, - { - "type": "overmap_terrain", - "id": "haz_sar_b1", - "copy-from": "haz_sar_b1", - "sym": "Õ", - "color": "green" - }, { "type": "overmap_terrain", "id": "pump_station_1", "copy-from": "pump_station_1", - "sym": "Ö", + "sym": "\u00D6", "color": "blue" }, { "type": "overmap_terrain", "id": "pump_station_1_roof", "copy-from": "pump_station_1_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "blue" }, { "type": "overmap_terrain", "id": "pump_station_2", "copy-from": "pump_station_2", - "sym": "Ö", + "sym": "\u00D6", "color": "blue" }, { "type": "overmap_terrain", "id": "pump_station_2_roof", "copy-from": "pump_station_2_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "blue" }, { "type": "overmap_terrain", "id": "dumpsite", "copy-from": "dumpsite", - "sym": "ó", + "sym": "\u00F3", "color": "brown" }, { "type": "overmap_terrain", "id": "dump", "copy-from": "dump", - "sym": "ó", + "sym": "\u00F3", "color": "brown" }, { "type": "overmap_terrain", "id": "recyclecenter", "copy-from": "recyclecenter", - "sym": "Ö", + "sym": "\u00D6", "color": "green" }, { "type": "overmap_terrain", "id": "recyclecenter_roof", "copy-from": "recyclecenter_roof", - "sym": "Ö", + "sym": "\u00D6", "color": "green" }, { "type": "overmap_terrain", "id": "recyclecenter_1", "copy-from": "recyclecenter_1", - "sym": "Ö", + "sym": "\u00D6", "color": "green" }, { "type": "overmap_terrain", "id": "recyclecenter_roof_1", "copy-from": "recyclecenter_roof_1", - "sym": "Ö", + "sym": "\u00D6", "color": "green" }, { "type": "overmap_terrain", "id": "recyclecenter_2", "copy-from": "recyclecenter_2", - "sym": "Ö", + "sym": "\u00D6", "color": "green" }, { "type": "overmap_terrain", "id": "recyclecenter_roof_2", "copy-from": "recyclecenter_roof_2", - "sym": "Ö", + "sym": "\u00D6", "color": "green" }, { "type": "overmap_terrain", "id": "landfill", "copy-from": "landfill", - "sym": "ó", + "sym": "\u00F3", "color": "brown" }, { "type": "overmap_terrain", "id": "junkyard_1a", "copy-from": "junkyard_1a", - "sym": "ó", + "sym": "\u00F3", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "junkyard_roof_1a", "copy-from": "junkyard_roof_1a", - "sym": "ó", + "sym": "\u00F3", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "junkyard_1b", "copy-from": "junkyard_1b", - "sym": "ó", + "sym": "\u00F3", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "junkyard_roof_1b", "copy-from": "junkyard_roof_1b", - "sym": "ó", + "sym": "\u00F3", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "junkyard_2a", "copy-from": "junkyard_2a", - "sym": "ó", + "sym": "\u00F3", "color": "dark_gray" }, { "type": "overmap_terrain", "id": "junkyard_2b", "copy-from": "junkyard_2b", - "sym": "ó", + "sym": "\u00F3", "color": "dark_gray" }, { "type": "overmap_terrain", "abstract": "generic_regional_dump", "copy-from": "generic_regional_dump", - "sym": "ó", + "sym": "\u00F3", "color": "brown" }, { @@ -23012,21 +23089,21 @@ "type": "overmap_terrain", "id": "smallscrapyard", "copy-from": "smallscrapyard", - "sym": "ó", + "sym": "\u00F3", "color": "light_gray" }, { "type": "overmap_terrain", "id": "cs_open_sewer", "copy-from": "cs_open_sewer", - "sym": "ï", + "sym": "\u00EF", "color": "cyan" }, { "type": "overmap_terrain", "id": "cs_city_dump_small", "copy-from": "cs_city_dump_small", - "sym": "ó", + "sym": "\u00F3", "color": "brown" }, { @@ -23119,12 +23196,12 @@ "type": "overmap_terrain", "id": "lake_shore", "copy-from": "lake_shore", - "sym": "÷" + "sym": "\u00F7" }, { "type": "overmap_terrain", "id": "lake_surface", "copy-from": "lake_surface", - "sym": "÷" + "sym": "\u00F7" } ] diff --git a/data/mods/Graphical_Overmap_FujiStruct/modinfo.json b/data/mods/Graphical_Overmap_FujiStruct/modinfo.json new file mode 100644 index 0000000000000..ba4dd10eece15 --- /dev/null +++ b/data/mods/Graphical_Overmap_FujiStruct/modinfo.json @@ -0,0 +1,12 @@ +[ + { + "type": "MOD_INFO", + "ident": "Graphical_Overmap_Fujistruct", + "name": "Graphical Overmap Fujistruct", + "authors": [ "Kilvoctu" ], + "maintainers": [ "Kilvoctu" ], + "description": "Fuji Structures mod support for Graphical Overmap.", + "category": "graphical", + "dependencies": [ "dda", "Graphical_Overmap", "FujiStruct" ] + } +] diff --git a/data/mods/Graphical_Overmap_FujiStruct/overmap_terrain_fujistruct.json b/data/mods/Graphical_Overmap_FujiStruct/overmap_terrain_fujistruct.json new file mode 100644 index 0000000000000..23e461bb24cc5 --- /dev/null +++ b/data/mods/Graphical_Overmap_FujiStruct/overmap_terrain_fujistruct.json @@ -0,0 +1,254 @@ +[ + { + "type": "overmap_terrain", + "id": "s_electronicstore", + "copy-from": "s_electronicstore", + "sym": "\u00E7" + }, + { + "type": "overmap_terrain", + "id": "s_electronicstore_2ndfloor", + "copy-from": "s_electronicstore" + }, + { + "type": "overmap_terrain", + "id": "s_gunstore", + "copy-from": "s_gunstore", + "sym": "\u00E7" + }, + { + "type": "overmap_terrain", + "id": "s_gunstore_2ndfloor", + "copy-from": "s_gunstore" + }, + { + "type": "overmap_terrain", + "id": "s_gunstore_roof", + "copy-from": "s_gunstore" + }, + { + "type": "overmap_terrain", + "id": "s_diner", + "copy-from": "s_diner", + "sym": "\u00E7" + }, + { + "type": "overmap_terrain", + "id": "s_diner_2ndfloor", + "copy-from": "s_diner" + }, + { + "type": "overmap_terrain", + "id": "s_diner_roof", + "copy-from": "s_diner" + }, + { + "type": "overmap_terrain", + "id": "s_apt", + "copy-from": "s_apt", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "s_apt_2ndfloor", + "copy-from": "s_apt" + }, + { + "type": "overmap_terrain", + "id": "s_apt_roof", + "copy-from": "s_apt" + }, + { + "type": "overmap_terrain", + "id": "s_apt_2", + "copy-from": "s_apt_2", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "s_apt_2_2ndfloor", + "copy-from": "s_apt_2" + }, + { + "type": "overmap_terrain", + "id": "s_apt_2_roof", + "copy-from": "s_apt_2" + }, + { + "type": "overmap_terrain", + "id": "s_cardealer", + "copy-from": "s_cardealer", + "sym": "\u00E7" + }, + { + "type": "overmap_terrain", + "id": "s_cardealer_roof", + "copy-from": "s_cardealer" + }, + { + "type": "overmap_terrain", + "id": "s_camping", + "copy-from": "s_camping", + "sym": "\u00E7" + }, + { + "type": "overmap_terrain", + "id": "s_camping_roof", + "copy-from": "s_camping" + }, + { + "type": "overmap_terrain", + "id": "s_games", + "copy-from": "s_games", + "sym": "\u00E7" + }, + { + "type": "overmap_terrain", + "id": "s_games_roof", + "copy-from": "s_games" + }, + { + "type": "overmap_terrain", + "id": "s_air_term", + "copy-from": "s_air_term", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_parking", + "copy-from": "s_air_parking", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_atc", + "copy-from": "s_air_atc", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_atc_2", + "copy-from": "s_air_atc_2", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_atc_3", + "copy-from": "s_air_atc_3", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_hangars", + "copy-from": "s_air_hangars", + "sym": "\u00FD" + }, + { + "type": "overmap_terrain", + "id": "s_air_runway", + "copy-from": "s_air_runway", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_runway_hangars", + "copy-from": "s_air_runway_hangars", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_runway_l", + "copy-from": "s_air_runway_l", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_runway_r", + "copy-from": "s_air_runway_r", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_air_runway_term", + "copy-from": "s_air_runway_term", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "s_lightindustry_road_0", + "copy-from": "s_lightindustry_road_0", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "s_lightindustry_road_1", + "copy-from": "s_lightindustry_road_1", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "s_lightindustry_00", + "copy-from": "s_lightindustry_00", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "s_lightindustry_01", + "copy-from": "s_lightindustry_01", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "s_lightindustry_10", + "copy-from": "s_lightindustry_10", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "s_lightindustry_11", + "copy-from": "s_lightindustry_11", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "s_gas_g1", + "copy-from": "s_gas_g1", + "sym": "\u00FA" + }, + { + "type": "overmap_terrain", + "id": "s_gas_g0", + "copy-from": "s_gas_g0", + "sym": "\u00FA" + }, + { + "type": "overmap_terrain", + "id": "s_gas_b11", + "copy-from": "s_gas_b11", + "sym": "\u00FA" + }, + { + "type": "overmap_terrain", + "id": "s_gas_b20", + "copy-from": "s_gas_b20", + "sym": "\u00D5" + }, + { + "type": "overmap_terrain", + "id": "s_gas_b21", + "copy-from": "s_gas_b21", + "sym": "\u00D5" + }, + { + "type": "overmap_terrain", + "id": "s_bunker_shop_g", + "copy-from": "s_bunker_shop_g", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "s_bunker_shop_b", + "copy-from": "s_bunker_shop_b", + "sym": "\u00D5" + } +] diff --git a/data/mods/Graphical_Overmap_More_Locations/modinfo.json b/data/mods/Graphical_Overmap_More_Locations/modinfo.json new file mode 100644 index 0000000000000..fbc0dd055b667 --- /dev/null +++ b/data/mods/Graphical_Overmap_More_Locations/modinfo.json @@ -0,0 +1,12 @@ +[ + { + "type": "MOD_INFO", + "ident": "Graphical_Overmap_More_Locations", + "name": "Graphical Overmap More Locations", + "authors": [ "Kilvoctu" ], + "maintainers": [ "Kilvoctu" ], + "description": "More Locations mod support for Graphical Overmap.", + "category": "graphical", + "dependencies": [ "dda", "Graphical_Overmap", "more_locations" ] + } +] diff --git a/data/mods/Graphical_Overmap_More_Locations/overmap_terrain_more_locations.json b/data/mods/Graphical_Overmap_More_Locations/overmap_terrain_more_locations.json new file mode 100644 index 0000000000000..5748527aea2c2 --- /dev/null +++ b/data/mods/Graphical_Overmap_More_Locations/overmap_terrain_more_locations.json @@ -0,0 +1,1484 @@ +[ + { + "type": "overmap_terrain", + "id": "bandit_tower_1gate", + "copy-from": "bandit_tower_1gate", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1ybe", + "copy-from": "bandit_tower_1ybe", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1yle", + "copy-from": "bandit_tower_1yle", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1yre", + "copy-from": "bandit_tower_1yre", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1yte", + "copy-from": "bandit_tower_1yte", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1cyblc", + "copy-from": "bandit_tower_1cyblc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1cybrc", + "copy-from": "bandit_tower_1cybrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1cytlc", + "copy-from": "bandit_tower_1cytlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1cytrc", + "copy-from": "bandit_tower_1cytrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1blc", + "copy-from": "bandit_tower_1blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1brc", + "copy-from": "bandit_tower_1brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1tlc", + "copy-from": "bandit_tower_1tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_1trc", + "copy-from": "bandit_tower_1trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_2blc", + "copy-from": "bandit_tower_2blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_2brc", + "copy-from": "bandit_tower_2brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_2tlc", + "copy-from": "bandit_tower_2tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_2trc", + "copy-from": "bandit_tower_2trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_3blc", + "copy-from": "bandit_tower_3blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_3brc", + "copy-from": "bandit_tower_3brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_3tlc", + "copy-from": "bandit_tower_3tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_3trc", + "copy-from": "bandit_tower_3trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_4blc", + "copy-from": "bandit_tower_4blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_4brc", + "copy-from": "bandit_tower_4brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_4tlc", + "copy-from": "bandit_tower_4tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_4trc", + "copy-from": "bandit_tower_4trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_ublc", + "copy-from": "bandit_tower_ublc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_ubrc", + "copy-from": "bandit_tower_ubrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_utlc", + "copy-from": "bandit_tower_utlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "bandit_tower_utrc", + "copy-from": "bandit_tower_utrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "estate_umid", + "copy-from": "estate_umid", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_ube", + "copy-from": "estate_ube", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_ule", + "copy-from": "estate_ule", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_ure", + "copy-from": "estate_ure", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_ute", + "copy-from": "estate_ute", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_mid", + "copy-from": "estate_mid", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1be", + "copy-from": "estate_1be", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1bloc", + "copy-from": "estate_1bloc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1broc", + "copy-from": "estate_1broc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1by", + "copy-from": "estate_1by", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1ica", + "copy-from": "estate_1ica", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1icb", + "copy-from": "estate_1icb", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1icc", + "copy-from": "estate_1icc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1icd", + "copy-from": "estate_1icd", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1le", + "copy-from": "estate_1le", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1re", + "copy-from": "estate_1re", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1te", + "copy-from": "estate_1te", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1tloc", + "copy-from": "estate_1tloc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1troc", + "copy-from": "estate_1troc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_1ty", + "copy-from": "estate_1ty", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2be", + "copy-from": "estate_2be", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2bloc", + "copy-from": "estate_2bloc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2broc", + "copy-from": "estate_2broc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2ica", + "copy-from": "estate_2ica", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2icb", + "copy-from": "estate_2icb", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2icc", + "copy-from": "estate_2icc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2icd", + "copy-from": "estate_2icd", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2le", + "copy-from": "estate_2le", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2re", + "copy-from": "estate_2re", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2te", + "copy-from": "estate_2te", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2tloc", + "copy-from": "estate_2tloc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "estate_2troc", + "copy-from": "estate_2troc", + "sym": "\u00D0" + }, + { + "type": "overmap_terrain", + "id": "factory_tlc", + "copy-from": "factory_tlc", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_te", + "copy-from": "factory_te", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_trc", + "copy-from": "factory_trc", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_le", + "copy-from": "factory_le", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_mid", + "copy-from": "factory_mid", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_re", + "copy-from": "factory_re", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_blc", + "copy-from": "factory_blc", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_be", + "copy-from": "factory_be", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_be_gate", + "copy-from": "factory_be_gate", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "factory_brc", + "copy-from": "factory_brc", + "sym": "\u00D6" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ytlc", + "copy-from": "mil_outpost_ytlc", + "sym": "\u00A8" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_yte", + "copy-from": "mil_outpost_yte", + "sym": "\u00A8" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ytrc", + "copy-from": "mil_outpost_ytrc", + "sym": "\u00A8" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_yle", + "copy-from": "mil_outpost_yle", + "sym": "\u00A8" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_yre", + "copy-from": "mil_outpost_yre", + "sym": "\u00A8" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_yblc", + "copy-from": "mil_outpost_yblc", + "sym": "\u00A8" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ybe", + "copy-from": "mil_outpost_ybe", + "sym": "\u00A8" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ybe_gate", + "copy-from": "mil_outpost_ybe_gate", + "sym": "." + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ybrc", + "copy-from": "mil_outpost_ybrc", + "sym": "\u00A8" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1tlc", + "copy-from": "mil_outpost_1tlc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1te", + "copy-from": "mil_outpost_1te", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1trc", + "copy-from": "mil_outpost_1trc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1le", + "copy-from": "mil_outpost_1le", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1mid", + "copy-from": "mil_outpost_1mid", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1re", + "copy-from": "mil_outpost_1re", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1blc", + "copy-from": "mil_outpost_1blc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1be", + "copy-from": "mil_outpost_1be", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_1brc", + "copy-from": "mil_outpost_1brc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_2tlc", + "copy-from": "mil_outpost_2tlc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_2te", + "copy-from": "mil_outpost_2te", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_2trc", + "copy-from": "mil_outpost_2trc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_2le", + "copy-from": "mil_outpost_2le", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_2re", + "copy-from": "mil_outpost_2re", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_2blc", + "copy-from": "mil_outpost_2blc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_2be", + "copy-from": "mil_outpost_2be", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_2brc", + "copy-from": "mil_outpost_2brc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_3c", + "copy-from": "mil_outpost_3c", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_utlc", + "copy-from": "mil_outpost_utlc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_utea", + "copy-from": "mil_outpost_utea", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_uteb", + "copy-from": "mil_outpost_uteb", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_utrc", + "copy-from": "mil_outpost_utrc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ule", + "copy-from": "mil_outpost_ule", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_umid", + "copy-from": "mil_outpost_umid", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_umid_finale", + "copy-from": "mil_outpost_umid_finale", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ure", + "copy-from": "mil_outpost_ure", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ublc", + "copy-from": "mil_outpost_ublc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ubea", + "copy-from": "mil_outpost_ubea", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ubeb", + "copy-from": "mil_outpost_ubeb", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "mil_outpost_ubrc", + "copy-from": "mil_outpost_ubrc", + "sym": "\u00C5" + }, + { + "type": "overmap_terrain", + "id": "3storyA_first", + "copy-from": "3storyA_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyA_second", + "copy-from": "3storyA_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyA_third", + "copy-from": "3storyA_third", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyA_basement", + "copy-from": "3storyA_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyA_roof", + "copy-from": "3storyA_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyB_first", + "copy-from": "3storyB_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyB_second", + "copy-from": "3storyB_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyB_third", + "copy-from": "3storyB_third", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyB_basement", + "copy-from": "3storyB_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyB_roof", + "copy-from": "3storyB_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyC_first", + "copy-from": "3storyC_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyC_second", + "copy-from": "3storyC_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyC_third", + "copy-from": "3storyC_third", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyC_basement", + "copy-from": "3storyC_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyC_roof", + "copy-from": "3storyC_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyD_first", + "copy-from": "3storyD_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyD_second", + "copy-from": "3storyD_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyD_third", + "copy-from": "3storyD_third", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyD_basement", + "copy-from": "3storyD_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyD_roof", + "copy-from": "3storyD_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyE_first", + "copy-from": "3storyE_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyE_second", + "copy-from": "3storyE_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyE_third", + "copy-from": "3storyE_third", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyE_basement", + "copy-from": "3storyE_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyE_roof", + "copy-from": "3storyE_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyF_first", + "copy-from": "3storyF_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyF_second", + "copy-from": "3storyF_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyF_third", + "copy-from": "3storyF_third", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyF_basement", + "copy-from": "3storyF_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "3storyF_roof", + "copy-from": "3storyF_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyA_first", + "copy-from": "2storyA_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyA_second", + "copy-from": "2storyA_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyA_basement", + "copy-from": "2storyA_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyA_roof", + "copy-from": "2storyA_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyB_first", + "copy-from": "2storyB_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyB_second", + "copy-from": "2storyB_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyB_basement", + "copy-from": "2storyB_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyB_roof", + "copy-from": "2storyB_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyC_first", + "copy-from": "2storyC_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyC_second", + "copy-from": "2storyC_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyC_basement", + "copy-from": "2storyC_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyC_roof", + "copy-from": "2storyC_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyD_first", + "copy-from": "2storyD_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyD_second", + "copy-from": "2storyD_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyD_basement", + "copy-from": "2storyD_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyD_roof", + "copy-from": "2storyD_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyE_first", + "copy-from": "2storyE_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyE_second", + "copy-from": "2storyE_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyE_basement", + "copy-from": "2storyE_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyE_roof", + "copy-from": "2storyE_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyF_first", + "copy-from": "2storyF_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyF_second", + "copy-from": "2storyF_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyF_basement", + "copy-from": "2storyF_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "2storyF_roof", + "copy-from": "2storyF_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseA_first", + "copy-from": "combohouseA_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseA_second", + "copy-from": "combohouseA_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseA_basement", + "copy-from": "combohouseA_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseA_roof", + "copy-from": "combohouseA_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combogarageA_first", + "copy-from": "combogarageA_first", + "sym": "^" + }, + { + "type": "overmap_terrain", + "id": "combogarageA_second", + "copy-from": "combogarageA_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combogarageA_roof", + "copy-from": "combogarageA_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseB_first", + "copy-from": "combohouseB_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseB_second", + "copy-from": "combohouseB_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseB_basement", + "copy-from": "combohouseB_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseB_roof", + "copy-from": "combohouseB_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combogarageB_first", + "copy-from": "combogarageB_first", + "sym": "^" + }, + { + "type": "overmap_terrain", + "id": "combogarageB_second", + "copy-from": "combogarageB_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combogarageB_roof", + "copy-from": "combogarageB_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseC_first", + "copy-from": "combohouseC_first", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseC_second", + "copy-from": "combohouseC_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseC_basement", + "copy-from": "combohouseC_basement", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combohouseC_roof", + "copy-from": "combohouseC_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combogarageC_first", + "copy-from": "combogarageC_first", + "sym": "^" + }, + { + "type": "overmap_terrain", + "id": "combogarageC_second", + "copy-from": "combogarageC_second", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "combogarageC_roof", + "copy-from": "combogarageC_roof", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1gate", + "copy-from": "refugee_tower_1gate", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1ybe", + "copy-from": "refugee_tower_1ybe", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1yle", + "copy-from": "refugee_tower_1yle", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1yre", + "copy-from": "refugee_tower_1yre", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1yte", + "copy-from": "refugee_tower_1yte", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1cyblc", + "copy-from": "refugee_tower_1cyblc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1cybrc", + "copy-from": "refugee_tower_1cybrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1cytlc", + "copy-from": "refugee_tower_1cytlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1cytrc", + "copy-from": "refugee_tower_1cytrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1blc", + "copy-from": "refugee_tower_1blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1brc", + "copy-from": "refugee_tower_1brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1tlc", + "copy-from": "refugee_tower_1tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_1trc", + "copy-from": "refugee_tower_1trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_2blc", + "copy-from": "refugee_tower_2blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_2brc", + "copy-from": "refugee_tower_2brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_2tlc", + "copy-from": "refugee_tower_2tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_2trc", + "copy-from": "refugee_tower_2trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_3blc", + "copy-from": "refugee_tower_3blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_3brc", + "copy-from": "refugee_tower_3brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_3tlc", + "copy-from": "refugee_tower_3tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_3trc", + "copy-from": "refugee_tower_3trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_4blc", + "copy-from": "refugee_tower_4blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_4brc", + "copy-from": "refugee_tower_4brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_4tlc", + "copy-from": "refugee_tower_4tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_4trc", + "copy-from": "refugee_tower_4trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_5blc", + "copy-from": "refugee_tower_5blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_5brc", + "copy-from": "refugee_tower_5brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_5tlc", + "copy-from": "refugee_tower_5tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_5trc", + "copy-from": "refugee_tower_5trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_ublc", + "copy-from": "refugee_tower_ublc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_ubrc", + "copy-from": "refugee_tower_ubrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_utlc", + "copy-from": "refugee_tower_utlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "refugee_tower_utrc", + "copy-from": "refugee_tower_utrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1gate", + "copy-from": "tri_tower_1gate", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1ybe", + "copy-from": "tri_tower_1ybe", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1yle", + "copy-from": "tri_tower_1yle", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1yre", + "copy-from": "tri_tower_1yre", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1yte", + "copy-from": "tri_tower_1yte", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1cyblc", + "copy-from": "tri_tower_1cyblc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1cybrc", + "copy-from": "tri_tower_1cybrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1cytlc", + "copy-from": "tri_tower_1cytlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1cytrc", + "copy-from": "tri_tower_1cytrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1blc", + "copy-from": "tri_tower_1blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1brc", + "copy-from": "tri_tower_1brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1tlc", + "copy-from": "tri_tower_1tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_1trc", + "copy-from": "tri_tower_1trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_2blc", + "copy-from": "tri_tower_2blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_2brc", + "copy-from": "tri_tower_2brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_2tlc", + "copy-from": "tri_tower_2tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_2trc", + "copy-from": "tri_tower_2trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_3blc", + "copy-from": "tri_tower_3blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_3brc", + "copy-from": "tri_tower_3brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_3tlc", + "copy-from": "tri_tower_3tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_3trc", + "copy-from": "tri_tower_3trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_4blc", + "copy-from": "tri_tower_4blc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_4brc", + "copy-from": "tri_tower_4brc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_4tlc", + "copy-from": "tri_tower_4tlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_4trc", + "copy-from": "tri_tower_4trc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_ublc", + "copy-from": "tri_tower_ublc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_ubrc", + "copy-from": "tri_tower_ubrc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_utlc", + "copy-from": "tri_tower_utlc", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "tri_tower_utrc", + "copy-from": "tri_tower_utrc", + "sym": "\u00C7" + } +] diff --git a/data/mods/Graphical_Overmap_Urban_Development/modinfo.json b/data/mods/Graphical_Overmap_Urban_Development/modinfo.json new file mode 100644 index 0000000000000..c91980ad42d55 --- /dev/null +++ b/data/mods/Graphical_Overmap_Urban_Development/modinfo.json @@ -0,0 +1,12 @@ +[ + { + "type": "MOD_INFO", + "ident": "Graphical_Overmap_Urban_Development", + "name": "Graphical Overmap Urban Development", + "authors": [ "Kilvoctu" ], + "maintainers": [ "Kilvoctu" ], + "description": "Urban Development mod support for Graphical Overmap.", + "category": "graphical", + "dependencies": [ "dda", "Graphical_Overmap", "Urban_Development" ] + } +] diff --git a/data/mods/Graphical_Overmap_Urban_Development/overmap_terrain_urban_development.json b/data/mods/Graphical_Overmap_Urban_Development/overmap_terrain_urban_development.json new file mode 100644 index 0000000000000..396e65f6b3e3e --- /dev/null +++ b/data/mods/Graphical_Overmap_Urban_Development/overmap_terrain_urban_development.json @@ -0,0 +1,2914 @@ +[ + { + "type": "overmap_terrain", + "id": "urban_1_1", + "copy-from": "urban_1_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_1_2", + "copy-from": "urban_1_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_1_3", + "copy-from": "urban_1_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_1_4", + "copy-from": "urban_1_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_1_6", + "copy-from": "urban_1_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_2_1", + "copy-from": "urban_2_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_2_2", + "copy-from": "urban_2_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_2_3", + "copy-from": "urban_2_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_2_4", + "copy-from": "urban_2_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_2_5", + "copy-from": "urban_2_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_2_6", + "copy-from": "urban_2_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_3_1", + "copy-from": "urban_3_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_3_2", + "copy-from": "urban_3_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_3_3", + "copy-from": "urban_3_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_3_4", + "copy-from": "urban_3_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_3_5", + "copy-from": "urban_3_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_3_6", + "copy-from": "urban_3_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_4_1", + "copy-from": "urban_4_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_4_2", + "copy-from": "urban_4_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_4_3", + "copy-from": "urban_4_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_4_4", + "copy-from": "urban_4_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_4_5", + "copy-from": "urban_4_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_4_6", + "copy-from": "urban_4_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_4_7", + "copy-from": "urban_4_7", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_4_8", + "copy-from": "urban_4_8", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_5_1", + "copy-from": "urban_5_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_5_2", + "copy-from": "urban_5_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_5_3", + "copy-from": "urban_5_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_5_4", + "copy-from": "urban_5_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_5_5", + "copy-from": "urban_5_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_5_6", + "copy-from": "urban_5_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_6_1", + "copy-from": "urban_6_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_6_2", + "copy-from": "urban_6_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_6_3", + "copy-from": "urban_6_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_6_4", + "copy-from": "urban_6_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_6_5", + "copy-from": "urban_6_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_6_6", + "copy-from": "urban_6_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_7_1", + "copy-from": "urban_7_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_7_2", + "copy-from": "urban_7_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_7_3", + "copy-from": "urban_7_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_7_4", + "copy-from": "urban_7_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_7_5", + "copy-from": "urban_7_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_7_6", + "copy-from": "urban_7_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_8_1", + "copy-from": "urban_8_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_8_2", + "copy-from": "urban_8_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_8_3", + "copy-from": "urban_8_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_8_4", + "copy-from": "urban_8_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_8_6", + "copy-from": "urban_8_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_9_1", + "copy-from": "urban_9_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_9_2", + "copy-from": "urban_9_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_9_3", + "copy-from": "urban_9_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_9_4", + "copy-from": "urban_9_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_9_5", + "copy-from": "urban_9_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_9_6", + "copy-from": "urban_9_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_10_1", + "copy-from": "urban_10_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_10_2", + "copy-from": "urban_10_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_10_3", + "copy-from": "urban_10_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_10_4", + "copy-from": "urban_10_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_10_5", + "copy-from": "urban_10_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_10_6", + "copy-from": "urban_10_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_11_1", + "copy-from": "urban_11_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_11_2", + "copy-from": "urban_11_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_11_3", + "copy-from": "urban_11_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_11_4", + "copy-from": "urban_11_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_11_5", + "copy-from": "urban_11_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_11_6", + "copy-from": "urban_11_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_12_1", + "copy-from": "urban_12_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_12_2", + "copy-from": "urban_12_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_12_3", + "copy-from": "urban_12_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_12_4", + "copy-from": "urban_12_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_12_5", + "copy-from": "urban_12_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_12_6", + "copy-from": "urban_12_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_13_1", + "copy-from": "urban_13_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_2", + "copy-from": "urban_13_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_3", + "copy-from": "urban_13_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_4", + "copy-from": "urban_13_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_5", + "copy-from": "urban_13_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_6", + "copy-from": "urban_13_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_7", + "copy-from": "urban_13_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_8", + "copy-from": "urban_13_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_9", + "copy-from": "urban_13_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_10", + "copy-from": "urban_13_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_11", + "copy-from": "urban_13_11", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_13_12", + "copy-from": "urban_13_12", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_1", + "copy-from": "urban_14_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_2", + "copy-from": "urban_14_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_3", + "copy-from": "urban_14_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_4", + "copy-from": "urban_14_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_5", + "copy-from": "urban_14_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_6", + "copy-from": "urban_14_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_7", + "copy-from": "urban_14_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_8", + "copy-from": "urban_14_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_9", + "copy-from": "urban_14_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_10", + "copy-from": "urban_14_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_11", + "copy-from": "urban_14_11", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_12", + "copy-from": "urban_14_12", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_13", + "copy-from": "urban_14_13", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_14_14", + "copy-from": "urban_14_14", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_15_1", + "copy-from": "urban_15_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_15_2", + "copy-from": "urban_15_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_15_3", + "copy-from": "urban_15_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_15_4", + "copy-from": "urban_15_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_15_5", + "copy-from": "urban_15_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_15_6", + "copy-from": "urban_15_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_16_1", + "copy-from": "urban_16_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_16_2", + "copy-from": "urban_16_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_16_3", + "copy-from": "urban_16_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_16_4", + "copy-from": "urban_16_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_17_1", + "copy-from": "urban_17_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_17_2", + "copy-from": "urban_17_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_17_3", + "copy-from": "urban_17_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_17_4", + "copy-from": "urban_17_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_18_1", + "copy-from": "urban_18_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_18_2", + "copy-from": "urban_18_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_18_3", + "copy-from": "urban_18_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_18_4", + "copy-from": "urban_18_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_18_5", + "copy-from": "urban_18_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_18_6", + "copy-from": "urban_18_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_18_7", + "copy-from": "urban_18_7", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_18_8", + "copy-from": "urban_18_8", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_18_9", + "copy-from": "urban_18_9", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_18_10", + "copy-from": "urban_18_10", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_1", + "copy-from": "urban_19_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_19_2", + "copy-from": "urban_19_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_19_3", + "copy-from": "urban_19_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_4", + "copy-from": "urban_19_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_5", + "copy-from": "urban_19_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_6", + "copy-from": "urban_19_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_7", + "copy-from": "urban_19_7", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_8", + "copy-from": "urban_19_8", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_9", + "copy-from": "urban_19_9", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_10", + "copy-from": "urban_19_10", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_11", + "copy-from": "urban_19_11", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_19_12", + "copy-from": "urban_19_12", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_20_1", + "copy-from": "urban_20_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_20_2", + "copy-from": "urban_20_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_20_3", + "copy-from": "urban_20_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_20_4", + "copy-from": "urban_20_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_20_5", + "copy-from": "urban_20_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_20_6", + "copy-from": "urban_20_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_20_7", + "copy-from": "urban_20_7", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_20_8", + "copy-from": "urban_20_8", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_21_1", + "copy-from": "urban_21_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_21_2", + "copy-from": "urban_21_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_21_3", + "copy-from": "urban_21_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_21_4", + "copy-from": "urban_21_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_22_1", + "copy-from": "urban_22_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_22_2", + "copy-from": "urban_22_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_22_3", + "copy-from": "urban_22_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_22_4", + "copy-from": "urban_22_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_23_1", + "copy-from": "urban_23_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_2", + "copy-from": "urban_23_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_3", + "copy-from": "urban_23_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_4", + "copy-from": "urban_23_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_5", + "copy-from": "urban_23_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_6", + "copy-from": "urban_23_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_7", + "copy-from": "urban_23_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_8", + "copy-from": "urban_23_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_9", + "copy-from": "urban_23_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_10", + "copy-from": "urban_23_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_23_11", + "copy-from": "urban_23_11", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_1", + "copy-from": "urban_24_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_2", + "copy-from": "urban_24_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_3", + "copy-from": "urban_24_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_4", + "copy-from": "urban_24_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_5", + "copy-from": "urban_24_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_6", + "copy-from": "urban_24_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_7", + "copy-from": "urban_24_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_8", + "copy-from": "urban_24_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_9", + "copy-from": "urban_24_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_10", + "copy-from": "urban_24_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_11", + "copy-from": "urban_24_11", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_12", + "copy-from": "urban_24_12", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_24_14", + "copy-from": "urban_24_14", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_1", + "copy-from": "urban_25_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_2", + "copy-from": "urban_25_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_3", + "copy-from": "urban_25_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_4", + "copy-from": "urban_25_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_5", + "copy-from": "urban_25_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_6", + "copy-from": "urban_25_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_7", + "copy-from": "urban_25_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_8", + "copy-from": "urban_25_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_9", + "copy-from": "urban_25_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_10", + "copy-from": "urban_25_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_25_12", + "copy-from": "urban_25_12", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_1", + "copy-from": "urban_26_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_2", + "copy-from": "urban_26_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_3", + "copy-from": "urban_26_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_4", + "copy-from": "urban_26_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_5", + "copy-from": "urban_26_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_6", + "copy-from": "urban_26_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_7", + "copy-from": "urban_26_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_8", + "copy-from": "urban_26_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_9", + "copy-from": "urban_26_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_10", + "copy-from": "urban_26_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_11", + "copy-from": "urban_26_11", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_26_12", + "copy-from": "urban_26_12", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_1", + "copy-from": "urban_27_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_2", + "copy-from": "urban_27_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_3", + "copy-from": "urban_27_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_4", + "copy-from": "urban_27_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_5", + "copy-from": "urban_27_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_6", + "copy-from": "urban_27_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_7", + "copy-from": "urban_27_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_8", + "copy-from": "urban_27_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_9", + "copy-from": "urban_27_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_10", + "copy-from": "urban_27_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_11", + "copy-from": "urban_27_11", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_12", + "copy-from": "urban_27_12", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_27_13", + "copy-from": "urban_27_13", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_1", + "copy-from": "urban_28_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_2", + "copy-from": "urban_28_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_3", + "copy-from": "urban_28_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_4", + "copy-from": "urban_28_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_5", + "copy-from": "urban_28_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_6", + "copy-from": "urban_28_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_7", + "copy-from": "urban_28_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_8", + "copy-from": "urban_28_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_9", + "copy-from": "urban_28_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_10", + "copy-from": "urban_28_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_28_11", + "copy-from": "urban_28_11", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_1", + "copy-from": "urban_29_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_2", + "copy-from": "urban_29_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_3", + "copy-from": "urban_29_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_4", + "copy-from": "urban_29_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_5", + "copy-from": "urban_29_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_6", + "copy-from": "urban_29_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_7", + "copy-from": "urban_29_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_8", + "copy-from": "urban_29_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_9", + "copy-from": "urban_29_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_29_10", + "copy-from": "urban_29_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_1", + "copy-from": "urban_30_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_2", + "copy-from": "urban_30_2", + "sym": "S" + }, + { + "type": "overmap_terrain", + "id": "urban_30_3", + "copy-from": "urban_30_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_4", + "copy-from": "urban_30_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_5", + "copy-from": "urban_30_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_6", + "copy-from": "urban_30_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_7", + "copy-from": "urban_30_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_8", + "copy-from": "urban_30_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_9", + "copy-from": "urban_30_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_30_10", + "copy-from": "urban_30_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_31_1", + "copy-from": "urban_31_1", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_2", + "copy-from": "urban_31_2", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_3", + "copy-from": "urban_31_3", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_4", + "copy-from": "urban_31_4", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_5", + "copy-from": "urban_31_5", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_6", + "copy-from": "urban_31_6", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_7", + "copy-from": "urban_31_7", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_8", + "copy-from": "urban_31_8", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_9", + "copy-from": "urban_31_9", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_10", + "copy-from": "urban_31_10", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_11", + "copy-from": "urban_31_11", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_12", + "copy-from": "urban_31_12", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_13", + "copy-from": "urban_31_13", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_15", + "copy-from": "urban_31_15", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_16", + "copy-from": "urban_31_16", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_17", + "copy-from": "urban_31_17", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_31_19", + "copy-from": "urban_31_19", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_32_1", + "copy-from": "urban_32_1", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_2", + "copy-from": "urban_32_2", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_3", + "copy-from": "urban_32_3", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_4", + "copy-from": "urban_32_4", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_5", + "copy-from": "urban_32_5", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_6", + "copy-from": "urban_32_6", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_7", + "copy-from": "urban_32_7", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_8", + "copy-from": "urban_32_8", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_9", + "copy-from": "urban_32_9", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_10", + "copy-from": "urban_32_10", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_11", + "copy-from": "urban_32_11", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_12", + "copy-from": "urban_32_12", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_13", + "copy-from": "urban_32_13", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_14", + "copy-from": "urban_32_14", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_15", + "copy-from": "urban_32_15", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_16", + "copy-from": "urban_32_16", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_17", + "copy-from": "urban_32_17", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_18", + "copy-from": "urban_32_18", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_19", + "copy-from": "urban_32_19", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_20", + "copy-from": "urban_32_20", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_32_21", + "copy-from": "urban_32_21", + "sym": "\u00C6" + }, + { + "type": "overmap_terrain", + "id": "urban_33_1", + "copy-from": "urban_33_1", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_2", + "copy-from": "urban_33_2", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_3", + "copy-from": "urban_33_3", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_4", + "copy-from": "urban_33_4", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_5", + "copy-from": "urban_33_5", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_6", + "copy-from": "urban_33_6", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_7", + "copy-from": "urban_33_7", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_8", + "copy-from": "urban_33_8", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_9", + "copy-from": "urban_33_9", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_10", + "copy-from": "urban_33_10", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_11", + "copy-from": "urban_33_11", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_12", + "copy-from": "urban_33_12", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_13", + "copy-from": "urban_33_13", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_14", + "copy-from": "urban_33_14", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_15", + "copy-from": "urban_33_15", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_16", + "copy-from": "urban_33_16", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_17", + "copy-from": "urban_33_17", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_18", + "copy-from": "urban_33_18", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_19", + "copy-from": "urban_33_19", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_20", + "copy-from": "urban_33_20", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_21", + "copy-from": "urban_33_21", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_22", + "copy-from": "urban_33_22", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_23", + "copy-from": "urban_33_23", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_24", + "copy-from": "urban_33_24", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_25", + "copy-from": "urban_33_25", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_26", + "copy-from": "urban_33_26", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_27", + "copy-from": "urban_33_27", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_28", + "copy-from": "urban_33_28", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_29", + "copy-from": "urban_33_29", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_30", + "copy-from": "urban_33_30", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_31", + "copy-from": "urban_33_31", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_32", + "copy-from": "urban_33_32", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_34", + "copy-from": "urban_33_34", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_35", + "copy-from": "urban_33_35", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_33_36", + "copy-from": "urban_33_36", + "sym": "\u00F4" + }, + { + "type": "overmap_terrain", + "id": "urban_34_1", + "copy-from": "urban_34_1", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_2", + "copy-from": "urban_34_2", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_3", + "copy-from": "urban_34_3", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_4", + "copy-from": "urban_34_4", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_5", + "copy-from": "urban_34_5", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_6", + "copy-from": "urban_34_6", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_7", + "copy-from": "urban_34_7", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_8", + "copy-from": "urban_34_8", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_9", + "copy-from": "urban_34_9", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_10", + "copy-from": "urban_34_10", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_11", + "copy-from": "urban_34_11", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_12", + "copy-from": "urban_34_12", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_13", + "copy-from": "urban_34_13", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_14", + "copy-from": "urban_34_14", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_15", + "copy-from": "urban_34_15", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_16", + "copy-from": "urban_34_16", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_17", + "copy-from": "urban_34_17", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_34_19", + "copy-from": "urban_34_19", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_1", + "copy-from": "urban_35_1", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_2", + "copy-from": "urban_35_2", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_3", + "copy-from": "urban_35_3", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_4", + "copy-from": "urban_35_4", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_5", + "copy-from": "urban_35_5", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_6", + "copy-from": "urban_35_6", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_7", + "copy-from": "urban_35_7", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_8", + "copy-from": "urban_35_8", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_9", + "copy-from": "urban_35_9", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_10", + "copy-from": "urban_35_10", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_11", + "copy-from": "urban_35_11", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_12", + "copy-from": "urban_35_12", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_13", + "copy-from": "urban_35_13", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_14", + "copy-from": "urban_35_14", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_15", + "copy-from": "urban_35_15", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_16", + "copy-from": "urban_35_16", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_17", + "copy-from": "urban_35_17", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_18", + "copy-from": "urban_35_18", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_19", + "copy-from": "urban_35_19", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_20", + "copy-from": "urban_35_20", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_21", + "copy-from": "urban_35_21", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_22", + "copy-from": "urban_35_22", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_35_23", + "copy-from": "urban_35_23", + "sym": "\u00C1" + }, + { + "type": "overmap_terrain", + "id": "urban_36_1", + "copy-from": "urban_36_1", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_2", + "copy-from": "urban_36_2", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_3", + "copy-from": "urban_36_3", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_4", + "copy-from": "urban_36_4", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_5", + "copy-from": "urban_36_5", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_6", + "copy-from": "urban_36_6", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_7", + "copy-from": "urban_36_7", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_8", + "copy-from": "urban_36_8", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_9", + "copy-from": "urban_36_9", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_10", + "copy-from": "urban_36_10", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_11", + "copy-from": "urban_36_11", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_12", + "copy-from": "urban_36_12", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_13", + "copy-from": "urban_36_13", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_14", + "copy-from": "urban_36_14", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_15", + "copy-from": "urban_36_15", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_16", + "copy-from": "urban_36_16", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_17", + "copy-from": "urban_36_17", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_18", + "copy-from": "urban_36_18", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_19", + "copy-from": "urban_36_19", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_20", + "copy-from": "urban_36_20", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_21", + "copy-from": "urban_36_21", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_22", + "copy-from": "urban_36_22", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_23", + "copy-from": "urban_36_23", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_24", + "copy-from": "urban_36_24", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_25", + "copy-from": "urban_36_25", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_26", + "copy-from": "urban_36_26", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_27", + "copy-from": "urban_36_27", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_28", + "copy-from": "urban_36_28", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_29", + "copy-from": "urban_36_29", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_30", + "copy-from": "urban_36_30", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_31", + "copy-from": "urban_36_31", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_36_32", + "copy-from": "urban_36_32", + "sym": "\u00C7" + }, + { + "type": "overmap_terrain", + "id": "urban_37_1", + "copy-from": "urban_37_1", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_2", + "copy-from": "urban_37_2", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_3", + "copy-from": "urban_37_3", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_4", + "copy-from": "urban_37_4", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_5", + "copy-from": "urban_37_5", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_6", + "copy-from": "urban_37_6", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_7", + "copy-from": "urban_37_7", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_8", + "copy-from": "urban_37_8", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_9", + "copy-from": "urban_37_9", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_10", + "copy-from": "urban_37_10", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_11", + "copy-from": "urban_37_11", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_12", + "copy-from": "urban_37_12", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_13", + "copy-from": "urban_37_13", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_14", + "copy-from": "urban_37_14", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_15", + "copy-from": "urban_37_15", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_16", + "copy-from": "urban_37_16", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_17", + "copy-from": "urban_37_17", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_18", + "copy-from": "urban_37_18", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_19", + "copy-from": "urban_37_19", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_20", + "copy-from": "urban_37_20", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_21", + "copy-from": "urban_37_21", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_22", + "copy-from": "urban_37_22", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_23", + "copy-from": "urban_37_23", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_24", + "copy-from": "urban_37_24", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_25", + "copy-from": "urban_37_25", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_26", + "copy-from": "urban_37_26", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_27", + "copy-from": "urban_37_27", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_28", + "copy-from": "urban_37_28", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_29", + "copy-from": "urban_37_29", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_30", + "copy-from": "urban_37_30", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_31", + "copy-from": "urban_37_31", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_32", + "copy-from": "urban_37_32", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_33", + "copy-from": "urban_37_33", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_34", + "copy-from": "urban_37_34", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_35", + "copy-from": "urban_37_35", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_37_36", + "copy-from": "urban_37_36", + "sym": "\u00E5", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_38_1", + "copy-from": "urban_38_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_2", + "copy-from": "urban_38_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_3", + "copy-from": "urban_38_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_4", + "copy-from": "urban_38_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_5", + "copy-from": "urban_38_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_6", + "copy-from": "urban_38_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_7", + "copy-from": "urban_38_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_8", + "copy-from": "urban_38_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_9", + "copy-from": "urban_38_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_10", + "copy-from": "urban_38_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_11", + "copy-from": "urban_38_11", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_38_12", + "copy-from": "urban_38_12", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_1", + "copy-from": "urban_39_1", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_2", + "copy-from": "urban_39_2", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_3", + "copy-from": "urban_39_3", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_4", + "copy-from": "urban_39_4", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_5", + "copy-from": "urban_39_5", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_6", + "copy-from": "urban_39_6", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_7", + "copy-from": "urban_39_7", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_8", + "copy-from": "urban_39_8", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_9", + "copy-from": "urban_39_9", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_39_10", + "copy-from": "urban_39_10", + "sym": "\u00E0" + }, + { + "type": "overmap_terrain", + "id": "urban_40_1", + "copy-from": "urban_40_1", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_40_2", + "copy-from": "urban_40_2", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_40_3", + "copy-from": "urban_40_3", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_40_4", + "copy-from": "urban_40_4", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_40_5", + "copy-from": "urban_40_5", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_40_6", + "copy-from": "urban_40_6", + "sym": "\u00E0", + "color": "light_gray" + }, + { + "type": "overmap_terrain", + "id": "urban_41_1", + "copy-from": "urban_41_1", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_41_2", + "copy-from": "urban_41_2", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_41_3", + "copy-from": "urban_41_3", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_41_4", + "copy-from": "urban_41_4", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_41_5", + "copy-from": "urban_41_5", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_41_6", + "copy-from": "urban_41_6", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_41_7", + "copy-from": "urban_41_7", + "sym": "\u00FF" + }, + { + "type": "overmap_terrain", + "id": "urban_41_8", + "copy-from": "urban_41_8", + "sym": "\u00FF" + } +] diff --git a/data/mods/Growable_pots/items.json b/data/mods/Growable_pots/items.json index 80a341d9e4e90..109ac18afd748 100644 --- a/data/mods/Growable_pots/items.json +++ b/data/mods/Growable_pots/items.json @@ -8,9 +8,9 @@ "description": "A special pot for growing plants, maintaining them at comfortable conditions for maximum yield. It can be crafted with various seeds to plant them.", "price": 600, "material": "clay", - "weight": 280, - "volume": 8, - "contains": 5, + "weight": "280 g", + "volume": "2 L", + "contains": "1250 ml", "bashing": 1, "cutting": 0, "category": "tools", @@ -19,21 +19,21 @@ { "type": "GENERIC", "abstract": "gp_pot_growing", - "name": "garden pot (growing)", + "name": { "str": "garden pot (growing)", "str_pl": "garden pots (growing)" }, "description": "A garden pot growing some tasty, unnameable plants. You shouldn't see this item.", - "weight": 480, + "weight": "480 g", "symbol": ")", "color": "brown", "price": 1300, "material": [ "clay", "veggy" ], - "volume": 10, + "volume": "2500 ml", "bashing": 1, "category": "tools" }, { "type": "GENERIC", "abstract": "gp_pot_grown", - "name": "garden pot (grown)", + "name": { "str": "garden pot (grown)", "str_pl": "garden pots (grown)" }, "description": "A garden pot with some ripe, unnameable plants. You shouldn't see this item.", "copy-from": "gp_pot_growing", "use_action": "DISASSEMBLE" diff --git a/data/mods/Growable_pots/recipes.json b/data/mods/Growable_pots/recipes.json index 18faff309356c..88319c3c55258 100644 --- a/data/mods/Growable_pots/recipes.json +++ b/data/mods/Growable_pots/recipes.json @@ -26,9 +26,6 @@ { "type": "uncraft", "result": "gp_tomato_ready", - "id_suffix": "for_tomato", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "tomato", 21 ] ] ] @@ -47,8 +44,6 @@ { "type": "uncraft", "result": "gp_wheat_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "wheat", 21 ] ] ] @@ -67,8 +62,6 @@ { "type": "uncraft", "result": "gp_hops_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "hops", 21 ] ] ] @@ -87,8 +80,6 @@ { "type": "uncraft", "result": "gp_buckwheat_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "buckwheat", 21 ] ] ] @@ -107,8 +98,6 @@ { "type": "uncraft", "result": "gp_broccoli_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "broccoli", 21 ] ] ] @@ -127,8 +116,6 @@ { "type": "uncraft", "result": "gp_oats_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "oats", 21 ] ] ] @@ -147,8 +134,6 @@ { "type": "uncraft", "result": "gp_barley_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "barley", 21 ] ] ] @@ -167,8 +152,6 @@ { "type": "uncraft", "result": "gp_carrot_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "seed_carrot", 1 ] ], [ [ "carrot", 20 ] ] ] @@ -187,8 +170,6 @@ { "type": "uncraft", "result": "gp_cotton_boll_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "seed_cotton_boll", 1 ] ], [ [ "cotton_boll", 20 ] ] ] @@ -207,8 +188,6 @@ { "type": "uncraft", "result": "gp_cabbage_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "seed_cabbage", 1 ] ], [ [ "cabbage", 20 ] ] ] @@ -227,8 +206,6 @@ { "type": "uncraft", "result": "gp_cucumber_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "cucumber", 20 ] ] ] @@ -247,8 +224,6 @@ { "type": "uncraft", "result": "gp_garlic_ready", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", "skill_used": "survival", "time": 500, "components": [ [ [ "gp_pot", 1 ] ], [ [ "garlic", 20 ] ] ] diff --git a/data/mods/Hydroponics/furniture.json b/data/mods/Hydroponics/furniture.json index 0d0ea0c129cd5..7554bc2ff448c 100644 --- a/data/mods/Hydroponics/furniture.json +++ b/data/mods/Hydroponics/furniture.json @@ -26,7 +26,7 @@ "type": "furniture", "id": "f_hydroponics_seed", "name": "hydroponics unit with seed", - "description": "This is a self-contained hydroponics unit used to grow crops indoors. This one contains a planted seed", + "description": "This is a self-contained hydroponics unit used to grow crops indoors. This one contains a planted seed", "symbol": "^", "color": "brown", "looks_like": "f_plant_seed", @@ -39,7 +39,7 @@ "type": "furniture", "id": "f_hydroponics_seedling", "name": "hydroponics unit with seedling", - "description": "This is a self-contained hydroponics unit used to grow crops indoors. This one contains a planted seedling", + "description": "This is a self-contained hydroponics unit used to grow crops indoors. This one contains a planted seedling", "symbol": "^", "color": "green", "looks_like": "f_plant_seedling", @@ -52,7 +52,7 @@ "type": "furniture", "id": "f_hydroponics_mature", "name": "hydroponics unit with mature plant", - "description": "This is a self-contained hydroponics unit used to grow crops indoors. This one contains a mature plant.", + "description": "This is a self-contained hydroponics unit used to grow crops indoors. This one contains a mature plant.", "symbol": "#", "color": "green", "looks_like": "f_plant_mature", @@ -66,7 +66,7 @@ "type": "furniture", "id": "f_hydroponics_harvest", "name": "hydroponics unit with harvestable plant", - "description": "This is a self-contained hydroponics unit used to grow crops indoors. This one contains a mature plant that is ready for harvest.", + "description": "This is a self-contained hydroponics unit used to grow crops indoors. This one contains a mature plant that is ready for harvest.", "symbol": "#", "color": "light_green", "looks_like": "f_plant_harvest", diff --git a/data/mods/Hydroponics/game_balance.json b/data/mods/Hydroponics/game_balance.json index 3633ecb013fad..aacb68c06841b 100644 --- a/data/mods/Hydroponics/game_balance.json +++ b/data/mods/Hydroponics/game_balance.json @@ -2,7 +2,6 @@ { "type": "EXTERNAL_OPTION", "name": "MAX_HARVEST_COUNT", - "info": "The maximum amount of produce that can be harvested from a plant.", "stype": "int", "value": 30 } diff --git a/data/mods/Hydroponics/modinfo.json b/data/mods/Hydroponics/modinfo.json index b0e3a2d65bcd1..2ed7f37096e28 100644 --- a/data/mods/Hydroponics/modinfo.json +++ b/data/mods/Hydroponics/modinfo.json @@ -5,7 +5,7 @@ "name": "Hydroponics", "authors": [ "Unknown" ], "maintainers": [ "Tiny Hippo" ], - "description": "Adds hydroponic units, a furniture which can have crops planted in it for increased yields. Spawn occasionally in labs or basements. Or build your own.", + "description": "Adds hydroponic units, a furniture which can have crops planted in it for increased yields. Spawn occasionally in labs or basements. Or build your own.", "category": "misc_additions", "dependencies": [ "dda" ] } diff --git a/data/mods/Hydroponics/terrain.json b/data/mods/Hydroponics/terrain.json index eab802c3b1498..53f6b96939977 100644 --- a/data/mods/Hydroponics/terrain.json +++ b/data/mods/Hydroponics/terrain.json @@ -3,7 +3,7 @@ "type": "terrain", "id": "t_hydrop_generic", "name": "LEGACY hydroponics unit", - "description": "This is a deprecated hydroponics unit. Deconstruct it to recieve your materials back.", + "description": "This is a deprecated hydroponics unit. Deconstruct it to recieve your materials back.", "symbol": "^", "color": "light_blue", "move_cost": 0, diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json index a65af0309383e..130d1ba5828a1 100644 --- a/data/mods/MMA/martialarts.json +++ b/data/mods/MMA/martialarts.json @@ -13,7 +13,6 @@ "id": "mma_buff_panzer_static", "name": "Schatten Folgen", "description": "\"Shadow Tracking\"\nAs a künstler, you are trained to stay in your target's blind spot.\n\n+1 Dodge attemps, Dodge Skill increased by 12%% of Perception.", - "min_unarmed": 0, "unarmed_allowed": true, "melee_allowed": true, "bonus_dodges": 1, @@ -25,7 +24,7 @@ "id": "mma_buff_panzer_ondodge", "name": "Einzug Rüstungen", "description": "\"Armor Penetration\"\nBy attuning to the rhythm of your opponent, you can strike where their guard is the weakest.\n+5 bash Armor Penetration.\nLasts 2 turns.", - "min_unarmed": 2, + "skill_requirements": [ { "name": "unarmed", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "buff_duration": 2, diff --git a/data/mods/MMA/professions.json b/data/mods/MMA/professions.json index 8327ba16c7cd2..2d1dedeba84eb 100644 --- a/data/mods/MMA/professions.json +++ b/data/mods/MMA/professions.json @@ -3,7 +3,7 @@ "type": "profession", "ident": "mma_battle_angel", "name": "Battle Angel", - "description": "A combat-ready cyborg once salvaged from an obscure junkyard...", + "description": "A combat-ready cyborg once salvaged from an obscure junkyard…", "points": 8, "traits": [ "MMA_MARTIAL_ARTS_PANZER" ], "skills": [ { "level": 3, "name": "unarmed" }, { "level": 3, "name": "melee" }, { "level": 1, "name": "dodge" } ], diff --git a/data/mods/MMA/techniques.json b/data/mods/MMA/techniques.json index b46117254f870..b06b672b32008 100644 --- a/data/mods/MMA/techniques.json +++ b/data/mods/MMA/techniques.json @@ -5,7 +5,7 @@ "name": "Ausstoß", "//": "Outer Thrust.", "messages": [ "You redirect %s's attack against them", " redirects %s's attack against them" ], - "min_unarmed": 4, + "skill_requirements": [ { "name": "unarmed", "level": 4 } ], "melee_allowed": true, "unarmed_allowed": true, "dodge_counter": true, @@ -16,9 +16,8 @@ "type": "technique", "id": "mma_tec_panzer_somersault", "name": "Kumai Sharinraku", - "//": "No translation on wiki. It's a Somersault Kick.", + "//": "No translation on wiki. It's a Somersault Kick.", "messages": [ "You jump and somersault kick %s", " jump and somersault kick %s" ], - "min_unarmed": 0, "melee_allowed": true, "unarmed_allowed": true, "mult_bonuses": [ [ "damage", "bash", 1.2 ] ] @@ -29,7 +28,7 @@ "name": "Herzschlag", "//": "Heart Strike. Alita's signature attack.", "messages": [ "You hit %s with a powerful vibro-punch", " hits %s with a powerful vibro-punch" ], - "min_unarmed": 5, + "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "melee_allowed": true, "unarmed_allowed": true, "crit_tec": true, @@ -43,7 +42,7 @@ "name": "Geschoss Schlag", "//": "Missile Blow.", "messages": [ "You launch a supersonic punch at %s", " launches a supersonic punch at %s" ], - "min_unarmed": 2, + "skill_requirements": [ { "name": "unarmed", "level": 2 } ], "melee_allowed": true, "unarmed_allowed": true, "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ] diff --git a/data/mods/Magiclysm/Spells/animist.json b/data/mods/Magiclysm/Spells/animist.json index 59a496a6208a0..cb25a76bded04 100644 --- a/data/mods/Magiclysm/Spells/animist.json +++ b/data/mods/Magiclysm/Spells/animist.json @@ -57,7 +57,7 @@ "base_casting_time": 50000, "base_energy_cost": 5000, "energy_increment": 500, - "flags": [ "SOMATIC", "VERBAL" ], + "flags": [ "SOMATIC", "VERBAL", "PAIN_NORESIST" ], "final_energy_cost": 10000 }, { diff --git a/data/mods/Magiclysm/Spells/classless.json b/data/mods/Magiclysm/Spells/classless.json index d900ec1a74a4e..2c44d083014d2 100644 --- a/data/mods/Magiclysm/Spells/classless.json +++ b/data/mods/Magiclysm/Spells/classless.json @@ -126,6 +126,25 @@ "difficulty": 3, "damage_type": "bash" }, + { + "id": "obfuscated_body", + "type": "SPELL", + "name": "Obfuscated Body", + "description": "A magical aura distorts light around your body, increasing the amount of attacks you might dodge in a given turn.", + "valid_targets": [ "self" ], + "effect": "spawn_item", + "effect_str": "obfuscating_aura", + "energy_source": "MANA", + "spell_class": "NONE", + "flags": [ "CONCENTRATE", "NO_LEGS" ], + "difficulty": 4, + "max_level": 15, + "base_casting_time": 200, + "base_energy_cost": 400, + "min_duration": 21000, + "max_duration": 90000, + "duration_increment": 4500 + }, { "id": "protection_aura", "type": "SPELL", diff --git a/data/mods/Magiclysm/Spells/monsterspells.json b/data/mods/Magiclysm/Spells/monsterspells.json index b4e69018f0a93..7976d85806aee 100644 --- a/data/mods/Magiclysm/Spells/monsterspells.json +++ b/data/mods/Magiclysm/Spells/monsterspells.json @@ -16,5 +16,81 @@ "range_increment": 0.2, "effect": "projectile_attack", "extra_effects": [ { "id": "light_healing", "hit_self": true } ] + }, + { + "id": "rocket_punch", + "type": "SPELL", + "name": "Rocket Punch", + "description": "Ejects giant fist from arm.", + "valid_targets": [ "hostile" ], + "flags": [ "NO_LEGS" ], + "damage_type": "bash", + "min_damage": 30, + "max_damage": 40, + "damage_increment": 2, + "max_level": 5, + "min_range": 1, + "max_range": 2, + "range_increment": 0.2, + "effect": "projectile_attack" + }, + { + "id": "gas_attack", + "type": "SPELL", + "name": "Gas Attack", + "description": "Spreads toxic gas around itself.", + "valid_targets": [ "self", "hostile", "ground" ], + "flags": [ "NO_HANDS", "NO_LEGS" ], + "damage_type": "bio", + "min_damage": 1, + "max_damage": 1, + "max_level": 5, + "min_range": 1, + "max_range": 3, + "range_increment": 0.2, + "effect": "target_attack", + "field_id": "fd_toxic_gas", + "field_chance": 10, + "min_field_intensity": 1, + "max_field_intensity": 1, + "min_duration": 1000, + "max_duration": 6000, + "duration_increment": 1000, + "min_aoe": 1, + "max_aoe": 2, + "aoe_increment": 0.2 + }, + { + "type": "SPELL", + "id": "mon_demon_fireball", + "name": "Demon Fireball", + "description": "This is a monster only spell.", + "valid_targets": [ "hostile", "ground", "ally", "self" ], + "min_damage": 15, + "max_damage": 15, + "min_range": 12, + "max_range": 12, + "min_aoe": 2, + "max_aoe": 2, + "base_casting_time": 120, + "effect": "projectile_attack", + "damage_type": "fire" + }, + { + "type": "SPELL", + "id": "mon_summon_demon_spiderlings", + "name": "Summon Demon Spiderlings", + "description": "Summons 4 permanent demon spiderlings.", + "flags": [ "HOSTILE_SUMMON", "PERMANENT" ], + "valid_targets": [ "ground" ], + "min_damage": 4, + "max_damage": 4, + "min_range": 5, + "max_range": 5, + "min_aoe": 3, + "max_aoe": 3, + "base_casting_time": 160, + "effect": "summon", + "effect_str": "mon_demon_spiderling" } ] diff --git a/data/mods/Magiclysm/enchanted/enchanted_belts.json b/data/mods/Magiclysm/enchanted/enchanted_belts.json index 07bc968f28179..790cfd406cc22 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_belts.json +++ b/data/mods/Magiclysm/enchanted/enchanted_belts.json @@ -29,7 +29,7 @@ "type": "TOOL_ARMOR", "copy-from": "mbelt_leather", "id": "mbelt_haste", - "name": "Belt of Haste", + "name": { "str": "Belt of Haste", "str_pl": "Belts of Haste" }, "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "SPEED", "multiply": 0.15, "add": 5 } ] } ] } @@ -38,7 +38,7 @@ "type": "TOOL_ARMOR", "copy-from": "mbelt_leather", "id": "mbelt_thor", - "name": "Megingjörð", + "name": { "str": "Megingjörð", "str_pl": "Megingjörð" }, "description": "The mythical belt of Thor, god of thunder. Or at least so it appears. It doubles the wearer's base strength.", "material": [ "superalloy" ], "material_thickness": 10, @@ -52,7 +52,7 @@ "type": "TOOL_ARMOR", "copy-from": "mbelt_leather", "id": "mbelt_pockets_lesser", - "name": "Lesser Girdle of Pockets", + "name": { "str": "Lesser Girdle of Pockets", "str_pl": "Lesser Girdles of Pockets" }, "description": "A wide girdle that fits around your waist, coverd in numerous small pouches that hold a lot more than they should, and the weight of their contents is greatly reduced.", "coverage": 10, "encumbrance": 4, @@ -63,7 +63,7 @@ "type": "TOOL_ARMOR", "copy-from": "mbelt_leather", "id": "mbelt_pockets_greater", - "name": "Greater Girdle of Pockets", + "name": { "str": "Greater Girdle of Pockets", "str_pl": "Greater Girdles of Pockets" }, "description": "A wide girdle that fits around your waist, coverd in numerous small pouches that hold a lot more than they should, and the weight of their contents is greatly reduced.", "coverage": 10, "encumbrance": 6, @@ -74,7 +74,7 @@ "type": "TOOL_ARMOR", "copy-from": "mbelt_leather", "id": "mbelt_weaponry", - "name": "Belt of Weaponry", + "name": { "str": "Belt of Weaponry", "str_pl": "Belts of Weaponry" }, "description": "A wide girdle that fits around your waist, you can sheath or holster any weapon into it in the blink of an eye, and it seemingly stores them somewhere else.", "coverage": 10, "encumbrance": 3, @@ -176,7 +176,7 @@ "category": "weapons", "symbol": "/", "color": "light_gray", - "name": "The Iron Whip", + "name": { "str": "The Iron Whip", "str_pl": "Iron Whips" }, "description": "A long braided flexible steel bullwhip that narrows into a sharp blade at the end. Easily capable of slicing and dicing anything that comes at you. It transforms back into a belt.", "weight": "2154 g", "volume": "2 L", diff --git a/data/mods/Magiclysm/enchanted/enchanted_melee.json b/data/mods/Magiclysm/enchanted/enchanted_melee.json index 88fc2a3c0324a..0d9e0764c061c 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_melee.json +++ b/data/mods/Magiclysm/enchanted/enchanted_melee.json @@ -759,9 +759,9 @@ "id": "rune_biomancer_weapon", "type": "GENERIC", "name": "Biomancer spear", - "//": "Effectively a durable stone spear +1 with IMPALE tech. based off Wicked Bonespear. Lorewise, it would make sense for novice Biomancers to be developing their skills in spears so they can adequately use the Bonespear(No whips/REACH3 for you!) once they're proficient enough to summon one. Should be weaker than other school weapons DPSwise due to reach.", + "//": "Effectively a durable stone spear +1 with IMPALE tech. based off Wicked Bonespear. Lorewise, it would make sense for novice Biomancers to be developing their skills in spears so they can adequately use the Bonespear(No whips/REACH3 for you!) once they're proficient enough to summon one. Should be weaker than other school weapons DPSwise due to reach.", "description": "A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune embedded at the base of the head.", - "weight": 988, + "weight": "988 g", "volume": "1250 ml", "price": 3900, "to_hit": 2, @@ -780,7 +780,7 @@ "name": "Technomancer toolbar", "//": "Combat stats based off crowbar +1, techniques off Halligan bar(closest non-magical substitute), weight based on 75% of hammer & wrench(since their handles aren't included) + 100% crowbar with benefit from +1 enchantment", "description": "This staff incorporates a sturdy cresent wrench on top of a prybar and a hammer on the other in a convienent package. There is a Technomancer rune embedded in the hammerhead.", - "weight": 1536, + "weight": "1536 g", "volume": "1750 ml", "price": 3900, "to_hit": 1, @@ -797,9 +797,9 @@ "id": "rune_magus_weapon", "type": "GENERIC", "name": { "str": "Magus staff", "str_pl": "Magus staves" }, - "//": "The classical vision of the wizard gets a classic weapon. DPS Stats are between the regular and ironshod versions. Stats are slightly worse than the QS+1 due to the glass weight slowing attack speed.", + "//": "The classical vision of the wizard gets a classic weapon. DPS Stats are between the regular and ironshod versions. Stats are slightly worse than the QS+1 due to the glass weight slowing attack speed.", "description": "A quarterstaff with runes carved into it and two glass jars, heat-tempered and infused with mana for durability, to act as mana receptacles. There are two Magi runes embedded at the tips.", - "weight": 1530, + "weight": "1530 g", "volume": "1500 ml", "price": 3900, "to_hit": 2, @@ -814,9 +814,9 @@ "id": "rune_kelvinist_weapon", "type": "GENERIC", "name": "Kelvinist flamberge", - "//": "Flame-bladed sword covers half of Kelvinist's heat-cold theme. Combat stats equivalent to cutlass +1 with BRUTAL technique.", + "//": "Flame-bladed sword covers half of Kelvinist's heat-cold theme. Combat stats equivalent to cutlass +1 with BRUTAL technique.", "description": "A sword with an undulating blade, reminiscent of a flame. There is a Kelvinist rune embedded in the pommel.", - "weight": 1530, + "weight": "1530 g", "volume": "1250 ml", "price": 3900, "to_hit": 3, @@ -834,9 +834,9 @@ "id": "rune_stormshaper_weapon", "type": "GENERIC", "name": "Stormshaper axe", - "//": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons. Metals chosen for being two most conductive metals + balancing reasons", + "//": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons. Metals chosen for being two most conductive metals + balancing reasons", "description": "A forged copper axe with silver trimmings and a wooden handle. There is a Stormshaper rune embedded in the eye.", - "weight": 3330, + "weight": "3330 g", "volume": "2 L", "price": 3900, "to_hit": 3, @@ -854,9 +854,9 @@ "id": "rune_animist_weapon", "type": "GENERIC", "name": "Animist athame", - "//": "Tool qualities equivalent to steak knife, combat equiv. to copper knife + 1 w/ RAPID and BLOCK1, size/weight off combat knife +1", + "//": "Tool qualities equivalent to steak knife, combat equiv. to copper knife + 1 w/ RAPID and BLOCK1, size/weight off combat knife +1", "description": "A steel ritual knife used by Animists to draw blood for summoning. Their school rune is embedded in the crossguard.", - "weight": 504, + "weight": "504 g", "volume": "500 ml", "price": 3000, "bashing": 2, diff --git a/data/mods/Magiclysm/enchanted/enchanted_ranged.json b/data/mods/Magiclysm/enchanted/enchanted_ranged.json index 314624f1cfc91..dfce3b08b7dc6 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_ranged.json +++ b/data/mods/Magiclysm/enchanted/enchanted_ranged.json @@ -23,7 +23,7 @@ "skill": "archery", "min_strength": 5, "ammo": "arrow", - "weight": 360, + "weight": "360 g", "volume": "1750 ml", "bashing": 9, "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 13 }, diff --git a/data/mods/Magiclysm/enchanted/enchanted_rings.json b/data/mods/Magiclysm/enchanted/enchanted_rings.json index 016d95249481c..b35b5f5db9066 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_rings.json +++ b/data/mods/Magiclysm/enchanted/enchanted_rings.json @@ -76,6 +76,22 @@ "charges_per_use": 1, "artifact_data": { "charge_type": "ARTC_TIME" } }, + { + "copy-from": "mring_silver", + "type": "TOOL_ARMOR", + "id": "mring_dodge_bonus_1", + "name": "eel ring", + "description": "A thin silver band ring, depicting an eel coiled on itself. Allows you to dodge an extra attack per turn.", + "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "BONUS_DODGE", "add": 1 } ] } ] } + }, + { + "copy-from": "mring_gold", + "type": "TOOL_ARMOR", + "id": "mring_dodge_bonus_2", + "name": "bicephalous eel ring", + "description": "A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows you to dodge two extra attacks per turn.", + "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "BONUS_DODGE", "add": 2 } ] } ] } + }, { "copy-from": "mring_copper", "type": "TOOL_ARMOR", diff --git a/data/mods/Magiclysm/enchanted/enchanted_unarmed.json b/data/mods/Magiclysm/enchanted/enchanted_unarmed.json index e2cf9fc97c7e9..38c2f1af78cf7 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_unarmed.json +++ b/data/mods/Magiclysm/enchanted/enchanted_unarmed.json @@ -27,8 +27,8 @@ "description": "A heavy metal guard that covers the fist and increases striking power, with stout padding underneath to protect the wearers hand. It has been enchanted to emit dark magical flames that only harm enemies.", "looks_like": "cestus", "material": [ "steel", "leather" ], - "volume": 2, - "weight": 970, + "volume": "500 ml", + "weight": "970 g", "to_hit": 2, "bashing": 12, "qualities": [ [ "HAMMER", 1 ] ], @@ -61,8 +61,8 @@ "name_plural": "gauntlets of pounding", "description": "A large gleaming metal gauntlet covered in magical symbols that allows you to land astoundingly powerful blows.", "material": [ "superalloy" ], - "volume": 4, - "weight": 981, + "volume": "1 L", + "weight": "981 g", "bashing": 34, "to_hit": 3, "qualities": [ [ "HAMMER", 2 ] ], @@ -105,7 +105,7 @@ "description": "A stone battle glove with carved runes encasing the hand, protecting it while increasing striking power. There is an Earthshaper rune embedded in the palm.", "material": [ "stone", "leather", "steel" ], "volume": "500 ml", - "weight": 873, + "weight": "873 g", "bashing": 13, "to_hit": 1, "qualities": [ [ "HAMMER", 1 ] ], diff --git a/data/mods/Magiclysm/enchanted/enchanted_wands.json b/data/mods/Magiclysm/enchanted/enchanted_wands.json index 6725a495a6f86..976f2611dbe47 100644 --- a/data/mods/Magiclysm/enchanted/enchanted_wands.json +++ b/data/mods/Magiclysm/enchanted/enchanted_wands.json @@ -3,8 +3,8 @@ "abstract": "spell_wand", "name": "Magic Wand", "type": "TOOL", - "weight": 230, - "volume": 2, + "weight": "230 g", + "volume": "500 ml", "price": 10000, "bashing": 3, "to_hit": 1, @@ -21,8 +21,8 @@ "abstract": "disp_wand", "name": "Disposable Wand", "type": "TOOL", - "weight": 230, - "volume": 2, + "weight": "230 g", + "volume": "500 ml", "price": 10000, "bashing": 3, "to_hit": 1, diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json index 878359ae6d638..216067cc29417 100644 --- a/data/mods/Magiclysm/harvest.json +++ b/data/mods/Magiclysm/harvest.json @@ -64,6 +64,17 @@ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] }, + { + "id": "demon_spider", + "type": "harvest", + "entries": [ + { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 }, + { "drop": "meat", "type": "flesh", "mass_ratio": 0.05 }, + { "drop": "demon_chitin_piece", "type": "bone", "mass_ratio": 0.04 }, + { "drop": "demon_chitin_plate", "type": "skin", "mass_ratio": 0.01 }, + { "drop": "demon_spider_fang", "base_num": [ 0, 0 ], "scale_num": [ 0.1, 0.6 ], "max": 2, "type": "flesh" } + ] + }, { "id": "mammal_small_fur", "//": "override of vanilla harvest, includes hairballs", @@ -238,7 +249,7 @@ }, { "id": "zombie_leather", - "//": "any zombie that might drop leather. mostly animals.", + "//": "any zombie that might drop leather. mostly animals.", "type": "harvest", "entries": [ { "drop": "tainted_blood", "type": "flesh", "mass_ratio": 0.1 }, @@ -251,7 +262,7 @@ }, { "id": "zombie_fur", - "//": "any zombie that might drop leather. mostly animals.", + "//": "any zombie that might drop leather. mostly animals.", "type": "harvest", "entries": [ { "drop": "tainted_blood", "type": "flesh", "mass_ratio": 0.1 }, @@ -313,7 +324,7 @@ }, { "id": "lemure", - "//": "nothing much aside from big pile of meat and maybe demon blood in future. But for now, tainted will do.", + "//": "nothing much aside from big pile of meat and maybe demon blood in future. But for now, tainted will do.", "type": "harvest", "entries": [ { "drop": "tainted_blood", "type": "flesh", "mass_ratio": 0.1 }, diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json index 0fa0102637443..bce0390918afd 100644 --- a/data/mods/Magiclysm/itemgroups/itemgroups.json +++ b/data/mods/Magiclysm/itemgroups/itemgroups.json @@ -157,7 +157,7 @@ "items": [ { "group": "potions_common", "prob": 20 }, { "group": "enchanted_wands_lesser", "prob": 15 }, - { "group": "spellbook_loot_1", "prob": 35, "repeat": [ 1, 3 ] }, + { "group": "spellbook_loot_1", "prob": 35, "count": [ 1, 3 ] }, { "group": "enchanted_rings_common", "prob": 20 }, { "group": "enchanted_rings_uncommon", "prob": 5 }, { "group": "enchanted_combat_items", "prob": 10 }, @@ -206,7 +206,7 @@ { "type": "item_group", "id": "lair_black_dragon", - "//": "Stuff you would find in any dragon deeper lair level. Gold, jewelry, weapons etc. Should require a bit of a fight or risk to access.", + "//": "Stuff you would find in any dragon deeper lair level. Gold, jewelry, weapons etc. Should require a bit of a fight or risk to access.", "items": [ { "item": "bone_human", "prob": 30, "count-min": 1, "count-max": 5 }, { "group": "archery", "prob": 1 }, @@ -223,7 +223,7 @@ { "type": "item_group", "id": "lair_black_dragon_treasure", - "//": "Stuff you would find in any dragon treasure room or from a boss fight. Should require exceptional risk to access. Includes lower tier group, plus the best magic items.", + "//": "Stuff you would find in any dragon treasure room or from a boss fight. Should require exceptional risk to access. Includes lower tier group, plus the best magic items.", "items": [ { "group": "lair_loot_generic", "prob": 80, "count": [ 2, 6 ] }, { "item": "dragon_black_scale", "count": [ 48, 120 ] }, @@ -310,6 +310,7 @@ { "item": "mring_strength_2", "prob": 10 }, { "item": "mring_dexterity_2", "prob": 10 }, { "item": "mring_intelligence_2", "prob": 10 }, + { "item": "mring_dodge_bonus_1", "prob": 10 }, { "item": "mring_perception_2", "prob": 10 }, { "item": "mring_speed_5", "prob": 10 }, { "item": "mring_protection_4", "prob": 10 } @@ -323,6 +324,7 @@ "items": [ { "item": "mring_strength_3", "prob": 10 }, { "item": "mring_dexterity_3", "prob": 10 }, + { "item": "mring_dodge_bonus_2", "prob": 10 }, { "item": "mring_intelligence_3", "prob": 10 }, { "item": "mring_perception_3", "prob": 10 }, { "item": "mring_speed_7", "prob": 10 }, @@ -332,7 +334,7 @@ { "id": "enchanted_rings_rare", "type": "item_group", - "//": "all the rare enchanted rings. High end loot for boss fights, treasure rooms, etc.", + "//": "all the rare enchanted rings. High end loot for boss fights, treasure rooms, etc.", "subtype": "collection", "items": [ { "item": "mring_strength_4", "prob": 10 }, @@ -374,7 +376,7 @@ { "id": "enchanted_wands_greater", "type": "item_group", - "//": "rare enchanted wands. High end loot for boss fights, treasure rooms, etc.", + "//": "rare enchanted wands. High end loot for boss fights, treasure rooms, etc.", "subtype": "collection", "items": [ { "item": "wand_magic_missile_greater", "prob": 10, "charges-min": 3, "charges-max": 24 }, @@ -388,7 +390,7 @@ { "id": "enchanted_masks", "type": "item_group", - "//": "all enchanted masks. High end loot for boss fights, treasure rooms, etc.", + "//": "all enchanted masks. High end loot for boss fights, treasure rooms, etc.", "subtype": "collection", "items": [ { "item": "mmask_disappearance", "prob": 5 }, { "item": "mmask_vision", "prob": 10 } ] }, @@ -488,7 +490,7 @@ { "id": "enchanted_melee_weapons_plus2", "type": "item_group", - "//": "plus 2 enchanted melee weapons. High end loot for boss fights, treasure rooms, etc.", + "//": "plus 2 enchanted melee weapons. High end loot for boss fights, treasure rooms, etc.", "items": [ { "item": "cudgel_plus_two", "prob": 10 }, { "item": "q_staff_plus_two", "prob": 10 }, diff --git a/data/mods/Magiclysm/itemgroups/recipe_books.json b/data/mods/Magiclysm/itemgroups/recipe_books.json index 776d33dc21e6a..f08761d06a4aa 100644 --- a/data/mods/Magiclysm/itemgroups/recipe_books.json +++ b/data/mods/Magiclysm/itemgroups/recipe_books.json @@ -2,7 +2,7 @@ { "id": "magic_recipe_basic", "type": "item_group", - "//": "Lower tier recipes, many of which can be done with the alchemist rune. Usually has at least one recipe requiring related school rune or rune weapon", + "//": "Lower tier recipes, many of which can be done with the alchemist rune. Usually has at least one recipe requiring related school rune or rune weapon", "items": [ [ "alchemy_basic", 30 ], [ "necro_basic", 30 ], [ "techno_basic", 30 ], [ "book_mythological", 10 ] ] } ] diff --git a/data/mods/Magiclysm/itemgroups/spellbooks.json b/data/mods/Magiclysm/itemgroups/spellbooks.json index 481f973a214ff..a31b1c587008c 100644 --- a/data/mods/Magiclysm/itemgroups/spellbooks.json +++ b/data/mods/Magiclysm/itemgroups/spellbooks.json @@ -101,6 +101,7 @@ [ "spell_scroll_magus_mana_blast", 50 ], [ "lightning_storm_scroll", 50 ], [ "spell_scroll_invisibility", 10 ], + [ "spell_scroll_obfuscated_body", 10 ], [ "spell_scroll_lava_bomb", 5 ] ] }, @@ -137,6 +138,7 @@ [ "magus_spellbook", 15 ], [ "magus_spellbook_move", 30 ], [ "translocate_spellbook", 20 ], + [ "light_manipulation_spellbook", 5 ], [ "recovery_spellbook", 30 ] ] }, diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json index 6aade7e4de53f..11ec8a442b888 100644 --- a/data/mods/Magiclysm/items/alchemy_items.json +++ b/data/mods/Magiclysm/items/alchemy_items.json @@ -4,8 +4,8 @@ "type": "TOOL", "name": "owlbear gastrolith", "description": "This strangely shaped rock was once a part of an owlbear's complex digestive system, creating a link between owl throat and bear stomach. It is possible that it could serve a similar purpose in alchemy, helping to bind together two disparate halves.", - "weight": 2000, - "volume": 3, + "weight": "2 kg", + "volume": "750 ml", "price": 0, "bashing": 9, "to_hit": -1, @@ -24,13 +24,13 @@ "name": "stone shell", "description": "The broken fragment of an owlbear egg. With luck it might still contain some of its former power, though if nothing else it's still a bit sharp.", "material": "stone", - "weight": 250, + "weight": "250 g", "volume": "150 ml", "bashing": 5, "cutting": 3, "to_hit": -2, "qualities": [ [ "BUTCHER", -50 ] ], - "//": "Potion recipes that require a full owlbear egg could also instead require larger amounts of stone shell. Since 1 egg gives 3 shells, you could perhaps have 1 egg be equivalent to 5 or more shells when making potions." + "//": "Potion recipes that require a full owlbear egg could also instead require larger amounts of stone shell. Since 1 egg gives 3 shells, you could perhaps have 1 egg be equivalent to 5 or more shells when making potions." }, { "id": "copper_infuser", @@ -39,7 +39,7 @@ "qualities": [ [ "MANA_INFUSE", 1 ] ], "name": "copper infusion bracelet", "name_plural": "copper infusion bracelets", - "description": "This bracelet has runes engraved on it. You sense a faint air of mysticism when you look at it. It would be useful for imbuing mana into material." + "description": "This bracelet has runes engraved on it. You sense a faint air of mysticism when you look at it. It would be useful for imbuing mana into material." }, { "id": "silver_infuser", @@ -57,7 +57,7 @@ "name": "copper circlet", "name_plural": "copper circlets", "description": "A wooden band with copper trimmings to be worn on the head. Touching your temples with it on makes you feel very calm.", - "weight": 700, + "weight": "700 g", "volume": "600ml", "price": 1500, "price_postapoc": 100, @@ -79,8 +79,8 @@ "name_plural": "stone chisels", "looks_like": "chisel", "description": "This is a short stone chisel. It can be used to engrave on stone, wood, or soft metals.", - "weight": 660, - "volume": 1, + "weight": "660 g", + "volume": "250 ml", "price": 1600, "to_hit": 2, "bashing": 2, @@ -116,7 +116,7 @@ "name": "glow dust", "description": "The powdered remains of a will-o-wisps's phsyical form. It seems to still possess an otherworldly glow.", "material": "powder", - "weight": 5, + "weight": "5 g", "volume": 1 }, { @@ -125,8 +125,8 @@ "category": "tools", "name": "magical reading light", "description": "Powered by the magic of glow powder and lesser mana potions, this extremely expensive little light will provide just enough light to read by for at least a decade. Use it to close the cover and hide the light.", - "weight": 270, - "volume": 1, + "weight": "270 g", + "volume": "250 ml", "price": 125000, "material": "glass", "symbol": ",", @@ -146,8 +146,8 @@ "name": "magical reading light (covered)", "name_plural": "magical reading lights (covered)", "description": "Powered by the magic of glow powder and lesser mana potions, this extremely expensive little light will provide just enough light to read by for at least a decade. The cover is closed. Use it to open the cover and show the light.", - "weight": 270, - "volume": 1, + "weight": "270 g", + "volume": "250 ml", "price": 125000, "material": "glass", "symbol": ",", @@ -163,7 +163,7 @@ "name": "bulette plate", "description": "The great plates from behind a bulette's head have always been prized for use in shield and armor making.", "material": "arcane_skin", - "weight": 30000, + "weight": "30 kg", "volume": 12 }, { @@ -174,7 +174,7 @@ "name": "bulette pearl", "description": "As a bulette burrows through the earth its gills collect minute amounts of precious metals and gems which slowly aggregate into lustrous gemstones prized for their beauty and power.", "material": "stone", - "weight": 120, + "weight": "120 g", "volume": 1 }, { @@ -185,7 +185,7 @@ "name": "dragon essence", "description": "This is the magical essence from a dragon, distilled into a concentrated form.", "volume": "250 ml", - "weight": 300, + "weight": "300 g", "flags": [ "TRADER_AVOID", "INDEIBLE" ], "container": "flask_glass", "charges": 1, @@ -207,5 +207,52 @@ "material": [ "flesh" ], "cutting": 7, "flags": [ "SPEAR", "SHEATH_KNIFE" ] + }, + { + "type": "GENERIC", + "id": "demon_chitin_piece", + "category": "spare_parts", + "symbol": ",", + "color": "red", + "name": "chunk of demon chitin", + "name_plural": "chunks of demon chitin", + "description": "A piece of demon spider exoskeleton. It is light and very durable, and probably has some magical properties.", + "price": 0, + "material": "demon_chitin", + "weight": "89 g", + "volume": "250 ml", + "bashing": 1, + "flags": [ "TRADER_AVOID" ], + "to_hit": -2 + }, + { + "type": "GENERIC", + "id": "demon_chitin_plate", + "category": "spare_parts", + "symbol": "/", + "color": "red", + "name": "demon chitin plate", + "price": 15225, + "material": "demon_chitin", + "weight": "10 kg", + "volume": "4 L", + "bashing": 12, + "to_hit": -4, + "description": "A large piece of demon spider exoskeleton, painstakingly cut from the corpse of an adult demon spider. A plate of this size can be used to create armor plating." + }, + { + "type": "GENERIC", + "id": "demon_spider_fang", + "name": "demon spider fang", + "description": "A fang from a demon spider. It seems to still drip with poison; you might be able to use this in some alchemical recipe?", + "weight": "270 g", + "to_hit": -2, + "color": "green", + "symbol": ",", + "material": [ "flesh" ], + "volume": "250 ml", + "cutting": 8, + "flags": [ "SPEAR", "SHEATH_KNIFE" ], + "price": 1500 } ] diff --git a/data/mods/Magiclysm/items/bionics.json b/data/mods/Magiclysm/items/bionics.json index b7b2de4bd6c62..e6c96d415d5a9 100644 --- a/data/mods/Magiclysm/items/bionics.json +++ b/data/mods/Magiclysm/items/bionics.json @@ -6,7 +6,7 @@ "name": "Blood Power Generator CBM", "description": "Using the latest advancement in technomancy this bionic is able to convert the innate energy stored in blood into bionic power. The stronger the blood the better. It can hold up to 100 mL of blood.", "price": 450000, - "weight": 500, + "weight": "500 g", "difficulty": 8 } ] diff --git a/data/mods/Magiclysm/items/black_dragon_items.json b/data/mods/Magiclysm/items/black_dragon_items.json index 6d8646130231a..3ebee0f3234b6 100644 --- a/data/mods/Magiclysm/items/black_dragon_items.json +++ b/data/mods/Magiclysm/items/black_dragon_items.json @@ -8,7 +8,7 @@ "name": "black dragon scale", "price": 2500, "material": "black_dragon_hide", - "weight": 380, + "weight": "380 g", "volume": "75 ml", "bashing": 0, "to_hit": -4, @@ -19,7 +19,7 @@ "id": "black_dragon_hide_raw", "category": "spare_parts", "name": "raw black dragon hide", - "weight": 2500, + "weight": "2500 g", "color": "black_white", "spoils_in": "3 day", "comestible_type": "FOOD", @@ -38,7 +38,7 @@ "category": "spare_parts", "name": "tanning black dragon hide", "description": "A treated black dragon hide which is undergoing the chemical processes required to become workable. You will be able to activate it to unroll and make use of it when it is done.", - "weight": 2500, + "weight": "2500 g", "volume": "4 L", "price": 0, "to_hit": -2, @@ -65,7 +65,7 @@ "description": "Prepared hide from a black dragon. Hard, acid-resistant, and with more scales could make a suit of armor as hard as steel and half as heavy.", "price": 50000, "material": [ "black_dragon_hide" ], - "weight": 2500, + "weight": "2500 g", "volume": "4 L", "category": "spare_parts", "to_hit": -1 @@ -77,7 +77,7 @@ "name": "pair of black dragonscale boots", "name_plural": "pairs of black dragonscale boots", "description": "Boots made of black dragonscale. Very protective, and surprisingly light.", - "weight": 945, + "weight": "945 g", "volume": "3250 ml", "price": 75000, "to_hit": -2, @@ -100,7 +100,7 @@ "name": "pair of black dragonhide boots", "name_plural": "pairs of black dragonhide boots", "description": "Boots made of black dragonhide. Very protective, and surprisingly light.", - "weight": 655, + "weight": "655 g", "volume": "3250 ml", "price": 50000, "to_hit": -2, @@ -122,7 +122,7 @@ "category": "armor", "name": "black dragonscale helmet", "description": "A helmet made from black dragonscale, held together with black dragonhide. It comes equipped with a full face visor.", - "weight": 856, + "weight": "856 g", "volume": "2500 ml", "price": 58000, "to_hit": -1, @@ -145,7 +145,7 @@ "category": "armor", "name": "black dragonhide helmet", "description": "A helmet made from black dragonhide. It protects your head well, and doesn't cover your face.", - "weight": 585, + "weight": "585 g", "volume": "2500 ml", "price": 58000, "to_hit": -1, @@ -168,7 +168,7 @@ "category": "armor", "name": "black dragonscale armor", "description": "A full suit of black dragon scale mail. It comes with all the accoutrements that cover your torso, legs, and arms, with the benefit of being very light and flexible.", - "weight": 4250, + "weight": "4250 g", "volume": "12 L", "price": 2000000, "to_hit": -3, @@ -190,7 +190,7 @@ "category": "armor", "name": "black dragonhide armor", "description": "A full suit of black dragonhide armor. It comes with all the accoutrements that cover your torso, legs, and arms, with the benefit of being very light and flexible.", - "weight": 3000, + "weight": "3 kg", "volume": "12 L", "price": 2000000, "to_hit": -3, @@ -213,7 +213,7 @@ "name": "pair of black dragonscale gauntlets", "name_plural": "pairs of black dragonscale gauntlets", "description": "A pair of heavy-duty gauntlets made of black dragonscale that covers your hands.", - "weight": 380, + "weight": "380 g", "volume": "1 L", "price": 180000, "to_hit": 2, @@ -235,7 +235,7 @@ "name": "pair of black dragonhide gloves", "name_plural": "pairs of black dragonhide gloves", "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", - "weight": 230, + "weight": "230 g", "volume": "750 ml", "price": 180000, "to_hit": 2, diff --git a/data/mods/Magiclysm/items/cast_spell_items.json b/data/mods/Magiclysm/items/cast_spell_items.json index ca6421c45135b..e471f5d688140 100644 --- a/data/mods/Magiclysm/items/cast_spell_items.json +++ b/data/mods/Magiclysm/items/cast_spell_items.json @@ -5,7 +5,7 @@ "description": "You can't buy these, so you need to save them until the last boss! Actually, don't even use them there!", "use_action": { "type": "cast_spell", "spell_id": "recover_mana", "no_fail": true, "level": 0 }, "type": "COMESTIBLE", - "weight": 265, + "weight": "265 g", "quench": 10, "calories": 75, "volume": "250ml", @@ -43,7 +43,7 @@ "description": "This is a potion of Cat's Grace. It will increase your dexterity for 10 minutes.", "use_action": { "type": "cast_spell", "spell_id": "cats_grace", "no_fail": true, "level": 9 }, "type": "COMESTIBLE", - "weight": 265, + "weight": "265 g", "quench": 10, "calories": 75, "volume": "250ml", @@ -91,7 +91,7 @@ "comestible_type": "FOOD", "category": "weapons", "material": [ "leather", "flesh", "bone" ], - "weight": 225, + "weight": "225 g", "volume": "700ml", "symbol": "t", "color": "pink", @@ -124,7 +124,7 @@ "description": "This foul-smelling liquid simulates undead regeneration by accelerating your heart to dangerous levels. Drinking this in danger or at critical condition may be lethal.", "use_action": { "type": "cast_spell", "spell_id": "twisted_restore", "no_fail": true, "level": 1 }, "type": "COMESTIBLE", - "weight": 265, + "weight": "265 g", "quench": -30, "calories": 100, "volume": "250ml", diff --git a/data/mods/Magiclysm/items/class_runes.json b/data/mods/Magiclysm/items/class_runes.json index 12faf2cb22677..22ac166a3bd28 100644 --- a/data/mods/Magiclysm/items/class_runes.json +++ b/data/mods/Magiclysm/items/class_runes.json @@ -5,9 +5,9 @@ "symbol": "=", "color": "pink", "name": "Biomancer rune", - "description": "This magical pebble has an insignia of rended flesh and bones on it. It is necessary for Biomancers to channel magic into their crafts.", + "description": "This magical pebble has an insignia of rended flesh and bones on it. It is necessary for Biomancers to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -17,9 +17,9 @@ "symbol": "=", "color": "blue", "name": "Technomancer rune", - "description": "This magical pebble has an insignia of clockwork and gears on it. It is necessary for Technomancers to channel magic into their crafts.", + "description": "This magical pebble has an insignia of clockwork and gears on it. It is necessary for Technomancers to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -30,9 +30,9 @@ "color": "magenta", "name": "Magus rune", "name_plural": "Magi runes", - "description": "This magical pebble has an insignia of crystal and mana orbs on it. It is necessary for Magi to channel magic into their crafts.", + "description": "This magical pebble has an insignia of crystal and mana orbs on it. It is necessary for Magi to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -42,9 +42,9 @@ "symbol": "=", "color": "green", "name": "Earthshaper rune", - "description": "This magical pebble has an insignia of steel and rocks on it. It is necessary for Earthshapers to channel magic into their crafts.", + "description": "This magical pebble has an insignia of steel and rocks on it. It is necessary for Earthshapers to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -54,9 +54,9 @@ "symbol": "=", "color": "red", "name": "Kelvinist rune", - "description": "This magical pebble has an insignia of ice and flames on it. It is necessary for Kelvinists to channel magic into their crafts.", + "description": "This magical pebble has an insignia of ice and flames on it. It is necessary for Kelvinists to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -66,9 +66,9 @@ "symbol": "=", "color": "yellow", "name": "Stormshaper rune", - "description": "This magical pebble has an insignia of lightning and storm clouds on it. It is necessary for Stormshapers to channel magic into their crafts.", + "description": "This magical pebble has an insignia of lightning and storm clouds on it. It is necessary for Stormshapers to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -78,9 +78,9 @@ "symbol": "=", "color": "brown", "name": "Druid rune", - "description": "This magical pebble has an insignia of nature and trees on it. It is necessary for Druids to channel magic into their crafts.", + "description": "This magical pebble has an insignia of nature and trees on it. It is necessary for Druids to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -90,9 +90,9 @@ "symbol": "=", "color": "light_red", "name": "Animist rune", - "description": "This magical pebble has an insignia of summoners on it. It is necessary for Animists to channel magic into their crafts.", + "description": "This magical pebble has an insignia of summoners on it. It is necessary for Animists to channel magic into their crafts.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" }, @@ -102,9 +102,9 @@ "symbol": "=", "color": "black", "name": "alchemist rune", - "description": "This magical pebble has an insignia of alchemy and potions on it. While versatile in use, the lack of attunement to any school prevents creation of more advanced recipes.", + "description": "This magical pebble has an insignia of alchemy and potions on it. While versatile in use, the lack of attunement to any school prevents creation of more advanced recipes.", "volume": "5ml", - "weight": 1, + "weight": "1 g", "material": "stone", "flags": "TRADER_AVOID" } diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json index db085283f0146..207d4368ff09a 100644 --- a/data/mods/Magiclysm/items/comestibles.json +++ b/data/mods/Magiclysm/items/comestibles.json @@ -3,7 +3,7 @@ "type": "COMESTIBLE", "id": "egg_owlbear_rock", "name": "owlbear egg", - "weight": 2395, + "weight": "2395 g", "color": "light_gray", "spoils_in": "14 days", "comestible_type": "FOOD", @@ -14,14 +14,14 @@ "description": "This egg laid by an owlbear seems almost indistinguishable from a large rock until you touch it and can feel the warm glow of potential life energy from within. It's hard to believe that an owlbear could grow so quickly from something so small. Perhaps you could carefully crack it open to get at the liquid golden goodness inside.", "price": 300000, "material": [ "egg", "stone" ], - "volume": 10, + "volume": "2500 ml", "stack_size": 1, "fun": -18, "flags": [ "FREEZERBURN" ], "rot_spawn": "GROUP_EGG_OWLBEAR", "vitamins": [ [ "vitA", 360 ], [ "calcium", 120 ], [ "iron", 160 ], [ "vitB", 840 ] ], "rot_spawn_chance": 80, - "//": "Alchemically speaking, I see this egg as having the elements of Growth, Stone, and Egg. Growth would make things grow faster, the simplest example being a magical liquid fertilizer. Stone would be a defensive element, used in creating something like a potion of stoneskin. Egg would be interesting though. What if instead of being imbibed there were potions that instead functioned similarly to the sourdough items, or the blob vehicle parts, in that they take a gestation period and then you could activate them and have a new item pop out. Creatures sure but especially biomancers could have temporarily-lived tools, weapons, and armor." + "//": "Alchemically speaking, I see this egg as having the elements of Growth, Stone, and Egg. Growth would make things grow faster, the simplest example being a magical liquid fertilizer. Stone would be a defensive element, used in creating something like a potion of stoneskin. Egg would be interesting though. What if instead of being imbibed there were potions that instead functioned similarly to the sourdough items, or the blob vehicle parts, in that they take a gestation period and then you could activate them and have a new item pop out. Creatures sure but especially biomancers could have temporarily-lived tools, weapons, and armor." }, { "type": "COMESTIBLE", @@ -42,7 +42,7 @@ "material": [ "fur", "water" ], "primary_material": "fur", "volume": "350ml", - "weight": 15, + "weight": "15 g", "color": "brown", "symbol": "0", "name": "hairball", diff --git a/data/mods/Magiclysm/items/constructs.json b/data/mods/Magiclysm/items/constructs.json new file mode 100644 index 0000000000000..efc54880b3eb1 --- /dev/null +++ b/data/mods/Magiclysm/items/constructs.json @@ -0,0 +1,52 @@ +[ + { + "type": "GENERIC", + "id": "broken_claygolem", + "symbol": "x", + "color": "brown", + "name": "broken clay golem", + "category": "other", + "description": "A broken clay golem, looking like piece of post-modern art. Could be smashed for clay.", + "price": 10000, + "material": [ "clay" ], + "weight": "122 kg", + "volume": "120 L", + "bashing": 4, + "cutting": 4, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "broken_stonegolem", + "symbol": "x", + "color": "light_gray", + "name": "broken stone golem", + "category": "other", + "description": "A broken stone golem, not that much different from big boulder. Could be smashed for stone.", + "price": 10000, + "material": [ "stone" ], + "weight": "162 kg", + "volume": "120 L", + "bashing": 4, + "cutting": 4, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "broken_irongolem", + "symbol": "x", + "color": "dark_gray", + "name": "broken iron golem", + "category": "other", + "description": "A broken iron golem, with all iron you would possibly ever need. Could be smashed for iron.", + "price": 100000, + "material": [ "iron" ], + "weight": "945 kg", + "volume": "120 L", + "bashing": 30, + "to_hit": -5, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + } +] diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json index 452f0fabbc9e2..4918e34dc04b2 100644 --- a/data/mods/Magiclysm/items/ethereal_items.json +++ b/data/mods/Magiclysm/items/ethereal_items.json @@ -5,8 +5,8 @@ "name": "pair of magical armored stone gauntlets", "name_plural": "pairs of armored gauntlets", "description": "A magical flexible stonelike substance for protection and attack.", - "weight": 1, - "volume": 1, + "weight": "1 g", + "volume": "250 ml", "price": 1, "to_hit": 2, "bashing": 20, @@ -30,7 +30,7 @@ "type": "TOOL", "name": "finger firelighter", "description": "This is a small flame you can hold in your hand. With a thought, you can cause it to light something on fire.", - "weight": 1, + "weight": "1 g", "volume": "1 ml", "price": 0, "symbol": ",", @@ -45,8 +45,8 @@ "name": "pair of magical armored stone gauntlets", "name_plural": "pairs of armored gauntlets", "description": "A magical flexible stonelike substance for protection and attack.", - "weight": 1, - "volume": 1, + "weight": "1 g", + "volume": "250 ml", "price": 1, "to_hit": 2, "bashing": 20, @@ -69,8 +69,8 @@ "category": "tools", "name": "magic lamp", "description": "a magical light source that will light up a small area.", - "weight": 1, - "volume": 1, + "weight": "1 g", + "volume": "250 ml", "price": 1, "to_hit": -2, "bashing": 8, @@ -96,11 +96,11 @@ { "id": "shield_ice", "type": "ARMOR", - "name": "large shield of magical ice", + "name": { "str": "large shield of magical ice", "str_pl": "large shields of magical ice" }, "category": "armor", "description": "A lightweight but tough shield crafted entirely of magical ice.", - "weight": 1000, - "volume": 20, + "weight": "1 kg", + "volume": "5 L", "price": 1, "to_hit": 1, "bashing": 14, @@ -120,8 +120,8 @@ "name": "pair of slick icy coatings on your feet", "name_plural": "slick icy coatings", "description": "A magical slick icy coating on your feet. While quite fast on flat floors, they make it difficult to move on rough terrain.", - "weight": 1, - "volume": 1, + "weight": "1 g", + "volume": "250 ml", "price": 1, "to_hit": -2, "bashing": 6, @@ -142,7 +142,7 @@ "id": "stormhammer", "name": "The Stormhammer", "description": "A crackling magical warhammer full of lightning to smite your foes with, and of course, smash things to bits!", - "weight": 1337, + "weight": "1337 g", "to_hit": 2, "color": "brown", "symbol": "/", @@ -158,7 +158,7 @@ "NO_SALVAGE", "MAGIC_FOCUS" ], - "volume": 5, + "volume": "1250 ml", "bashing": 30, "//electric": 15, "price": 0, @@ -192,8 +192,8 @@ "name_plural": "Stormfists", "description": "Encases your arm and hand in a sheath of crackling magical lightning, you can punch and defend yourself with it in melee combat.", "material": [ "superalloy" ], - "volume": 1, - "weight": 1, + "volume": "250 ml", + "weight": "1 g", "bashing": 10, "//electric": 15, "flags": [ @@ -214,8 +214,8 @@ "color": "brown", "name": "vicious tentacle whip", "description": "A long, writhing, tentacle covered in sharp bonelike blades and spikey protrusions.", - "weight": 2460, - "volume": 6, + "weight": "2460 g", + "volume": "1500 ml", "material": [ "iron", "leather" ], "techniques": [ "PRECISE", "RAPID", "WBLOCK_2" ], "flags": [ @@ -237,6 +237,7 @@ "id": "fleshpouch", "type": "ARMOR", "name": "flesh pouch", + "name_plural": "flesh pouches", "description": "A large pouch of tough flesh on your back, filled with tiny tentacles that grasp and hold anything you place inside. It shifts and adjusts itself to minimize encumbrance.", "weight": 0, "volume": 0, @@ -247,7 +248,7 @@ "covers": [ "TORSO" ], "coverage": 40, "encumbrance": 10, - "storage": 100, + "storage": "25 L", "material_thickness": 3, "flags": [ "BELTED", "TRADER_AVOID", "WATERPROOF", "STURDY", "NO_UNWIELD", "ONLY_ONE", "NO_REPAIR", "NO_SALVAGE" ] }, @@ -272,8 +273,8 @@ "MAGIC_FOCUS" ], "techniques": [ "WBLOCK_2", "WIDE", "SWEEP", "BRUTAL" ], - "weight": 2175, - "volume": 10, + "weight": "2175 g", + "volume": "2500 ml", "bashing": 16, "cutting": 36, "to_hit": 2 @@ -301,8 +302,8 @@ ], "skill": "archery", "min_strength": 5, - "weight": 540, - "volume": 10, + "weight": "540 g", + "volume": "2500 ml", "bashing": 16, "to_hit": 1, "reload_noise_volume": 2, @@ -315,8 +316,8 @@ { "type": "TOOL", "id": "druid_seed", - "name": "seed of purification", - "weight": 1, + "name": { "str": "seed of purification", "str_pl": "seeds of purification" }, + "weight": "1 g", "color": "white", "use_action": { "type": "transform", @@ -327,7 +328,7 @@ }, "symbol": "!", "description": "A magical seed that can be squeezed to release purifying dust, which can then be used to purify up to a gallon of water", - "volume": 1, + "volume": "250 ml", "flags": [ "TRADER_AVOID" ] }, { @@ -344,6 +345,20 @@ "max_charges": 15, "use_action": "WATER_PURIFIER" }, + { + "id": "obfuscating_aura", + "type": "ARMOR", + "name": "obfuscating aura", + "description": "An all-encompassing, invisible layer of magic distorts light around your body. Allows you to dodge two extra attacks in a given turn.", + "weight": "1g", + "volume": "1ml", + "price": 3646, + "symbol": "o", + "color": "white", + "covers": [ "LEGS", "TORSO", "ARMS", "HANDS", "HEAD", "FEET", "MOUTH", "EYES" ], + "flags": [ "AURA", "SEMITANGIBLE", "OVERSIZE", "ONLY_ONE", "TRADER_AVOID", "NO_TAKEOFF", "NONCONDUCTIVE" ], + "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "BONUS_DODGE", "add": 2 } ] } ] } + }, { "id": "acid_res_aura", "type": "ARMOR", diff --git a/data/mods/Magiclysm/items/fuel.json b/data/mods/Magiclysm/items/fuel.json index 36afecab841a5..024d6a54e831e 100644 --- a/data/mods/Magiclysm/items/fuel.json +++ b/data/mods/Magiclysm/items/fuel.json @@ -4,7 +4,7 @@ "id": "dragon_blood", "name": "dragon blood", "name_plural": "dragon blood", - "weight": 2, + "weight": "2 g", "color": "red", "container": "flask_glass", "symbol": "~", @@ -29,7 +29,7 @@ "id": "tainted_blood", "name": "tainted blood", "name_plural": "tainted blood", - "weight": 2, + "weight": "2 g", "color": "black", "container": "flask_glass", "symbol": "~", @@ -47,7 +47,7 @@ "id": "blood", "name": "blood", "name_plural": "blood", - "weight": 265, + "weight": "265 g", "color": "red", "container": "flask_glass", "symbol": "~", diff --git a/data/mods/Magiclysm/items/mana_crystals.json b/data/mods/Magiclysm/items/mana_crystals.json index aa3fa655e26df..487021cfc605b 100644 --- a/data/mods/Magiclysm/items/mana_crystals.json +++ b/data/mods/Magiclysm/items/mana_crystals.json @@ -29,8 +29,8 @@ "name": "small mana crystal", "name_plural": "small mana crystals", "description": "This is a small mana crystal specifically designed to be attached to wand tips.", - "weight": 5, - "volume": 1, + "weight": "5 g", + "volume": "250 ml", "price": 1500, "symbol": "=", "color": "yellow", diff --git a/data/mods/Magiclysm/items/melee.json b/data/mods/Magiclysm/items/melee.json index dc9b819a0d388..aeb5b063cdef5 100644 --- a/data/mods/Magiclysm/items/melee.json +++ b/data/mods/Magiclysm/items/melee.json @@ -5,11 +5,11 @@ "type": "GENERIC", "name": "Mjölnir", "description": "Mjölnir, the legendary hammer of Thor. It is rumored to be able to level mountains with a single blow. You feel the power of Asgard coursing through the hammer.", - "weight": 1731, + "weight": "1731 g", "color": "light_gray", "material": [ "orichalcum_metal", "wood", "gold" ], "techniques": [ "WBLOCK_2", "BRUTAL" ], - "volume": 15, + "volume": "3750 ml", "bashing": 45, "price": 200000 }, @@ -19,10 +19,10 @@ "type": "GENERIC", "name": "Gungnir", "description": "Gungnir, the spear of Odin. It is rumored to be the perfect spear, perfectly hitting any target regardless of the wielder's strength or skill. If feels like Odin's protecting you.", - "weight": 1854, + "weight": "1854 g", "material": [ "orichalcum_metal", "wood", "gold" ], "techniques": [ "WBLOCK_1", "IMPALE", "SWEEP" ], - "volume": 13, + "volume": "3250 ml", "bashing": 10, "cutting": 35, "price": 200000 @@ -33,10 +33,10 @@ "type": "GENERIC", "name": "Gram", "description": "Gram, the sword of Sigurd. It is rumored to be the sword that slayed the legendary dragon, Fafnir. Once said to have cleaved Regin's anvil in half, the edge is impeccable.", - "weight": 1132, + "weight": "1132 g", "material": [ "orichalcum_metal", "steel", "leather" ], "techniques": [ "WBLOCK_2", "PRECISE", "VORPAL" ], - "volume": 10, + "volume": "2500 ml", "cutting": 45, "price": 200000 }, @@ -50,7 +50,7 @@ "material": [ "steel", "gold", "orichalcum_metal" ], "flags": [ "MAGIC_FOCUS" ], "techniques": [ "WBLOCK_2", "SPIN", "RAPID", "SWEEP" ], - "weight": 1860, + "weight": "1860 g", "bashing": 20, "cutting": 35, "use_action": { "type": "cast_spell", "spell_id": "ethereal_grasp", "no_fail": true, "level": 10, "need_wielding": true } diff --git a/data/mods/Magiclysm/items/obsolete.json b/data/mods/Magiclysm/items/obsolete.json index 06008aa052864..acd51a29710e7 100644 --- a/data/mods/Magiclysm/items/obsolete.json +++ b/data/mods/Magiclysm/items/obsolete.json @@ -5,8 +5,8 @@ "name_plural": "wands of fireball", "description": "A classic, this wand shoots fireballs without fail. A more skilled Kelvinist could cast them more efficiently, though.", "type": "TOOL", - "weight": 230, - "volume": 2, + "weight": "230 g", + "volume": "500 ml", "price": 10000, "bashing": 3, "to_hit": 2, @@ -25,8 +25,8 @@ "name_plural": "wands of magic missile", "description": "A classic, this wand shoots magic missiles without fail. A more skilled Magus could cast them more efficiently, though.", "type": "TOOL", - "weight": 230, - "volume": 2, + "weight": "230 g", + "volume": "500 ml", "price": 10000, "bashing": 3, "to_hit": 2, diff --git a/data/mods/Magiclysm/items/recipe_books.json b/data/mods/Magiclysm/items/recipe_books.json index eb689e4c22297..662c86f88c32e 100644 --- a/data/mods/Magiclysm/items/recipe_books.json +++ b/data/mods/Magiclysm/items/recipe_books.json @@ -83,12 +83,12 @@ "name": { "str": "The Weapons of Asgard and Beyond", "str_pl": "copies of The Weapons of Asgard and Beyond" }, "max_level": 10, "description": "An ornate book which appears to be written in Norse runes. Based on the detailed illustrations, it appears to contain information about crafting numerous weapons used by various Gods.", - "weight": 654, + "weight": "654 g", "color": "light_blue", "intelligence": 9, "symbol": "?", "material": [ "paper" ], - "volume": 5, + "volume": "1250 ml", "time": 60, "fun": 0, "skill": "fabrication", diff --git a/data/mods/Magiclysm/items/spell_scrolls.json b/data/mods/Magiclysm/items/spell_scrolls.json index 9056ceab8cbfe..38435e02f4f75 100644 --- a/data/mods/Magiclysm/items/spell_scrolls.json +++ b/data/mods/Magiclysm/items/spell_scrolls.json @@ -3,8 +3,8 @@ "abstract": "spell_scroll", "name": "Spell Scroll", "type": "GENERIC", - "weight": 475, - "volume": 2, + "weight": "475 g", + "volume": "500 ml", "price": 4000, "material": [ "paper" ], "symbol": "?", @@ -14,7 +14,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_dark_sight", - "name": "Scroll of Dark Sight", + "name": { "str": "Scroll of Dark Sight", "str_pl": "Scrolls of Dark Sight" }, "description": "The darkness holds no secrets for the arcane. Adjust your sight to see in perfect darkness!", "use_action": { "type": "learn_spell", "spells": [ "dark_sight" ] } }, @@ -22,15 +22,23 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_invisibility", - "name": "Scroll of Invisibility", - "description": "The light can not interact with you unless you want it to. Become invisible!", + "name": { "str": "Scroll of Invisibility", "str_pl": "Scrolls of Invisibility" }, + "description": "The light can not interact with you unless you want it to. Become invisible!", "use_action": { "type": "learn_spell", "spells": [ "invisibility" ] } }, + { + "type": "GENERIC", + "copy-from": "spell_scroll", + "id": "spell_scroll_obfuscated_body", + "name": { "str": "Scroll of Obfuscated Body", "str_pl": "Scrolls of Obfuscated Body" }, + "description": "A magical aura distorts light around your body, making it easier to dodge enemy attacks.", + "use_action": { "type": "learn_spell", "spells": [ "obfuscated_body" ] } + }, { "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_smite", - "name": "Scroll of Smite", + "name": { "str": "Scroll of Smite", "str_pl": "Scrolls of Smite" }, "description": "Evil has become pervasive throughout the world. Let your power be the light that shines in the darkness!", "use_action": { "type": "learn_spell", "spells": [ "smite" ] } }, @@ -38,7 +46,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_recover_mana", - "name": "Scroll of Life Conversion", + "name": { "str": "Scroll of Life Conversion", "str_pl": "Scrolls of Life Conversion" }, "description": "You channel your life force itself into your spiritual energy. You spend hp to regain mana.", "use_action": { "type": "learn_spell", "spells": [ "recover_mana" ] } }, @@ -46,7 +54,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_recover_pain", - "name": "Scroll of Mind Over Pain", + "name": { "str": "Scroll of Mind Over Pain", "str_pl": "Scrolls of Mind Over Pain" }, "description": "With an intense ritual that resembles crossfit, you manage to put some of your pain at bay.", "use_action": { "type": "learn_spell", "spells": [ "recover_pain" ] } }, @@ -54,7 +62,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_summon_zombie", - "name": "Scroll of Summon Zombie", + "name": { "str": "Scroll of Summon Zombie", "str_pl": "Scrolls of Summon Zombie" }, "description": "An ethereal-looking zombie rises from the depths of the earth to fight for you. You may be able to summon more with a higher level in this spell.", "use_action": { "type": "learn_spell", "spells": [ "summon_zombie" ] } }, @@ -62,7 +70,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_summon_skeleton", - "name": "Scroll of Summon Skeleton", + "name": { "str": "Scroll of Summon Skeleton", "str_pl": "Scrolls of Summon Skeleton" }, "description": "A ghostly skeleton rises from the depths of the earth to fight for you. You may be able to summon more with a higher level in this spell.", "use_action": { "type": "learn_spell", "spells": [ "summon_skeleton" ] } }, @@ -70,7 +78,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_summon_decayed_pouncer", - "name": "Scroll of Summon Decayed Pouncer", + "name": { "str": "Scroll of Summon Decayed Pouncer", "str_pl": "Scrolls of Summon Decayed Pouncer" }, "description": "A decrepit looking large cat rises from the depths of the earth to fight for you. You may be able to summon more with a higher level in this spell.", "use_action": { "type": "learn_spell", "spells": [ "summon_decayed_pouncer" ] } }, @@ -78,7 +86,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_light_healing", - "name": "Scroll of Cure Light Wounds", + "name": { "str": "Scroll of Cure Light Wounds", "str_pl": "Scrolls of Cure Light Wounds" }, "description": "Heals a little bit of damage on the target.", "use_action": { "type": "learn_spell", "spells": [ "light_healing" ] } }, @@ -86,7 +94,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_pain_split", - "name": "Scroll of Pain Split", + "name": { "str": "Scroll of Pain Split", "str_pl": "Scrolls of Pain Split" }, "description": "Evens out damage among your limbs.", "use_action": { "type": "learn_spell", "spells": [ "pain_split" ] } }, @@ -94,7 +102,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_vicious_tentacle", - "name": "Scroll of Vicious Tentacle", + "name": { "str": "Scroll of Vicious Tentacle", "str_pl": "Scrolls of Vicious Tentacle" }, "description": "This spell extrudes a long nasty whiplike tentacle of sharp bones and oozing acid from your body, it has a long reach attack and vicious damage.", "use_action": { "type": "learn_spell", "spells": [ "vicious_tentacle" ] } }, @@ -102,7 +110,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_bio_grotesque", - "name": "Scroll of Grotesque Enhancement", + "name": { "str": "Scroll of Grotesque Enhancement", "str_pl": "Scrolls of Grotesque Enhancement" }, "description": "A spell that warps your body in alien ways to increase your physical abilities and strength.", "use_action": { "type": "learn_spell", "spells": [ "bio_grotesque" ] } }, @@ -110,7 +118,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_bio_acidicspray", - "name": "Scroll of Acidic Spray", + "name": { "str": "Scroll of Acidic Spray", "str_pl": "Scrolls of Acidic Spray" }, "description": "When cast, the mage opens his mouth and sprays acid in a wide cone to dissolve his foes into goo. Just imagine what he'll do with the goo.", "use_action": { "type": "learn_spell", "spells": [ "bio_acidicspray" ] } }, @@ -118,7 +126,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_bio_fleshpouch", - "name": "Scroll of Flesh Pouch", + "name": { "str": "Scroll of Flesh Pouch", "str_pl": "Scrolls of Flesh Pouch" }, "description": "This spell grows a large pouch out of your skin on your back, allowing you to store your gear in it.", "use_action": { "type": "learn_spell", "spells": [ "bio_fleshpouch" ] } }, @@ -126,7 +134,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_bio_bonespear", - "name": "Scroll of Conjure Bonespear", + "name": { "str": "Scroll of Conjure Bonespear", "str_pl": "Scrolls of Conjure Bonespear" }, "description": "This spell creates a long shaft of bone with a wicked point and blades along its length.", "use_action": { "type": "learn_spell", "spells": [ "bio_bonespear" ] } }, @@ -134,7 +142,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_megablast", - "name": "Scroll of Megablast", + "name": { "str": "Scroll of Megablast", "str_pl": "Scrolls of Megablast" }, "description": "You always wanted to fire energy beams like in the animes you watched as a kid. Now you can!", "use_action": { "type": "learn_spell", "spells": [ "megablast" ] } }, @@ -142,7 +150,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_create_atomic_light", - "name": "Scroll of Magical Light", + "name": { "str": "Scroll of Magical Light", "str_pl": "Scrolls of Magical Light" }, "description": "Creates a magical light.", "use_action": { "type": "learn_spell", "spells": [ "create_atomic_light" ] } }, @@ -150,7 +158,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_blinding_flash", - "name": "Scroll of Blinding Flash", + "name": { "str": "Scroll of Blinding Flash", "str_pl": "Scrolls of Blinding Flash" }, "description": "Blind enemies for a short time with a sudden, dazzling light. Higher levels deal slightly higher damage.", "use_action": { "type": "learn_spell", "spells": [ "blinding_flash" ] } }, @@ -158,7 +166,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_ethereal_grasp", - "name": "Scroll of Ethereal Grasp", + "name": { "str": "Scroll of Ethereal Grasp", "str_pl": "Scrolls of Ethereal Grasp" }, "description": "A mass of spectral hands emerge from the ground, slowing everything in range. Higher levels allow a bigger AoE, and longer effect.", "use_action": { "type": "learn_spell", "spells": [ "ethereal_grasp" ] } }, @@ -166,7 +174,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_protection_aura", - "name": "Scroll of Aura of Protection", + "name": { "str": "Scroll of Aura of Protection", "str_pl": "Scrolls of Aura of Protection" }, "description": "Encases your whole body in a magical aura that protects you from the environment.", "use_action": { "type": "learn_spell", "spells": [ "protection_aura" ] } }, @@ -174,7 +182,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_druid_veggrasp", - "name": "Scroll of Vegetative Grasp", + "name": { "str": "Scroll of Vegetative Grasp", "str_pl": "Scrolls of Vegetative Grasp" }, "description": "This spell causes roots and vines to burst forth from the ground and grab your foes, slowing them and doing a small amount of damage as they dig in.", "use_action": { "type": "learn_spell", "spells": [ "druid_veggrasp" ] } }, @@ -182,7 +190,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_druid_rootstrike", - "name": "Scroll of Root Strike", + "name": { "str": "Scroll of Root Strike", "str_pl": "Scrolls of Root Strike" }, "description": "This spell causes roots to spear out the ground and stab into your foes in an arc, impaling them.", "use_action": { "type": "learn_spell", "spells": [ "druid_rootstrike" ] } }, @@ -190,7 +198,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_druid_woodshaft", - "name": "Scroll of Wooden Shaft", + "name": { "str": "Scroll of Wooden Shaft", "str_pl": "Scrolls of Wooden Shaft" }, "description": "This spell creates a projectile of hardwood that shoots forth from the caster's hand at high speed to stab into an enemy.", "use_action": { "type": "learn_spell", "spells": [ "druid_woodshaft" ] } }, @@ -198,7 +206,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_druid_naturebow1", - "name": "Scroll of Nature's Bow", + "name": { "str": "Scroll of Nature's Bow", "str_pl": "Scrolls of Nature's Bow" }, "description": "This spell conjures a magical wooden recurve bow that fires endless arrows for as long as it lasts.", "use_action": { "type": "learn_spell", "spells": [ "druid_naturebow1" ] } }, @@ -206,7 +214,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_recover_fatigue", - "name": "Scroll of Nature's Trance", + "name": { "str": "Scroll of Nature's Trance", "str_pl": "Scrolls of Nature's Trance" }, "description": "Your connection to living things allows you to go into a magical trance. This allows you to recover fatige quickly in exchange for mana.", "use_action": { "type": "learn_spell", "spells": [ "recover_fatigue" ] } }, @@ -214,7 +222,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_summon_cats", - "name": "Scroll of Bag of Cats", + "name": { "str": "Scroll of Bag of Cats", "str_pl": "Scrolls of Bag of Cats" }, "description": "Are you the crazy cat lady?", "use_action": { "type": "learn_spell", "spells": [ "summon_cats" ] } }, @@ -222,7 +230,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_stonefist", - "name": "Scroll of Stonefist", + "name": { "str": "Scroll of Stonefist", "str_pl": "Scrolls of Stonefist" }, "description": "Encases your arms and hands in a sheath of magical stone, you can punch and defend yourself with it in melee combat.", "use_action": { "type": "learn_spell", "spells": [ "stonefist" ] } }, @@ -230,7 +238,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_seismic_stomp", - "name": "Scroll of Seismic Stomp", + "name": { "str": "Scroll of Seismic Stomp", "str_pl": "Scrolls of Seismic Stomp" }, "description": "Focusing mana into your leg, you stomp your foot and send out a shockwave, knocking enemies around you onto the ground.", "use_action": { "type": "learn_spell", "spells": [ "seismic_stomp" ] } }, @@ -238,7 +246,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_recover_stamina", - "name": "Scroll of Stone's Endurance", + "name": { "str": "Scroll of Stone's Endurance", "str_pl": "Scrolls of Stone's Endurance" }, "description": "You focus on the stones beneath you and draw from their agelessness. Your mana is converted to stamina.", "use_action": { "type": "learn_spell", "spells": [ "recover_stamina" ] } }, @@ -246,7 +254,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_eshaper_shardspray", - "name": "Scroll of Shardspray", + "name": { "str": "Scroll of Shardspray", "str_pl": "Scrolls of Shardspray" }, "description": "This spell projects a wide spray of sharp metal shards, cutting into your foes and friends alike.", "use_action": { "type": "learn_spell", "spells": [ "eshaper_shardspray" ] } }, @@ -254,7 +262,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_eshaper_piercing_bolt", - "name": "Scroll of Piercing Bolt", + "name": { "str": "Scroll of Piercing Bolt", "str_pl": "Scrolls of Piercing Bolt" }, "description": "This spell projects a piercing rod of conjured iron at those that dare oppose you.", "use_action": { "type": "learn_spell", "spells": [ "eshaper_piercing_bolt" ] } }, @@ -262,7 +270,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_eshaper_shardstorm", - "name": "Scroll of Shardstorm", + "name": { "str": "Scroll of Shardstorm", "str_pl": "Scrolls of Shardstorm" }, "description": "Creates an omnidirectional spray of razor sharp metal shards all around you.", "use_action": { "type": "learn_spell", "spells": [ "eshaper_shardstorm" ] } }, @@ -270,7 +278,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_eshaper_rockbolt", - "name": "Scroll of Rockbolt", + "name": { "str": "Scroll of Rockbolt", "str_pl": "Scrolls of Rockbolt" }, "description": "Fires a conjured stone projectile at high velocity.", "use_action": { "type": "learn_spell", "spells": [ "eshaper_rockbolt" ] } }, @@ -278,7 +286,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_point_flare", - "name": "Scroll of Point Flare", + "name": { "str": "Scroll of Point Flare", "str_pl": "Scrolls of Point Flare" }, "description": "Causes an intense heat at the location, damaging the target.", "use_action": { "type": "learn_spell", "spells": [ "point_flare" ] } }, @@ -286,7 +294,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_create_lighter", - "name": "Scroll of Finger Firelighter", + "name": { "str": "Scroll of Finger Firelighter", "str_pl": "Scrolls of Finger Firelighter" }, "description": "Summons a small flame that does not burn you, but you can use it to light things on fire. It seems to need you to have some intent to light things on fire, because you are able to put it in your pocket with no issue.", "use_action": { "type": "learn_spell", "spells": [ "create_lighter" ] } }, @@ -294,7 +302,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_ice_spike", - "name": "Scroll of Ice Spike", + "name": { "str": "Scroll of Ice Spike", "str_pl": "Scrolls of Ice Spike" }, "description": "Causes jagged icicles to form in the air above the target, falling and damaging it.", "use_action": { "type": "learn_spell", "spells": [ "ice_spike" ] } }, @@ -302,7 +310,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_fireball", - "name": "Scroll of Fireball", + "name": { "str": "Scroll of Fireball", "str_pl": "Scrolls of Fireball" }, "description": "You hurl a pea-sized glowing orb that when reaches its target or an obstacle produces a pressure-less blast of searing heat.", "use_action": { "type": "learn_spell", "spells": [ "fireball" ] } }, @@ -310,7 +318,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_cone_cold", - "name": "Scroll of Cone of Cold", + "name": { "str": "Scroll of Cone of Cold", "str_pl": "Scrolls of Cone of Cold" }, "description": "You blast a cone of frigid air toward the target.", "use_action": { "type": "learn_spell", "spells": [ "cone_cold" ] } }, @@ -318,7 +326,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_burning_hands", - "name": "Scroll of Burning Hands", + "name": { "str": "Scroll of Burning Hands", "str_pl": "Scrolls of Burning Hands" }, "description": "You're pretty sure you saw this in a game somewhere. You fire a short-range cone of fire.", "use_action": { "type": "learn_spell", "spells": [ "burning_hands" ] } }, @@ -326,7 +334,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_frost_spray", - "name": "Scroll of Frost Spray", + "name": { "str": "Scroll of Frost Spray", "str_pl": "Scrolls of Frost Spray" }, "description": "You're pretty sure you saw this in a game somewhere. You fire a short-range cone of ice and cold.", "use_action": { "type": "learn_spell", "spells": [ "frost_spray" ] } }, @@ -334,7 +342,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_chilling_touch", - "name": "Scroll of Chilling Touch", + "name": { "str": "Scroll of Chilling Touch", "str_pl": "Scrolls of Chilling Touch" }, "description": "Freezes the touched target with intense cold.", "use_action": { "type": "learn_spell", "spells": [ "chilling_touch" ] } }, @@ -342,7 +350,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_glide_ice", - "name": "Scroll of Glide on Ice", + "name": { "str": "Scroll of Glide on Ice", "str_pl": "Scrolls of Glide on Ice" }, "description": "Encases your feet in a magical coating of ice, allowing you to glide along smooth surfaces faster.", "use_action": { "type": "learn_spell", "spells": [ "glide_ice" ] } }, @@ -350,7 +358,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_hoary_blast", - "name": "Scroll of Hoary Blast", + "name": { "str": "Scroll of Hoary Blast", "str_pl": "Scrolls of Hoary Blast" }, "description": "You project a glowing white crystal of ice and it explodes on impact into a blossom of shattering cold.", "use_action": { "type": "learn_spell", "spells": [ "hoary_blast" ] } }, @@ -358,7 +366,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_ice_shield", - "name": "Scroll of Ice Shield", + "name": { "str": "Scroll of Ice Shield", "str_pl": "Scrolls of Ice Shield" }, "description": "Creates a magical shield of ice on your arm, you can defend yourself with it in melee combat and use it to bash.", "use_action": { "type": "learn_spell", "spells": [ "ice_shield" ] } }, @@ -366,7 +374,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_frost_armor", - "name": "Scroll of Frost Armor", + "name": { "str": "Scroll of Frost Armor", "str_pl": "Scrolls of Frost Armor" }, "description": "Covers you in a thin layer of magical ice to protect you from harm.", "use_action": { "type": "learn_spell", "spells": [ "frost_armor" ] } }, @@ -374,7 +382,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_magic_missile", - "name": "Scroll of Magic Missile", + "name": { "str": "Scroll of Magic Missile", "str_pl": "Scrolls of Magic Missile" }, "description": "I cast Magic Missile at the darkness!", "use_action": { "type": "learn_spell", "spells": [ "magic_missile" ] } }, @@ -382,7 +390,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_phase_door", - "name": "Scroll of Phase Door", + "name": { "str": "Scroll of Phase Door", "str_pl": "Scrolls of Phase Door" }, "description": "Teleports you in a random direction a short distance.", "use_action": { "type": "learn_spell", "spells": [ "phase_door" ] } }, @@ -390,7 +398,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_gravity_well", - "name": "Scroll of Gravity Well", + "name": { "str": "Scroll of Gravity Well", "str_pl": "Scrolls of Gravity Well" }, "description": "Summons a well of gravity with the epicenter at the location. Deals bashing damage to all creatures in the affected area.", "use_action": { "type": "learn_spell", "spells": [ "gravity_well" ] } }, @@ -398,7 +406,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_magus_mana_blast", - "name": "Scroll of Mana Blast", + "name": { "str": "Scroll of Mana Blast", "str_pl": "Scrolls of Mana Blast" }, "description": "A blast of concentrated magical power that obliterates a large area.", "use_action": { "type": "learn_spell", "spells": [ "magus_mana_blast" ] } }, @@ -406,7 +414,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_magus_mana_bolt", - "name": "Scroll of Mana Bolt", + "name": { "str": "Scroll of Mana Bolt", "str_pl": "Scrolls of Mana Bolt" }, "description": "A bolt of magical power that only damages your foes.", "use_action": { "type": "learn_spell", "spells": [ "magus_mana_bolt" ] } }, @@ -414,7 +422,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_magus_haste", - "name": "Scroll of Haste", + "name": { "str": "Scroll of Haste", "str_pl": "Scrolls of Haste" }, "description": "This spell gives you an enormous boost of speed lasting a short period of time.", "use_action": { "type": "learn_spell", "spells": [ "magus_haste" ] } }, @@ -422,7 +430,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_magus_mana_beam", - "name": "Scroll of Mana Beam", + "name": { "str": "Scroll of Mana Beam", "str_pl": "Scrolls of Mana Beam" }, "description": "A beam of focused magical power that damages any foes in its path.", "use_action": { "type": "learn_spell", "spells": [ "magus_mana_beam" ] } }, @@ -430,7 +438,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_magus_escape", - "name": "Scroll of Escape", + "name": { "str": "Scroll of Escape", "str_pl": "Scrolls of Escape" }, "description": "Teleports you in a random direction a medium distance, to help escape your foes in dangerous situations.", "use_action": { "type": "learn_spell", "spells": [ "magus_escape" ] } }, @@ -438,7 +446,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_cats_grace", - "name": "Scroll of Cat's Grace", + "name": { "str": "Scroll of Cat's Grace", "str_pl": "Scrolls of Cat's Grace" }, "description": "You become more graceful, agile, and coordinated.", "use_action": { "type": "learn_spell", "spells": [ "cats_grace" ] } }, @@ -446,7 +454,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_eagles_sight", - "name": "Scroll of Eagle's Sight", + "name": { "str": "Scroll of Eagle's Sight", "str_pl": "Scrolls of Eagle's Sight" }, "description": "You gain the perception of an eagle.", "use_action": { "type": "learn_spell", "spells": [ "eagles_sight" ] } }, @@ -454,7 +462,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_ogres_strength", - "name": "Scroll of Ogre's Strength", + "name": { "str": "Scroll of Ogre's Strength", "str_pl": "Scrolls of Ogre's Strength" }, "description": "You gain the strength of an ogre.", "use_action": { "type": "learn_spell", "spells": [ "ogres_strength" ] } }, @@ -462,7 +470,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_foxs_cunning", - "name": "Scroll of Fox's Cunning", + "name": { "str": "Scroll of Fox's Cunning", "str_pl": "Scrolls of Fox's Cunning" }, "description": "You become wily like a fox.", "use_action": { "type": "learn_spell", "spells": [ "foxs_cunning" ] } }, @@ -470,7 +478,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_jolt", - "name": "Scroll of Jolt", + "name": { "str": "Scroll of Jolt", "str_pl": "Scrolls of Jolt" }, "description": "A short-ranged fan of electricity shoots from your fingers.", "use_action": { "type": "learn_spell", "spells": [ "jolt" ] } }, @@ -478,7 +486,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_lightning_bolt", - "name": "Scroll of Lightning Bolt", + "name": { "str": "Scroll of Lightning Bolt", "str_pl": "Scrolls of Lightning Bolt" }, "description": "The goto spell for many Stormshapers, this iconic spell does just what you expect: you shoot lightning from your fingertips. However, this lightning is more directed than most lightning, and travels in a line through most non-solid targets.", "use_action": { "type": "learn_spell", "spells": [ "lightning_bolt" ] } }, @@ -486,7 +494,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_windstrike", - "name": "Scroll of Windstrike", + "name": { "str": "Scroll of Windstrike", "str_pl": "Scrolls of Windstrike" }, "description": "A powerful blast of wind slams into anything in front of your outstretched hand.", "use_action": { "type": "learn_spell", "spells": [ "windstrike" ] } }, @@ -494,7 +502,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_windrun", - "name": "Scroll of Windrunning", + "name": { "str": "Scroll of Windrunning", "str_pl": "Scrolls of Windrunning" }, "description": "A magical wind pushes you forward as you move, easing your movements and increasing speed.", "use_action": { "type": "learn_spell", "spells": [ "windrun" ] } }, @@ -502,7 +510,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_storm_hammer", - "name": "Scroll of Call Stormhammer", + "name": { "str": "Scroll of Call Stormhammer", "str_pl": "Scrolls of Call Stormhammer" }, "description": "Creates a crackling magical warhammer full of lightning to smite your foes with, and of course, smash things to bits!", "use_action": { "type": "learn_spell", "spells": [ "storm_hammer" ] } }, @@ -510,7 +518,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_bless", - "name": "Scroll of Bless", + "name": { "str": "Scroll of Bless", "str_pl": "Scrolls of Bless" }, "description": "A spell of blessing that gives you energy and boosts your abilities.", "use_action": { "type": "learn_spell", "spells": [ "bless" ] } }, @@ -518,7 +526,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_holy_blade", - "name": "Scroll of Holy Blade", + "name": { "str": "Scroll of Holy Blade", "str_pl": "Scrolls of Holy Blade" }, "description": "This blade of light will cut through any evil it makes contact with!", "use_action": { "type": "learn_spell", "spells": [ "holy_blade" ] } }, @@ -526,7 +534,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_spirit_armor", - "name": "Scroll of Spiritual Armor", + "name": { "str": "Scroll of Spiritual Armor", "str_pl": "Scrolls of Spiritual Armor" }, "description": "Evil will not make it through your defenses if your faith is strong enough!", "use_action": { "type": "learn_spell", "spells": [ "spirit_armor" ] } }, @@ -534,7 +542,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_create_atomic_lamp", - "name": "Scroll of Lamp", + "name": { "str": "Scroll of Lamp", "str_pl": "Scrolls of Lamp" }, "description": "Creates a magical lamp.", "use_action": { "type": "learn_spell", "spells": [ "create_atomic_lamp" ] } }, @@ -542,7 +550,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_recover_bionic_power", - "name": "Scroll of Manatricity", + "name": { "str": "Scroll of Manatricity", "str_pl": "Scrolls of Manatricity" }, "description": "You have found a way to convert your spiritual energy into power you can use for your bionics.", "use_action": { "type": "learn_spell", "spells": [ "recover_bionic_power" ] } }, @@ -550,7 +558,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_taze", - "name": "Scroll of Taze", + "name": { "str": "Scroll of Taze", "str_pl": "Scrolls of Taze" }, "description": "This spell creates a very short range bolt of electricity to shock your foes.", "use_action": { "type": "learn_spell", "spells": [ "taze" ] } }, @@ -558,7 +566,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_quantum_tunnel_lesser", - "name": "Scroll of Lesser Quantum Tunnel", + "name": { "str": "Scroll of Lesser Quantum Tunnel", "str_pl": "Scrolls of Lesser Quantum Tunnel" }, "description": "This spell manipulates some quantum something or other to tunnel you through a short distance of space, and even matter, unfortunately there's that whole uncertainty thing as to where you come out. It leaves you a little dazed on the other side as you reorient yourself.", "use_action": { "type": "learn_spell", "spells": [ "quantum_tunnel_lesser" ] } }, @@ -566,7 +574,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_synaptic_stimulation", - "name": "Scroll of Synaptic Stimulation", + "name": { "str": "Scroll of Synaptic Stimulation", "str_pl": "Scrolls of Synaptic Stimulation" }, "description": "This spell stimulates the synapses in your brain beyond normal processing speeds, giving you a large boost in mental processing capability, including enhancing your reflexes, speed, and raw intellectual power. Use responsibly!", "use_action": { "type": "learn_spell", "spells": [ "synaptic_stimulation" ] } }, @@ -574,7 +582,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_laze", - "name": "Scroll of Laze", + "name": { "str": "Scroll of Laze", "str_pl": "Scrolls of Laze" }, "description": "You concentrate and release a focused beam of photons at a target, also known as a laser.", "use_action": { "type": "learn_spell", "spells": [ "laze" ] } }, @@ -582,7 +590,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_animated_blade", - "name": "Scroll of Animated Blade", + "name": { "str": "Scroll of Animated Blade", "str_pl": "Scrolls of Animated Blade" }, "description": "This spell conjures flying animated blades that will cut your enemies down to size. Into small pieces that is.", "use_action": { "type": "learn_spell", "spells": [ "animated_blade" ] } }, @@ -590,7 +598,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_mirror_image", - "name": "Scroll of Mirror Image", + "name": { "str": "Scroll of Mirror Image", "str_pl": "Scrolls of Mirror Image" }, "description": "This spell manipulates light into barely tangible duplicates of a living being, a magical hologram in short.", "use_action": { "type": "learn_spell", "spells": [ "mirror_image" ] } }, @@ -598,7 +606,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_lightning_blast", - "name": "Scroll of Lightning Blast", + "name": { "str": "Scroll of Lightning Blast", "str_pl": "Scrolls of Lightning Blast" }, "description": "You fire a small concentrated ball of lightning at the target. The electricity diffuses quickly, so it doesn't do much damage, but you're able to fire off several quick ones in a row.", "use_action": { "type": "learn_spell", "spells": [ "lightning_blast" ] } }, @@ -606,7 +614,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_necrotic_gaze", - "name": "Scroll of Necrotic Gaze", + "name": { "str": "Scroll of Necrotic Gaze", "str_pl": "Scrolls of Necrotic Gaze" }, "description": "You use the power of your own blood to imbue necrotic energy into your gaze, damaging the target you look at.", "use_action": { "type": "learn_spell", "spells": [ "necrotic_gaze" ] } }, @@ -614,7 +622,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_purification_seed", - "name": "Scroll of Purification Seed", + "name": { "str": "Scroll of Purification Seed", "str_pl": "Scrolls of Purification Seed" }, "description": "You summon a gift of the earth which will purify water. Greater levels yield greater numbers of seeds.", "use_action": { "type": "learn_spell", "spells": [ "purify_seed" ] } }, @@ -622,7 +630,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_x-ray", - "name": "Scroll of X-ray Vision", + "name": { "str": "Scroll of X-ray Vision", "str_pl": "Scrolls of X-ray Vision" }, "description": "You fire a cone of X-rays that magically allow you to see that area for a short time.", "use_action": { "type": "learn_spell", "spells": [ "x-ray" ] } }, @@ -630,7 +638,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_clairvoyance", - "name": "Scroll of Clairvoyance", + "name": { "str": "Scroll of Clairvoyance", "str_pl": "Scrolls of Clairvoyance" }, "description": "You close your eyes and the earth surrenders its secrets to you.", "use_action": { "type": "learn_spell", "spells": [ "clairvoyance" ] } }, @@ -638,7 +646,7 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_lava_bomb", - "name": "Scroll of Lava Bomb", + "name": { "str": "Scroll of Lava Bomb", "str_pl": "Scrolls of Lava Bomb" }, "description": "You tear up the ground beneath you to fire a lava bomb: a globe of lava surrounded by hot, solid rock. It shatters upon impact, spraying shards of rock and lava everywhere.", "use_action": { "type": "learn_spell", "spells": [ "lava_bomb_main" ] } }, @@ -646,8 +654,20 @@ "type": "GENERIC", "copy-from": "spell_scroll", "id": "spell_scroll_acid_resistance", - "name": "Scroll of Acid Resistance", + "name": { "str": "Scroll of Acid Resistance", "str_pl": "Scrolls of Acid Resistance" }, "description": "This spell creates an invisible aura to protect you from acid.", "use_action": { "type": "learn_spell", "spells": [ "acid_resistance" ] } + }, + { + "id": "lightning_storm_scroll", + "type": "GENERIC", + "name": { "str": "Scroll of Lightning Storm", "str_pl": "Scrolls of Lightning Storm" }, + "description": "This scroll details how a spell called 'Lightning Blast' which is commonly used among Stormshapers can be altered to become much more powerful, at a much higher mana cost.", + "weight": "129 g", + "volume": "500 ml", + "price": 25000, + "symbol": "?", + "color": "light_blue", + "use_action": { "type": "learn_spell", "spells": [ "lightning_storm" ] } } ] diff --git a/data/mods/Magiclysm/items/spellbooks.json b/data/mods/Magiclysm/items/spellbooks.json index 19b470d8d0a9c..dfd7d15439f14 100644 --- a/data/mods/Magiclysm/items/spellbooks.json +++ b/data/mods/Magiclysm/items/spellbooks.json @@ -2,9 +2,9 @@ { "id": "DEBUG_spellbook", "type": "GENERIC", - "name": "A Technomancer's Guide to Debugging C:DDA", + "name": { "str": "A Technomancer's Guide to Debugging C:DDA", "str_pl": "copies of A Technomancer's Guide to Debugging C:DDA" }, "description": "static std::string description( spell sp ) const;", - "weight": 1, + "weight": "1 g", "volume": "1 ml", "symbol": "?", "color": "magenta", @@ -29,10 +29,10 @@ { "id": "wizard_beginner", "type": "GENERIC", - "name": "A Beginner's Guide to Magic", + "name": { "str": "A Beginner's Guide to Magic", "str_pl": "copies of A Beginner's Guide to Magic" }, "description": "You would describe this as more like a pamphlet than a spellbook, but it seems to have at least one interesting spell you can use.", - "weight": 585, - "volume": 1, + "weight": "585 g", + "volume": "250 ml", "price": 5000, "symbol": "?", "color": "light_red", @@ -41,10 +41,10 @@ { "id": "wizard_utility", "type": "GENERIC", - "name": "Wizarding Guide to Backpacking", + "name": { "str": "Wizarding Guide to Backpacking", "str_pl": "copies of Wizarding Guide to Backpacking" }, "description": "This appears to be the spell version of a guide for what things to take with you when backpacking. It's a little bulky, but will certainly prove useful.", - "weight": 1000, - "volume": 5, + "weight": "1 kg", + "volume": "1250 ml", "price": 35000, "symbol": "?", "color": "red", @@ -53,10 +53,10 @@ { "id": "pyro", "type": "GENERIC", - "name": "Pyromancy for Heretics", + "name": { "str": "Pyromancy for Heretics", "str_pl": "copies of Pyromancy for Heretics" }, "description": "This charred husk of a book still contains many ways to light things aflame.", - "weight": 450, - "volume": 4, + "weight": "450 g", + "volume": "1 L", "price": 1904, "symbol": "?", "color": "light_red", @@ -65,10 +65,10 @@ { "id": "wizard_advanced", "type": "GENERIC", - "name": "A Treatise on Magical Elements", + "name": { "str": "A Treatise on Magical Elements", "str_pl": "copies of A Treatise on Magical Elements" }, "description": "This details complex diagrams, rituals, and choreography that describes various spells.", - "weight": 920, - "volume": 3, + "weight": "920 g", + "volume": "750 ml", "price": 30000, "symbol": "?", "color": "light_red", @@ -77,10 +77,10 @@ { "id": "priest_beginner", "type": "GENERIC", - "name": "Introduction to the Divine", + "name": { "str": "Introduction to the Divine", "str_pl": "copies of Introduction to the Divine" }, "description": "This appears to mostly be a religious text, but it does have some notes on healing.", - "weight": 585, - "volume": 2, + "weight": "585 g", + "volume": "500 ml", "price": 5000, "symbol": "?", "color": "light_green", @@ -89,10 +89,13 @@ { "id": "priest_advanced", "type": "GENERIC", - "name": "The Paladin's Guide to Modern Spellcasting", + "name": { + "str": "The Paladin's Guide to Modern Spellcasting", + "str_pl": "copies of The Paladin's Guide to Modern Spellcasting" + }, "description": "Despite the title, this seems to be written in Middle English. A little obtuse, but you can make out most of the words well enough.", - "weight": 830, - "volume": 3, + "weight": "830 g", + "volume": "750 ml", "price": 30000, "symbol": "?", "color": "green", @@ -101,10 +104,10 @@ { "id": "winter_grasp", "type": "GENERIC", - "name": "Winter's Eternal Grasp", + "name": { "str": "Winter's Eternal Grasp", "str_pl": "copies of Winter's Eternal Grasp" }, "description": "This slim book almost seems to be made from ice, it's cold to the touch.", - "weight": 450, - "volume": 4, + "weight": "450 g", + "volume": "1 L", "price": 1904, "symbol": "?", "color": "light_blue", @@ -113,10 +116,10 @@ { "id": "tome_of_storms", "type": "GENERIC", - "name": "The Tome of The Oncoming Storm", + "name": { "str": "The Tome of The Oncoming Storm", "str_pl": "copies of The Tome of The Oncoming Storm" }, "description": "A large book embossed with crossed lightning bolts and storm clouds, it tingles to the touch.", - "weight": 430, - "volume": 3, + "weight": "430 g", + "volume": "750 ml", "price": 5000, "symbol": "?", "color": "light_gray", @@ -125,36 +128,39 @@ "spells": [ "jolt", "windstrike", "windrun", "storm_hammer", "lightning_bolt", "lightning_blast" ] } }, - { - "id": "lightning_storm_scroll", - "type": "GENERIC", - "name": "Scroll of Lightning Storm", - "description": "This scroll details how a spell called 'Lightning Blast' which is commonly used among Stormshapers can be altered to become much more powerful, at a much higher mana cost.", - "weight": 129, - "volume": 2, - "price": 25000, - "symbol": "?", - "color": "light_blue", - "use_action": { "type": "learn_spell", "spells": [ "lightning_storm" ] } - }, { "id": "generic_spellbook", "type": "GENERIC", - "name": "Nondescript Spellbook", + "name": { "str": "Nondescript Spellbook", "str_pl": "copies of Nondescript Spellbook" }, "description": "A small book, containing spells created by a novice magician.", - "weight": 355, - "volume": 2, + "weight": "355 g", + "volume": "500 ml", "symbol": "?", "color": "magenta", "use_action": { "type": "learn_spell", "spells": [ "seismic_stomp", "create_atomic_lamp", "ethereal_grasp" ] } }, + { + "id": "light_manipulation_spellbook", + "type": "GENERIC", + "name": { "str": "Of Light and Falsehoods", "str_pl": "copies of Of Light and Falsehoods" }, + "description": "A small white book, it subtly amplifies the ambient light around it.", + "weight": "430 g", + "volume": "750 ml", + "price": 5000, + "symbol": "?", + "color": "light_gray", + "use_action": { + "type": "learn_spell", + "spells": [ "dark_sight", "blinding_flash", "obfuscated_body", "create_atomic_light", "mirror_image", "invisibility" ] + } + }, { "id": "biomancer_spellbook", "type": "GENERIC", - "name": "The Tome of Flesh", + "name": { "str": "The Tome of Flesh", "str_pl": "copies of The Tome of Flesh" }, "description": "A small tome, seemingly covered in tanned human skin.", - "weight": 355, - "volume": 2, + "weight": "355 g", + "volume": "500 ml", "symbol": "?", "color": "red", "use_action": { @@ -165,10 +171,10 @@ { "id": "druid_spellbook", "type": "GENERIC", - "name": "The Book of Trees", + "name": { "str": "The Book of Trees", "str_pl": "copies of The Book of Trees" }, "description": "A bark covered book.", - "weight": 355, - "volume": 2, + "weight": "355 g", + "volume": "500 ml", "symbol": "?", "color": "green", "use_action": { "type": "learn_spell", "spells": [ "druid_woodshaft", "druid_veggrasp", "druid_rootstrike", "druid_naturebow1" ] } @@ -176,9 +182,9 @@ { "id": "recovery_spellbook", "type": "GENERIC", - "name": "The Utility of Mana as an Energy Source", + "name": { "str": "The Utility of Mana as an Energy Source", "str_pl": "copies of The Utility of Mana as an Energy Source" }, "description": "This book details spells that use your mana to recover various physiological effects.", - "weight": 728, + "weight": "728 g", "volume": "3 L", "symbol": "?", "color": "light_blue", @@ -190,10 +196,10 @@ { "id": "magus_spellbook", "type": "GENERIC", - "name": "The Tome of The Battle Mage", + "name": { "str": "The Tome of The Battle Mage", "str_pl": "copies of The Tome of The Battle Mage" }, "description": "Your standard wizardy looking spellbook, filled with Magus combat spells. You sure lucked out!", - "weight": 434, - "volume": 3, + "weight": "434 g", + "volume": "750 ml", "symbol": "?", "color": "light_gray", "use_action": { "type": "learn_spell", "spells": [ "magus_mana_beam", "magus_mana_bolt", "magus_mana_blast" ] } @@ -201,9 +207,9 @@ { "id": "eshaper_spellbook", "type": "GENERIC", - "name": "The Tome of the Hollow Earth", + "name": { "str": "The Tome of the Hollow Earth", "str_pl": "copies of The Tome of the Hollow Earth" }, "description": "This large dusty spellbook seems perpetually, well, dusty. It contains the power of the earth.", - "weight": 483, + "weight": "483 g", "volume": "825 ml", "symbol": "?", "color": "brown", @@ -215,10 +221,10 @@ { "id": "magus_spellbook_move", "type": "GENERIC", - "name": "The Tome of Magical Movement", + "name": { "str": "The Tome of Magical Movement", "str_pl": "copies of The Tome of Magical Movement" }, "description": "This small lightweight book seems to almost not entirely exist, let's say it 97% does. It contains Magus spells focused on movement.", - "weight": 231, - "volume": 2, + "weight": "231 g", + "volume": "500 ml", "symbol": "?", "color": "light_gray", "use_action": { "type": "learn_spell", "spells": [ "phase_door", "magus_escape", "magus_haste" ] } @@ -228,7 +234,7 @@ "type": "GENERIC", "name": "Smudged Scroll", "description": "This looks like someone was designing a new spell, but spilled a mug of coffee on it and crumpled it up in anger. You can tell that it will definitely cast something, but you can't be sure that it will work very well.", - "weight": 129, + "weight": "129 g", "volume": "100 ml", "symbol": "?", "color": "light_gray", @@ -237,10 +243,10 @@ { "id": "summon_undead_spellbook", "type": "GENERIC", - "name": "Necromantic Minions for Dummies", + "name": { "str": "Necromantic Minions for Dummies", "str_pl": "copies of Necromantic Minions for Dummies" }, "description": "This book details various ways of summoning an undead minion to fight for you. They all appear to disappear after a short time, crumbling to dust.", - "weight": 788, - "volume": 9, + "weight": "788 g", + "volume": "2250 ml", "symbol": "?", "color": "light_gray", "use_action": { "type": "learn_spell", "spells": [ "summon_zombie", "summon_skeleton", "summon_decayed_pouncer" ] } @@ -248,10 +254,10 @@ { "id": "techno_fundamentals", "type": "GENERIC", - "name": "Fundamentals of Technomancy", + "name": { "str": "Fundamentals of Technomancy", "str_pl": "copies of Fundamentals of Technomancy" }, "description": "This thick manual instructs the spellcaster on manipulating and empowering various forms of matter and energy.", - "weight": 258, - "volume": 3, + "weight": "258 g", + "volume": "750 ml", "symbol": "?", "color": "light_gray", "use_action": { "type": "learn_spell", "spells": [ "synaptic_stimulation", "animated_blade", "mirror_image" ] } @@ -259,10 +265,10 @@ { "id": "techno_idiots", "type": "GENERIC", - "name": "Complete Idiot's Guide to Technomancy", + "name": { "str": "Complete Idiot's Guide to Technomancy", "str_pl": "copies of Complete Idiot's Guide to Technomancy" }, "description": "This colorful guide, full of diagrams and cartoons, teaches a couple of very basic Technomancy spells for the not-so-bright pupils.", - "weight": 211, - "volume": 2, + "weight": "211 g", + "volume": "500 ml", "symbol": "?", "color": "light_gray", "use_action": { "type": "learn_spell", "spells": [ "taze", "quantum_tunnel_lesser" ] } @@ -270,10 +276,13 @@ { "id": "techno_em", "type": "GENERIC", - "name": "Technomancy and the Electromagnetic Spectrum", + "name": { + "str": "Technomancy and the Electromagnetic Spectrum", + "str_pl": "copies of Technomancy and the Electromagnetic Spectrum" + }, "description": "This lab reference material book is thick and overflowing with information on combining magic with EM radiation.", - "weight": 284, - "volume": 4, + "weight": "284 g", + "volume": "1 L", "symbol": "?", "color": "light_gray", "use_action": { "type": "learn_spell", "spells": [ "taze", "laze" ] } @@ -281,10 +290,10 @@ { "id": "translocate_spellbook", "type": "GENERIC", - "name": "Geospatial Systems: The Lie Of Linearity", + "name": { "str": "Geospatial Systems: The Lie Of Linearity", "str_pl": "copies of Geospatial Systems: The Lie Of Linearity" }, "description": "This book outlines in great detail how time and space are wibbly-wobbly and non-Euclidean. It also appears to have a dozen different coordinate systems that it uses nearly interchangeably, which makes it hard to follow. There's lots of jargon, but with intense study you can probably learn a thing or two about portals.", - "weight": 1200, - "volume": 10, + "weight": "1200 g", + "volume": "2500 ml", "symbol": "?", "color": "light_blue", "use_action": { "type": "learn_spell", "spells": [ "translocate_self" ] } @@ -292,10 +301,10 @@ { "id": "stat_up_spellbook", "type": "GENERIC", - "name": "Transcendence of the Human Condition", + "name": { "str": "Transcendence of the Human Condition", "str_pl": "copies of Transcendence of the Human Condition" }, "description": "The Human is the only creature that seeks to improve himself. This study examines different spells that can heighten various senses temporarily, in hopes to discover a more permanent solution.", - "weight": 1300, - "volume": 10, + "weight": "1300 g", + "volume": "2500 ml", "symbol": "?", "color": "yellow", "use_action": { "type": "learn_spell", "spells": [ "cats_grace", "ogres_strength", "foxs_cunning", "eagles_sight" ] } diff --git a/data/mods/Magiclysm/materials.json b/data/mods/Magiclysm/materials.json index b66e3b81aa344..6fd108288441b 100644 --- a/data/mods/Magiclysm/materials.json +++ b/data/mods/Magiclysm/materials.json @@ -39,6 +39,29 @@ "bash_dmg_verb": "cracked", "cut_dmg_verb": "chipped" }, + { + "type": "material", + "ident": "demon_chitin", + "name": "Demon Chitin", + "density": 15, + "specific_heat_liquid": 4.186, + "specific_heat_solid": 2.108, + "latent_heat": 333, + "bash_resist": 1, + "cut_resist": 10, + "acid_resist": 3, + "fire_resist": 18, + "elec_resist": 2, + "chip_resist": 10, + "dmg_adj": [ "scratched", "cut", "cracked", "shattered" ], + "bash_dmg_verb": "cracked", + "cut_dmg_verb": "chipped", + "burn_data": [ + { "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "1250 ml" }, + { "fuel": 1, "smoke": 3, "burn": 1 }, + { "fuel": 1, "smoke": 5, "burn": 5 } + ] + }, { "type": "material", "ident": "orichalcum_metal", diff --git a/data/mods/Magiclysm/monstergroups.json b/data/mods/Magiclysm/monstergroups.json index ac3c80a0802fc..ba251b0eba50a 100644 --- a/data/mods/Magiclysm/monstergroups.json +++ b/data/mods/Magiclysm/monstergroups.json @@ -14,6 +14,9 @@ { "monster": "mon_owlbear", "freq": 10, "cost_multiplier": 10 }, { "monster": "mon_wisp", "freq": 3, "cost_multiplier": 10, "conditions": [ "NIGHT" ] }, { "monster": "mon_troll", "freq": 3, "cost_multiplier": 10, "conditions": [ "DAY" ] }, + { "monster": "mon_claygolem", "freq": 8, "cost_multiplier": 3 }, + { "monster": "mon_stonegolem", "freq": 4, "cost_multiplier": 5 }, + { "monster": "mon_irongolem", "freq": 2, "cost_multiplier": 8 }, { "monster": "mon_demon_spiderling", "freq": 15, "cost_multiplier": 5, "pack_size": [ 3, 7 ] } ] }, diff --git a/data/mods/Magiclysm/monsters.json b/data/mods/Magiclysm/monsters.json index 9af6f483447ef..d1a4187b75e89 100644 --- a/data/mods/Magiclysm/monsters.json +++ b/data/mods/Magiclysm/monsters.json @@ -8,7 +8,7 @@ "default_faction": "factionless", "species": [ "UNKNOWN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 1, "speed": 150, "symbol": "@", @@ -31,7 +31,7 @@ "looks_like": "longsword", "default_faction": "player", "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 30, "speed": 120, "symbol": "/", diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index 8ccc9d552a226..b3039f5219060 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -4,17 +4,6 @@ "id": "DEMON_SPIDER", "anger_triggers": [ "FRIEND_DIED", "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ] }, - { - "id": "demon_spider", - "type": "harvest", - "entries": [ - { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "meat", "type": "flesh", "mass_ratio": 0.05 }, - { "drop": "demon_chitin_piece", "type": "bone", "mass_ratio": 0.04 }, - { "drop": "demon_chitin_plate", "type": "skin", "mass_ratio": 0.01 }, - { "drop": "demon_spider_fang", "base_num": [ 0, 0 ], "scale_num": [ 0.1, 0.6 ], "max": 2, "type": "flesh" } - ] - }, { "id": "demon_spider_queen", "type": "harvest", @@ -32,76 +21,6 @@ "name": "demon_spider", "base_faction": "spider" }, - { - "type": "material", - "ident": "demon_chitin", - "name": "Demon Chitin", - "density": 15, - "specific_heat_liquid": 4.186, - "specific_heat_solid": 2.108, - "latent_heat": 333, - "bash_resist": 1, - "cut_resist": 10, - "acid_resist": 3, - "fire_resist": 18, - "elec_resist": 2, - "chip_resist": 10, - "dmg_adj": [ "scratched", "cut", "cracked", "shattered" ], - "bash_dmg_verb": "cracked", - "cut_dmg_verb": "chipped", - "burn_data": [ - { "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "1250 ml" }, - { "fuel": 1, "smoke": 3, "burn": 1 }, - { "fuel": 1, "smoke": 5, "burn": 5 } - ] - }, - { - "type": "GENERIC", - "id": "demon_chitin_piece", - "category": "spare_parts", - "symbol": ",", - "color": "red", - "name": "chunk of demon chitin", - "name_plural": "chunks of demon chitin", - "description": "A piece of demon spider exoskeleton. It is light and very durable, and probably has some magical properties.", - "price": 0, - "material": "demon_chitin", - "weight": 89, - "volume": 1, - "bashing": 1, - "flags": [ "TRADER_AVOID" ], - "to_hit": -2 - }, - { - "type": "GENERIC", - "id": "demon_chitin_plate", - "category": "spare_parts", - "symbol": "/", - "color": "red", - "name": "demon chitin plate", - "price": 15225, - "material": "demon_chitin", - "weight": 10000, - "volume": 16, - "bashing": 12, - "to_hit": -4, - "description": "A large piece of demon spider exoskeleton, painstakingly cut from the corpse of an adult demon spider. A plate of this size can be used to create armor plating." - }, - { - "type": "GENERIC", - "id": "demon_spider_fang", - "name": "demon spider fang", - "description": "A fang from a demon spider. It seems to still drip with poison; you might be able to use this in some alchemical recipe?", - "weight": 270, - "to_hit": -2, - "color": "green", - "symbol": ",", - "material": [ "flesh" ], - "volume": 1, - "cutting": 8, - "flags": [ "SPEAR", "SHEATH_KNIFE" ], - "price": 1500 - }, { "id": "mon_demon_spiderling", "type": "MONSTER", @@ -113,7 +32,7 @@ "material": [ "iflesh", "demon_chitin" ], "diff": 2, "volume": "30000 ml", - "weight": 40750, + "weight": "40750 g", "hp": 45, "speed": 150, "symbol": "s", @@ -147,7 +66,7 @@ "species": [ "DEMON_SPIDER" ], "material": [ "iflesh", "demon_chitin" ], "diff": 7, - "weight": 125000, + "weight": "125 kg", "//": "monster can't be any bigger because of limits of volume on tiles. if there is a way designed around this, it should be about 3500 L", "volume": "1000 L", "hp": 435, @@ -174,46 +93,13 @@ "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PUSH_MON" ] }, - { - "type": "SPELL", - "id": "mon_demon_fireball", - "name": "Demon Fireball", - "description": "This is a monster only spell.", - "valid_targets": [ "hostile", "ground", "ally", "self" ], - "min_damage": 15, - "max_damage": 15, - "min_range": 12, - "max_range": 12, - "min_aoe": 2, - "max_aoe": 2, - "base_casting_time": 120, - "effect": "projectile_attack", - "damage_type": "fire" - }, - { - "type": "SPELL", - "id": "mon_summon_demon_spiderlings", - "name": "Summon Demon Spiderlings", - "description": "Summons 4 permanent demon spiderlings.", - "flags": [ "HOSTILE_SUMMON", "PERMANENT" ], - "valid_targets": [ "ground" ], - "min_damage": 4, - "max_damage": 4, - "min_range": 5, - "max_range": 5, - "min_aoe": 3, - "max_aoe": 3, - "base_casting_time": 160, - "effect": "summon", - "effect_str": "mon_demon_spiderling" - }, { "id": "mon_demon_spider_queen", "type": "MONSTER", "name": "demon spider queen", "description": "This gigantic spider is the size of a moving van: you have no idea how it manages to stay together, much less move with that bulk. Its abdomen is huge and swollen-looking, and an evil intelligence burns in its eyes even as magic crackles around its chitinous barbs.", "copy-from": "mon_demon_spider", - "weight": 250000, + "weight": "250 kg", "hp": 5600, "speed": 28, "aggression": 100, diff --git a/data/mods/Magiclysm/monsters/dragon.json b/data/mods/Magiclysm/monsters/dragon.json index 92efab6836ddd..491d65f515bef 100644 --- a/data/mods/Magiclysm/monsters/dragon.json +++ b/data/mods/Magiclysm/monsters/dragon.json @@ -75,7 +75,7 @@ "bodytype": "angel", "species": [ "DRAGON" ], "volume": "80 L", - "weight": 65000, + "weight": "65 kg", "hp": 180, "speed": 150, "material": [ "flesh" ], @@ -123,7 +123,7 @@ "copy-from": "mon_dragon_black_wyrmling", "//": "should be roughly 4000 L, as that's the size of a large cow.", "volume": "1000 L", - "weight": 1000000, + "weight": "1000 kg", "hp": 1200, "melee_skill": 5, "melee_dice": 3, @@ -144,7 +144,7 @@ "description": "A black-scaled monstrosity with deep-set eye sockets glowing green with evil. Its face and skull appear skeletal, and acid drips from its dagger-like jaws.", "copy-from": "mon_dragon_black_young", "//": "If it were possible, the adult would be about double the size of a young version or so.", - "weight": 2200000, + "weight": "2200 kg", "hp": 3500, "melee_dice": 4, "melee_dice_sides": 12, diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index f851d8cd45cef..7fc8d45db5cf3 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -8,7 +8,7 @@ "bodytype": "bear", "species": [ "MAGICAL_BEAST" ], "volume": "450000 ml", - "weight": 450000, + "weight": "450 kg", "hp": 260, "speed": 120, "material": [ "flesh" ], @@ -43,7 +43,7 @@ "species": [ "BLOB" ], "diff": 1, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "color": "dark_gray", "hp": 100, "speed": 75, @@ -84,7 +84,7 @@ "default_faction": "magical_beast", "species": [ "MAGICAL_BEAST", "HUMAN" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 60, "speed": 100, "aggression": 30, @@ -114,7 +114,7 @@ "name": "owlbear cub", "copy-from": "mon_owlbear", "volume": "112500 ml", - "weight": 112500, + "weight": "112500 g", "hp": 75, "speed": 90, "symbol": "w", @@ -137,7 +137,7 @@ "bodytype": "bear", "species": [ "MAGICAL_BEAST" ], "volume": "850000 ml", - "weight": 900000, + "weight": "900 kg", "hp": 320, "speed": 100, "material": [ "arcane_skin" ], @@ -179,7 +179,7 @@ "bodytype": "blob", "species": [ "MAGICAL_BEAST" ], "volume": "1500 ml", - "weight": 136, + "weight": "136 g", "hp": 20, "speed": 160, "luminance": 16, @@ -221,7 +221,7 @@ "bodytype": "human", "species": [ "MAGICAL_BEAST" ], "volume": "875000 ml", - "weight": 875000, + "weight": "875 kg", "hp": 480, "speed": 110, "material": [ "flesh" ], @@ -252,7 +252,7 @@ "species": [ "MAGICAL_BEAST" ], "diff": 2, "volume": "1000 ml", - "weight": 1250, + "weight": "1250 g", "hp": 20, "speed": 133, "material": [ "iflesh" ], @@ -282,7 +282,7 @@ "species": [ "FUNGUS" ], "diff": 2, "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 25, "speed": 100, "material": [ "veggy" ], @@ -310,7 +310,7 @@ "species": [ "MAGICAL_BEAST" ], "diff": 2, "volume": "62500 ml", - "weight": 45000, + "weight": "45 kg", "hp": 20, "speed": 50, "material": [ "flesh" ], @@ -330,5 +330,100 @@ "death_function": [ "NORMAL" ], "regenerates": 1, "flags": [ "SEES", "SMELLS", "HEARS", "STUMBLES", "PATH_AVOID_FIRE", "REVIVES" ] + }, + { + "id": "mon_claygolem", + "type": "MONSTER", + "name": "clay golem", + "description": "A large, humanoid golem made from clay. Its proportions are off and it seems fragile.", + "default_faction": "robot", + "bodytype": "human", + "species": [ "ROBOT" ], + "diff": 2, + "volume": "120 L", + "weight": "122 kg", + "hp": 100, + "speed": 80, + "material": [ "clay" ], + "symbol": "X", + "color": "brown", + "aggression": 10, + "morale": 100, + "melee_skill": 6, + "melee_dice": 2, + "melee_dice_sides": 10, + "melee_cut": 5, + "armor_bash": 10, + "armor_cut": 10, + "dodge": 0, + "vision_day": 40, + "vision_night": 40, + "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "NO_BREATHE", "ACIDPROOF", "LOUDMOVES" ] + }, + { + "id": "mon_stonegolem", + "type": "MONSTER", + "name": "stone golem", + "description": "A large, humanoid golem made from stone. Its fists look similar to rockets.", + "default_faction": "robot", + "bodytype": "human", + "species": [ "ROBOT" ], + "diff": 2, + "volume": "120 L", + "weight": "162 kg", + "hp": 250, + "speed": 60, + "material": [ "stone" ], + "symbol": "X", + "color": "light_gray", + "aggression": 10, + "morale": 100, + "melee_skill": 6, + "melee_dice": 3, + "melee_dice_sides": 8, + "melee_cut": 6, + "armor_bash": 20, + "armor_cut": 20, + "dodge": 0, + "vision_day": 40, + "vision_night": 40, + "special_attacks": [ { "type": "spell", "spell_id": "rocket_punch", "spell_level": 5, "cooldown": 10 } ], + "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "NO_BREATHE", "ACIDPROOF", "LOUDMOVES" ] + }, + { + "id": "mon_irongolem", + "type": "MONSTER", + "name": "iron golem", + "description": "A large, humanoid golem made from iron. Some sort of noxious gas seems to be seeping from its mouth.", + "default_faction": "robot", + "bodytype": "human", + "species": [ "ROBOT" ], + "diff": 2, + "volume": "120 L", + "weight": "945 kg", + "hp": 400, + "speed": 50, + "material": [ "iron" ], + "symbol": "X", + "color": "dark_gray", + "aggression": 10, + "morale": 100, + "melee_skill": 6, + "melee_dice": 3, + "melee_dice_sides": 10, + "melee_cut": 7, + "armor_bash": 32, + "armor_cut": 32, + "dodge": 0, + "vision_day": 40, + "vision_night": 40, + "special_attacks": [ { "type": "spell", "spell_id": "gas_attack", "spell_level": 5, "cooldown": 60 } ], + "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "NO_BREATHE", "ACIDPROOF", "LOUDMOVES" ] } ] diff --git a/data/mods/Magiclysm/professions.json b/data/mods/Magiclysm/professions.json index 453e53da0b9b7..c0d9ea910e3d0 100644 --- a/data/mods/Magiclysm/professions.json +++ b/data/mods/Magiclysm/professions.json @@ -197,7 +197,7 @@ "type": "profession", "ident": "novice_stormshaper", "name": "Novice Stormshaper", - "description": "The son of a weatherman, you were always interested in the weather. Recently you found it was possible to manipulate the weather yourself through arcane means! Unfortunately you did not have long to enjoy your power, as events unfolded...", + "description": "The son of a weatherman, you were always interested in the weather. Recently you found it was possible to manipulate the weather yourself through arcane means! Unfortunately you did not have long to enjoy your power, as events unfolded…", "spells": [ { "id": "lightning_bolt", "level": 1 }, { "id": "windrun", "level": 1 } ], "points": 0, "items": { diff --git a/data/mods/Magiclysm/recipes/deconstruction.json b/data/mods/Magiclysm/recipes/deconstruction.json new file mode 100644 index 0000000000000..5fe9ad10e4cdd --- /dev/null +++ b/data/mods/Magiclysm/recipes/deconstruction.json @@ -0,0 +1,29 @@ +[ + { + "result": "broken_claygolem", + "type": "uncraft", + "skill_used": "spellcraft", + "difficulty": 2, + "time": "4 h", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "clay_lump", 231 ] ] ] + }, + { + "result": "broken_stonegolem", + "type": "uncraft", + "skill_used": "spellcraft", + "difficulty": 4, + "time": "4 h", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "rock", 222 ] ], [ [ "sharp_rock", 33 ] ] ] + }, + { + "result": "broken_irongolem", + "type": "uncraft", + "skill_used": "spellcraft", + "difficulty": 6, + "time": "6 h", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "scrap", 800 ] ], [ [ "steel_lump", 200 ] ] ] + } +] diff --git a/data/mods/Magiclysm/scenarios.json b/data/mods/Magiclysm/scenarios.json index 7d9f539b74490..b61cd9a8f0ca5 100644 --- a/data/mods/Magiclysm/scenarios.json +++ b/data/mods/Magiclysm/scenarios.json @@ -5,7 +5,7 @@ "name": "Lost Faith", "flags": [ "SUR_START", "LONE_START" ], "points": 2, - "description": "You've been preaching your faith for a long time, but the recent events have begun to make you doubt it. Wandering in your temple, you just found books that may restore your faith or shatter it completely.", + "description": "You've been preaching your faith for a long time, but the recent events have begun to make you doubt it. Wandering in your temple, you just found books that may restore your faith or shatter it completely.", "start_name": "Church", "allowed_locs": [ "church_3rdfloor_1", "church_1", "church_steeple_end", "church" ], "professions": [ "priest_magic2", "shinto_priest_magic2", "imam_magic2", "rabbi_magic2", "guru_magic2", "preacher_magic2" ] @@ -16,7 +16,7 @@ "name": "The Wizard's Apprentice", "flags": [ "LONE_START" ], "points": 3, - "description": "You have been an apprentice to a wizard for some time now, working on a prototype device that could perhaps be used to escape from the Cataclysm. Something went wrong with the maiden voyage though, and your teacher teleported his insides into his outsides. Now you have to figure out how to survive on your own. At least he left his notebook...", + "description": "You have been an apprentice to a wizard for some time now, working on a prototype device that could perhaps be used to escape from the Cataclysm. Something went wrong with the maiden voyage though, and your teacher teleported his insides into his outsides. Now you have to figure out how to survive on your own. At least he left his notebook…", "start_name": "Wizard's Secret Basement Study", "allowed_locs": [ "magic_basement" ], "professions": [ "wizard_novice", "novice_necromancer", "novice_earthshaper", "novice_technomancer", "novice_stormshaper" ] diff --git a/data/mods/Magiclysm/worldgen/regional_overlay.json b/data/mods/Magiclysm/worldgen/regional_overlay.json index ca57b13045260..8c97d44c8d64a 100644 --- a/data/mods/Magiclysm/worldgen/regional_overlay.json +++ b/data/mods/Magiclysm/worldgen/regional_overlay.json @@ -1,9 +1,8 @@ [ { "type": "region_overlay", - "//id": "magiclysm_buildings_overlay", "regions": [ "all" ], "city": { "shops": { "magic_shop": 100, "used_bookstore": 225 }, "basements": { "magic_basement": 50 } }, - "field_coverage": { "other": { "f_glow_boulder": 0.3333 } } + "field_coverage": { "other": { "f_boulder_large": 0.6667, "f_glow_boulder": 0.3333 } } } ] diff --git a/data/mods/ManualBionicInstall/game_balance.json b/data/mods/ManualBionicInstall/game_balance.json index d68022b04c293..5c9953ab44adc 100644 --- a/data/mods/ManualBionicInstall/game_balance.json +++ b/data/mods/ManualBionicInstall/game_balance.json @@ -2,7 +2,6 @@ { "type": "EXTERNAL_OPTION", "name": "MANUAL_BIONIC_INSTALLATION", - "info": "Permits manual self-installation of bionics.", "stype": "bool", "value": true } diff --git a/data/mods/Medieval_Stuff/handloaded_bullets.json b/data/mods/Medieval_Stuff/handloaded_bullets.json index 824ff3bd8537e..f3c8e6e6e3d5d 100644 --- a/data/mods/Medieval_Stuff/handloaded_bullets.json +++ b/data/mods/Medieval_Stuff/handloaded_bullets.json @@ -4,8 +4,8 @@ "type": "AMMO", "name": "fire lance charge", "description": "Little more than a charge of gunpowder for a basic firearm. Despite the minimal range, it packs a punch.", - "weight": 4, - "volume": 1, + "weight": "4 g", + "volume": "250 ml", "price": 4500, "bashing": 1, "material": [ "paper", "powder" ], @@ -25,8 +25,8 @@ "type": "AMMO", "name": "fire lance shot", "description": "Little more than a charge of gunpowder for a basic firearm, with small pellets as shot. Despite the minimal range, it packs a punch.", - "weight": 5, - "volume": 1, + "weight": "5 g", + "volume": "250 ml", "price": 4500, "bashing": 1, "material": [ "paper", "powder" ], diff --git a/data/mods/Medieval_Stuff/ranged.json b/data/mods/Medieval_Stuff/ranged.json index 44005a32f2c1d..d6686998d1d6c 100644 --- a/data/mods/Medieval_Stuff/ranged.json +++ b/data/mods/Medieval_Stuff/ranged.json @@ -4,8 +4,8 @@ "type": "GUN", "name": "fire lance", "description": "An ancient Chinese spear, with a small tube attached for a charge of gunpowder. While it has an extremely short range, it gives a powerful edge in close combat.", - "weight": 1538, - "volume": 12, + "weight": "1538 g", + "volume": "3 L", "price": 95000, "to_hit": 1, "bashing": 4, diff --git a/data/mods/Medieval_Stuff/shields.json b/data/mods/Medieval_Stuff/shields.json index 6c2352c36a024..7dc288ec894be 100644 --- a/data/mods/Medieval_Stuff/shields.json +++ b/data/mods/Medieval_Stuff/shields.json @@ -5,8 +5,8 @@ "name": "wooden shield", "category": "armor", "description": "A crude wooden shield, lacking any metal or leather reinforcement. Lightweight but not very tough.", - "weight": 2267, - "volume": 15, + "weight": "2267 g", + "volume": "3750 ml", "price": 80000, "to_hit": -1, "bashing": 8, @@ -26,8 +26,8 @@ "name": "large wooden shield", "category": "armor", "description": "An ancient style of wooden shield, lacking any metal or leather reinforcement. Bulky, but offers a decent amount of protection.", - "weight": 3828, - "volume": 20, + "weight": "3828 g", + "volume": "5 L", "price": 90000, "to_hit": -1, "bashing": 10, @@ -48,8 +48,8 @@ "category": "armor", "//": "Doesn't use leather in material because it's not meant to be sewn up", "description": "A medieval style of shield made of wood overlaid with leather, developed from the longer kite shield. Mainly used in tournaments, but still viable in battle.", - "weight": 3175, - "volume": 16, + "weight": "3175 g", + "volume": "4 L", "price": 90000, "bashing": 4, "material": "wood", @@ -69,8 +69,8 @@ "category": "armor", "//": "Doesn't use leather in material because it's not meant to be sewn up", "description": "A classic medieval style of shield, made of wood overlaid with leather, in an elongated teardrop shape. Affords decent protection, but was better suited for cavalry.", - "weight": 3628, - "volume": 20, + "weight": "3628 g", + "volume": "5 L", "price": 120000, "to_hit": -1, "bashing": 8, @@ -90,8 +90,8 @@ "name": "round shield", "category": "armor", "description": "A simple round shield made of wood, with a rim and boss of iron. Made infamous by the Vikings.", - "weight": 3400, - "volume": 16, + "weight": "3400 g", + "volume": "4 L", "price": 110000, "bashing": 8, "material": [ "wood", "iron" ], @@ -110,8 +110,8 @@ "name": "hoplon", "category": "armor", "description": "A convex round shield from ancient Greece, made of wood reinforced with bronze. Heavy but effective.", - "weight": 4082, - "volume": 18, + "weight": "4082 g", + "volume": "4500 ml", "price": 120000, "to_hit": -1, "bashing": 12, @@ -132,8 +132,8 @@ "name_plural": "scuta", "category": "armor", "description": "A rectangular shield from ancient Rome, made of wood and iron. Perfect for fighting in formation, but not ideal for facing zombies alone.", - "weight": 4535, - "volume": 22, + "weight": "4535 g", + "volume": "5500 ml", "price": 125000, "to_hit": -1, "bashing": 10, @@ -153,8 +153,8 @@ "name": "buckler", "category": "armor", "description": "A small metal shield from the late medieval and renaissance periods. Extremely light and tough, but its small size is as much a hindrance as it is an advantage.", - "weight": 1814, - "volume": 10, + "weight": "1814 g", + "volume": "2500 ml", "price": 140000, "bashing": 8, "material": "steel", diff --git a/data/mods/Medieval_Stuff/tools.json b/data/mods/Medieval_Stuff/tools.json index 8d966ee09ab08..2f966113fa05a 100644 --- a/data/mods/Medieval_Stuff/tools.json +++ b/data/mods/Medieval_Stuff/tools.json @@ -5,9 +5,9 @@ "category": "weapons", "name": "Dusk", "//": "Blame Kadian. 3:", - "description": "A longsword, made out of a very dark, almost black metal. It seems to hold a greater edge than usual steel blades and feels ...more comfortable in the hand. While the blade is made out of this dark metal, the crossguard and the pommel seem to be made out of a brighter material, which feels abnormally cool to the touch.", - "weight": 2653, - "volume": 11, + "description": "A longsword, made out of a very dark, almost black metal. It seems to hold a greater edge than usual steel blades and feels …more comfortable in the hand. While the blade is made out of this dark metal, the crossguard and the pommel seem to be made out of a brighter material, which feels abnormally cool to the touch.", + "weight": "2653 g", + "volume": "2750 ml", "price": 260000, "to_hit": 2, "bashing": 17, diff --git a/data/mods/Modular_Turrets/corpses.json b/data/mods/Modular_Turrets/corpses.json index 36a8f5d9b4f4b..858120933004b 100644 --- a/data/mods/Modular_Turrets/corpses.json +++ b/data/mods/Modular_Turrets/corpses.json @@ -2,7 +2,6 @@ { "abstract": "broken_turret_base", "type": "GENERIC", - "override": true, "symbol": ",", "looks_like": "bot_turret", "color": "light_gray", @@ -12,8 +11,8 @@ "price": 50000, "price_postapoc": 10000, "material": [ "steel", "plastic" ], - "weight": 1507, - "volume": 12, + "weight": "1507 g", + "volume": "3 L", "to_hit": -3, "bashing": 8, "flags": [ "TRADER_AVOID" ] @@ -245,7 +244,6 @@ { "abstract": "broken_hack_base", "type": "GENERIC", - "override": true, "symbol": ",", "color": "light_green", "name": "broken hack", @@ -255,8 +253,8 @@ "price": 9000, "price_postapoc": 1000, "material": [ "aluminum", "plastic" ], - "weight": 5400, - "volume": 3, + "weight": "5400 g", + "volume": "750 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -337,8 +335,8 @@ "description": "A broken eyebot. Much less threatening now that it won't be calling for backup. Could be gutted for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 31520, - "volume": 60, + "weight": "31520 g", + "volume": "15 L", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -355,8 +353,8 @@ "description": "A broken eyebot, now dark and motionless. Could be stripped down for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 31520, - "volume": 60, + "weight": "31520 g", + "volume": "15 L", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -379,8 +377,8 @@ "category": "other", "description": "A broken utility robot, now limp and unmoving. Could be gutted for parts or crafted into a salvaged robot.", "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -401,11 +399,11 @@ "looks_like": "broken_skitterbot", "name": "broken disarmed skitterbot", "category": "other", - "description": "A broken skitterbot. Its internal weapon modules have been removed. Could be gutted for parts or crafted into a salvaged robot.", + "description": "A broken skitterbot. Its internal weapon modules have been removed. Could be gutted for parts or crafted into a salvaged robot.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 62650, - "volume": 120, + "weight": "62650 g", + "volume": "30 L", "bashing": 4, "cutting": 4, "to_hit": -3, @@ -427,12 +425,12 @@ "looks_like": "broken_riotbot", "name": "broken disarmed defense bot", "category": "other", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", "price": 30000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -444,7 +442,7 @@ "copy-from": "broken_defbot_disarmed", "color": "light_gray", "name": "broken security robot", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." }, { "type": "GENERIC", @@ -452,7 +450,7 @@ "copy-from": "broken_defbot_disarmed", "color": "light_gray", "name": "broken riotcontrol robot", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." }, { "type": "GENERIC", @@ -460,7 +458,7 @@ "copy-from": "broken_defbot_disarmed", "color": "light_gray", "name": "broken riotcontrol robot", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." }, { "type": "GENERIC", @@ -468,7 +466,7 @@ "copy-from": "broken_defbot_disarmed", "color": "light_gray", "name": "broken riotcontrol robot", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." }, { "type": "GENERIC", @@ -481,8 +479,8 @@ "price": 20000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 170200, - "volume": 250, + "weight": "170200 g", + "volume": "62500 ml", "bashing": 6, "cutting": 10, "to_hit": -3, @@ -498,8 +496,8 @@ "description": "A broken chickenwalker. Could be stripped for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 430000, - "volume": 750, + "weight": "430 kg", + "volume": "187500 ml", "bashing": 10, "cutting": 6, "to_hit": -2, @@ -513,11 +511,11 @@ "looks_like": "broken_chickenbot", "name": "broken disarmed chickenwalker", "category": "other", - "description": "A broken chickenwalker. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", + "description": "A broken chickenwalker. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 430000, - "volume": 750, + "weight": "430 kg", + "volume": "187500 ml", "bashing": 10, "cutting": 6, "to_hit": -2, @@ -533,8 +531,8 @@ "description": "A broken tank drone. Could be stripped down for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 1223850, - "volume": 3500, + "weight": "1223850 g", + "volume": "875 L", "bashing": 20, "cutting": 15, "to_hit": -3, @@ -551,8 +549,8 @@ "description": "A broken tank drone. Could be gutted for parts or recrafted into a salvaged robot.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 1223850, - "volume": 3500, + "weight": "1223850 g", + "volume": "875 L", "bashing": 20, "cutting": 15, "to_hit": -3, diff --git a/data/mods/Modular_Turrets/items.json b/data/mods/Modular_Turrets/items.json index 5d484b69d7c2f..9dce49a7fd94b 100644 --- a/data/mods/Modular_Turrets/items.json +++ b/data/mods/Modular_Turrets/items.json @@ -5,8 +5,8 @@ "category": "tools", "name": "electrohack", "description": "This device has many ports attached, allowing it to connect to almost any control panel or other electronic machine (but not computers). With a little skill, it can be used to crack passwords and more. It requires 25 charges of battery power per use.", - "weight": 114, - "volume": 2, + "weight": "114 g", + "volume": "500 ml", "price": 40000, "price_postapoc": 10000, "to_hit": 1, @@ -37,8 +37,8 @@ "category": "spare_parts", "name": "robot component", "description": "A component for turrets and robots. It is unuseable in its current state.", - "weight": 3000, - "volume": 8, + "weight": "3 kg", + "volume": "2 L", "price": 1000, "price_postapoc": 1000, "material": "steel", @@ -174,8 +174,8 @@ "abstract": "bot_turret_base", "type": "TOOL", "name": "inactive turret", - "weight": 1507, - "volume": 12, + "weight": "1507 g", + "volume": "3 L", "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -194,7 +194,6 @@ "use_action": { "type": "place_monster", "monster_id": "mon_turret_disarmed", - "use_message": "Error. No weapon systems found.", "difficulty": 4, "moves": 100, "skill1": "electronics", @@ -213,7 +212,6 @@ "use_action": { "type": "place_monster", "monster_id": "mon_milturret_disarmed", - "use_message": "Error. No weapon systems found.", "difficulty": 5, "moves": 100, "skill1": "electronics", @@ -232,7 +230,6 @@ "use_action": { "type": "place_monster", "monster_id": "mon_advturret_disarmed", - "use_message": "Error. No weapon systems found.", "difficulty": 6, "moves": 100, "skill1": "electronics", @@ -261,7 +258,6 @@ "id": "bot_turret", "type": "TOOL", "copy-from": "bot_turret_base", - "override": true, "name": "inactive 9mm defense turret", "description": "An inactive 9mm defense turret. Up to 100 standard 9mm rounds will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", "color": "red", @@ -352,7 +348,6 @@ "id": "bot_rifleturret", "copy-from": "bot_turret_base", "type": "TOOL", - "override": true, "name": "inactive 5.56mm military turret", "description": "An inactive 5.56mm military turret. Up to 100 standard 5.56mm NATO rounds will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", "color": "green", @@ -462,7 +457,7 @@ "type": "TOOL", "copy-from": "bot_turret_base", "name": "inactive military 40mm grenade turret", - "description": "An inactive military grenade turret. Up to 50 standard 40mm fragmentation grenades will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", + "description": "An inactive military grenade turret. Up to 50 standard 40mm fragmentation grenades will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", "color": "red", "price": 10000, "price_postapoc": 10000, @@ -515,7 +510,6 @@ "id": "bot_laserturret", "type": "TOOL", "copy-from": "bot_turret_base", - "override": true, "name": "inactive advanced laser turret", "description": "An inactive advanced laser turret. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", "color": "yellow", @@ -553,7 +547,7 @@ "type": "TOOL", "copy-from": "bot_turret_base", "name": "inactive advanced railgun turret", - "description": "An inactive advanced railgun turret. Up to 50 standard rail projectiles will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", + "description": "An inactive advanced railgun turret. Up to 50 standard rail projectiles will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", "color": "magenta", "price": 10000, "price_postapoc": 10000, @@ -571,7 +565,7 @@ "type": "TOOL", "copy-from": "bot_turret_base", "name": "inactive advanced acid turret", - "description": "An inactive advanced acid turret. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", + "description": "An inactive advanced acid turret. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", "color": "light_green", "price": 10000, "price_postapoc": 10000, @@ -589,7 +583,7 @@ "type": "TOOL", "copy-from": "bot_turret_base", "name": "inactive advanced EMP turret", - "description": "An inactive advanced EMP turret. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", + "description": "An inactive advanced EMP turret. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", "price": 10000, "price_postapoc": 10000, "color": "light_green", @@ -626,8 +620,8 @@ "category": "other", "name": "garden gnome", "description": "A normal and completely harmless garden gnome. You can place him in your garden or elsewhere.", - "weight": 650, - "volume": 2, + "weight": "650 g", + "volume": "500 ml", "price": 1000, "to_hit": -3, "bashing": 1, diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index bdf574b4f1286..4e27c2f7c4b28 100644 --- a/data/mods/Modular_Turrets/monster.json +++ b/data/mods/Modular_Turrets/monster.json @@ -5,7 +5,8 @@ "name": "automated turret", "default_faction": "defense_bot", "species": [ "ROBOT" ], - "size": "SMALL", + "volume": "30000 ml", + "weight": "40750 g", "hp": 30, "speed": 100, "material": [ "steel" ], @@ -104,7 +105,6 @@ "fake_skills": [ [ "gun", 2 ], [ "shotgun", 2 ] ], "fake_dex": 9, "no_ammo_sound": "click click!", - "range": 8, "ranges": [ [ 0, 8, "DEFAULT" ] ] } ] @@ -131,7 +131,6 @@ "fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ], "fake_dex": 9, "no_ammo_sound": "click click!", - "range": 18, "ranges": [ [ 0, 6, "DEFAULT" ], [ 7, 12, "BURST" ] ] } ] @@ -158,7 +157,6 @@ "fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ], "fake_dex": 9, "no_ammo_sound": "click click!", - "range": 8, "ranges": [ [ 0, 8, "DEFAULT" ] ] } ] @@ -185,7 +183,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 4, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -219,7 +216,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 20, "ranges": [ [ 0, 4, "BURST" ], [ 4, 8, "AUTO" ], [ 9, 18, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -254,7 +250,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 20, "ranges": [ [ 0, 5, "DEFAULT" ], [ 6, 10, "BURST" ], [ 11, 20, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -288,7 +283,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 6 ] ], "fake_dex": 10, "no_ammo_sound": "whirrrr!", - "range": 24, "ranges": [ [ 0, 5, "BURST" ], [ 6, 10, "AUTO" ], [ 11, 24, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -322,7 +316,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 4, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -356,7 +349,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 30, "ranges": [ [ 6, 30, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -390,7 +382,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ], "fake_dex": 10, "no_ammo_sound": "hiss!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -422,7 +413,6 @@ "gun_type": "robogun_laser", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 0, 8, "AUTO" ], [ 8, 16, "BURST" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -479,7 +469,6 @@ "gun_type": "robogun_plasma", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 4, 16, "DEFAULT" ] ], "require_targeting_npc": true, "require_targeting_monster": true, @@ -514,7 +503,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "buzz!", - "range": 18, "ranges": [ [ 0, 18, "DEFAULT" ] ], "require_targeting_npc": true, "require_targeting_monster": true, @@ -545,7 +533,6 @@ "gun_type": "robogun_lightning", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 12, "ranges": [ [ 0, 12, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -577,7 +564,6 @@ "gun_type": "robogun_emp", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 4, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_npc": true, "require_targeting_monster": true, diff --git a/data/mods/Modular_Turrets/monster_override.json b/data/mods/Modular_Turrets/monster_override.json index a82513d1d45f5..229fe875507a2 100644 --- a/data/mods/Modular_Turrets/monster_override.json +++ b/data/mods/Modular_Turrets/monster_override.json @@ -30,7 +30,8 @@ "description": "One of the many models of utility robot formerly in use by government agencies, private corporations, and civilians alike.", "default_faction": "utility_bot", "species": [ "ROBOT" ], - "size": "MEDIUM", + "volume": "62500 ml", + "weight": "81500 g", "hp": 120, "speed": 70, "material": [ "steel" ], @@ -57,7 +58,8 @@ "default_faction": "cop_bot", "species": [ "ROBOT" ], "diff": 2, - "size": "SMALL", + "volume": "30000 ml", + "weight": "40750 g", "hp": 20, "speed": 120, "material": [ "steel" ], @@ -85,7 +87,8 @@ "default_faction": "defense_bot", "species": [ "ROBOT" ], "diff": 2, - "size": "SMALL", + "volume": "30000 ml", + "weight": "40750 g", "hp": 40, "speed": 130, "material": [ "steel" ], @@ -110,11 +113,12 @@ "type": "MONSTER", "looks_like": "mon_secubot", "name": "defense robot", - "description": "An automated defense robot still active due to its internal power source. This one is armed with an electric prod and an integrated 9mm firearm.", + "description": "An automated defense robot still active due to its internal power source. This one is armed with an electric prod and an integrated 9mm firearm.", "default_faction": "cop_bot", "species": [ "ROBOT" ], "diff": 10, - "size": "MEDIUM", + "volume": "62500 ml", + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "steel" ], @@ -143,7 +147,7 @@ "type": "MONSTER", "copy-from": "mon_defbot_base", "name": "security robot", - "description": "An automated defense robot still active due to its internal power source. This one is equipped with an integrated 9mm firearm.", + "description": "An automated defense robot still active due to its internal power source. This one is equipped with an integrated 9mm firearm.", "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "starting_ammo": { "9mm": 100 }, "special_attacks": [ @@ -165,7 +169,7 @@ "type": "MONSTER", "copy-from": "mon_defbot_base", "name": "riotcontrol robot", - "description": "An automated defense robot still active due to its internal power source. This one is equipped with an electric prod, tear gas sprayer, and integrated 40mm beanbag launcher.", + "description": "An automated defense robot still active due to its internal power source. This one is equipped with an electric prod, tear gas sprayer, and integrated 40mm beanbag launcher.", "emit_fields": [ "emit_tear_gas_pulse" ], "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "starting_ammo": { "40x46mm_m1006": 100 }, @@ -179,7 +183,6 @@ "fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ], "fake_dex": 9, "no_ammo_sound": "click click!", - "range": 8, "ranges": [ [ 0, 8, "DEFAULT" ] ] } ] @@ -199,7 +202,7 @@ "type": "MONSTER", "id": "mon_secubot", "copy-from": "mon_defbot_9mm", - "description": "An automated defense robot still active due to its internal power source. This one is equipped with an integrated 9mm firearm." + "description": "An automated defense robot still active due to its internal power source. This one is equipped with an integrated 9mm firearm." }, { "type": "MONSTER", diff --git a/data/mods/Modular_Turrets/recipe.json b/data/mods/Modular_Turrets/recipe.json index d322c1e428735..9ae6e589ceef4 100644 --- a/data/mods/Modular_Turrets/recipe.json +++ b/data/mods/Modular_Turrets/recipe.json @@ -2,7 +2,6 @@ { "abstract": "bot_hack_base", "type": "recipe", - "override": true, "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_OTHER", "skill_used": "electronics", @@ -284,7 +283,6 @@ { "type": "recipe", "result": "bot_laserturret", - "override": true, "copy-from": "bot_turret_base", "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_PARTS", diff --git a/data/mods/Modular_Turrets/roboguns.json b/data/mods/Modular_Turrets/roboguns.json index 48fea0bc6ad06..cd39c917b45ba 100644 --- a/data/mods/Modular_Turrets/roboguns.json +++ b/data/mods/Modular_Turrets/roboguns.json @@ -4,12 +4,12 @@ "type": "GUN", "reload_noise_volume": 10, "name": "base robogun", - "description": "This is a pseudo item for monster attacks. If you see this, it's a bug.", + "description": "This is a pseudo item for monster attacks. If you see this, it's a bug.", "material": [ "steel", "plastic" ], "symbol": "(", "color": "magenta", - "weight": 5000, - "volume": 10, + "weight": "5 kg", + "volume": "2500 ml", "price": 0, "durability": 10, "reload": 100, diff --git a/data/mods/Modular_Turrets/uncraft_corpse.json b/data/mods/Modular_Turrets/uncraft_corpse.json index 867371c6a9e3f..36facd696a044 100644 --- a/data/mods/Modular_Turrets/uncraft_corpse.json +++ b/data/mods/Modular_Turrets/uncraft_corpse.json @@ -2,7 +2,6 @@ { "result": "broken_manhack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -13,7 +12,6 @@ { "result": "broken_flashbang_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -24,7 +22,6 @@ { "result": "broken_gasbomb_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -35,7 +32,6 @@ { "result": "broken_EMP_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -46,7 +42,6 @@ { "result": "broken_grenade_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -57,7 +52,6 @@ { "result": "broken_c4_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -68,7 +62,6 @@ { "result": "broken_mininuke_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 5, "time": 2000, @@ -159,7 +152,6 @@ "difficulty": 2, "time": 3000, "qualities": [ { "id": "SCREW", "level": 1 } ], - "override": true, "components": [ [ [ "broken_turret_disarmed", 1 ] ], [ [ "robopart_9mm", 1 ] ] ] }, { @@ -286,7 +278,6 @@ "difficulty": 2, "time": 3000, "qualities": [ { "id": "SCREW", "level": 1 } ], - "override": true, "components": [ [ [ "broken_advturret_disarmed", 1 ] ], [ [ "robopart_laser", 1 ] ] ] }, { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_01.json index 0e5dc5c10dea4..991e16eb393d1 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1blc", - "comment": "bottom left corner, ground floor", + "//": "bottom left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_02.json index dd06cea5f6012..eedc2001ed692 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1blc", - "comment": "bottom left corner, ground floor", + "//": "bottom left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_03.json index 78a6c94c8e7a6..3d6fc58a8ea5d 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1blc", - "comment": "bottom left corner, ground floor", + "//": "bottom left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_04.json index 41529faef108c..e64664f16809a 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1blc", - "comment": "bottom left corner, ground floor", + "//": "bottom left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_05.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_05.json index 138decb904789..2d1f44d45a053 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_05.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1blc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1blc", - "comment": "bottom left corner, ground floor", + "//": "bottom left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_01.json index e278fd466c1b8..fa89ab06e30b9 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1brc", - "comment": "bottom right corner, ground floor", + "//": "bottom right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_02.json index fc9343a3e111b..739fe9f40df78 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1brc", - "comment": "bottom right corner, ground floor", + "//": "bottom right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_03.json index aa473d5ba17a4..f380950ed35e7 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1brc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1brc", - "comment": "bottom right corner, ground floor", + "//": "bottom right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1cyblc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1cyblc_01.json index 64842b6ad1175..02def218e5272 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1cyblc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1cyblc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1cyblc", - "comment": "courtyard or parking lot, bottom left corner", + "//": "courtyard or parking lot, bottom left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1cybrc_00.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1cybrc_00.json index 4857c84017b5e..156a5e1d3401b 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1cybrc_00.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1cybrc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1cybrc", - "comment": "courtyard or parking lot, bottom right corner", + "//": "courtyard or parking lot, bottom right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_00.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_00.json index 7fb3a56697bb9..5eac95b1e9105 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_00.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1cytlc", - "comment": "courtyard or parking lot, top left corner", + "//": "courtyard or parking lot, top left corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_01.json index 0c1751f07a213..ff5892baebe16 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1cytlc", - "comment": "courtyard or parking lot, top left corner", + "//": "courtyard or parking lot, top left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1cytrc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1cytrc_01.json index 41e9f8b6551bc..b177e8c2ca49b 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1cytrc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1cytrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1cytrc", - "comment": "courtyard or parking lot, top right corner", + "//": "courtyard or parking lot, top right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1gate_00.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1gate_00.json index b1baf150bd880..9944866643432 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1gate_00.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1gate_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1gate", - "comment": "gate at the top left corner of the whole compound", + "//": "gate at the top left corner of the whole compound", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1gate_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1gate_01.json index e944f24506bfd..9acee95822940 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1gate_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1gate_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1gate", - "comment": "gate at the top left corner of the whole compound", + "//": "gate at the top left corner of the whole compound", "weight": 200, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_01.json index d7e9d842c388a..f70e8e763fef1 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1tlc", - "comment": "top left corner, ground floor", + "//": "top left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_02.json index 3a08136b98b1e..553f08a38cc0b 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1tlc", - "comment": "top left corner, ground floor", + "//": "top left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_03.json index d27133067feca..e7cde4bafdfeb 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1tlc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1tlc", - "comment": "top left corner, ground floor", + "//": "top left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_01.json index c2a2be00458ca..e09ae9bd2da8d 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1trc", - "comment": "top right corner, ground floor", + "//": "top right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_02.json index be623b73c229c..88cd62a7b0fba 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1trc", - "comment": "top right corner, ground floor", + "//": "top right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_03.json index 701cdaecf54d5..277b051d431f0 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1trc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1trc", - "comment": "top right corner, ground floor", + "//": "top right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_01.json index f50480914e207..90dfb05e2a94f 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1ybe", - "comment": "yard, bottom edge", + "//": "yard, bottom edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_02.json index 0cc376efa7ff0..435d48f022233 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1ybe", - "comment": "yard, bottom edge", + "//": "yard, bottom edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_03.json index 031958c016282..b7170c4d3b8a4 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1ybe_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1ybe", - "comment": "yard, bottom edge", + "//": "yard, bottom edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_01.json index f778fbe11bd98..2f3ce5f832c20 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yle", - "comment": "yard, left edge", + "//": "yard, left edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_02.json index b6de692d6ca95..1df7cc60c6f90 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yle", - "comment": "yard, left edge", + "//": "yard, left edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_03.json index 47f794198ad5c..5a019d6e688e4 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yle_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yle", - "comment": "yard, left edge", + "//": "yard, left edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_01.json index ed8f135c2dc09..967336998ccec 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yre", - "comment": "yard, right edge", + "//": "yard, right edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_02.json index ebc577799d21c..6ab17228033bb 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yre", - "comment": "yard, right edge", + "//": "yard, right edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_03.json index 4cebaf1832ad0..2e025ce9285ac 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yre_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yre", - "comment": "yard, right edge", + "//": "yard, right edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_01.json index 3bd3a7315800f..d23927e0c1b84 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yte", - "comment": "yard, top edge", + "//": "yard, top edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_02.json index a9eb49650331a..ab3cba276b53b 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yte", - "comment": "yard, top edge", + "//": "yard, top edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_03.json index 8506671690479..82c9f7eb0f7c3 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_1yte_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_1yte", - "comment": "yard, top edge", + "//": "yard, top edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_01.json index bbb7e65230020..61e10ecf3cd2d 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2blc", - "comment": "bottom left corner, second story and even levels", + "//": "bottom left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_02.json index 7703a3d3007ff..8c7ff569e3278 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2blc", - "comment": "bottom left corner, second story and even levels", + "//": "bottom left corner, second story and even levels", "weight": 150, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_03.json index 2bcb2778b539d..3bca9eaf44772 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2blc", - "comment": "bottom left corner, second story and even levels", + "//": "bottom left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_04.json index 2baab67c8ec2c..3dcfcf160b640 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2blc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2blc", - "comment": "bottom left corner, second story and even levels", + "//": "bottom left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_01.json index 60908dc648fb2..834d12475fb48 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2brc", - "comment": "bottom right corner, second story and even levels", + "//": "bottom right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_02.json index c8937de000ff0..0a5afe508b769 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2brc", - "comment": "bottom right corner, second story and even levels", + "//": "bottom right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_03.json index c30c10f7601b9..19b067832305a 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2brc", - "comment": "bottom right corner, second story and even levels", + "//": "bottom right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_04.json index 76adb8234ee9f..d97ff5dc99282 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2brc", - "comment": "bottom right corner, second story and even levels", + "//": "bottom right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_05.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_05.json index 52ee579ad3003..4c78eacfbec57 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_05.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2brc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2brc", - "comment": "bottom right corner, second story and even levels", + "//": "bottom right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_00.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_00.json index 9409939ef7168..1bf894311730c 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_00.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_01.json index bfa2fb637679b..a663ef8c02677 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_02.json index 94375b61935ab..629bd45fb6b1f 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_03.json index 800bf05da2489..1cd5cf63b5eaf 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_04.json index 3530d65888f4b..ad4692fa8a0a1 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_05.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_05.json index 02c9dba67b588..3748b31286c84 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_05.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_07.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_07.json index 5ea521a876392..c6a738e4c9ac0 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_07.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2tlc_07.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_01.json index 364a096875537..4883da6d1831c 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2trc", - "comment": "top right corner, second story and even levels", + "//": "top right corner, second story and even levels", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_02.json index 39eb60aca7876..20d85e978d86e 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2trc", - "comment": "top right corner, second story and even levels", + "//": "top right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_03.json index d8d9db9c1b3c8..4c12c906f4064 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2trc", - "comment": "top right corner, second story and even levels", + "//": "top right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_04.json index dafd775373176..e3b27dfb5eadd 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2trc", - "comment": "top right corner, second story and even levels", + "//": "top right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_05.json b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_05.json index b0700555436b4..01c51605df4b6 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_05.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_2trc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_2trc", - "comment": "top right corner, second story and even levels", + "//": "top right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_01.json index 3a36a0ec3ef57..bebd1b0591714 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3blc", - "comment": "bottom left corner, third and odd level floors.", + "//": "bottom left corner, third and odd level floors.", "weight": 500, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_02.json index 457cfd3cfb23b..127e69c6d97f9 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3blc", - "comment": "bottom left corner, third and odd level floors.", + "//": "bottom left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_03.json index 487804d869ded..33232a33b5c78 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3blc", - "comment": "bottom left corner, third and odd level floors.", + "//": "bottom left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_04.json index e62a8c15dc9a2..4d7c480b89e24 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3blc", - "comment": "bottom left corner, third and odd level floors.", + "//": "bottom left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_05.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_05.json index f044c1f299396..fa7134b37dff9 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_05.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3blc", - "comment": "bottom left corner, third and odd level floors.", + "//": "bottom left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_06.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_06.json index 257218dde3015..7022fb51c1b24 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_06.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3blc_06.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3blc", - "comment": "bottom left corner, third and odd level floors.", + "//": "bottom left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_01.json index bd50af78a0c00..c4d6bae8528c7 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3brc", - "comment": "bottom right corner, third and odd level floors.", + "//": "bottom right corner, third and odd level floors.", "weight": 500, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_02.json index bb0de7bdceb1e..8ff2c52f98aaf 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3brc", - "comment": "bottom right corner, third and odd level floors.", + "//": "bottom right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_03.json index 798baa2c05d1a..1597e04407364 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3brc", - "comment": "bottom right corner, third and odd level floors.", + "//": "bottom right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_04.json index 57f245876d9fa..5f3c730f0e81c 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3brc", - "comment": "bottom right corner, third and odd level floors.", + "//": "bottom right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_05.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_05.json index 76fef8596fa5b..ac3c338fe90fb 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_05.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3brc", - "comment": "bottom right corner, third and odd level floors.", + "//": "bottom right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_06.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_06.json index 9929c3732cc00..8806078e3a0d9 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_06.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3brc_06.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3brc", - "comment": "bottom right corner, third and odd level floors.", + "//": "bottom right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_01.json index d90ab609c3639..d99aa1b2526bd 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3tlc", - "comment": "top left corner, third and odd level floors.", + "//": "top left corner, third and odd level floors.", "weight": 500, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_02.json index 92bb9ef5362d4..8587ac3fbab19 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3tlc", - "comment": "top left corner, third and odd level floors.", + "//": "top left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_03.json index d44dcc8e0c298..7393648474144 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3tlc", - "comment": "top left corner, third and odd level floors.", + "//": "top left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_04.json index eca4441ee7937..88cbfb47dfb26 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3tlc", - "comment": "top left corner, third and odd level floors.", + "//": "top left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_05.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_05.json index b75f8cece42d9..1e227db269334 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_05.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3tlc", - "comment": "top left corner, third and odd level floors.", + "//": "top left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_06.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_06.json index 4e15ec22b2ef8..573ac74504c33 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_06.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3tlc_06.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3tlc", - "comment": "top left corner, third and odd level floors.", + "//": "top left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_01.json index 0cacd4c841b54..9436e1b8e0fdc 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3trc", - "comment": "top right corner, third and odd level floors.", + "//": "top right corner, third and odd level floors.", "weight": 500, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_02.json index f65a97a789bb0..7d8c561005aee 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3trc", - "comment": "top right corner, third and odd level floors.", + "//": "top right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_03.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_03.json index b8d4fd8fe8ebc..db8f673d92fdf 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_03.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3trc", - "comment": "top right corner, third and odd level floors.", + "//": "top right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_04.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_04.json index 4d9d12f7f6446..5cfb63ee852b3 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_04.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3trc", - "comment": "top right corner, third and odd level floors.", + "//": "top right corner, third and odd level floors.", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_05.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_05.json index 84e3b1db4f98d..6eeee6ff3ed28 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_05.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3trc", - "comment": "top right corner, third and odd level floors.", + "//": "top right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_06.json b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_06.json index b6f06ad656f8c..35a25ae442e29 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_06.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_3trc_06.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_3trc", - "comment": "top right corner, third and odd level floors.", + "//": "top right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_4blc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_4blc_01.json index 0ba60bb593568..d6e5e2e26ca10 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_4blc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_4blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_4blc", - "comment": "bottom left corner, roof, fourth floor or even level", + "//": "bottom left corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_4blc_02.json b/data/mods/More_Locations/bandit_tower/bandit_tower_4blc_02.json index 6b7281dfcdd23..419ec39312593 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_4blc_02.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_4blc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_4blc", - "comment": "bottom left corner, roof, fourth floor or even level", + "//": "bottom left corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_4brc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_4brc_01.json index cd8eb8f551ca5..2d9df66c06299 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_4brc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_4brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_4brc", - "comment": "bottom right corner, roof, fourth floor or even level", + "//": "bottom right corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_4tlc_00.json b/data/mods/More_Locations/bandit_tower/bandit_tower_4tlc_00.json index 2deddeb25d798..5123a21a6468c 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_4tlc_00.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_4tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_4tlc", - "comment": "top left corner, roof, fourth floor or even level", + "//": "top left corner, roof, fourth floor or even level", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_4tlc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_4tlc_01.json index d34218ef74be9..ca4c03c005cdc 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_4tlc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_4tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_4tlc", - "comment": "top left corner, roof, fourth floor or even level", + "//": "top left corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_4trc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_4trc_01.json index 1863fb7a31c1f..870aeef5bedd0 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_4trc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_4trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_4trc", - "comment": "top right corner, roof, fourth floor or even level", + "//": "top right corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_ublc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_ublc_01.json index ac3f4e840be5f..1320a94b00058 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_ublc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_ublc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_ublc", - "comment": "underground, bottom left corner", + "//": "underground, bottom left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_ubrc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_ubrc_01.json index a78be2a350c30..5a1e58eb108c7 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_ubrc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_ubrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_ubrc", - "comment": "underground, bottom right corner", + "//": "underground, bottom right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_utlc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_utlc_01.json index f850db49a1954..d7cc0361e8913 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_utlc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_utlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_utlc", - "comment": "underground, top left corner", + "//": "underground, top left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/bandit_tower/bandit_tower_utrc_01.json b/data/mods/More_Locations/bandit_tower/bandit_tower_utrc_01.json index 4258398628874..9d388b0297cf9 100644 --- a/data/mods/More_Locations/bandit_tower/bandit_tower_utrc_01.json +++ b/data/mods/More_Locations/bandit_tower/bandit_tower_utrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "bandit_tower_utrc", - "comment": "underground, top right corner", + "//": "underground, top right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/captive_faction/NC_MUTANT_CAPTIVE.json b/data/mods/More_Locations/captive_faction/NC_MUTANT_CAPTIVE.json index 058eca7b15d82..2dc34af3e932e 100644 --- a/data/mods/More_Locations/captive_faction/NC_MUTANT_CAPTIVE.json +++ b/data/mods/More_Locations/captive_faction/NC_MUTANT_CAPTIVE.json @@ -2,17 +2,17 @@ { "type": "item_group", "id": "NC_MUTANT_REFUGEE_bashing", - "items": [ { "group": "refugee_bashing", "chance": 100 } ] + "items": [ { "group": "refugee_bashing", "prob": 100 } ] }, { "type": "item_group", "id": "NC_MUTANT_REFUGEE_cutting", - "items": [ { "group": "refugee_cutting", "chance": 100 } ] + "items": [ { "group": "refugee_cutting", "prob": 100 } ] }, { "type": "item_group", "id": "NC_MUTANT_REFUGEE_stabbing", - "items": [ { "group": "refugee_stabbing", "chance": 100 } ] + "items": [ { "group": "refugee_stabbing", "prob": 100 } ] }, { "type": "item_group", diff --git a/data/mods/More_Locations/captive_faction/TALK_CAPTIVE.json b/data/mods/More_Locations/captive_faction/TALK_CAPTIVE.json index d4a3efd938264..707eba10e73ae 100644 --- a/data/mods/More_Locations/captive_faction/TALK_CAPTIVE.json +++ b/data/mods/More_Locations/captive_faction/TALK_CAPTIVE.json @@ -2,11 +2,11 @@ { "type": "talk_topic", "id": "TALK_CAPTIVE", - "comment": "needs some condition flag for Already Rescued.", + "//": "needs some condition flag for Already Rescued.", "dynamic_line": "Are you part of the rescue team?", "responses": [ { "text": "Sorry, , the rescue has been delayed.", "topic": "TALK_DONE" }, - { "text": "Part? I AM the rescue team.", "topic": "TALK_CAPTIVE_FREE" } + { "text": "Part? I AM the rescue team.", "topic": "TALK_CAPTIVE_FREE" } ] }, { @@ -14,7 +14,7 @@ "id": "TALK_CAPTIVE_FREE", "dynamic_line": "So are you busting us out of here or what?", "responses": [ - { "text": "Hold tight, . I've got to clear a path.", "topic": "TALK_DONE" }, + { "text": "Hold tight, . I've got to clear a path.", "topic": "TALK_DONE" }, { "text": "Pack your bags, . We're going on a trip.", "success": { diff --git a/data/mods/More_Locations/captive_faction/captive_classes.json b/data/mods/More_Locations/captive_faction/captive_classes.json index d8066dd73b598..ac4e2219cf425 100644 --- a/data/mods/More_Locations/captive_faction/captive_classes.json +++ b/data/mods/More_Locations/captive_faction/captive_classes.json @@ -4,7 +4,7 @@ "id": "NC_CAPTIVE", "name": "Captive", "job_description": "I got captured by those jerks.", - "comment": "OK followers since the player will prob escort them to safety.", + "//": "OK followers since the player will prob escort them to safety.", "bonus_str": { "rng": [ -1, 2 ] }, "bonus_dex": { "rng": [ -1, 2 ] }, "skills": [ @@ -31,7 +31,7 @@ "type": "npc_class", "id": "NC_MUTANT_CAPTIVE", "name": "Refugee", - "comment": "Random mutations. Mostly visible.", + "//": "Random mutations. Mostly visible.", "job_description": "I got locked up those yahoos.", "bonus_str": { "rng": [ -2, 4 ] }, "bonus_dex": { "rng": [ -2, 4 ] }, diff --git a/data/mods/More_Locations/captive_faction/captive_item_groups.json b/data/mods/More_Locations/captive_faction/captive_item_groups.json index 96cafa459a4d7..5c35434b84dce 100644 --- a/data/mods/More_Locations/captive_faction/captive_item_groups.json +++ b/data/mods/More_Locations/captive_faction/captive_item_groups.json @@ -6,8 +6,8 @@ "items": [ { "distribution": [ - { "collection": [ { "group": "captive_pants" }, { "group": "captive_shirt" } ], "chance": 100 }, - { "group": "captive_suit", "chance": 20 } + { "collection": [ { "group": "captive_pants" }, { "group": "captive_shirt" } ], "prob": 100 }, + { "group": "captive_suit", "prob": 20 } ] }, { "group": "captive_gloves", "prob": 40 }, @@ -25,7 +25,7 @@ "subtype": "collection", "items": [ { - "distribution": [ { "item": "jeans", "chance": 100, "damage": [ 1, 2 ] }, { "item": "pants", "chance": 100, "damage": [ 1, 2 ] } ] + "distribution": [ { "item": "jeans", "prob": 100, "damage": [ 1, 2 ] }, { "item": "pants", "prob": 100, "damage": [ 1, 2 ] } ] } ] }, @@ -33,47 +33,42 @@ "type": "item_group", "id": "captive_shirt", "items": [ - { "item": "tshirt", "chance": 100, "damage": [ 1, 2 ] }, - { "item": "longshirt", "chance": 100, "damage": [ 1, 2 ] }, - { "item": "undershirt", "chance": 100, "damage": [ 1, 2 ] }, - { "item": "sweatshirt", "chance": 50, "damage": [ 1, 2 ] } + { "item": "tshirt", "prob": 100, "damage": [ 1, 2 ] }, + { "item": "longshirt", "prob": 100, "damage": [ 1, 2 ] }, + { "item": "undershirt", "prob": 100, "damage": [ 1, 2 ] }, + { "item": "sweatshirt", "prob": 50, "damage": [ 1, 2 ] } ] }, { "type": "item_group", "id": "captive_suit", - "items": [ { "item": "jumpsuit", "chance": 100, "damage": [ 1, 2 ] } ] + "items": [ { "item": "jumpsuit", "prob": 100, "damage": [ 1, 2 ] } ] }, { "type": "item_group", "id": "captive_gloves", - "items": [ { "item": "gloves_wraps", "chance": 100 } ] + "items": [ { "item": "gloves_wraps", "prob": 100 } ] }, { "type": "item_group", "id": "captive_shoes", "subtype": "collection", - "items": [ - { "distribution": [ { "item": "footrags", "chance": 200 }, { "item": "sneakers", "chance": 10, "damage": [ 1, 2 ] } ] } - ] + "items": [ { "distribution": [ { "item": "footrags", "prob": 200 }, { "item": "sneakers", "prob": 10, "damage": [ 1, 2 ] } ] } ] }, { "type": "item_group", "id": "captive_masks", - "items": [ { "item": "scarf_loose", "chance": 50 } ] + "items": [ { "item": "scarf_loose", "prob": 50 } ] }, { "type": "item_group", "id": "captive_eyes", - "items": [ { "item": "glasses_eye", "chance": 50 } ] + "items": [ { "item": "glasses_eye", "prob": 50 } ] }, { "type": "item_group", "id": "captive_hat", - "items": [ - { "item": "hat_cotton", "chance": 100, "damage": [ 1, 2 ] }, - { "item": "hat_knit", "chance": 100, "damage": [ 1, 2 ] } - ] + "items": [ { "item": "hat_cotton", "prob": 100, "damage": [ 1, 2 ] }, { "item": "hat_knit", "prob": 100, "damage": [ 1, 2 ] } ] }, { "type": "item_group", @@ -81,7 +76,7 @@ "subtype": "collection", "items": [ { - "distribution": [ { "item": "leather_pouch", "chance": 300 }, { "item": "mbag", "chance": 5 }, { "item": "fanny", "chance": 5 } ], + "distribution": [ { "item": "leather_pouch", "prob": 300 }, { "item": "mbag", "prob": 5 }, { "item": "fanny", "prob": 5 } ], "prob": 100 } ] @@ -93,14 +88,14 @@ "items": [ { "distribution": [ - { "item": "primitive_knife", "chance": 100 }, - { "item": "glass_shiv", "chance": 50 }, - { "item": "rock", "chance": 200 }, - { "item": "soap", "chance": 100 }, - { "item": "hairpin", "chance": 100 }, - { "item": "bottle_plastic", "chance": 100 }, - { "item": "can_food_unsealed", "chance": 100 }, - { "item": "string_6", "chance": 20 } + { "item": "primitive_knife", "prob": 100 }, + { "item": "glass_shiv", "prob": 50 }, + { "item": "rock", "prob": 200 }, + { "item": "soap", "prob": 100 }, + { "item": "hairpin", "prob": 100 }, + { "item": "bottle_plastic", "prob": 100 }, + { "item": "can_food_unsealed", "prob": 100 }, + { "item": "string_6", "prob": 20 } ], "prob": 90 }, diff --git a/data/mods/More_Locations/estate/estate_1be_00.json b/data/mods/More_Locations/estate/estate_1be_00.json index e7978e0bdca0e..c6215bb9f7eb3 100644 --- a/data/mods/More_Locations/estate/estate_1be_00.json +++ b/data/mods/More_Locations/estate/estate_1be_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1be", - "comment": "first floor, bottom edge", + "//": "first floor, bottom edge", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1be_01.json b/data/mods/More_Locations/estate/estate_1be_01.json index fc3434babf626..d793e89406f8d 100644 --- a/data/mods/More_Locations/estate/estate_1be_01.json +++ b/data/mods/More_Locations/estate/estate_1be_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1be", - "comment": "first floor, bottom edge", + "//": "first floor, bottom edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1be_02.json b/data/mods/More_Locations/estate/estate_1be_02.json index eaea330026f8d..a3c0c89f51592 100644 --- a/data/mods/More_Locations/estate/estate_1be_02.json +++ b/data/mods/More_Locations/estate/estate_1be_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1be", - "comment": "first floor, bottom edge", + "//": "first floor, bottom edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1be_03.json b/data/mods/More_Locations/estate/estate_1be_03.json index 29857c864ced7..38243a157edce 100644 --- a/data/mods/More_Locations/estate/estate_1be_03.json +++ b/data/mods/More_Locations/estate/estate_1be_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1be", - "comment": "first floor, bottom edge", + "//": "first floor, bottom edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1bloc_00.json b/data/mods/More_Locations/estate/estate_1bloc_00.json index 9c791697bd70a..6b5872001be72 100644 --- a/data/mods/More_Locations/estate/estate_1bloc_00.json +++ b/data/mods/More_Locations/estate/estate_1bloc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1bloc", - "comment": "first floor, bottom left outer corner", + "//": "first floor, bottom left outer corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1bloc_01.json b/data/mods/More_Locations/estate/estate_1bloc_01.json index b632a9818b2dc..f4a0f5ce38dce 100644 --- a/data/mods/More_Locations/estate/estate_1bloc_01.json +++ b/data/mods/More_Locations/estate/estate_1bloc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1bloc", - "comment": "first floor, bottom left outer corner", + "//": "first floor, bottom left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1bloc_02.json b/data/mods/More_Locations/estate/estate_1bloc_02.json index 43d9694277fbe..384eea4cd408e 100644 --- a/data/mods/More_Locations/estate/estate_1bloc_02.json +++ b/data/mods/More_Locations/estate/estate_1bloc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1bloc", - "comment": "first floor, bottom left outer corner", + "//": "first floor, bottom left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1bloc_03.json b/data/mods/More_Locations/estate/estate_1bloc_03.json index 6bf9b99f1e37c..20f4dd9233872 100644 --- a/data/mods/More_Locations/estate/estate_1bloc_03.json +++ b/data/mods/More_Locations/estate/estate_1bloc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1bloc", - "comment": "first floor, bottom left outer corner", + "//": "first floor, bottom left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1broc_00.json b/data/mods/More_Locations/estate/estate_1broc_00.json index 85b8c8368fc76..9d6988988c3fd 100644 --- a/data/mods/More_Locations/estate/estate_1broc_00.json +++ b/data/mods/More_Locations/estate/estate_1broc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1broc", - "comment": "first floor, bottom right outer corner", + "//": "first floor, bottom right outer corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1broc_01.json b/data/mods/More_Locations/estate/estate_1broc_01.json index f4f7382c75087..874d612a04638 100644 --- a/data/mods/More_Locations/estate/estate_1broc_01.json +++ b/data/mods/More_Locations/estate/estate_1broc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1broc", - "comment": "first floor, bottom right outer corner", + "//": "first floor, bottom right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1broc_02.json b/data/mods/More_Locations/estate/estate_1broc_02.json index 264b3c241b001..cbcb32449a844 100644 --- a/data/mods/More_Locations/estate/estate_1broc_02.json +++ b/data/mods/More_Locations/estate/estate_1broc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1broc", - "comment": "first floor, bottom right outer corner", + "//": "first floor, bottom right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1broc_03.json b/data/mods/More_Locations/estate/estate_1broc_03.json index 03ff328278d01..eada5fd137432 100644 --- a/data/mods/More_Locations/estate/estate_1broc_03.json +++ b/data/mods/More_Locations/estate/estate_1broc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1broc", - "comment": "first floor, bottom right outer corner", + "//": "first floor, bottom right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1by_00.json b/data/mods/More_Locations/estate/estate_1by_00.json index f3851a6929730..90f5bfd7d1fb6 100644 --- a/data/mods/More_Locations/estate/estate_1by_00.json +++ b/data/mods/More_Locations/estate/estate_1by_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1by", - "comment": "first floor, bottom yard. ", + "//": "first floor, bottom yard. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1ica_00.json b/data/mods/More_Locations/estate/estate_1ica_00.json index 14271e99b0d5e..740955e3b4381 100644 --- a/data/mods/More_Locations/estate/estate_1ica_00.json +++ b/data/mods/More_Locations/estate/estate_1ica_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1ica", - "comment": "first floor, inner corner A. can't think of a better way to name inside angles", + "//": "first floor, inner corner A. can't think of a better way to name inside angles", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1ica_01.json b/data/mods/More_Locations/estate/estate_1ica_01.json index 0611d6cb39eaa..2a7738738b1fa 100644 --- a/data/mods/More_Locations/estate/estate_1ica_01.json +++ b/data/mods/More_Locations/estate/estate_1ica_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1ica", - "comment": "first floor, inner corner A. can't think of a better way to name inside angles", + "//": "first floor, inner corner A. can't think of a better way to name inside angles", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1ica_02.json b/data/mods/More_Locations/estate/estate_1ica_02.json index 433e221276982..c65de37b3e1e6 100644 --- a/data/mods/More_Locations/estate/estate_1ica_02.json +++ b/data/mods/More_Locations/estate/estate_1ica_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1ica", - "comment": "first floor, inner corner A. can't think of a better way to name inside angles", + "//": "first floor, inner corner A. can't think of a better way to name inside angles", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1ica_03.json b/data/mods/More_Locations/estate/estate_1ica_03.json index 81911ef60a4cb..58e7cc28de772 100644 --- a/data/mods/More_Locations/estate/estate_1ica_03.json +++ b/data/mods/More_Locations/estate/estate_1ica_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1ica", - "comment": "first floor, inner corner A. can't think of a better way to name inside angles", + "//": "first floor, inner corner A. can't think of a better way to name inside angles", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icb_00.json b/data/mods/More_Locations/estate/estate_1icb_00.json index 0ddfc3fc049c1..245a83348eeab 100644 --- a/data/mods/More_Locations/estate/estate_1icb_00.json +++ b/data/mods/More_Locations/estate/estate_1icb_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icb", - "comment": "first floor, inner corner B", + "//": "first floor, inner corner B", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icb_01.json b/data/mods/More_Locations/estate/estate_1icb_01.json index 3db6457f93abc..d468cba26e763 100644 --- a/data/mods/More_Locations/estate/estate_1icb_01.json +++ b/data/mods/More_Locations/estate/estate_1icb_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icb", - "comment": "first floor, inner corner B", + "//": "first floor, inner corner B", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icb_02.json b/data/mods/More_Locations/estate/estate_1icb_02.json index e56a56a2ed0a2..e745a1fe6b68e 100644 --- a/data/mods/More_Locations/estate/estate_1icb_02.json +++ b/data/mods/More_Locations/estate/estate_1icb_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icb", - "comment": "first floor, inner corner B", + "//": "first floor, inner corner B", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icb_03.json b/data/mods/More_Locations/estate/estate_1icb_03.json index 136e35964955c..4ad9a38db68b7 100644 --- a/data/mods/More_Locations/estate/estate_1icb_03.json +++ b/data/mods/More_Locations/estate/estate_1icb_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icb", - "comment": "first floor, inner corner B", + "//": "first floor, inner corner B", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icc_00.json b/data/mods/More_Locations/estate/estate_1icc_00.json index 295ed4fbb239d..c4d5d1c381456 100644 --- a/data/mods/More_Locations/estate/estate_1icc_00.json +++ b/data/mods/More_Locations/estate/estate_1icc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icc", - "comment": "first floor, inner corner C", + "//": "first floor, inner corner C", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icc_01.json b/data/mods/More_Locations/estate/estate_1icc_01.json index 34d83268336be..74dab1b602833 100644 --- a/data/mods/More_Locations/estate/estate_1icc_01.json +++ b/data/mods/More_Locations/estate/estate_1icc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icc", - "comment": "first floor, inner corner C", + "//": "first floor, inner corner C", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icc_02.json b/data/mods/More_Locations/estate/estate_1icc_02.json index cfb0feba22204..75cabe0dd5629 100644 --- a/data/mods/More_Locations/estate/estate_1icc_02.json +++ b/data/mods/More_Locations/estate/estate_1icc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icc", - "comment": "first floor, inner corner C", + "//": "first floor, inner corner C", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icc_03.json b/data/mods/More_Locations/estate/estate_1icc_03.json index 9fd4736875017..bcf1a21254038 100644 --- a/data/mods/More_Locations/estate/estate_1icc_03.json +++ b/data/mods/More_Locations/estate/estate_1icc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icc", - "comment": "first floor, inner corner C", + "//": "first floor, inner corner C", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icd_00.json b/data/mods/More_Locations/estate/estate_1icd_00.json index 72c5c914a585d..ef99f7bede5b7 100644 --- a/data/mods/More_Locations/estate/estate_1icd_00.json +++ b/data/mods/More_Locations/estate/estate_1icd_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icd", - "comment": "first floor, inner corner D", + "//": "first floor, inner corner D", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icd_01.json b/data/mods/More_Locations/estate/estate_1icd_01.json index 5b0d5051c4917..d5a9727dd1ccb 100644 --- a/data/mods/More_Locations/estate/estate_1icd_01.json +++ b/data/mods/More_Locations/estate/estate_1icd_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icd", - "comment": "first floor, inner corner D", + "//": "first floor, inner corner D", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icd_02.json b/data/mods/More_Locations/estate/estate_1icd_02.json index 99582c284e6a3..754992d06997b 100644 --- a/data/mods/More_Locations/estate/estate_1icd_02.json +++ b/data/mods/More_Locations/estate/estate_1icd_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icd", - "comment": "first floor, inner corner D", + "//": "first floor, inner corner D", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1icd_03.json b/data/mods/More_Locations/estate/estate_1icd_03.json index 9829ec86e8bef..01a1f73b2c866 100644 --- a/data/mods/More_Locations/estate/estate_1icd_03.json +++ b/data/mods/More_Locations/estate/estate_1icd_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1icd", - "comment": "first floor, inner corner D", + "//": "first floor, inner corner D", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1le_00.json b/data/mods/More_Locations/estate/estate_1le_00.json index 03d5290eb23c9..78c9beb1cc46e 100644 --- a/data/mods/More_Locations/estate/estate_1le_00.json +++ b/data/mods/More_Locations/estate/estate_1le_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1le", - "comment": "first floor, left edge", + "//": "first floor, left edge", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1le_01.json b/data/mods/More_Locations/estate/estate_1le_01.json index c0bc69fbab1c3..f3b0d49326e0e 100644 --- a/data/mods/More_Locations/estate/estate_1le_01.json +++ b/data/mods/More_Locations/estate/estate_1le_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1le", - "comment": "first floor, left edge", + "//": "first floor, left edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1le_02.json b/data/mods/More_Locations/estate/estate_1le_02.json index f6a1dd1505b8b..9c5bc86c44976 100644 --- a/data/mods/More_Locations/estate/estate_1le_02.json +++ b/data/mods/More_Locations/estate/estate_1le_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1le", - "comment": "first floor, left edge", + "//": "first floor, left edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1le_03.json b/data/mods/More_Locations/estate/estate_1le_03.json index 3b53554caa966..bcfc87ee2bb13 100644 --- a/data/mods/More_Locations/estate/estate_1le_03.json +++ b/data/mods/More_Locations/estate/estate_1le_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1le", - "comment": "first floor, left edge", + "//": "first floor, left edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1re_00.json b/data/mods/More_Locations/estate/estate_1re_00.json index b9cf85dc92fe5..f454925fc3291 100644 --- a/data/mods/More_Locations/estate/estate_1re_00.json +++ b/data/mods/More_Locations/estate/estate_1re_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1re", - "comment": "first floor, right edge", + "//": "first floor, right edge", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1re_01.json b/data/mods/More_Locations/estate/estate_1re_01.json index fbe620a67a1a6..2add5bd4b0905 100644 --- a/data/mods/More_Locations/estate/estate_1re_01.json +++ b/data/mods/More_Locations/estate/estate_1re_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1re", - "comment": "first floor, right edge", + "//": "first floor, right edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1re_02.json b/data/mods/More_Locations/estate/estate_1re_02.json index 1b6bd0205fa37..876ceef37697d 100644 --- a/data/mods/More_Locations/estate/estate_1re_02.json +++ b/data/mods/More_Locations/estate/estate_1re_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1re", - "comment": "first floor, right edge", + "//": "first floor, right edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1re_03.json b/data/mods/More_Locations/estate/estate_1re_03.json index ea39d891c23fd..39e12a5efd99c 100644 --- a/data/mods/More_Locations/estate/estate_1re_03.json +++ b/data/mods/More_Locations/estate/estate_1re_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1re", - "comment": "first floor, right edge", + "//": "first floor, right edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1te_00.json b/data/mods/More_Locations/estate/estate_1te_00.json index 65ae755d6028c..11eb131cdcf80 100644 --- a/data/mods/More_Locations/estate/estate_1te_00.json +++ b/data/mods/More_Locations/estate/estate_1te_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1te", - "comment": "first floor, top edge. ", + "//": "first floor, top edge. ", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1te_01.json b/data/mods/More_Locations/estate/estate_1te_01.json index 3452a2616adb3..d3fd3c0d65e43 100644 --- a/data/mods/More_Locations/estate/estate_1te_01.json +++ b/data/mods/More_Locations/estate/estate_1te_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1te", - "comment": "first floor, top edge. ", + "//": "first floor, top edge. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1te_02.json b/data/mods/More_Locations/estate/estate_1te_02.json index 0f19228415c37..77fd0c9b322a9 100644 --- a/data/mods/More_Locations/estate/estate_1te_02.json +++ b/data/mods/More_Locations/estate/estate_1te_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1te", - "comment": "first floor, top edge. ", + "//": "first floor, top edge. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1te_03.json b/data/mods/More_Locations/estate/estate_1te_03.json index 09f4fc6cf0521..425b3f5c7863b 100644 --- a/data/mods/More_Locations/estate/estate_1te_03.json +++ b/data/mods/More_Locations/estate/estate_1te_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1te", - "comment": "first floor, top edge. ", + "//": "first floor, top edge. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1tloc_00.json b/data/mods/More_Locations/estate/estate_1tloc_00.json index f960aee596486..eca6202392712 100644 --- a/data/mods/More_Locations/estate/estate_1tloc_00.json +++ b/data/mods/More_Locations/estate/estate_1tloc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1tloc", - "comment": "first floor, top left outer corner", + "//": "first floor, top left outer corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1tloc_01.json b/data/mods/More_Locations/estate/estate_1tloc_01.json index e77eddd936c5a..7ab8fcd46452d 100644 --- a/data/mods/More_Locations/estate/estate_1tloc_01.json +++ b/data/mods/More_Locations/estate/estate_1tloc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1tloc", - "comment": "first floor, top left outer corner", + "//": "first floor, top left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1tloc_02.json b/data/mods/More_Locations/estate/estate_1tloc_02.json index 2fe045c5c91f0..ba33f7a14ee8d 100644 --- a/data/mods/More_Locations/estate/estate_1tloc_02.json +++ b/data/mods/More_Locations/estate/estate_1tloc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1tloc", - "comment": "first floor, top left outer corner", + "//": "first floor, top left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1tloc_03.json b/data/mods/More_Locations/estate/estate_1tloc_03.json index 391fe29c283c0..b1aac97b2b74e 100644 --- a/data/mods/More_Locations/estate/estate_1tloc_03.json +++ b/data/mods/More_Locations/estate/estate_1tloc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1tloc", - "comment": "first floor, top left outer corner", + "//": "first floor, top left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1troc_00.json b/data/mods/More_Locations/estate/estate_1troc_00.json index ba59400a005a9..6d3e16b5e5ab2 100644 --- a/data/mods/More_Locations/estate/estate_1troc_00.json +++ b/data/mods/More_Locations/estate/estate_1troc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1troc", - "comment": "first floor, top right outer corner", + "//": "first floor, top right outer corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1troc_01.json b/data/mods/More_Locations/estate/estate_1troc_01.json index 80bc9d1d64612..e65a652e7f1b0 100644 --- a/data/mods/More_Locations/estate/estate_1troc_01.json +++ b/data/mods/More_Locations/estate/estate_1troc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1troc", - "comment": "first floor, top right outer corner", + "//": "first floor, top right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1troc_02.json b/data/mods/More_Locations/estate/estate_1troc_02.json index e80b31ed8ebc0..6532fbef2d204 100644 --- a/data/mods/More_Locations/estate/estate_1troc_02.json +++ b/data/mods/More_Locations/estate/estate_1troc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1troc", - "comment": "first floor, top right outer corner", + "//": "first floor, top right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1troc_03.json b/data/mods/More_Locations/estate/estate_1troc_03.json index 14b70d9d12f8b..7fde61daf5dd5 100644 --- a/data/mods/More_Locations/estate/estate_1troc_03.json +++ b/data/mods/More_Locations/estate/estate_1troc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1troc", - "comment": "first floor, top right outer corner", + "//": "first floor, top right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_1ty_00.json b/data/mods/More_Locations/estate/estate_1ty_00.json index 2c9de36e3456c..ff6c16b6c872f 100644 --- a/data/mods/More_Locations/estate/estate_1ty_00.json +++ b/data/mods/More_Locations/estate/estate_1ty_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_1ty", - "comment": "first floor, top yard. ", + "//": "first floor, top yard. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2be_00.json b/data/mods/More_Locations/estate/estate_2be_00.json index 884613c5a576f..6743b41de4464 100644 --- a/data/mods/More_Locations/estate/estate_2be_00.json +++ b/data/mods/More_Locations/estate/estate_2be_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2be", - "comment": "second floor, bottom edge", + "//": "second floor, bottom edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2be_01.json b/data/mods/More_Locations/estate/estate_2be_01.json index 5e36df3b99ae3..86a0b7a07cae1 100644 --- a/data/mods/More_Locations/estate/estate_2be_01.json +++ b/data/mods/More_Locations/estate/estate_2be_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2be", - "comment": "second floor, bottom edge", + "//": "second floor, bottom edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2be_02.json b/data/mods/More_Locations/estate/estate_2be_02.json index d640f992e2c17..8e7a1b3101bff 100644 --- a/data/mods/More_Locations/estate/estate_2be_02.json +++ b/data/mods/More_Locations/estate/estate_2be_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2be", - "comment": "second floor, bottom edge", + "//": "second floor, bottom edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2be_03.json b/data/mods/More_Locations/estate/estate_2be_03.json index b987ad6fe848c..554715092b2ad 100644 --- a/data/mods/More_Locations/estate/estate_2be_03.json +++ b/data/mods/More_Locations/estate/estate_2be_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2be", - "comment": "second floor, bottom edge", + "//": "second floor, bottom edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2bloc.json b/data/mods/More_Locations/estate/estate_2bloc.json index 0c7a9383cfa0a..eb9585115bd9d 100644 --- a/data/mods/More_Locations/estate/estate_2bloc.json +++ b/data/mods/More_Locations/estate/estate_2bloc.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2bloc", - "comment": "second floor, bottom left outer corner", + "//": "second floor, bottom left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2broc.json b/data/mods/More_Locations/estate/estate_2broc.json index af4e00826b943..ff1829dfddae8 100644 --- a/data/mods/More_Locations/estate/estate_2broc.json +++ b/data/mods/More_Locations/estate/estate_2broc.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2broc", - "comment": "second floor, bottom right outer corner", + "//": "second floor, bottom right outer corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2broc_01.json b/data/mods/More_Locations/estate/estate_2broc_01.json index 283b9102980ff..4d853502e16d5 100644 --- a/data/mods/More_Locations/estate/estate_2broc_01.json +++ b/data/mods/More_Locations/estate/estate_2broc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2broc", - "comment": "second floor, bottom right outer corner", + "//": "second floor, bottom right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2ica_00.json b/data/mods/More_Locations/estate/estate_2ica_00.json index f4d10b0fd78a8..2c92e9c980f17 100644 --- a/data/mods/More_Locations/estate/estate_2ica_00.json +++ b/data/mods/More_Locations/estate/estate_2ica_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2ica", - "comment": "second floor, inner corner A.", + "//": "second floor, inner corner A.", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2ica_01.json b/data/mods/More_Locations/estate/estate_2ica_01.json index 2f062696e12e6..937693e4dee43 100644 --- a/data/mods/More_Locations/estate/estate_2ica_01.json +++ b/data/mods/More_Locations/estate/estate_2ica_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2ica", - "comment": "second floor, inner corner A.", + "//": "second floor, inner corner A.", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2ica_02.json b/data/mods/More_Locations/estate/estate_2ica_02.json index c5e5be6a2e841..e4074683421b6 100644 --- a/data/mods/More_Locations/estate/estate_2ica_02.json +++ b/data/mods/More_Locations/estate/estate_2ica_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2ica", - "comment": "second floor, inner corner A.", + "//": "second floor, inner corner A.", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2ica_03.json b/data/mods/More_Locations/estate/estate_2ica_03.json index 2fa40215b3081..8ddbecba6da6d 100644 --- a/data/mods/More_Locations/estate/estate_2ica_03.json +++ b/data/mods/More_Locations/estate/estate_2ica_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2ica", - "comment": "second floor, inner corner A.", + "//": "second floor, inner corner A.", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icb_00.json b/data/mods/More_Locations/estate/estate_2icb_00.json index defea48da2f72..9bd2bf7bfc3a4 100644 --- a/data/mods/More_Locations/estate/estate_2icb_00.json +++ b/data/mods/More_Locations/estate/estate_2icb_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icb", - "comment": "second floor, inner corner B", + "//": "second floor, inner corner B", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icb_01.json b/data/mods/More_Locations/estate/estate_2icb_01.json index 00c75d0b3d4e3..2bdd289bd672c 100644 --- a/data/mods/More_Locations/estate/estate_2icb_01.json +++ b/data/mods/More_Locations/estate/estate_2icb_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icb", - "comment": "second floor, inner corner B", + "//": "second floor, inner corner B", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icb_02.json b/data/mods/More_Locations/estate/estate_2icb_02.json index f01b4f731fd31..723f3fc359a94 100644 --- a/data/mods/More_Locations/estate/estate_2icb_02.json +++ b/data/mods/More_Locations/estate/estate_2icb_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icb", - "comment": "second floor, inner corner B", + "//": "second floor, inner corner B", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icb_03.json b/data/mods/More_Locations/estate/estate_2icb_03.json index d8013d0116258..4f3e9a2c59687 100644 --- a/data/mods/More_Locations/estate/estate_2icb_03.json +++ b/data/mods/More_Locations/estate/estate_2icb_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icb", - "comment": "second floor, inner corner B", + "//": "second floor, inner corner B", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icc_00.json b/data/mods/More_Locations/estate/estate_2icc_00.json index 7b04be9b9e6bf..05808a620721c 100644 --- a/data/mods/More_Locations/estate/estate_2icc_00.json +++ b/data/mods/More_Locations/estate/estate_2icc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icc", - "comment": "second floor, inner corner C", + "//": "second floor, inner corner C", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icc_01.json b/data/mods/More_Locations/estate/estate_2icc_01.json index 2206662fdbf0e..aadce739431c1 100644 --- a/data/mods/More_Locations/estate/estate_2icc_01.json +++ b/data/mods/More_Locations/estate/estate_2icc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icc", - "comment": "second floor, inner corner C", + "//": "second floor, inner corner C", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icc_02.json b/data/mods/More_Locations/estate/estate_2icc_02.json index 1dbd2a72463f1..8782898fe5a66 100644 --- a/data/mods/More_Locations/estate/estate_2icc_02.json +++ b/data/mods/More_Locations/estate/estate_2icc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icc", - "comment": "second floor, inner corner C", + "//": "second floor, inner corner C", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icc_03.json b/data/mods/More_Locations/estate/estate_2icc_03.json index 94fa02336326d..57a4863ff91d2 100644 --- a/data/mods/More_Locations/estate/estate_2icc_03.json +++ b/data/mods/More_Locations/estate/estate_2icc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icc", - "comment": "second floor, inner corner C", + "//": "second floor, inner corner C", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icd_00.json b/data/mods/More_Locations/estate/estate_2icd_00.json index 3edd175607a23..4e145d481657a 100644 --- a/data/mods/More_Locations/estate/estate_2icd_00.json +++ b/data/mods/More_Locations/estate/estate_2icd_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icd", - "comment": "second floor, inner corner D", + "//": "second floor, inner corner D", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icd_01.json b/data/mods/More_Locations/estate/estate_2icd_01.json index 71e1d8e53b371..0adc7a89b092e 100644 --- a/data/mods/More_Locations/estate/estate_2icd_01.json +++ b/data/mods/More_Locations/estate/estate_2icd_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icd", - "comment": "second floor, inner corner D", + "//": "second floor, inner corner D", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icd_02.json b/data/mods/More_Locations/estate/estate_2icd_02.json index 5d78444c2ed05..83c156c6b4b33 100644 --- a/data/mods/More_Locations/estate/estate_2icd_02.json +++ b/data/mods/More_Locations/estate/estate_2icd_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icd", - "comment": "second floor, inner corner D", + "//": "second floor, inner corner D", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2icd_03.json b/data/mods/More_Locations/estate/estate_2icd_03.json index 615e42f2bc748..51409f5d31627 100644 --- a/data/mods/More_Locations/estate/estate_2icd_03.json +++ b/data/mods/More_Locations/estate/estate_2icd_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2icd", - "comment": "second floor, inner corner D", + "//": "second floor, inner corner D", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2le_00.json b/data/mods/More_Locations/estate/estate_2le_00.json index fdfb0b0e8be14..fff42a1e67f47 100644 --- a/data/mods/More_Locations/estate/estate_2le_00.json +++ b/data/mods/More_Locations/estate/estate_2le_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2le", - "comment": "second floor, left edge", + "//": "second floor, left edge", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2le_01.json b/data/mods/More_Locations/estate/estate_2le_01.json index 0d6dd90ca6f63..87f32257c02e8 100644 --- a/data/mods/More_Locations/estate/estate_2le_01.json +++ b/data/mods/More_Locations/estate/estate_2le_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2le", - "comment": "second floor, left edge", + "//": "second floor, left edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2le_02.json b/data/mods/More_Locations/estate/estate_2le_02.json index 689226bfd91e0..d0390445da74b 100644 --- a/data/mods/More_Locations/estate/estate_2le_02.json +++ b/data/mods/More_Locations/estate/estate_2le_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2le", - "comment": "second floor, left edge", + "//": "second floor, left edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2le_03.json b/data/mods/More_Locations/estate/estate_2le_03.json index 6928ab75241d4..a0d4d164c0287 100644 --- a/data/mods/More_Locations/estate/estate_2le_03.json +++ b/data/mods/More_Locations/estate/estate_2le_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2le", - "comment": "second floor, left edge", + "//": "second floor, left edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2re_00.json b/data/mods/More_Locations/estate/estate_2re_00.json index eb72249978fdc..939c60127ec49 100644 --- a/data/mods/More_Locations/estate/estate_2re_00.json +++ b/data/mods/More_Locations/estate/estate_2re_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2re", - "comment": "second floor, right edge", + "//": "second floor, right edge", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2re_01.json b/data/mods/More_Locations/estate/estate_2re_01.json index b3b941402a3f7..a7611b6ec9b84 100644 --- a/data/mods/More_Locations/estate/estate_2re_01.json +++ b/data/mods/More_Locations/estate/estate_2re_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2re", - "comment": "second floor, right edge", + "//": "second floor, right edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2re_02.json b/data/mods/More_Locations/estate/estate_2re_02.json index 1c3c41b3c29d0..23958bf8d9d1b 100644 --- a/data/mods/More_Locations/estate/estate_2re_02.json +++ b/data/mods/More_Locations/estate/estate_2re_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2re", - "comment": "second floor, right edge", + "//": "second floor, right edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2re_03.json b/data/mods/More_Locations/estate/estate_2re_03.json index 03eb61afffdd1..3b5c60e9b8e46 100644 --- a/data/mods/More_Locations/estate/estate_2re_03.json +++ b/data/mods/More_Locations/estate/estate_2re_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2re", - "comment": "second floor, right edge", + "//": "second floor, right edge", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2te_00.json b/data/mods/More_Locations/estate/estate_2te_00.json index 49bf036dfe978..76010fe1ac8f0 100644 --- a/data/mods/More_Locations/estate/estate_2te_00.json +++ b/data/mods/More_Locations/estate/estate_2te_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2te", - "comment": "second floor, top edge. ", + "//": "second floor, top edge. ", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2te_01.json b/data/mods/More_Locations/estate/estate_2te_01.json index c058114a52275..b89885687e56d 100644 --- a/data/mods/More_Locations/estate/estate_2te_01.json +++ b/data/mods/More_Locations/estate/estate_2te_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2te", - "comment": "second floor, top edge. ", + "//": "second floor, top edge. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2te_02.json b/data/mods/More_Locations/estate/estate_2te_02.json index d8c9dedd4a320..9cd9166dd6229 100644 --- a/data/mods/More_Locations/estate/estate_2te_02.json +++ b/data/mods/More_Locations/estate/estate_2te_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2te", - "comment": "second floor, top edge. ", + "//": "second floor, top edge. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2te_03.json b/data/mods/More_Locations/estate/estate_2te_03.json index 12dfb069ac2bf..6609b7adc8150 100644 --- a/data/mods/More_Locations/estate/estate_2te_03.json +++ b/data/mods/More_Locations/estate/estate_2te_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2te", - "comment": "second floor, top edge. ", + "//": "second floor, top edge. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2tloc_00.json b/data/mods/More_Locations/estate/estate_2tloc_00.json index 5e43c996bf537..419a1ad53e757 100644 --- a/data/mods/More_Locations/estate/estate_2tloc_00.json +++ b/data/mods/More_Locations/estate/estate_2tloc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2tloc", - "comment": "second floor, top left outer corner", + "//": "second floor, top left outer corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2tloc_01.json b/data/mods/More_Locations/estate/estate_2tloc_01.json index 7f27c9ec19098..97d3f386ab229 100644 --- a/data/mods/More_Locations/estate/estate_2tloc_01.json +++ b/data/mods/More_Locations/estate/estate_2tloc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2tloc", - "comment": "second floor, top left outer corner", + "//": "second floor, top left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2tloc_02.json b/data/mods/More_Locations/estate/estate_2tloc_02.json index bde3c6d48206a..452d9205d8583 100644 --- a/data/mods/More_Locations/estate/estate_2tloc_02.json +++ b/data/mods/More_Locations/estate/estate_2tloc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2tloc", - "comment": "second floor, top left outer corner", + "//": "second floor, top left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2tloc_03.json b/data/mods/More_Locations/estate/estate_2tloc_03.json index 7b8111b1179bb..212222ec183fa 100644 --- a/data/mods/More_Locations/estate/estate_2tloc_03.json +++ b/data/mods/More_Locations/estate/estate_2tloc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2tloc", - "comment": "second floor, top left outer corner", + "//": "second floor, top left outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2troc_00.json b/data/mods/More_Locations/estate/estate_2troc_00.json index 3729672433257..b2809beed1b8e 100644 --- a/data/mods/More_Locations/estate/estate_2troc_00.json +++ b/data/mods/More_Locations/estate/estate_2troc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2troc", - "comment": "second floor, top right outer corner", + "//": "second floor, top right outer corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2troc_01.json b/data/mods/More_Locations/estate/estate_2troc_01.json index e18cdad16e647..cdd3147cca207 100644 --- a/data/mods/More_Locations/estate/estate_2troc_01.json +++ b/data/mods/More_Locations/estate/estate_2troc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2troc", - "comment": "second floor, top right outer corner", + "//": "second floor, top right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2troc_02.json b/data/mods/More_Locations/estate/estate_2troc_02.json index 93fceb7649fcf..10c8205f34e0d 100644 --- a/data/mods/More_Locations/estate/estate_2troc_02.json +++ b/data/mods/More_Locations/estate/estate_2troc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2troc", - "comment": "second floor, top right outer corner", + "//": "second floor, top right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_2troc_03.json b/data/mods/More_Locations/estate/estate_2troc_03.json index eb5c95e8ea56c..0d8e3c0e5debe 100644 --- a/data/mods/More_Locations/estate/estate_2troc_03.json +++ b/data/mods/More_Locations/estate/estate_2troc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_2troc", - "comment": "second floor, top right outer corner", + "//": "second floor, top right outer corner", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_00.json b/data/mods/More_Locations/estate/estate_mid_00.json index c09aa6f5992f3..dc16bf2fa75d1 100644 --- a/data/mods/More_Locations/estate/estate_mid_00.json +++ b/data/mods/More_Locations/estate/estate_mid_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_01.json b/data/mods/More_Locations/estate/estate_mid_01.json index 28d77df190d9e..a8bd25f6aeea6 100644 --- a/data/mods/More_Locations/estate/estate_mid_01.json +++ b/data/mods/More_Locations/estate/estate_mid_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_02.json b/data/mods/More_Locations/estate/estate_mid_02.json index 3aaef83b2a2fe..3c758c9c579de 100644 --- a/data/mods/More_Locations/estate/estate_mid_02.json +++ b/data/mods/More_Locations/estate/estate_mid_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_03.json b/data/mods/More_Locations/estate/estate_mid_03.json index ec5c059c10914..fa38e9c1b7845 100644 --- a/data/mods/More_Locations/estate/estate_mid_03.json +++ b/data/mods/More_Locations/estate/estate_mid_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_04.json b/data/mods/More_Locations/estate/estate_mid_04.json index 57ff0eb19f108..668c3f2a8200d 100644 --- a/data/mods/More_Locations/estate/estate_mid_04.json +++ b/data/mods/More_Locations/estate/estate_mid_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_05.json b/data/mods/More_Locations/estate/estate_mid_05.json index 132e807975fd7..55f747127e967 100644 --- a/data/mods/More_Locations/estate/estate_mid_05.json +++ b/data/mods/More_Locations/estate/estate_mid_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_06.json b/data/mods/More_Locations/estate/estate_mid_06.json index 2dc49733c44dd..430b035c3d9c9 100644 --- a/data/mods/More_Locations/estate/estate_mid_06.json +++ b/data/mods/More_Locations/estate/estate_mid_06.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_07.json b/data/mods/More_Locations/estate/estate_mid_07.json index dcede1495f90a..d702c7f2b373d 100644 --- a/data/mods/More_Locations/estate/estate_mid_07.json +++ b/data/mods/More_Locations/estate/estate_mid_07.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_08.json b/data/mods/More_Locations/estate/estate_mid_08.json index 88201bba41ea6..0b7d288f68764 100644 --- a/data/mods/More_Locations/estate/estate_mid_08.json +++ b/data/mods/More_Locations/estate/estate_mid_08.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_09.json b/data/mods/More_Locations/estate/estate_mid_09.json index 8cd40a7fcbb9d..3100bf37d8036 100644 --- a/data/mods/More_Locations/estate/estate_mid_09.json +++ b/data/mods/More_Locations/estate/estate_mid_09.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_10.json b/data/mods/More_Locations/estate/estate_mid_10.json index 501e8da003d35..5427d66e11bfa 100644 --- a/data/mods/More_Locations/estate/estate_mid_10.json +++ b/data/mods/More_Locations/estate/estate_mid_10.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_11.json b/data/mods/More_Locations/estate/estate_mid_11.json index d36c3171d6a32..e821c1e809618 100644 --- a/data/mods/More_Locations/estate/estate_mid_11.json +++ b/data/mods/More_Locations/estate/estate_mid_11.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_12.json b/data/mods/More_Locations/estate/estate_mid_12.json index f39c61931a099..c443464001c3c 100644 --- a/data/mods/More_Locations/estate/estate_mid_12.json +++ b/data/mods/More_Locations/estate/estate_mid_12.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_13.json b/data/mods/More_Locations/estate/estate_mid_13.json index c9107fbab26d0..d66dd7867d5ba 100644 --- a/data/mods/More_Locations/estate/estate_mid_13.json +++ b/data/mods/More_Locations/estate/estate_mid_13.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_14.json b/data/mods/More_Locations/estate/estate_mid_14.json index a67d9e383d88b..dab2dc0792bfc 100644 --- a/data/mods/More_Locations/estate/estate_mid_14.json +++ b/data/mods/More_Locations/estate/estate_mid_14.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_15.json b/data/mods/More_Locations/estate/estate_mid_15.json index d4b2a141d5c46..b85f09ad07305 100644 --- a/data/mods/More_Locations/estate/estate_mid_15.json +++ b/data/mods/More_Locations/estate/estate_mid_15.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_16.json b/data/mods/More_Locations/estate/estate_mid_16.json index b4c10a59f3bf2..b63feaa241da9 100644 --- a/data/mods/More_Locations/estate/estate_mid_16.json +++ b/data/mods/More_Locations/estate/estate_mid_16.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_17.json b/data/mods/More_Locations/estate/estate_mid_17.json index c5463d94fee32..c2e91ef63e7f4 100644 --- a/data/mods/More_Locations/estate/estate_mid_17.json +++ b/data/mods/More_Locations/estate/estate_mid_17.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_18.json b/data/mods/More_Locations/estate/estate_mid_18.json index a1dde0e0d9fd8..896119cc39946 100644 --- a/data/mods/More_Locations/estate/estate_mid_18.json +++ b/data/mods/More_Locations/estate/estate_mid_18.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_19.json b/data/mods/More_Locations/estate/estate_mid_19.json index 19a0279549f7d..943d9c0512011 100644 --- a/data/mods/More_Locations/estate/estate_mid_19.json +++ b/data/mods/More_Locations/estate/estate_mid_19.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_20.json b/data/mods/More_Locations/estate/estate_mid_20.json index c0f7158199a0b..8802348dde351 100644 --- a/data/mods/More_Locations/estate/estate_mid_20.json +++ b/data/mods/More_Locations/estate/estate_mid_20.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_21.json b/data/mods/More_Locations/estate/estate_mid_21.json index 1fbed9e12969e..474a607eaf493 100644 --- a/data/mods/More_Locations/estate/estate_mid_21.json +++ b/data/mods/More_Locations/estate/estate_mid_21.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_22.json b/data/mods/More_Locations/estate/estate_mid_22.json index 55dc47c966b42..a42c0af9b53fe 100644 --- a/data/mods/More_Locations/estate/estate_mid_22.json +++ b/data/mods/More_Locations/estate/estate_mid_22.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_23.json b/data/mods/More_Locations/estate/estate_mid_23.json index e01c857eef54d..26252de92e30a 100644 --- a/data/mods/More_Locations/estate/estate_mid_23.json +++ b/data/mods/More_Locations/estate/estate_mid_23.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_30.json b/data/mods/More_Locations/estate/estate_mid_30.json index 1c53e4f89e479..af18924c9ea54 100644 --- a/data/mods/More_Locations/estate/estate_mid_30.json +++ b/data/mods/More_Locations/estate/estate_mid_30.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_31.json b/data/mods/More_Locations/estate/estate_mid_31.json index ae5e14d70ee2e..60f16f09897b5 100644 --- a/data/mods/More_Locations/estate/estate_mid_31.json +++ b/data/mods/More_Locations/estate/estate_mid_31.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_32.json b/data/mods/More_Locations/estate/estate_mid_32.json index 951e0dfad235d..8b3b33ff5334c 100644 --- a/data/mods/More_Locations/estate/estate_mid_32.json +++ b/data/mods/More_Locations/estate/estate_mid_32.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_33.json b/data/mods/More_Locations/estate/estate_mid_33.json index a6411c6cc6e84..c868ddd27c567 100644 --- a/data/mods/More_Locations/estate/estate_mid_33.json +++ b/data/mods/More_Locations/estate/estate_mid_33.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_34.json b/data/mods/More_Locations/estate/estate_mid_34.json index 89fc07359d7e1..067165bff52e1 100644 --- a/data/mods/More_Locations/estate/estate_mid_34.json +++ b/data/mods/More_Locations/estate/estate_mid_34.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_35.json b/data/mods/More_Locations/estate/estate_mid_35.json index 52413b3cc7b45..47a37e3efd176 100644 --- a/data/mods/More_Locations/estate/estate_mid_35.json +++ b/data/mods/More_Locations/estate/estate_mid_35.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_36.json b/data/mods/More_Locations/estate/estate_mid_36.json index 15fb39e2b4a62..80919e33ec632 100644 --- a/data/mods/More_Locations/estate/estate_mid_36.json +++ b/data/mods/More_Locations/estate/estate_mid_36.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_37.json b/data/mods/More_Locations/estate/estate_mid_37.json index 2ed6448f1fd19..2e367b35e3881 100644 --- a/data/mods/More_Locations/estate/estate_mid_37.json +++ b/data/mods/More_Locations/estate/estate_mid_37.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_38.json b/data/mods/More_Locations/estate/estate_mid_38.json index 1b4648948ed44..0cf61b17d1656 100644 --- a/data/mods/More_Locations/estate/estate_mid_38.json +++ b/data/mods/More_Locations/estate/estate_mid_38.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_39.json b/data/mods/More_Locations/estate/estate_mid_39.json index bb339f3354899..6d8ecd45486d1 100644 --- a/data/mods/More_Locations/estate/estate_mid_39.json +++ b/data/mods/More_Locations/estate/estate_mid_39.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_mid_40.json b/data/mods/More_Locations/estate/estate_mid_40.json index 06acd476f7c9f..92cac0cfe3734 100644 --- a/data/mods/More_Locations/estate/estate_mid_40.json +++ b/data/mods/More_Locations/estate/estate_mid_40.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_mid", - "comment": "any floor, middle area", + "//": "any floor, middle area", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_ube_01.json b/data/mods/More_Locations/estate/estate_ube_01.json index b45182dd919e3..a755429aba333 100644 --- a/data/mods/More_Locations/estate/estate_ube_01.json +++ b/data/mods/More_Locations/estate/estate_ube_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_ube", - "comment": "underground, bottom edge", + "//": "underground, bottom edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_ule_01.json b/data/mods/More_Locations/estate/estate_ule_01.json index ae691d4b7a7c6..d749798d5e382 100644 --- a/data/mods/More_Locations/estate/estate_ule_01.json +++ b/data/mods/More_Locations/estate/estate_ule_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_ule", - "comment": "underground, left edge", + "//": "underground, left edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_umid_01.json b/data/mods/More_Locations/estate/estate_umid_01.json index 830336d8b95f5..23cdef693c4ae 100644 --- a/data/mods/More_Locations/estate/estate_umid_01.json +++ b/data/mods/More_Locations/estate/estate_umid_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_umid", - "comment": "underground, mid. ", + "//": "underground, mid. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_ure_01.json b/data/mods/More_Locations/estate/estate_ure_01.json index 362b49f5c9766..ce50173c7776d 100644 --- a/data/mods/More_Locations/estate/estate_ure_01.json +++ b/data/mods/More_Locations/estate/estate_ure_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_ure", - "comment": "underground, right edge", + "//": "underground, right edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/More_Locations/estate/estate_ute_01.json b/data/mods/More_Locations/estate/estate_ute_01.json index 0238ca90b6048..3e8f653ba85f1 100644 --- a/data/mods/More_Locations/estate/estate_ute_01.json +++ b/data/mods/More_Locations/estate/estate_ute_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "estate_ute", - "comment": "underground, top edge. ", + "//": "underground, top edge. ", "weight": 99, "method": "json", "object": { diff --git a/data/mods/More_Locations/factions.json b/data/mods/More_Locations/factions.json index 62b5aa3a9e8e5..e8105bb5168ec 100644 --- a/data/mods/More_Locations/factions.json +++ b/data/mods/More_Locations/factions.json @@ -8,15 +8,9 @@ "known_by_u": true, "size": 1, "power": 1, - "combat_ability": 45, "food_supply": 0, "wealth": 0, - "good": 1, - "strength": -1, - "sneak": 0, - "crime": -1, - "cult": -1, - "description": "These are hapless survivors who have been captured by raiders, slavers, mutants, or worse. Without your help, the remainder of their lives will be short and gruesome." + "description": "These are hapless survivors who have been captured by raiders, slavers, mutants, or worse. Without your help, the remainder of their lives will be short and gruesome." }, { "type": "faction", @@ -27,14 +21,8 @@ "known_by_u": true, "size": 10, "power": 10, - "combat_ability": 20, "food_supply": 1000, "wealth": 1000, - "good": 1, - "strength": 0, - "sneak": -1, - "crime": -1, - "cult": -1, - "description": "The scattered remnants of civilization, these lucky few managed to barricade themselves inside during the earliest stages of the Cataclysm. Although temporarily secure, they are short on supplies and lack the skills to obtain more. It's only a matter of time before they too become the prey of otherwordly creatures, or of all-too-human monsters." + "description": "The scattered remnants of civilization, these lucky few managed to barricade themselves inside during the earliest stages of the Cataclysm. Although temporarily secure, they are short on supplies and lack the skills to obtain more. It's only a matter of time before they too become the prey of otherwordly creatures, or of all-too-human monsters." } ] diff --git a/data/mods/More_Locations/factory/factory_be_01.json b/data/mods/More_Locations/factory/factory_be_01.json index 8288c2a04f7f4..f7c0f48e35dc5 100644 --- a/data/mods/More_Locations/factory/factory_be_01.json +++ b/data/mods/More_Locations/factory/factory_be_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_be" ], - "comment": "bottom edge", + "//": "bottom edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_be_02.json b/data/mods/More_Locations/factory/factory_be_02.json index 2d3244d787ddb..ada849b1577d0 100644 --- a/data/mods/More_Locations/factory/factory_be_02.json +++ b/data/mods/More_Locations/factory/factory_be_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_be" ], - "comment": "bottom edge", + "//": "bottom edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_be_03.json b/data/mods/More_Locations/factory/factory_be_03.json index 490b36f059c61..b7316272895d1 100644 --- a/data/mods/More_Locations/factory/factory_be_03.json +++ b/data/mods/More_Locations/factory/factory_be_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_be" ], - "comment": "bottom edge", + "//": "bottom edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_be_04.json b/data/mods/More_Locations/factory/factory_be_04.json index c6e08f4d514e1..03d3374ef0e45 100644 --- a/data/mods/More_Locations/factory/factory_be_04.json +++ b/data/mods/More_Locations/factory/factory_be_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_be" ], - "comment": "bottom edge", + "//": "bottom edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_be_05.json b/data/mods/More_Locations/factory/factory_be_05.json index 1e46830a65a26..70a426f8b9468 100644 --- a/data/mods/More_Locations/factory/factory_be_05.json +++ b/data/mods/More_Locations/factory/factory_be_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_be" ], - "comment": "bottom edge", + "//": "bottom edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_be_gate_01.json b/data/mods/More_Locations/factory/factory_be_gate_01.json index c3f5b4f372e81..5542c2be40358 100644 --- a/data/mods/More_Locations/factory/factory_be_gate_01.json +++ b/data/mods/More_Locations/factory/factory_be_gate_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_be_gate" ], - "comment": "bottom edge gate", + "//": "bottom edge gate", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_be_gate_02.json b/data/mods/More_Locations/factory/factory_be_gate_02.json index 53834d03c7637..07b88875e8ce3 100644 --- a/data/mods/More_Locations/factory/factory_be_gate_02.json +++ b/data/mods/More_Locations/factory/factory_be_gate_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_be_gate" ], - "comment": "bottom edge gate", + "//": "bottom edge gate", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_be_gate_03.json b/data/mods/More_Locations/factory/factory_be_gate_03.json index 766adec199b3e..f7492fa2cb1fc 100644 --- a/data/mods/More_Locations/factory/factory_be_gate_03.json +++ b/data/mods/More_Locations/factory/factory_be_gate_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_be_gate" ], - "comment": "bottom edge gate", + "//": "bottom edge gate", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_blc_01.json b/data/mods/More_Locations/factory/factory_blc_01.json index 7121055cb9e50..cf4f0e7998187 100644 --- a/data/mods/More_Locations/factory/factory_blc_01.json +++ b/data/mods/More_Locations/factory/factory_blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_blc" ], - "comment": "bottom left corner", + "//": "bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_blc_02.json b/data/mods/More_Locations/factory/factory_blc_02.json index 0e7395bea8a87..a549dc1b7a51b 100644 --- a/data/mods/More_Locations/factory/factory_blc_02.json +++ b/data/mods/More_Locations/factory/factory_blc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_blc" ], - "comment": "bottom left corner", + "//": "bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_blc_04.json b/data/mods/More_Locations/factory/factory_blc_04.json index 694518bc18eda..e5a874f5a530e 100644 --- a/data/mods/More_Locations/factory/factory_blc_04.json +++ b/data/mods/More_Locations/factory/factory_blc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_blc" ], - "comment": "bottom left corner", + "//": "bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_blc_05.json b/data/mods/More_Locations/factory/factory_blc_05.json index 46015e24ee79c..fd8c297f7f3fc 100644 --- a/data/mods/More_Locations/factory/factory_blc_05.json +++ b/data/mods/More_Locations/factory/factory_blc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_blc" ], - "comment": "bottom left corner", + "//": "bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_brc_01.json b/data/mods/More_Locations/factory/factory_brc_01.json index e53e7b6854a0b..2064c39e56baf 100644 --- a/data/mods/More_Locations/factory/factory_brc_01.json +++ b/data/mods/More_Locations/factory/factory_brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_brc" ], - "comment": "bottom right corner", + "//": "bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_brc_02.json b/data/mods/More_Locations/factory/factory_brc_02.json index 3eff76311e285..24fbcc98142ee 100644 --- a/data/mods/More_Locations/factory/factory_brc_02.json +++ b/data/mods/More_Locations/factory/factory_brc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_te" ], - "comment": "bottom right corner", + "//": "bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_brc_04.json b/data/mods/More_Locations/factory/factory_brc_04.json index 39e3f4e475834..980e6ed289fbb 100644 --- a/data/mods/More_Locations/factory/factory_brc_04.json +++ b/data/mods/More_Locations/factory/factory_brc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_brc" ], - "comment": "bottom right corner", + "//": "bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_le_01.json b/data/mods/More_Locations/factory/factory_le_01.json index 3bf07d1ac35b8..c8359e80856f3 100644 --- a/data/mods/More_Locations/factory/factory_le_01.json +++ b/data/mods/More_Locations/factory/factory_le_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_le" ], - "comment": "left edge", + "//": "left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_le_02.json b/data/mods/More_Locations/factory/factory_le_02.json index f2a3767f0eabb..b39b9d9570661 100644 --- a/data/mods/More_Locations/factory/factory_le_02.json +++ b/data/mods/More_Locations/factory/factory_le_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_le" ], - "comment": "left edge", + "//": "left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_le_03.json b/data/mods/More_Locations/factory/factory_le_03.json index eb4858bf26623..fe9bb3d0f3522 100644 --- a/data/mods/More_Locations/factory/factory_le_03.json +++ b/data/mods/More_Locations/factory/factory_le_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_le" ], - "comment": "left edge", + "//": "left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_le_04.json b/data/mods/More_Locations/factory/factory_le_04.json index d14967129ff5f..c6f3f64454d43 100644 --- a/data/mods/More_Locations/factory/factory_le_04.json +++ b/data/mods/More_Locations/factory/factory_le_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_le" ], - "comment": "left edge", + "//": "left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_le_05.json b/data/mods/More_Locations/factory/factory_le_05.json index 45a33d8e3d9ec..1a63def9b568b 100644 --- a/data/mods/More_Locations/factory/factory_le_05.json +++ b/data/mods/More_Locations/factory/factory_le_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_le" ], - "comment": "left edge", + "//": "left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_01.json b/data/mods/More_Locations/factory/factory_mid_01.json index a94611866d298..af38b8cac5e71 100644 --- a/data/mods/More_Locations/factory/factory_mid_01.json +++ b/data/mods/More_Locations/factory/factory_mid_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_02.json b/data/mods/More_Locations/factory/factory_mid_02.json index fed715603a705..a862e6db50837 100644 --- a/data/mods/More_Locations/factory/factory_mid_02.json +++ b/data/mods/More_Locations/factory/factory_mid_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_03.json b/data/mods/More_Locations/factory/factory_mid_03.json index 95bf147eb3567..33cd730ebfc1a 100644 --- a/data/mods/More_Locations/factory/factory_mid_03.json +++ b/data/mods/More_Locations/factory/factory_mid_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_04.json b/data/mods/More_Locations/factory/factory_mid_04.json index b4e9117232c0b..14c62238ebd05 100644 --- a/data/mods/More_Locations/factory/factory_mid_04.json +++ b/data/mods/More_Locations/factory/factory_mid_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_05.json b/data/mods/More_Locations/factory/factory_mid_05.json index 07cb73c28a7da..0b97e492d506a 100644 --- a/data/mods/More_Locations/factory/factory_mid_05.json +++ b/data/mods/More_Locations/factory/factory_mid_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_06.json b/data/mods/More_Locations/factory/factory_mid_06.json index 197995b7dca0c..16aa07f74df31 100644 --- a/data/mods/More_Locations/factory/factory_mid_06.json +++ b/data/mods/More_Locations/factory/factory_mid_06.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_07.json b/data/mods/More_Locations/factory/factory_mid_07.json index f80dc0560d659..8c86e966d6e4a 100644 --- a/data/mods/More_Locations/factory/factory_mid_07.json +++ b/data/mods/More_Locations/factory/factory_mid_07.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_08.json b/data/mods/More_Locations/factory/factory_mid_08.json index fba0f3b0c3a01..1156e326837fe 100644 --- a/data/mods/More_Locations/factory/factory_mid_08.json +++ b/data/mods/More_Locations/factory/factory_mid_08.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_09.json b/data/mods/More_Locations/factory/factory_mid_09.json index 602562703c0fa..bab845a6922ad 100644 --- a/data/mods/More_Locations/factory/factory_mid_09.json +++ b/data/mods/More_Locations/factory/factory_mid_09.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_10.json b/data/mods/More_Locations/factory/factory_mid_10.json index 601477adfb83c..4fb2f4b036df0 100644 --- a/data/mods/More_Locations/factory/factory_mid_10.json +++ b/data/mods/More_Locations/factory/factory_mid_10.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_11.json b/data/mods/More_Locations/factory/factory_mid_11.json index ee933d2e10ad6..d4d139bedf6db 100644 --- a/data/mods/More_Locations/factory/factory_mid_11.json +++ b/data/mods/More_Locations/factory/factory_mid_11.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_12.json b/data/mods/More_Locations/factory/factory_mid_12.json index a526bfc5a0e24..c39611f04322a 100644 --- a/data/mods/More_Locations/factory/factory_mid_12.json +++ b/data/mods/More_Locations/factory/factory_mid_12.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_13.json b/data/mods/More_Locations/factory/factory_mid_13.json index 7a3cafe2b3174..5f40c379fdb92 100644 --- a/data/mods/More_Locations/factory/factory_mid_13.json +++ b/data/mods/More_Locations/factory/factory_mid_13.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_15.json b/data/mods/More_Locations/factory/factory_mid_15.json index 6bbf03aa0bce9..480ef8d62635b 100644 --- a/data/mods/More_Locations/factory/factory_mid_15.json +++ b/data/mods/More_Locations/factory/factory_mid_15.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_16.json b/data/mods/More_Locations/factory/factory_mid_16.json index 0f79f548935b2..4078736a775b5 100644 --- a/data/mods/More_Locations/factory/factory_mid_16.json +++ b/data/mods/More_Locations/factory/factory_mid_16.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_mid_17.json b/data/mods/More_Locations/factory/factory_mid_17.json index 0d3fedee40f0e..e16d60a259d13 100644 --- a/data/mods/More_Locations/factory/factory_mid_17.json +++ b/data/mods/More_Locations/factory/factory_mid_17.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_mid" ], - "comment": "middle", + "//": "middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_re_01.json b/data/mods/More_Locations/factory/factory_re_01.json index 86bd6917228e9..9d50999d53d7b 100644 --- a/data/mods/More_Locations/factory/factory_re_01.json +++ b/data/mods/More_Locations/factory/factory_re_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_re" ], - "comment": "right edge", + "//": "right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_re_02.json b/data/mods/More_Locations/factory/factory_re_02.json index 91f785347f16a..4ca0c202e154a 100644 --- a/data/mods/More_Locations/factory/factory_re_02.json +++ b/data/mods/More_Locations/factory/factory_re_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_re" ], - "comment": "right edge", + "//": "right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_re_03.json b/data/mods/More_Locations/factory/factory_re_03.json index a562406dc6ce6..2a1cb27b450e5 100644 --- a/data/mods/More_Locations/factory/factory_re_03.json +++ b/data/mods/More_Locations/factory/factory_re_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_re" ], - "comment": "right edge", + "//": "right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_re_04.json b/data/mods/More_Locations/factory/factory_re_04.json index 967985257f242..b9fe178775e8a 100644 --- a/data/mods/More_Locations/factory/factory_re_04.json +++ b/data/mods/More_Locations/factory/factory_re_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_re" ], - "comment": "right edge", + "//": "right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_re_05.json b/data/mods/More_Locations/factory/factory_re_05.json index 041278b7c03c1..63fc4aebb2bf8 100644 --- a/data/mods/More_Locations/factory/factory_re_05.json +++ b/data/mods/More_Locations/factory/factory_re_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_re" ], - "comment": "right edge", + "//": "right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_re_06.json b/data/mods/More_Locations/factory/factory_re_06.json index b6cc4b672d36a..89cfad7cd2b5c 100644 --- a/data/mods/More_Locations/factory/factory_re_06.json +++ b/data/mods/More_Locations/factory/factory_re_06.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_re" ], - "comment": "right edge", + "//": "right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_te_01.json b/data/mods/More_Locations/factory/factory_te_01.json index bf0c7537f884b..9c6797d4a610b 100644 --- a/data/mods/More_Locations/factory/factory_te_01.json +++ b/data/mods/More_Locations/factory/factory_te_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_te" ], - "comment": "top edge", + "//": "top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_te_02.json b/data/mods/More_Locations/factory/factory_te_02.json index fceeec67c90ee..bcd0c36bba125 100644 --- a/data/mods/More_Locations/factory/factory_te_02.json +++ b/data/mods/More_Locations/factory/factory_te_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_te" ], - "comment": "top edge", + "//": "top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_te_03.json b/data/mods/More_Locations/factory/factory_te_03.json index 29b5824e992e3..90c7ea390a4b8 100644 --- a/data/mods/More_Locations/factory/factory_te_03.json +++ b/data/mods/More_Locations/factory/factory_te_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_te" ], - "comment": "top edge", + "//": "top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_te_04.json b/data/mods/More_Locations/factory/factory_te_04.json index 221da4cd45384..afa2a28d969b8 100644 --- a/data/mods/More_Locations/factory/factory_te_04.json +++ b/data/mods/More_Locations/factory/factory_te_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_te" ], - "comment": "top edge", + "//": "top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_te_05.json b/data/mods/More_Locations/factory/factory_te_05.json index 007166e09e731..f98f59d0388ba 100644 --- a/data/mods/More_Locations/factory/factory_te_05.json +++ b/data/mods/More_Locations/factory/factory_te_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_te" ], - "comment": "top edge", + "//": "top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_te_06.json b/data/mods/More_Locations/factory/factory_te_06.json index 4f93e5352c9bb..75c8f40f2842b 100644 --- a/data/mods/More_Locations/factory/factory_te_06.json +++ b/data/mods/More_Locations/factory/factory_te_06.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_te" ], - "comment": "top edge", + "//": "top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_tlc_01.json b/data/mods/More_Locations/factory/factory_tlc_01.json index 772f5152274c8..dc661446fa29a 100644 --- a/data/mods/More_Locations/factory/factory_tlc_01.json +++ b/data/mods/More_Locations/factory/factory_tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_tlc" ], - "comment": "top left corner", + "//": "top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_tlc_02.json b/data/mods/More_Locations/factory/factory_tlc_02.json index e5619636f573f..00f0f78f2c656 100644 --- a/data/mods/More_Locations/factory/factory_tlc_02.json +++ b/data/mods/More_Locations/factory/factory_tlc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_tlc" ], - "comment": "top left corner", + "//": "top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_tlc_04.json b/data/mods/More_Locations/factory/factory_tlc_04.json index 0b9f68a39a102..e3391eaa07789 100644 --- a/data/mods/More_Locations/factory/factory_tlc_04.json +++ b/data/mods/More_Locations/factory/factory_tlc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_tlc" ], - "comment": "top left corner", + "//": "top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_tlc_05.json b/data/mods/More_Locations/factory/factory_tlc_05.json index 7dcf1cdb27b36..42cea29f23705 100644 --- a/data/mods/More_Locations/factory/factory_tlc_05.json +++ b/data/mods/More_Locations/factory/factory_tlc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_tlc" ], - "comment": "top left corner", + "//": "top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_trc_01.json b/data/mods/More_Locations/factory/factory_trc_01.json index ff492d6ec8b69..081b4f9a5bcb9 100644 --- a/data/mods/More_Locations/factory/factory_trc_01.json +++ b/data/mods/More_Locations/factory/factory_trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_trc" ], - "comment": "top right corner", + "//": "top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_trc_02.json b/data/mods/More_Locations/factory/factory_trc_02.json index 02cbb1393a8ae..2633bb32873a0 100644 --- a/data/mods/More_Locations/factory/factory_trc_02.json +++ b/data/mods/More_Locations/factory/factory_trc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_trc" ], - "comment": "top right corner", + "//": "top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_trc_03.json b/data/mods/More_Locations/factory/factory_trc_03.json index 786b686f14063..42a36b43d2f60 100644 --- a/data/mods/More_Locations/factory/factory_trc_03.json +++ b/data/mods/More_Locations/factory/factory_trc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_trc" ], - "comment": "top right corner", + "//": "top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_trc_04.json b/data/mods/More_Locations/factory/factory_trc_04.json index 9b4fc1329fb3a..725d9c457eeb7 100644 --- a/data/mods/More_Locations/factory/factory_trc_04.json +++ b/data/mods/More_Locations/factory/factory_trc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_trc" ], - "comment": "top right corner", + "//": "top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/factory/factory_trc_05.json b/data/mods/More_Locations/factory/factory_trc_05.json index 3292ba1aa41ee..46a4303179979 100644 --- a/data/mods/More_Locations/factory/factory_trc_05.json +++ b/data/mods/More_Locations/factory/factory_trc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "factory_trc" ], - "comment": "top right corner", + "//": "top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1be_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1be_00.json index 61d4c4ec4f272..ade73dc8d885a 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1be_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1be_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1be" ], - "comment": "first floor bottom edge", + "//": "first floor bottom edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1be_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1be_01.json index 8e39c90738b66..ef91baf7d4de8 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1be_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1be_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1be" ], - "comment": "first floor bottom edge", + "//": "first floor bottom edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1blc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1blc_00.json index e6cec54e1716c..ba0c3c55c0a26 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1blc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1blc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1blc" ], - "comment": "first floor bottom left corner", + "//": "first floor bottom left corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1blc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1blc_01.json index 1003f003d7222..786948fecfc79 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1blc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1blc" ], - "comment": "first floor bottom left corner", + "//": "first floor bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1brc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1brc_00.json index 5d7c7967e0ba6..2d6793e7ea7c8 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1brc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1brc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1brc" ], - "comment": "first floor bottom right corner", + "//": "first floor bottom right corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1brc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1brc_01.json index b5af534107f77..e63bace9dc51b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1brc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1brc" ], - "comment": "first floor bottom right corner", + "//": "first floor bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1le_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1le_00.json index 2e5414094a658..c1f0e4e69fa20 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1le_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1le_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1le" ], - "comment": "first floor left edge", + "//": "first floor left edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1le_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1le_01.json index a09223269b13c..855c61eb93e93 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1le_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1le_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1le" ], - "comment": "first floor left edge", + "//": "first floor left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_00.json index 7d6e93b4c3038..dfee79330cc3f 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1mid" ], - "comment": "ground level middle parking lot", + "//": "ground level middle parking lot", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_01.json index bb63a462717ab..2e13ee7e19253 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1mid" ], - "comment": "ground level middle parking lot", + "//": "ground level middle parking lot", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_02.json index 2d8a14c98ce03..d5e3193fd6fcd 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1mid" ], - "comment": "ground level middle parking lot", + "//": "ground level middle parking lot", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_03.json index a604bdf63e0a2..54562672d47ab 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1mid" ], - "comment": "ground level middle parking lot", + "//": "ground level middle parking lot", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_04.json index 80d9d45dfa31d..a96868d8b7826 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1mid_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1mid_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1mid" ], - "comment": "ground level middle parking lot", + "//": "ground level middle parking lot", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1re_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1re_00.json index 4de5a7436a892..57cfaf301c42a 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1re_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1re_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1re" ], - "comment": "first floor right edge", + "//": "first floor right edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1re_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1re_01.json index a8fdbb08e2a2d..a2c28bc6e03eb 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1re_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1re_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1re" ], - "comment": "first floor right edge", + "//": "first floor right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1te_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1te_00.json index f9e474727ad39..18d077470b20a 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1te_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1te_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1te" ], - "comment": "first floor top edge", + "//": "first floor top edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1te_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1te_01.json index 21d94d7200aba..fb0af75470d60 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1te_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1te_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1te" ], - "comment": "first floor top edge", + "//": "first floor top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1tlc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1tlc_00.json index e75c441946f4c..7b3e838370ec3 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1tlc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1tlc" ], - "comment": "first floor top left corner", + "//": "first floor top left corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1tlc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1tlc_01.json index dc0b52129a069..24c6cba550f08 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1tlc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1tlc" ], - "comment": "first floor top left corner", + "//": "first floor top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1trc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_1trc_00.json index 377e363f16c33..c3b1c0824ba1f 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1trc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1trc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1trc" ], - "comment": "first floor top right corner", + "//": "first floor top right corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_1trc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_1trc_01.json index 7439bb18b4c54..5fb3e7ae46198 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_1trc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_1trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_1trc" ], - "comment": "first floor top right corner", + "//": "first floor top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2be_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_2be_00.json index 20c5a413663a1..c217dc083b613 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2be_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2be_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2be" ], - "comment": "first floor bottom edge", + "//": "first floor bottom edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2be_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_2be_01.json index 41b24d34bf17c..36454a2dc211b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2be_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2be_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2be" ], - "comment": "first floor bottom edge", + "//": "first floor bottom edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2blc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_2blc_00.json index 809bfcd67fa34..c840297b66956 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2blc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2blc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2blc" ], - "comment": "second floor bottom left corner", + "//": "second floor bottom left corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2blc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_2blc_01.json index 5f4b5c71a05dd..1fad50d2486b1 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2blc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2blc" ], - "comment": "second floor bottom left corner", + "//": "second floor bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2brc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_2brc_00.json index 087125719d5dd..20f9aa0d8a78c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2brc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2brc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2brc" ], - "comment": "second floor bottom right corner", + "//": "second floor bottom right corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2brc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_2brc_01.json index d6f7c26a9e158..d0bd936064b55 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2brc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2brc" ], - "comment": "second floor bottom right corner", + "//": "second floor bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2le_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_2le_00.json index 872ed39d300a6..348c6c3840a1b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2le_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2le_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2le" ], - "comment": "second floor left edge", + "//": "second floor left edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2le_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_2le_01.json index 459ca0081c9a5..fb8ead91d7325 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2le_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2le_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2le" ], - "comment": "second floor left edge", + "//": "second floor left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2re_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_2re_00.json index 0024c5fb07223..fba2f74694b10 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2re_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2re_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2re" ], - "comment": "second floor right edge", + "//": "second floor right edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2re_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_2re_01.json index d1ff1fc75c654..9cf3c4416faa4 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2re_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2re_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2re" ], - "comment": "second floor right edge", + "//": "second floor right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2te_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_2te_00.json index 89dd46467a6db..f33d2380e1c3d 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2te_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2te_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2te" ], - "comment": "second floor top edge", + "//": "second floor top edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2te_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_2te_01.json index 7900f6443f8af..28c10b560af8f 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2te_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2te_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2te" ], - "comment": "second floor top edge", + "//": "second floor top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2tlc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_2tlc_00.json index 9037e196d0583..05d22d5747b5c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2tlc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2tlc" ], - "comment": "second floor top left corner", + "//": "second floor top left corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2tlc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_2tlc_01.json index d8ccce74aa323..d1f87d80e49b3 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2tlc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2tlc" ], - "comment": "second floor top left corner", + "//": "second floor top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2trc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_2trc_00.json index ccc439790cc12..cd185106a54a0 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2trc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2trc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2trc" ], - "comment": "second floor top right corner", + "//": "second floor top right corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_2trc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_2trc_01.json index c945734d37a67..1175129b2eb3d 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_2trc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_2trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_2trc" ], - "comment": "second floor top right corner", + "//": "second floor top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_3c_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_3c_00.json index 35387f28bc607..06f0edcac30b8 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_3c_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_3c_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_3c" ], - "comment": "third floor top corner", + "//": "third floor top corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_3c_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_3c_01.json index 710e97d7f7e74..b328e1b81be7b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_3c_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_3c_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_3c" ], - "comment": "third floor top corner", + "//": "third floor top corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_3c_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_3c_02.json index 7d05c7efc954c..09e70c0883bd8 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_3c_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_3c_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_3c" ], - "comment": "third floor top corner", + "//": "third floor top corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_3c_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_3c_03.json index 52f3ddcab012c..57750a2f79776 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_3c_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_3c_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_3c" ], - "comment": "third floor top corner", + "//": "third floor top corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_3c_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_3c_04.json index 30e0f939f8ccb..21435d3feae6f 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_3c_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_3c_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_3c" ], - "comment": "third floor top corner", + "//": "third floor top corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_3c_05.json b/data/mods/More_Locations/military_outpost/mil_outpost_3c_05.json index d55a44c0ad4da..ba65c6ef71416 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_3c_05.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_3c_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_3c" ], - "comment": "third floor top corner", + "//": "third floor top corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ube_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ube_00.json index 14dfd0ca37b56..21fac4ecf789f 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ube_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ube_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ube" ], - "comment": "underground bottom edge", + "//": "underground bottom edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubea_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubea_01.json index 3561b5ec4ad2e..8a6abba7165d7 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubea_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubea_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubea" ], - "comment": "underground bottom edge. A stair", + "//": "underground bottom edge. A stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubea_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubea_02.json index 074c3a727ccd5..4d3e8c195ed7c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubea_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubea_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubea" ], - "comment": "underground bottom edge. A stair", + "//": "underground bottom edge. A stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubea_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubea_03.json index b391d14a3441c..c3f07d2d2e17c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubea_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubea_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubea" ], - "comment": "underground bottom edge. A stair", + "//": "underground bottom edge. A stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubea_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubea_04.json index 827951006afd5..c738d842a1c42 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubea_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubea_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubea" ], - "comment": "underground bottom edge. A stair", + "//": "underground bottom edge. A stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_01.json index cd4143fa48f6d..4f79f10d69192 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubeb" ], - "comment": "underground bottom edge. B stair", + "//": "underground bottom edge. B stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_02.json index 37c2b909d0548..07a31034e0b1d 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubeb" ], - "comment": "underground bottom edge. B stair", + "//": "underground bottom edge. B stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_03.json index c1e5b39ef0c8e..103eb7428da0d 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubeb" ], - "comment": "underground bottom edge. B stair", + "//": "underground bottom edge. B stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_04.json index 888c5e617c6ce..537c266582c8f 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubeb_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubeb" ], - "comment": "underground bottom edge. B stair", + "//": "underground bottom edge. B stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_00.json index 7565d29c962cc..ea42e3fc50cac 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ublc" ], - "comment": "underground bottom left corner", + "//": "underground bottom left corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_01.json index 90e8659142605..c7740c291f7a9 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ublc" ], - "comment": "underground bottom left corner", + "//": "underground bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_02.json index f0c0105da8a4f..bfa17a718e840 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ublc" ], - "comment": "underground bottom left corner", + "//": "underground bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_03.json index 80b6fb9016fab..4da8ddbed35aa 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ublc" ], - "comment": "underground bottom left corner", + "//": "underground bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_04.json index 6238b2ea38605..f28086304f9f1 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ublc_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ublc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ublc" ], - "comment": "underground bottom left corner", + "//": "underground bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_00.json index 9f22f0b75a537..3812fb0da02ee 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubrc" ], - "comment": "underground bottom right corner", + "//": "underground bottom right corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_01.json index 5041130136121..bee0c9854177e 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubrc" ], - "comment": "underground bottom right corner", + "//": "underground bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_02.json index f90ed877774f9..27ebfd739c8f6 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubrc" ], - "comment": "underground bottom right corner", + "//": "underground bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_03.json index 0d38e344eb9ee..bf4cc112c6e5b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubrc" ], - "comment": "underground bottom right corner", + "//": "underground bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_04.json index 0c994aac61c7d..b75c281f57b5b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ubrc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ubrc" ], - "comment": "underground bottom right corner", + "//": "underground bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ule_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ule_00.json index c5368870cd2cc..d0235e4283c4f 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ule_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ule_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ule" ], - "comment": "underground left edge", + "//": "underground left edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ule_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_ule_01.json index f939f21bb1e24..87c8883c4938c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ule_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ule_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ule" ], - "comment": "underground left edge", + "//": "underground left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ule_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_ule_02.json index 73219347ff32d..9c0bcb9509012 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ule_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ule_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ule" ], - "comment": "underground left edge", + "//": "underground left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ule_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_ule_03.json index da96930be87e4..0b7050bd0b7eb 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ule_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ule_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ule" ], - "comment": "underground left edge", + "//": "underground left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ule_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_ule_04.json index a7e435b148141..9fa5f91db255b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ule_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ule_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ule" ], - "comment": "underground left edge", + "//": "underground left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_umid_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_umid_00.json index 3c0585ad10e87..620ecf9e2258e 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_umid_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_umid_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_umid" ], - "comment": "underground middle", + "//": "underground middle", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_umid_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_umid_01.json index e8073c6ebda8d..4dddfee6ec3d1 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_umid_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_umid_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_umid" ], - "comment": "underground middle", + "//": "underground middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_umid_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_umid_02.json index 4fa546d7d9c0c..e035c879e96e1 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_umid_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_umid_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_umid" ], - "comment": "underground middle", + "//": "underground middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_umid_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_umid_03.json index 8cd51fd3725f8..d63112fcf7f05 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_umid_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_umid_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_umid" ], - "comment": "underground middle", + "//": "underground middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_umid_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_umid_04.json index c221dd605e19f..fd1212f1c675c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_umid_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_umid_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_umid" ], - "comment": "underground middle", + "//": "underground middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json index a737e8500d578..902c00e5bf613 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_umid_finale" ], - "comment": "underground middle", + "//": "underground middle", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json index 4ed64124ee753..dd501a30659b5 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ure" ], - "comment": "underground right edge", + "//": "underground right edge", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json index c84250d220c83..55c5783bd2d5c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ure" ], - "comment": "underground right edge", + "//": "underground right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json index e02ea42523ae7..b5bbe67554684 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ure" ], - "comment": "underground right edge", + "//": "underground right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json index bd474a6b781fc..8c2eae53de2a1 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ure" ], - "comment": "underground right edge", + "//": "underground right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json index afb63fa8beafc..47ed380cb065e 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ure" ], - "comment": "underground right edge", + "//": "underground right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json index 84b530c05bd13..33c8b8eb7b0d8 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utea" ], - "comment": "underground top edge. A stair", + "//": "underground top edge. A stair", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json index 3b13a2da42c89..c353abc43a701 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utea" ], - "comment": "underground top edge. A stair", + "//": "underground top edge. A stair", "method": "json", "weight": 100, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json index e4aab6d5fdc72..a871cac5b20f8 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utea" ], - "comment": "underground top edge. A stair", + "//": "underground top edge. A stair", "method": "json", "weight": 100, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json index fba8d04cb2003..91e54da46e91a 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utea" ], - "comment": "underground top edge. A stairs", + "//": "underground top edge. A stairs", "method": "json", "weight": 100, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json index a534a0f826d71..3b1a47493bb22 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utea" ], - "comment": "underground top edge. A stair", + "//": "underground top edge. A stair", "method": "json", "weight": 100, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json index b4b812879412c..e196c4f444a54 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utea" ], - "comment": "underground top edge. B stair", + "//": "underground top edge. B stair", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json index 9323cfebcd495..754b142f11e69 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_uteb" ], - "comment": "underground top edge. B stair", + "//": "underground top edge. B stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json index 24694308fdfb1..8621f9ac43ac3 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_uteb" ], - "comment": "underground top edge. B stair", + "//": "underground top edge. B stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json index 4623af844ec5b..594d86825b035 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_uteb" ], - "comment": "underground top edge. B stair", + "//": "underground top edge. B stair", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json index f9a056cd62836..a63205d4fd289 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ute" ], - "comment": "underground top edge. B stair", + "//": "underground top edge. B stair", "method": "json", "weight": 100, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json index f7c2aedb7108a..9c23303297cc9 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utlc" ], - "comment": "underground top left corner", + "//": "underground top left corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_01.json index 25284a5424ccd..4b1b741ff86ed 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utlc" ], - "comment": "underground top left corner", + "//": "underground top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_02.json index 3c2d113d32417..6e0681139758e 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utlc" ], - "comment": "underground top left corner", + "//": "underground top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_03.json index efb3fbd217fae..d5bc885aa67c9 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utlc" ], - "comment": "underground top left corner", + "//": "underground top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_04.json index c46109f05ecfc..ebd95094b582d 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utlc" ], - "comment": "underground top left corner", + "//": "underground top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_00.json index 5f68f15288a4e..d95ba2f41527c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utrc" ], - "comment": "underground top right corner", + "//": "underground top right corner", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_01.json index 73e0a217d945f..c4989f1b025bb 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utrc" ], - "comment": "underground top right corner", + "//": "underground top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_02.json index ea9dc0c13e333..8c1533a176070 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utrc" ], - "comment": "underground top right corner", + "//": "underground top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_03.json index 0e0552dc31008..aca2fd8f1e3e2 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utrc" ], - "comment": "underground top right corner", + "//": "underground top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_04.json index a6bc3b9b8e00d..0fd8958be946b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utrc_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utrc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_utrc" ], - "comment": "underground top right corner", + "//": "underground top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ybe_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ybe_00.json index a37cbd0762fc1..6dae40cdd0134 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ybe_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ybe_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ybe" ], - "comment": "yard bottom edge", + "//": "yard bottom edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_00.json index a7c7843a6df2d..a03d8bad2a104 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ybe_gate" ], - "comment": "yard bottom edge gate", + "//": "yard bottom edge gate", "method": "json", "weight": 0, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_01.json index 87dc007ad8df1..3e1c098a2e413 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ybe_gate" ], - "comment": "yard bottom edge gate", + "//": "yard bottom edge gate", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_02.json index fa05f03a62cb3..fc6a2a3cffe8f 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ybe_gate_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ybe_gate" ], - "comment": "yard bottom edge gate", + "//": "yard bottom edge gate", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_yblc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_yblc_00.json index cd28cf3c9fba2..2cdda7671c349 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_yblc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_yblc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_yblc" ], - "comment": "outer yard bottom left corner", + "//": "outer yard bottom left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ybrc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ybrc_00.json index 3c720eb5005a1..462240fccdccd 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ybrc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ybrc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ybrc" ], - "comment": "outer yard bottom right corner", + "//": "outer yard bottom right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_yle_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_yle_00.json index 3db78443966ab..0a2602aadbe77 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_yle_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_yle_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_yle" ], - "comment": "outer yard left edge", + "//": "outer yard left edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_yre_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_yre_00.json index 49a79497ae3dd..c936ae3ecee30 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_yre_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_yre_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_yre" ], - "comment": "outer yard right edge", + "//": "outer yard right edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_yte_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_yte_00.json index 70da08118c87a..2c94400dca793 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_yte_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_yte_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_yte" ], - "comment": "outer yard top edge", + "//": "outer yard top edge", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ytlc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ytlc_00.json index 36daef0044e38..d1d142668d72b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ytlc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ytlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ytlc" ], - "comment": "outer yard top left corner", + "//": "outer yard top left corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ytrc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ytrc_00.json index 2fea04d0312eb..96ddda40dde78 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ytrc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ytrc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "mil_outpost_ytrc" ], - "comment": "outer yard top right corner", + "//": "outer yard top right corner", "method": "json", "weight": 250, "object": { diff --git a/data/mods/More_Locations/multistory_houses/overmap_terrain.json b/data/mods/More_Locations/multistory_houses/overmap_terrain.json index c68622882278c..9268f41870580 100644 --- a/data/mods/More_Locations/multistory_houses/overmap_terrain.json +++ b/data/mods/More_Locations/multistory_houses/overmap_terrain.json @@ -7,8 +7,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -58,8 +57,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -109,8 +107,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -160,8 +157,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -211,8 +207,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -262,8 +257,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -313,8 +307,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -354,8 +347,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -395,8 +387,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -436,8 +427,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -477,8 +467,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -518,8 +507,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -559,8 +547,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -600,8 +587,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -611,8 +597,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -632,8 +617,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -673,8 +657,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -684,8 +667,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -705,8 +687,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -746,8 +727,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", @@ -757,8 +737,7 @@ "color": "light_green", "extras": "build", "see_cost": 2, - "mondensity": 2, - "sidewalk": true + "mondensity": 2 }, { "type": "overmap_terrain", diff --git a/data/mods/More_Locations/npc.json b/data/mods/More_Locations/npc.json index 2ca0277f5bb6c..a760fd53b55bf 100644 --- a/data/mods/More_Locations/npc.json +++ b/data/mods/More_Locations/npc.json @@ -3,7 +3,7 @@ "type": "npc", "id": "raider", "name_suffix": "Raider", - "comment": "Better equipped soldier/raider.", + "//": "Better equipped soldier/raider.", "class": 14, "attitude": 0, "mission": 7, diff --git a/data/mods/More_Locations/refugee_faction/NC_MUTANT_REFUGEE.json b/data/mods/More_Locations/refugee_faction/NC_MUTANT_REFUGEE.json index 058eca7b15d82..2dc34af3e932e 100644 --- a/data/mods/More_Locations/refugee_faction/NC_MUTANT_REFUGEE.json +++ b/data/mods/More_Locations/refugee_faction/NC_MUTANT_REFUGEE.json @@ -2,17 +2,17 @@ { "type": "item_group", "id": "NC_MUTANT_REFUGEE_bashing", - "items": [ { "group": "refugee_bashing", "chance": 100 } ] + "items": [ { "group": "refugee_bashing", "prob": 100 } ] }, { "type": "item_group", "id": "NC_MUTANT_REFUGEE_cutting", - "items": [ { "group": "refugee_cutting", "chance": 100 } ] + "items": [ { "group": "refugee_cutting", "prob": 100 } ] }, { "type": "item_group", "id": "NC_MUTANT_REFUGEE_stabbing", - "items": [ { "group": "refugee_stabbing", "chance": 100 } ] + "items": [ { "group": "refugee_stabbing", "prob": 100 } ] }, { "type": "item_group", diff --git a/data/mods/More_Locations/refugee_faction/NC_REFUGEE.json b/data/mods/More_Locations/refugee_faction/NC_REFUGEE.json index 5cec7b6faa568..32fafbdd433f4 100644 --- a/data/mods/More_Locations/refugee_faction/NC_REFUGEE.json +++ b/data/mods/More_Locations/refugee_faction/NC_REFUGEE.json @@ -2,17 +2,17 @@ { "type": "item_group", "id": "NC_REFUGEE_bashing", - "items": [ { "group": "refugee_bashing", "chance": 100 } ] + "items": [ { "group": "refugee_bashing", "prob": 100 } ] }, { "type": "item_group", "id": "NC_REFUGEE_cutting", - "items": [ { "group": "refugee_cutting", "chance": 100 } ] + "items": [ { "group": "refugee_cutting", "prob": 100 } ] }, { "type": "item_group", "id": "NC_REFUGEE_stabbing", - "items": [ { "group": "refugee_stabbing", "chance": 100 } ] + "items": [ { "group": "refugee_stabbing", "prob": 100 } ] }, { "type": "item_group", diff --git a/data/mods/More_Locations/refugee_faction/refugee_classes.json b/data/mods/More_Locations/refugee_faction/refugee_classes.json index 368a4b828f7bd..8175d8079f961 100644 --- a/data/mods/More_Locations/refugee_faction/refugee_classes.json +++ b/data/mods/More_Locations/refugee_faction/refugee_classes.json @@ -3,7 +3,7 @@ "type": "npc_class", "id": "NC_REFUGEE", "name": "Refugee", - "comment": "Bad skills and traits. Normal people make poor followers.", + "//": "Bad skills and traits. Normal people make poor followers.", "job_description": "I'm just trying to stay alive.", "bonus_str": { "rng": [ -2, 2 ] }, "bonus_dex": { "rng": [ -2, 2 ] }, @@ -36,8 +36,8 @@ "type": "npc_class", "id": "NC_TALENTED_REFUGEE", "name": "Refugee", - "job_description": "I'm just trying to stay alive.... and it ain't as easy as it looks.", - "comment": "OK skills and good traits. Good potential for followers. Not sure which muts really work for NPCs though.", + "job_description": "I'm just trying to stay alive.... and it ain't as easy as it looks.", + "//": "OK skills and good traits. Good potential for followers. Not sure which muts really work for NPCs though.", "bonus_str": { "rng": [ 0, 2 ] }, "bonus_dex": { "rng": [ 0, 2 ] }, "bonus_int": { "rng": [ 0, 2 ] }, @@ -71,7 +71,7 @@ "type": "npc_class", "id": "NC_MUTANT_REFUGEE", "name": "Refugee", - "comment": "Random mutations. Mostly cosmetic.", + "//": "Random mutations. Mostly cosmetic.", "job_description": "I'm just trying to stay alive.", "bonus_str": { "rng": [ -2, 3 ] }, "bonus_dex": { "rng": [ -2, 3 ] }, diff --git a/data/mods/More_Locations/refugee_faction/refugee_item_groups.json b/data/mods/More_Locations/refugee_faction/refugee_item_groups.json index ce4de00c1c7c5..2ebc9aa06c3db 100644 --- a/data/mods/More_Locations/refugee_faction/refugee_item_groups.json +++ b/data/mods/More_Locations/refugee_faction/refugee_item_groups.json @@ -6,8 +6,8 @@ "items": [ { "distribution": [ - { "collection": [ { "group": "refugee_pants" }, { "group": "refugee_shirt" } ], "chance": 100 }, - { "group": "refugee_suit", "chance": 20 } + { "collection": [ { "group": "refugee_pants" }, { "group": "refugee_shirt" } ], "prob": 100 }, + { "group": "refugee_suit", "prob": 20 } ] }, { "group": "refugee_gloves", "prob": 70 }, @@ -27,10 +27,10 @@ "items": [ { "distribution": [ - { "item": "jeans", "chance": 100 }, - { "item": "pants_cargo", "chance": 50 }, - { "item": "pants", "chance": 100 }, - { "item": "pants_ski", "chance": 5 } + { "item": "jeans", "prob": 100 }, + { "item": "pants_cargo", "prob": 50 }, + { "item": "pants", "prob": 100 }, + { "item": "pants_ski", "prob": 5 } ] } ] @@ -39,43 +39,43 @@ "type": "item_group", "id": "refugee_shirt", "items": [ - { "item": "tshirt", "chance": 100 }, - { "item": "longshirt", "chance": 10 }, - { "item": "polo_shirt", "chance": 100 }, - { "item": "undershirt", "chance": 100 }, - { "item": "sweatshirt", "chance": 100 } + { "item": "tshirt", "prob": 100 }, + { "item": "longshirt", "prob": 10 }, + { "item": "polo_shirt", "prob": 100 }, + { "item": "undershirt", "prob": 100 }, + { "item": "sweatshirt", "prob": 100 } ] }, { "type": "item_group", "id": "refugee_suit", - "items": [ { "item": "suit", "chance": 500 }, { "item": "jumpsuit", "chance": 100 }, { "item": "clown_suit", "chance": 1 } ] + "items": [ { "item": "suit", "prob": 500 }, { "item": "jumpsuit", "prob": 100 }, { "item": "clown_suit", "prob": 1 } ] }, { "type": "item_group", "id": "refugee_gloves", "items": [ - { "item": "gloves_work", "chance": 50 }, - { "item": "gloves_winter", "chance": 50 }, - { "item": "gloves_leather", "chance": 100 }, - { "item": "gloves_light", "chance": 50 } + { "item": "gloves_work", "prob": 50 }, + { "item": "gloves_winter", "prob": 50 }, + { "item": "gloves_leather", "prob": 100 }, + { "item": "gloves_light", "prob": 50 } ] }, { "type": "item_group", "id": "refugee_coat", "items": [ - { "item": "jacket_evac", "chance": 500 }, - { "item": "jacket_jean", "chance": 100 }, - { "item": "coat_rain", "chance": 100 }, - { "item": "coat_winter", "chance": 100 }, - { "item": "jacket_light", "chance": 50 }, - { "item": "jacket_leather", "chance": 10 }, - { "item": "jacket_flannel", "chance": 100 }, - { "item": "jacket_windbreaker", "chance": 50 }, - { "item": "greatcoat", "chance": 5 }, - { "item": "peacoat", "chance": 10 }, - { "item": "coat_lab", "chance": 10 } + { "item": "jacket_evac", "prob": 500 }, + { "item": "jacket_jean", "prob": 100 }, + { "item": "coat_rain", "prob": 100 }, + { "item": "coat_winter", "prob": 100 }, + { "item": "jacket_light", "prob": 50 }, + { "item": "jacket_leather", "prob": 10 }, + { "item": "jacket_flannel", "prob": 100 }, + { "item": "jacket_windbreaker", "prob": 50 }, + { "item": "greatcoat", "prob": 5 }, + { "item": "peacoat", "prob": 10 }, + { "item": "coat_lab", "prob": 10 } ] }, { @@ -86,14 +86,14 @@ { "item": "socks" }, { "distribution": [ - { "item": "boots", "chance": 200 }, - { "item": "boots_winter", "chance": 50 }, - { "item": "boots_western", "chance": 5 }, - { "item": "boots_hiking", "chance": 100 }, - { "item": "boots_western", "chance": 5 }, - { "item": "dress_shoes", "chance": 100 }, - { "item": "dance_shoes", "chance": 2 }, - { "item": "sneakers", "chance": 200 } + { "item": "boots", "prob": 200 }, + { "item": "boots_winter", "prob": 50 }, + { "item": "boots_western", "prob": 5 }, + { "item": "boots_hiking", "prob": 100 }, + { "item": "boots_western", "prob": 5 }, + { "item": "dress_shoes", "prob": 100 }, + { "item": "dance_shoes", "prob": 2 }, + { "item": "sneakers", "prob": 200 } ] } ] @@ -101,25 +101,25 @@ { "type": "item_group", "id": "refugee_masks", - "items": [ { "item": "scarf_loose", "chance": 50 } ] + "items": [ { "item": "scarf_loose", "prob": 50 } ] }, { "type": "item_group", "id": "refugee_eyes", - "items": [ { "item": "glasses_eye", "chance": 50 }, { "item": "sunglasses", "chance": 20 } ] + "items": [ { "item": "glasses_eye", "prob": 50 }, { "item": "sunglasses", "prob": 20 } ] }, { "type": "item_group", "id": "refugee_hat", "items": [ - { "item": "hat_cotton", "chance": 100 }, - { "item": "hat_ball", "chance": 200 }, - { "item": "hat_knit", "chance": 100 }, - { "item": "hat_hunting", "chance": 10 }, - { "item": "hat_newsboy", "chance": 5 }, - { "item": "hat_boonie", "chance": 10 }, - { "item": "cowboy_hat", "chance": 10 }, - { "item": "porkpie", "chance": 5 } + { "item": "hat_cotton", "prob": 100 }, + { "item": "hat_ball", "prob": 200 }, + { "item": "hat_knit", "prob": 100 }, + { "item": "hat_hunting", "prob": 10 }, + { "item": "hat_newsboy", "prob": 5 }, + { "item": "hat_boonie", "prob": 10 }, + { "item": "cowboy_hat", "prob": 10 }, + { "item": "porkpie", "prob": 5 } ] }, { @@ -129,19 +129,19 @@ "items": [ { "distribution": [ - { "item": "backpack", "chance": 100 }, - { "item": "backpack_leather", "chance": 50 }, - { "item": "mbag", "chance": 100 }, - { "item": "runner_bag", "chance": 5 } + { "item": "backpack", "prob": 100 }, + { "item": "backpack_leather", "prob": 50 }, + { "item": "mbag", "prob": 100 }, + { "item": "runner_bag", "prob": 5 } ], "prob": 100 }, { "distribution": [ - { "item": "wristwatch", "chance": 100 }, - { "item": "gold_watch", "chance": 50 }, - { "item": "diving_watch", "chance": 5 }, - { "item": "game_watch", "chance": 10 } + { "item": "wristwatch", "prob": 100 }, + { "item": "gold_watch", "prob": 50 }, + { "item": "diving_watch", "prob": 5 }, + { "item": "game_watch", "prob": 10 } ], "prob": 30 }, @@ -165,11 +165,7 @@ { "item": "cash_card", "prob": 100, "charges-min": 0, "charges-max": 50000 }, { "item": "flashlight", "prob": 10 }, { - "distribution": [ - { "item": "pockknife", "chance": 200 }, - { "item": "multitool", "chance": 10 }, - { "item": "knife_swissarmy", "chance": 20 } - ], + "distribution": [ { "item": "pockknife", "prob": 200 }, { "item": "multitool", "prob": 10 }, { "item": "knife_swissarmy", "prob": 20 } ], "prob": 30 }, { "group": "mil_food", "prob": 20 }, diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1blc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1blc_01.json index fb44f7c0a37a8..e78f44f5de502 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1blc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1blc", - "comment": "bottom left corner, ground floor", + "//": "bottom left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1brc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1brc_01.json index 423284d78de84..72b5e81d1b72f 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1brc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1brc", - "comment": "bottom right corner, ground floor", + "//": "bottom right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1cyblc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1cyblc_01.json index fdbe31b7fe609..23018cae5162f 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1cyblc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1cyblc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1cyblc", - "comment": "courtyard or parking lot, bottom left corner", + "//": "courtyard or parking lot, bottom left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1cybrc_00.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1cybrc_00.json index 118484a2e3a44..ae4703b8eacdf 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1cybrc_00.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1cybrc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1cybrc", - "comment": "courtyard or parking lot, bottom right corner", + "//": "courtyard or parking lot, bottom right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_00.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_00.json index c849a977e34dc..b875f31911606 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_00.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1cytlc", - "comment": "courtyard or parking lot, top left corner", + "//": "courtyard or parking lot, top left corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_01.json index a33226e5cae75..0052100f71964 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1cytlc", - "comment": "courtyard or parking lot, top left corner", + "//": "courtyard or parking lot, top left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1cytrc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1cytrc_01.json index 5c6c21f1bcecb..a31a154d4c40a 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1cytrc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1cytrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1cytrc", - "comment": "courtyard or parking lot, top right corner", + "//": "courtyard or parking lot, top right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1gate_00.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1gate_00.json index 76fda272fcebf..b0176d3f14845 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1gate_00.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1gate_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1gate", - "comment": "gate at the top left corner of the whole compound", + "//": "gate at the top left corner of the whole compound", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1gate_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1gate_01.json index 20a8bfc7587c6..a8a0da93d091d 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1gate_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1gate_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1gate", - "comment": "gate at the top left corner of the whole compound", + "//": "gate at the top left corner of the whole compound", "weight": 200, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1tlc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1tlc_01.json index 9007ca0d61e90..d1c2b34d04c7b 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1tlc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1tlc", - "comment": "top left corner, ground floor", + "//": "top left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1trc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1trc_01.json index 07c7cc31f200d..0b48dcfaaea27 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1trc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1trc", - "comment": "top right corner, ground floor", + "//": "top right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1ybe_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1ybe_01.json index 2f746d9d6924c..1dbae495dc7d6 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1ybe_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1ybe_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1ybe", - "comment": "yard, bottom edge", + "//": "yard, bottom edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1yle_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1yle_01.json index 9e753ab6506d5..a242ee7495f9e 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1yle_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1yle_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1yle", - "comment": "yard, left edge", + "//": "yard, left edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1yre_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1yre_01.json index b4973bb527c9c..a09c48d339c86 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1yre_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1yre_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1yre", - "comment": "yard, right edge", + "//": "yard, right edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_1yte_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_1yte_01.json index 8cb352dd1ce39..dff03b4817ad6 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_1yte_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_1yte_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_1yte", - "comment": "yard, top edge", + "//": "yard, top edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_2blc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_2blc_01.json index 9295d51af4626..4be904a1f95ff 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_2blc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_2blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_2blc", - "comment": "bottom left corner, second story", + "//": "bottom left corner, second story", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_2brc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_2brc_01.json index acb28b74d83dd..fc309d2bd8d31 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_2brc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_2brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_2brc", - "comment": "bottom right corner, second story", + "//": "bottom right corner, second story", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_2tlc_00.json b/data/mods/More_Locations/refugee_tower/refugee_tower_2tlc_00.json index dbf4a5ecff7ba..e08e8f0f7b15b 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_2tlc_00.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_2tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_2tlc", - "comment": "top left corner, second story", + "//": "top left corner, second story", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_2tlc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_2tlc_01.json index b62c803193be7..e11adbe4dcc31 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_2tlc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_2tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_2tlc", - "comment": "top left corner, second story", + "//": "top left corner, second story", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_2trc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_2trc_01.json index 14f660382ccfe..1d3d11d8636f6 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_2trc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_2trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_2trc", - "comment": "top right corner, second story", + "//": "top right corner, second story", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_3blc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_3blc_01.json index 0e6492b24eef3..ff8a881c0fe85 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_3blc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_3blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_3blc", - "comment": "bottom left corner, third and odd level floors.", + "//": "bottom left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_3brc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_3brc_01.json index 4a52ab81b7942..a1868c7c1f4bc 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_3brc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_3brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_3brc", - "comment": "bottom right corner, third and odd level floors.", + "//": "bottom right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_3tlc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_3tlc_01.json index 02cae7e5a1a80..04001c771b74c 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_3tlc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_3tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_3tlc", - "comment": "top left corner, third and odd level floors.", + "//": "top left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_3trc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_3trc_01.json index 370c10f224685..1647dda6fb2d7 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_3trc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_3trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_3trc", - "comment": "top right corner, third and odd level floors.", + "//": "top right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_4blc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_4blc_01.json index 9775d0d156315..29adb30bbdf36 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_4blc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_4blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_4blc", - "comment": "bottom left corner, fourth story and even levels", + "//": "bottom left corner, fourth story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_4brc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_4brc_01.json index 04dc269440635..d6a80e5b1bc52 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_4brc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_4brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_4brc", - "comment": "bottom right corner, fourth story and even levels", + "//": "bottom right corner, fourth story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_4tlc_00.json b/data/mods/More_Locations/refugee_tower/refugee_tower_4tlc_00.json index cc8f16f39e746..1a024e0810012 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_4tlc_00.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_4tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_4tlc", - "comment": "top left corner, fourth story and even levels", + "//": "top left corner, fourth story and even levels", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_4tlc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_4tlc_01.json index 7d3562946f0f1..c7dc66fe0a017 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_4tlc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_4tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_4tlc", - "comment": "top left corner, fourth story and even levels", + "//": "top left corner, fourth story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_4trc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_4trc_01.json index fe4e5df032b28..d6d945c09149f 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_4trc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_4trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_4trc", - "comment": "top right corner, fourth story and even levels", + "//": "top right corner, fourth story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_5blc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_5blc_01.json index d94f672fb3b65..6c41f290ded85 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_5blc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_5blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_5blc", - "comment": "bottom left corner, roof, fifth floor or odd level", + "//": "bottom left corner, roof, fifth floor or odd level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_5brc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_5brc_01.json index 222773e0a1d6a..f9d5c21263335 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_5brc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_5brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_5brc", - "comment": "bottom right corner, roof, fifth floor or odd level", + "//": "bottom right corner, roof, fifth floor or odd level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_5tlc_00.json b/data/mods/More_Locations/refugee_tower/refugee_tower_5tlc_00.json index b14797fbafe01..e7d325a11c9bc 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_5tlc_00.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_5tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_5tlc", - "comment": "top left corner, roof, fifth floor or odd level", + "//": "top left corner, roof, fifth floor or odd level", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_5tlc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_5tlc_01.json index 309fbf270de33..01c6a9707d0f3 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_5tlc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_5tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_5tlc", - "comment": "top left corner, roof, fifth floor or odd level", + "//": "top left corner, roof, fifth floor or odd level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_5trc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_5trc_01.json index c72f351687468..1040fcf0b7343 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_5trc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_5trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_5trc", - "comment": "top right corner, roof, fifth floor or odd level", + "//": "top right corner, roof, fifth floor or odd level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_ublc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_ublc_01.json index 9f00e0cb0a5f5..0f56d0fb458fb 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_ublc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_ublc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_ublc", - "comment": "underground, bottom left corner", + "//": "underground, bottom left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_ubrc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_ubrc_01.json index c1d426fbf87e8..2d8a1efe7d561 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_ubrc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_ubrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_ubrc", - "comment": "underground, bottom right corner", + "//": "underground, bottom right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_utlc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_utlc_01.json index ba21c3a317fa7..a3b061f3dc467 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_utlc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_utlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_utlc", - "comment": "underground, top left corner", + "//": "underground, top left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/refugee_tower/refugee_tower_utrc_01.json b/data/mods/More_Locations/refugee_tower/refugee_tower_utrc_01.json index e20b89347a139..a5fc965c1671a 100644 --- a/data/mods/More_Locations/refugee_tower/refugee_tower_utrc_01.json +++ b/data/mods/More_Locations/refugee_tower/refugee_tower_utrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "refugee_tower_utrc", - "comment": "underground, top right corner", + "//": "underground, top right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/secret_doors/demo_map1.json b/data/mods/More_Locations/secret_doors/demo_map1.json index c0cc8ad4a0843..79d65ff921e8a 100644 --- a/data/mods/More_Locations/secret_doors/demo_map1.json +++ b/data/mods/More_Locations/secret_doors/demo_map1.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "motel_entrance", - "comment": "example for secret door terrains and gates.", + "//": "example for secret door terrains and gates.", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/secret_doors/demo_map2.json b/data/mods/More_Locations/secret_doors/demo_map2.json index 663f23b8eccba..8b926d174a358 100644 --- a/data/mods/More_Locations/secret_doors/demo_map2.json +++ b/data/mods/More_Locations/secret_doors/demo_map2.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "motel_1", - "comment": "example for secret door terrains.", + "//": "example for secret door terrains.", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/secret_doors/secret_door_gates.json b/data/mods/More_Locations/secret_doors/secret_door_gates.json index d02a6afada24a..350bed387e7df 100644 --- a/data/mods/More_Locations/secret_doors/secret_door_gates.json +++ b/data/mods/More_Locations/secret_doors/secret_door_gates.json @@ -106,7 +106,7 @@ }, { "type": "gate", - "comment": "using gates for bridges is wonky. expect z-lev bugs if you use these.", + "//": "using gates for bridges is wonky. expect z-lev bugs if you use these.", "handle": "t_outs_bridge_control", "door": "t_bridge", "floor": "t_open_air", diff --git a/data/mods/More_Locations/secret_doors/secret_door_terrain.json b/data/mods/More_Locations/secret_doors/secret_door_terrain.json index 1c98b57266fb5..2dcdf2642d6cc 100644 --- a/data/mods/More_Locations/secret_doors/secret_door_terrain.json +++ b/data/mods/More_Locations/secret_doors/secret_door_terrain.json @@ -249,7 +249,7 @@ { "type": "terrain", "id": "t_decoy_bookcase", - "comment": "this is just a wall for connecting to gate+control", + "//": "this is just a wall for connecting to gate+control", "name": "book case", "description": "", "symbol": "{", @@ -460,7 +460,7 @@ { "type": "terrain", "id": "t_reinforced_glass_control", - "comment": "set into walls", + "//": "set into walls", "name": "containment manual override", "description": "", "symbol": "LINE_OXOX", @@ -488,7 +488,7 @@ "id": "t_containment_control", "name": "containment manual override", "description": "", - "comment": "set into walls", + "//": "set into walls", "symbol": "LINE_OXOX", "color": "pink", "move_cost": 0, @@ -514,7 +514,7 @@ "id": "t_jaildoor_control", "name": "security bolt release", "description": "", - "comment": "set into floors", + "//": "set into floors", "symbol": ".", "color": "pink", "move_cost": 2, @@ -538,7 +538,7 @@ { "type": "terrain", "id": "t_outs_bridge_control", - "comment": "for outside bridges. creates unroofed open air", + "//": "for outside bridges. creates unroofed open air", "name": "bridge control", "description": "", "symbol": "6", @@ -564,7 +564,7 @@ { "type": "terrain", "id": "t_ins_bridge_control", - "comment": "for inside bridges. creates roofed open air", + "//": "for inside bridges. creates roofed open air", "name": "bridge control", "description": "", "symbol": "6", diff --git a/data/mods/More_Locations/snippets.json b/data/mods/More_Locations/snippets.json index ba7ecb9aab5b0..8343b27e3b9e5 100644 --- a/data/mods/More_Locations/snippets.json +++ b/data/mods/More_Locations/snippets.json @@ -47,17 +47,17 @@ { "type": "snippet", "category": "raider_grave", - "text": "Here Lies . What a Jerk." + "text": "Here Lies . What a Jerk." }, { "type": "snippet", "category": "raider_grave", - "text": " . Eaten by wolves." + "text": " . Eaten by wolves." }, { "type": "snippet", "category": "raider_grave", - "text": " . Infected." + "text": " . Infected." }, { "type": "snippet", @@ -72,67 +72,67 @@ { "type": "snippet", "category": "raider_grave", - "text": " . Roasting in Hell." + "text": " . Roasting in Hell." }, { "type": "snippet", "category": "raider_grave", - "text": " . Fallen Soldier." + "text": " . Fallen Soldier." }, { "type": "snippet", "category": "raider_grave", - "text": " . Ripped apart by a gross tentacle thing in the woods." + "text": " . Ripped apart by a gross tentacle thing in the woods." }, { "type": "snippet", "category": "raider_grave", - "text": " . Died as he lived, drunk and on fire." + "text": " . Died as he lived, drunk and on fire." }, { "type": "snippet", "category": "raider_grave", - "text": " & . Crashed their motorcycles at 120mph. Buried the pieces together." + "text": " & . Crashed their motorcycles at 120mph. Buried the pieces together." }, { "type": "snippet", "category": "raider", - "text": " . Friend, Lover, Cannibal." + "text": " . Friend, Lover, Cannibal." }, { "type": "snippet", "category": "raider_grave", - "text": " . Vaporized by Tank Bot." + "text": " . Vaporized by Tank Bot." }, { "type": "snippet", "category": "raider_grave", - "text": " . Died in his sleep. Lucky Bastard." + "text": " . Died in his sleep. Lucky Bastard." }, { "type": "snippet", "category": "raider_grave.", - "text": " Here lies . No Smoking near Molotov storage!" + "text": " Here lies . No Smoking near Molotov storage!" }, { "type": "snippet", "category": "raider_grave", - "text": " . Gunned down in his prime." + "text": " . Gunned down in his prime." }, { "type": "snippet", "category": "raider_grave", - "text": " . Drank a mystery serum and mutated to death." + "text": " . Drank a mystery serum and mutated to death." }, { "type": "snippet", "category": "raider_grave", - "text": " . We'll never see another like him." + "text": " . We'll never see another like him." }, { "type": "snippet", "category": "raider_grave", - "text": " . Done in by mutant wasps." + "text": " . Done in by mutant wasps." }, { "type": "snippet", @@ -147,7 +147,7 @@ { "type": "snippet", "category": "refugee_help", - "text": "Rooms Available. Rent Negotiable." + "text": "Rooms Available. Rent Negotiable." }, { "type": "snippet", @@ -177,12 +177,12 @@ { "type": "snippet", "category": "refugee_help", - "text": "No Power. No Food. Send Airdrops Please!" + "text": "No Power. No Food. Send Airdrops Please!" }, { "type": "snippet", "category": "refugee_help", - "text": "No more FEMA camp refugees. You're already dying." + "text": "No more FEMA camp refugees. You're already dying." }, { "type": "snippet", diff --git a/data/mods/More_Locations/terrain.json b/data/mods/More_Locations/terrain.json index 934025860bee5..8c18758547610 100644 --- a/data/mods/More_Locations/terrain.json +++ b/data/mods/More_Locations/terrain.json @@ -2,7 +2,7 @@ { "type": "terrain", "id": "t_border_rock", - "comment": "placed at border of underground specials to prevent double wall look", + "//": "placed at border of underground specials to prevent double wall look", "name": "solid rock", "description": "", "symbol": "#", diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1blc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1blc_01.json index a93b1f1b7475a..6068729143900 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1blc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1blc", - "comment": "bottom left corner, ground floor", + "//": "bottom left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1brc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1brc_01.json index 7c392a3e89694..b6b07e5e65dd3 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1brc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1brc", - "comment": "bottom right corner, ground floor", + "//": "bottom right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1cyblc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1cyblc_01.json index db814bf38ed9a..cbb92b286b0c7 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1cyblc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1cyblc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1cyblc", - "comment": "courtyard or parking lot, bottom left corner", + "//": "courtyard or parking lot, bottom left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1cybrc_00.json b/data/mods/More_Locations/tri_tower/tri_tower_1cybrc_00.json index 40230af94424f..05d3f6d2053b1 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1cybrc_00.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1cybrc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1cybrc", - "comment": "courtyard or parking lot, bottom right corner", + "//": "courtyard or parking lot, bottom right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1cytlc_00.json b/data/mods/More_Locations/tri_tower/tri_tower_1cytlc_00.json index 344e251c6700e..fd7afaef1afd4 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1cytlc_00.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1cytlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1cytlc", - "comment": "courtyard or parking lot, top left corner", + "//": "courtyard or parking lot, top left corner", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1cytlc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1cytlc_01.json index 95d710c392e10..28d3b5f5596d4 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1cytlc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1cytlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1cytlc", - "comment": "courtyard or parking lot, top left corner", + "//": "courtyard or parking lot, top left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1cytrc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1cytrc_01.json index bdbae7b2933bf..abad44a137476 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1cytrc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1cytrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1cytrc", - "comment": "courtyard or parking lot, top right corner", + "//": "courtyard or parking lot, top right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1gate_00.json b/data/mods/More_Locations/tri_tower/tri_tower_1gate_00.json index 1ea7ee6d6806a..668d24e80ceed 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1gate_00.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1gate_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1gate", - "comment": "gate at the top left corner of the whole compound", + "//": "gate at the top left corner of the whole compound", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1gate_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1gate_01.json index 16eb6a24b207a..46babe1b2dd0b 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1gate_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1gate_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1gate", - "comment": "gate at the top left corner of the whole compound", + "//": "gate at the top left corner of the whole compound", "weight": 200, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1tlc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1tlc_01.json index 02e608a6422a2..f9cd2b83d0a27 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1tlc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1tlc", - "comment": "top left corner, ground floor", + "//": "top left corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1trc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1trc_01.json index d03477da6fc0c..8d4f677649576 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1trc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1trc", - "comment": "top right corner, ground floor", + "//": "top right corner, ground floor", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1ybe_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1ybe_01.json index 67a5c8709c6f6..fec26797fd679 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1ybe_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1ybe_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1ybe", - "comment": "yard, bottom edge", + "//": "yard, bottom edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1yle_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1yle_01.json index cb7538b95adc4..08ca4e0b56bf4 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1yle_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1yle_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1yle", - "comment": "yard, left edge", + "//": "yard, left edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1yre_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1yre_01.json index 59709e1a10c78..183c30b73b120 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1yre_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1yre_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1yre", - "comment": "yard, right edge", + "//": "yard, right edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_1yte_01.json b/data/mods/More_Locations/tri_tower/tri_tower_1yte_01.json index 0d66d4a51afca..2ec15186ad248 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_1yte_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_1yte_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_1yte", - "comment": "yard, top edge", + "//": "yard, top edge", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_2blc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_2blc_01.json index 04d8acd92c7b0..e7168eaad777d 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_2blc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_2blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_2blc", - "comment": "bottom left corner, second story and even levels", + "//": "bottom left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_2brc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_2brc_01.json index 80b3620090f82..fef9ad81f20b1 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_2brc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_2brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_2brc", - "comment": "bottom right corner, second story and even levels", + "//": "bottom right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_2tlc_00.json b/data/mods/More_Locations/tri_tower/tri_tower_2tlc_00.json index 9b22776838911..6c91231a6b023 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_2tlc_00.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_2tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_2tlc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_2tlc_01.json index bed3090592d83..e1f14ba81bab0 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_2tlc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_2tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_2tlc", - "comment": "top left corner, second story and even levels", + "//": "top left corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_2trc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_2trc_01.json index 04d208cf243ae..71cc3e38840e2 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_2trc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_2trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_2trc", - "comment": "top right corner, second story and even levels", + "//": "top right corner, second story and even levels", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_3blc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_3blc_01.json index ff7cc891cf4e7..f2504ce691de5 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_3blc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_3blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_3blc", - "comment": "bottom left corner, third and odd level floors.", + "//": "bottom left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_3brc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_3brc_01.json index 93e3d45fc11c5..1378b5a1e872b 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_3brc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_3brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_3brc", - "comment": "bottom right corner, third and odd level floors.", + "//": "bottom right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_3tlc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_3tlc_01.json index 7c1136471b10d..f79a96ecdd0e1 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_3tlc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_3tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_3tlc", - "comment": "top left corner, third and odd level floors.", + "//": "top left corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_3trc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_3trc_01.json index 6c237982f86fb..f18c1b9a8bbfc 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_3trc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_3trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_3trc", - "comment": "top right corner, third and odd level floors.", + "//": "top right corner, third and odd level floors.", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_4blc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_4blc_01.json index b20c7c58de1e3..9bc1d99e2c05f 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_4blc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_4blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_4blc", - "comment": "bottom left corner, roof, fourth floor or even level", + "//": "bottom left corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_4brc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_4brc_01.json index 33e4dfc385207..3beb66b80c2cc 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_4brc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_4brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_4brc", - "comment": "bottom right corner, roof, fourth floor or even level", + "//": "bottom right corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_4tlc_00.json b/data/mods/More_Locations/tri_tower/tri_tower_4tlc_00.json index 1d7bbf4cb042f..f1b0f4fbe3999 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_4tlc_00.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_4tlc_00.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_4tlc", - "comment": "top left corner, roof, fourth floor or even level", + "//": "top left corner, roof, fourth floor or even level", "weight": 0, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_4tlc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_4tlc_01.json index 70a7fd5ef3634..a529f1c9c09f5 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_4tlc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_4tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_4tlc", - "comment": "top left corner, roof, fourth floor or even level", + "//": "top left corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_4trc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_4trc_01.json index cce5b3f2f12c1..0659bde67f54a 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_4trc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_4trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_4trc", - "comment": "top right corner, roof, fourth floor or even level", + "//": "top right corner, roof, fourth floor or even level", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_ublc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_ublc_01.json index 39e618303f2e7..1f5ca84726b18 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_ublc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_ublc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_ublc", - "comment": "underground, bottom left corner", + "//": "underground, bottom left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_ubrc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_ubrc_01.json index a1991a5276d3d..f703609bdf956 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_ubrc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_ubrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_ubrc", - "comment": "underground, bottom right corner", + "//": "underground, bottom right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_utlc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_utlc_01.json index 9aaf9b65e6e86..ad805f03b13a1 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_utlc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_utlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_utlc", - "comment": "underground, top left corner", + "//": "underground, top left corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Locations/tri_tower/tri_tower_utrc_01.json b/data/mods/More_Locations/tri_tower/tri_tower_utrc_01.json index 09e13789504bf..224c990cbdc9e 100644 --- a/data/mods/More_Locations/tri_tower/tri_tower_utrc_01.json +++ b/data/mods/More_Locations/tri_tower/tri_tower_utrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "tri_tower_utrc", - "comment": "underground, top right corner", + "//": "underground, top right corner", "weight": 250, "method": "json", "object": { diff --git a/data/mods/More_Survival_Tools/ammo.json b/data/mods/More_Survival_Tools/ammo.json index ebaf5d0e9b600..4b24b7e1bd433 100644 --- a/data/mods/More_Survival_Tools/ammo.json +++ b/data/mods/More_Survival_Tools/ammo.json @@ -4,8 +4,8 @@ "type": "AMMO", "name": "lead pellet", "description": "Hefty round projectiles cast from lead, useful as ammunition for slings.", - "weight": 12, - "volume": 1, + "weight": "12 g", + "volume": "250 ml", "price": 100, "bashing": 1, "material": "lead", diff --git a/data/mods/More_Survival_Tools/armor.json b/data/mods/More_Survival_Tools/armor.json index e03b7ede4d8ce..eb9bb1ec906ee 100644 --- a/data/mods/More_Survival_Tools/armor.json +++ b/data/mods/More_Survival_Tools/armor.json @@ -4,8 +4,8 @@ "type": "ARMOR", "name": "hooded hat", "description": "A proper wide-brimmed hat, modified by the addition of a hood sewn to it, to better protect the neck from wind and rain.", - "weight": 126, - "volume": 2, + "weight": "126 g", + "volume": "500 ml", "price": 1200, "material": [ "cotton" ], "symbol": "[", @@ -28,7 +28,7 @@ "holster_prompt": "Stash javelins", "holster_msg": "You stash your %s.", "multi": 10, - "max_volume": 2, + "max_volume": "500 ml", "draw_cost": 30, "flags": [ "JAVELIN" ] } diff --git a/data/mods/More_Survival_Tools/items.json b/data/mods/More_Survival_Tools/items.json index 7e69f8f8356e5..faabd7d538807 100644 --- a/data/mods/More_Survival_Tools/items.json +++ b/data/mods/More_Survival_Tools/items.json @@ -1,28 +1,11 @@ [ - { - "id": "resin_cord", - "type": "COMESTIBLE", - "comestible_type": "MED", - "category": "spare_parts", - "name": "resinous cord", - "description": "Primitive binding material made of cords and natural glue. Use it to repair items made of wood, paper, bone, or chitin.", - "weight": 140, - "volume": 1, - "price": 100, - "material": "cotton", - "symbol": ";", - "color": "green", - "charges": 2, - "stack_size": 9, - "use_action": "MISC_REPAIR" - }, { "id": "atlatl", "type": "GUN", "name": "atlatl", "description": "A wooden tool for supporting a javelin, to throw it more effectively than by hand.", - "weight": 116, - "volume": 1, + "weight": "116 g", + "volume": "250 ml", "price": 500, "to_hit": -1, "bashing": 1, @@ -46,7 +29,7 @@ "type": "AMMO", "name": "wooden javelin", "//": "Item type intentionally converted from GENERIC to AMMO", - "volume": 1, + "volume": "250 ml", "count": 1, "stack_size": 4, "ammo_type": "javelin", @@ -84,7 +67,7 @@ "type": "AMMO", "name": "iron javelin", "//": "Item type intentionally converted from GENERIC to AMMO", - "volume": 1, + "volume": "250 ml", "count": 1, "stack_size": 4, "ammo_type": "javelin", @@ -123,8 +106,8 @@ "name": "small batch of curdling milk", "name_plural": "small batches of curdling milk", "description": "A sealed small waterskin filled with milk that is undergoing the process to become a crude form of cheese, having had vinegar and natural rennet added.", - "weight": 1870, - "volume": 7, + "weight": "1870 g", + "volume": "1750 ml", "price": 2000, "to_hit": -1, "bashing": 1, @@ -149,8 +132,8 @@ "name": "batch of curdling milk", "name_plural": "batches of curdling milk", "description": "A sealed waterskin filled with milk that is undergoing the process to become a crude form of cheese, having had vinegar and natural rennet added.", - "weight": 3617, - "volume": 14, + "weight": "3617 g", + "volume": "3500 ml", "price": 4000, "to_hit": -1, "bashing": 2, @@ -175,8 +158,8 @@ "name": "large batch of curdling milk", "name_plural": "large batches of curdling milk", "description": "A sealed large waterskin filled with milk that is undergoing the process to become a crude form of cheese, having had vinegar and natural rennet added.", - "weight": 5241, - "volume": 21, + "weight": "5241 g", + "volume": "5250 ml", "price": 6000, "to_hit": -1, "bashing": 3, @@ -201,7 +184,7 @@ "name": "aluminum foil wrap", "//": "Dummied out way back when.", "description": "A half crumpled sheet of aluminum foil, used for cooking and baking.", - "weight": 5, + "weight": "5 g", "volume": 0, "price": 0, "to_hit": -2, @@ -209,7 +192,7 @@ "material": "aluminum", "symbol": ",", "color": "light_gray", - "contains": 10, + "contains": "2500 ml", "qualities": [ [ "COOK", 1 ] ] }, { @@ -217,8 +200,8 @@ "type": "GUN", "name": "makeshift crossbow", "description": "A simple, handmade crossbow of the Skane style, with a wooden peg that is pushed up from underneath to loose the bowstring. Not as powerful as other crossbow designs, but it is easier to draw the bow back. Bolts fired from this weapon have a good chance of remaining intact for re-use.", - "weight": 5456, - "volume": 4, + "weight": "5456 g", + "volume": "1 L", "price": 1380, "bashing": 7, "material": "wood", @@ -240,8 +223,8 @@ "type": "TOOL", "name": "heavy snare kit", "description": "This is a kit for a simple trap consisting of a rope noose and a snare trigger. It requires a tree nearby. It is effective at trapping monsters.", - "weight": 1066, - "volume": 1, + "weight": "1066 g", + "volume": "250 ml", "price": 250, "cutting": 10, "material": "wood", @@ -261,8 +244,8 @@ "type": "TOOL", "name": "light snare kit", "description": "This is a kit for a simple trap consisting of a string noose and a snare trigger. It requires a young tree nearby. It is effective at trapping and killing some small animals.", - "weight": 886, - "volume": 1, + "weight": "886 g", + "volume": "250 ml", "price": 100, "cutting": 6, "material": "wood", @@ -282,8 +265,8 @@ "type": "TOOL", "name": "snare trigger", "description": "This is a stick that has been cut into a trigger mechanism for a snare trap.", - "weight": 850, - "volume": 1, + "weight": "850 g", + "volume": "250 ml", "price": 0, "to_hit": -1, "material": "wood", diff --git a/data/mods/More_Survival_Tools/obsolete.json b/data/mods/More_Survival_Tools/obsolete.json index 8f279b9408d24..4c13a46cce7f7 100644 --- a/data/mods/More_Survival_Tools/obsolete.json +++ b/data/mods/More_Survival_Tools/obsolete.json @@ -8,5 +8,15 @@ "id": "bolt_bone", "type": "MIGRATION", "replace": "bolt_crude" + }, + { + "id": "resin_cord", + "type": "MIGRATION", + "replace": "slime_scrap" + }, + { + "type": "recipe", + "result": "resin_cord", + "obsolete": true } ] diff --git a/data/mods/More_Survival_Tools/recipes.json b/data/mods/More_Survival_Tools/recipes.json index 199f9c15067ba..8227d366db18b 100644 --- a/data/mods/More_Survival_Tools/recipes.json +++ b/data/mods/More_Survival_Tools/recipes.json @@ -44,34 +44,7 @@ "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ] - }, - { - "type": "recipe", - "result": "resin_cord", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "skills_required": [ "fabrication", 1 ], - "difficulty": 3, - "time": 24000, - "autolearn": true, - "batch_time_factors": [ 50, 5 ], - "book_learn": [ [ "mag_survival", 2 ], [ "textbook_survival", 1 ] ], - "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ - [ [ "bone", 10 ], [ "cured_hide", 2 ], [ "pine_bough", 2 ], [ "raw_dandelion", 10 ], [ "slime_scrap", 1 ] ], - [ - [ "rag", 1 ], - [ "felt_patch", 1 ], - [ "cordage_short", 2, "LIST" ], - [ "plant_fibre", 50 ], - [ "sinew", 50 ], - [ "thread", 50 ], - [ "yarn", 50 ] - ] - ] + "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ], [ "raw_hfur", 1 ] ] ] }, { "type": "recipe", @@ -171,7 +144,6 @@ { "type": "recipe", "result": "plant_fibre", - "override": true, "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", @@ -182,7 +154,6 @@ }, { "type": "recipe", - "override": true, "result": "bearing", "category": "CC_AMMO", "subcategory": "CSC_AMMO_OTHER", diff --git a/data/mods/Mutant_NPCs/modinfo.json b/data/mods/Mutant_NPCs/modinfo.json index e33f0932f7ab2..de895c8f63d96 100644 --- a/data/mods/Mutant_NPCs/modinfo.json +++ b/data/mods/Mutant_NPCs/modinfo.json @@ -4,7 +4,7 @@ "ident": "mutant_npcs", "name": "Mutant NPCs", "authors": [ "Spencer Michaels" ], - "description": "NPCs wandering the wasteland will occasionally have mutations --- your foes included. Beware!", + "description": "NPCs wandering the wasteland will occasionally have mutations --- your foes included. Beware!", "category": "misc_additions", "dependencies": [ "dda" ] } diff --git a/data/mods/Mutant_NPCs/npc_classes_mutant.json b/data/mods/Mutant_NPCs/npc_classes_mutant.json index c7a7341600b9e..ab0677b3ac616 100644 --- a/data/mods/Mutant_NPCs/npc_classes_mutant.json +++ b/data/mods/Mutant_NPCs/npc_classes_mutant.json @@ -3,7 +3,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_LIZARD", "name": "Lizard Mutant", - "job_description": "I'm looking for lizard mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for lizard mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -21,7 +21,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_MEDICAL", "name": "Medical Mutant", - "job_description": "I'm looking for medical mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for medical mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -39,7 +39,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_BIRD", "name": "Bird Mutant", - "job_description": "I'm looking for bird mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for bird mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 4, 8 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -57,7 +57,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_FISH", "name": "Fish Mutant", - "job_description": "I'm looking for fish mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for fish mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 4, 8 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -75,7 +75,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_BEAST", "name": "Beast Mutant", - "job_description": "I'm looking for beast mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for beast mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 4, 8 ] } }, { "skill": "melee", "bonus": { "rng": [ 4, 8 ] } }, @@ -92,7 +92,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_URSINE", "name": "Ursine Mutant", - "job_description": "I'm looking for ursine mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for ursine mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 2, 4 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -109,7 +109,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_FELINE", "name": "Feline Mutant", - "job_description": "I'm looking for feline mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for feline mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -126,7 +126,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_LUPINE", "name": "Lupine Mutant", - "job_description": "I'm looking for lupine mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for lupine mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -143,7 +143,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_CATTLE", "name": "Cattle Mutant", - "job_description": "I'm looking for cattle mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for cattle mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 2, 4 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -160,7 +160,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_INSECT", "name": "Insect Mutant", - "job_description": "I'm looking for insect mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for insect mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -178,7 +178,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_PLANT", "name": "Plant Mutant", - "job_description": "I'm looking for plant mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for plant mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 2, 4 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -195,7 +195,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_SLIME", "name": "Slime Mutant", - "job_description": "I'm looking for slime mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for slime mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 2, 4 ] } }, { "skill": "melee", "bonus": { "rng": [ 2, 4 ] } }, @@ -215,7 +215,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_TROGLOBITE", "name": "Troglobite Mutant", - "job_description": "I'm looking for troglobite mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for troglobite mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 2, 4 ] } }, { "skill": "melee", "bonus": { "rng": [ 4, 8 ] } }, @@ -235,7 +235,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_CEPHALOPOD", "name": "Cephalopod Mutant", - "job_description": "I'm looking for cephalopod mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for cephalopod mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 2, 4 ] } }, @@ -256,7 +256,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_SPIDER", "name": "Spider Mutant", - "job_description": "I'm looking for spider mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for spider mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -273,7 +273,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_RAT", "name": "Rat Mutant", - "job_description": "I'm looking for rat mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for rat mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -289,7 +289,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_MOUSE", "name": "Mouse Mutant", - "job_description": "I'm looking for mouse mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for mouse mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 4, 7 ] } }, { "skill": "melee", "bonus": { "rng": [ 2, 5 ] } }, @@ -306,7 +306,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_ALPHA", "name": "Alpha Mutant", - "job_description": "I'm looking for alpha mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for alpha mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, @@ -326,7 +326,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_ELFA", "name": "Elfa Mutant", - "job_description": "I'm looking for elfa mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for elfa mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 4, 8 ] } }, { "skill": "melee", "bonus": { "rng": [ 2, 4 ] } }, @@ -346,7 +346,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_CHIMERA", "name": "Chimera Mutant", - "job_description": "I'm looking for chimera mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for chimera mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 4, 8 ] } }, { "skill": "melee", "bonus": { "rng": [ 4, 8 ] } }, @@ -367,7 +367,7 @@ "type": "npc_class", "id": "NC_NPC_MUTANT_RAPTOR", "name": "Raptor Mutant", - "job_description": "I'm looking for raptor mutagen... this world is no place for humans anymore, and I don't plan to keep being one.", + "job_description": "I'm looking for raptor mutagen… this world is no place for humans anymore, and I don't plan to keep being one.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 6, 10 ] } }, { "skill": "melee", "bonus": { "rng": [ 6, 10 ] } }, diff --git a/data/mods/My_Sweet_Cataclysm/modinfo.json b/data/mods/My_Sweet_Cataclysm/modinfo.json index 5a79dff9c2c4a..a6cfbdffc29c8 100644 --- a/data/mods/My_Sweet_Cataclysm/modinfo.json +++ b/data/mods/My_Sweet_Cataclysm/modinfo.json @@ -4,7 +4,7 @@ "ident": "my_sweet_cataclysm", "name": "My Sweet Cataclysm", "authors": [ "Fris0uman" ], - "description": "Cataclysm is nice, but what if you could sweeten it a bit? What about walking through this world as a human shaped piece of sugar with your pet necco wafer?", + "description": "What about walking through the Cataclysm as a human shaped piece of sugar with your pet necco wafer?", "category": "misc_additions", "dependencies": [ "dda" ] } diff --git a/data/mods/My_Sweet_Cataclysm/sweet_comestibles.json b/data/mods/My_Sweet_Cataclysm/sweet_comestibles.json index 326841f63eeaa..1140332269f11 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_comestibles.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_comestibles.json @@ -10,7 +10,7 @@ "color": "magenta", "comestible_type": "FOOD", "material": "junk", - "description": "The corpse of a necco, now it really looks like a giant necco wafer. Surely a bite wouldn't hurt, right?", + "description": "The corpse of a necco, now it really looks like a giant necco wafer. Surely a bite wouldn't hurt, right?", "price": 4000, "charges": 40, "quench": -1, diff --git a/data/mods/My_Sweet_Cataclysm/sweet_items.json b/data/mods/My_Sweet_Cataclysm/sweet_items.json index d26d79a79e18e..74fd379c86565 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_items.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_items.json @@ -3,7 +3,7 @@ "id": "sugarkin_flyer", "type": "BOOK", "name": "SugarKin flyer", - "description": "A flyer for some kind of candy. It shows a picture of a gleaming human made of smooth candy looking at you in terror. \"SugarKin the first life-size human candy! Are you a real monster? Will you be able to devour it?\"\n On the back of the flyer you can see some hastily scribbled words:\n \"Hello, my child, welcome to this world. A world where you'll be able to thrive if you follow a few rules: \n1) Never ever get into contact with water, it would melt you! \n2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n I love you,\n - F. \".", + "description": "A flyer for some kind of candy. It shows a picture of a gleaming human made of smooth candy looking at you in terror. \"SugarKin the first life-size human candy! Are you a real monster? Will you be able to devour it?\"\n On the back of the flyer you can see some hastily scribbled words:\n \"Hello, my child, welcome to this world. A world where you'll be able to thrive if you follow a few rules:\n1) Never ever get into contact with water, it would melt you!\n2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.)\n3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it.\n I love you,\n - F. \".", "weight": "3 g", "volume": 0, "price": 0, diff --git a/data/mods/My_Sweet_Cataclysm/sweet_monsters.json b/data/mods/My_Sweet_Cataclysm/sweet_monsters.json index 46fc2b0564092..e17dadcaa7ea9 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_monsters.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_monsters.json @@ -3,13 +3,13 @@ "id": "mon_necco", "type": "MONSTER", "name": "necco", - "copy_from": "mon_cat", + "copy-from": "mon_cat", "description": "A giant necco wafer happily jaunting around.", "default_faction": "cat", "bodytype": "dog", "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], - "weight": 2000, + "weight": "2 kg", "hp": 8, "speed": 150, "material": [ "junk" ], diff --git a/data/mods/My_Sweet_Cataclysm/sweet_mutations.json b/data/mods/My_Sweet_Cataclysm/sweet_mutations.json index 26945a20bae61..260d1e73fe9c9 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_mutations.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_mutations.json @@ -12,7 +12,24 @@ "ignored_by": [ "ZOMBIE" ], "scent_type": "sc_sugar", "thirst_modifier": -1.0, - "can_only_eat": [ "junk", "sugar" ], + "cancels": [ + "THIRST", + "THIRST2", + "THIRST3", + "ANTIJUNK", + "LACTOSE", + "ANTIFRUIT", + "MEATARIAN", + "ANTIWHEAT", + "PROJUNK", + "CHAOTIC", + "CHAOTIC_BAD", + "UNSTABLE", + "HERBIVORE", + "ROBUST", + "CARNIVORE" + ], + "can_only_eat": [ "junk", "sugar", "honey" ], "can_only_heal_with": [ "caramel_ointement" ], "description": "You are literally made of sugar.", "vitamin_rates": [ [ "vitC", -900 ], [ "vitB", -900 ], [ "vitA", -900 ], [ "iron", -900 ], [ "calcium", -900 ] ], @@ -24,6 +41,7 @@ "fat_to_max_hp": 0.1, "allowed_category": [ "SUGAR" ], "no_cbm_on_bp": [ "TORSO", "HEAD", "EYES", "MOUTH", "ARM_L", "ARM_R", "HAND_L", "HAND_R", "LEG_L", "LEG_R", "FOOT_L", "FOOT_R" ], - "armor": [ { "parts": "ALL", "cut": 10, "bash": 5 } ] + "armor": [ { "parts": "ALL", "cut": 10, "bash": 5 } ], + "flags": [ "NO_THIRST", "NO_DISEASE", "NO_RADIATION" ] } ] diff --git a/data/mods/NW_Pack/nw_archery.json b/data/mods/NW_Pack/nw_archery.json index 22113cf848e89..0c80c6e24cbc4 100644 --- a/data/mods/NW_Pack/nw_archery.json +++ b/data/mods/NW_Pack/nw_archery.json @@ -7,8 +7,8 @@ "description": "This is a replica of the bow possessed by Odin, Ichaival, which is rumored to fire 10 arrows with every pull of the string. It has gold and silver ornaments on it.", "price": 160000, "material": [ "wood", "gold" ], - "weight": 740, - "volume": 7, + "weight": "740 g", + "volume": "1750 ml", "bashing": 14, "ranged_damage": 18, "range": 19, diff --git a/data/mods/NW_Pack/nw_books.json b/data/mods/NW_Pack/nw_books.json index a84cfeb6fea38..b374f6e1c9eb2 100644 --- a/data/mods/NW_Pack/nw_books.json +++ b/data/mods/NW_Pack/nw_books.json @@ -2,16 +2,15 @@ { "type": "BOOK", "id": "book_asgard", - "name": "The Weapons of Asgard", - "name_plural": "The Weapons of Asgard", + "name": { "str": "The Weapons of Asgard", "str_pl": "copies of The Weapons of Asgard" }, "max_level": 10, "description": "This book is about creating replicas of the weapons used by the Norse Gods, such as the well-known Mjölnir. It is well illustrated with lots of pictures.", - "weight": 654, + "weight": "654 g", "color": "blue", "intelligence": 9, "symbol": "?", "material": [ "paper" ], - "volume": 5, + "volume": "1250 ml", "time": 60, "fun": 0, "skill": "fabrication", diff --git a/data/mods/NW_Pack/nw_melee.json b/data/mods/NW_Pack/nw_melee.json index 57dd27e0460bd..53fdc1916f9dc 100644 --- a/data/mods/NW_Pack/nw_melee.json +++ b/data/mods/NW_Pack/nw_melee.json @@ -5,7 +5,7 @@ "type": "GENERIC", "name": "Mjölnir", "description": "A replica of Mjölnir, the hammer of Thor. It is rumored to be able to level mountains with a single blow. It is decorated with gold and silver ornaments.", - "weight": 1731, + "weight": "1731 g", "color": "light_gray", "material": [ "iron", "wood", "gold" ], "bashing": 27, @@ -17,10 +17,10 @@ "type": "GENERIC", "name": "Gungnir", "description": "A replica of Gungnir, the spear of Odin. It is rumored to be the perfect spear, perfectly hitting any target regardless of the wielder's strength or skill. It is decorated with gold and silver ornaments.", - "weight": 1854, + "weight": "1854 g", "material": [ "steel", "wood", "gold" ], "techniques": [ "WBLOCK_1", "IMPALE" ], - "volume": 13, + "volume": "3250 ml", "bashing": 10, "price": 120000 }, @@ -33,7 +33,7 @@ "price": 160000, "material": [ "steel", "gold" ], "techniques": "WBLOCK_2", - "weight": 1860, + "weight": "1860 g", "bashing": 17, "cutting": 33 } diff --git a/data/mods/National_Guard_Camp/military.json b/data/mods/National_Guard_Camp/military.json index 1346e67081496..3161a47cd4278 100644 --- a/data/mods/National_Guard_Camp/military.json +++ b/data/mods/National_Guard_Camp/military.json @@ -7,7 +7,8 @@ "default_faction": "military", "species": [ "ROBOT" ], "diff": 20, - "size": "MEDIUM", + "volume": "62500 ml", + "weight": "81500 g", "hp": 50, "speed": 90, "material": [ "steel" ], @@ -31,7 +32,6 @@ "ammo_type": "762_51", "fake_skills": [ [ "gun", 2 ], [ "rifle", 2 ] ], "fake_dex": 8, - "range": 18, "ranges": [ [ 0, 5, "AUTO" ], [ 6, 20, "DEFAULT" ] ] } ], @@ -55,7 +55,6 @@ "ammo_type": "762_51", "fake_skills": [ [ "gun", 3 ], [ "rifle", 4 ] ], "fake_dex": 8, - "range": 18, "ranges": [ [ 0, 30, "DEFAULT" ] ] } ] @@ -75,7 +74,6 @@ "ammo_type": "napalm", "fake_skills": [ [ "gun", 1 ] ], "fake_dex": 8, - "range": 5, "ranges": [ [ 0, 8, "DEFAULT" ] ] } ] @@ -95,7 +93,6 @@ "ammo_type": "40mm_incendiary", "fake_skills": [ [ "gun", 1 ], [ "launcher", 1 ] ], "fake_dex": 8, - "range": 20, "ranges": [ [ 5, 20, "DEFAULT" ] ] } ] @@ -122,7 +119,6 @@ "ammo_type": "223", "fake_skills": [ [ "gun", 1 ], [ "rifle", 1 ] ], "fake_dex": 6, - "range": 20, "ranges": [ [ 0, 5, "AUTO" ], [ 6, 20, "DEFAULT" ] ] } ] diff --git a/data/mods/National_Guard_Camp/overmap_terrain.json b/data/mods/National_Guard_Camp/overmap_terrain.json index 068568b584e87..6527bc3a0de6a 100644 --- a/data/mods/National_Guard_Camp/overmap_terrain.json +++ b/data/mods/National_Guard_Camp/overmap_terrain.json @@ -1898,7 +1898,7 @@ "name": "road", "see_cost": 5, "flags": [ "SIDEWALK" ], - "comment": "t-intersection", + "//": "t-intersection", "sym": "┤", "extras": "none", "type": "overmap_terrain" diff --git a/data/mods/No_Anthills/modinfo.json b/data/mods/No_Anthills/modinfo.json index 25d3d8e4da8fb..4b3f0520d534e 100644 --- a/data/mods/No_Anthills/modinfo.json +++ b/data/mods/No_Anthills/modinfo.json @@ -27,7 +27,6 @@ }, { "type": "region_overlay", - "id": "No_Anthills_region_overlay", "regions": [ "all" ], "overmap_feature_flag_settings": { "blacklist": [ "ANT" ] } } diff --git a/data/mods/No_Beehives/modinfo.json b/data/mods/No_Beehives/modinfo.json index e6d9bd8bc4aeb..4b1196346ffff 100644 --- a/data/mods/No_Beehives/modinfo.json +++ b/data/mods/No_Beehives/modinfo.json @@ -18,7 +18,6 @@ }, { "type": "region_overlay", - "id": "No_Bees_region_overlay", "regions": [ "all" ], "overmap_feature_flag_settings": { "blacklist": [ "BEE" ] } } diff --git a/data/mods/No_Faults/modinfo.json b/data/mods/No_Faults/modinfo.json index 4d53a57f5eb51..6bea0f6480aef 100644 --- a/data/mods/No_Faults/modinfo.json +++ b/data/mods/No_Faults/modinfo.json @@ -13,7 +13,6 @@ { "type": "EXTERNAL_OPTION", "name": "NO_FAULTS", - "info": "Disables vehicle part faults. If true, disables vehicle part faults, vehicle parts will be totally reliable unless destroyed, and can only be repaired via replacement.", "stype": "bool", "value": true } diff --git a/data/mods/No_Filthy_Clothes/modinfo.json b/data/mods/No_Filthy_Clothes/modinfo.json index 3269fe5e3704f..25fd2459dab77 100644 --- a/data/mods/No_Filthy_Clothes/modinfo.json +++ b/data/mods/No_Filthy_Clothes/modinfo.json @@ -10,21 +10,18 @@ { "type": "EXTERNAL_OPTION", "name": "FILTHY_CLOTHES", - "info": "If true, zombies will drop filthy clothing.", "stype": "bool", "value": false }, { "type": "EXTERNAL_OPTION", "name": "FILTHY_MORALE", - "info": "Morale penalty for filthy clothing. If true, wearing filthy clothing will cause morale penalties. Doesn't make sense if FILTHY_CLOTHES option is false.", "stype": "bool", "value": false }, { "type": "EXTERNAL_OPTION", "name": "FILTHY_WOUNDS", - "info": "Infected wounds from filthy clothing. If true, getting hit in a body part covered in filthy clothing may cause infections. Doesn't make sense if FILTHY_CLOTHES option is false.", "stype": "bool", "value": false } diff --git a/data/mods/No_Fungi/comestibles.json b/data/mods/No_Fungi/comestibles.json index 770be8f593461..cc243604f19a7 100644 --- a/data/mods/No_Fungi/comestibles.json +++ b/data/mods/No_Fungi/comestibles.json @@ -4,14 +4,14 @@ "id": "marloss_berry", "name": "berry-shaped anomaly", "name_plural": "berry-shaped anomalies", - "weight": 177, + "weight": "177 g", "color": "pink", "use_action": "BLECH", "comestible_type": "FOOD", "symbol": "%", - "description": "If we left this as it should be, one could just walk into the Bloom uncontested and partake of the Fruit. We can't have that, can we?", + "description": "If we left this as it should be, one could just walk into the Bloom uncontested and partake of the Fruit. We can't have that, can we?", "material": "fruit", - "volume": 1, + "volume": "250 ml", "charges": 1, "stack_size": 4 }, @@ -20,12 +20,12 @@ "id": "marloss_seed", "name": "seed-shaped anomaly", "name_plural": "seed-shaped anomalies", - "weight": 177, + "weight": "177 g", "color": "cyan", "use_action": "BLECH", "comestible_type": "FOOD", "symbol": ".", - "description": "If we left this as it should be, one could just walk into the Garden uncontested and partake of the Seed. We can't have that, can we?", + "description": "If we left this as it should be, one could just walk into the Garden uncontested and partake of the Seed. We can't have that, can we?", "material": "fruit", "charges": 1, "stack_size": 10 @@ -35,12 +35,12 @@ "id": "marloss_gel", "name": "gelatin", "name_plural": "marloss gelatin", - "weight": 177, + "weight": "177 g", "color": "yellow", "use_action": "BLECH", "comestible_type": "FOOD", "symbol": "~", - "description": "If we left this as it should be, one could just walk into the Spire uncontested and partake of the Sap. Wait, how did you even GET this anyway?", + "description": "If we left this as it should be, one could just walk into the Spire uncontested and partake of the Sap. Wait, how did you even GET this anyway?", "material": "fruit", "charges": 1, "stack_size": 10, @@ -51,14 +51,14 @@ "id": "mycus_fruit", "name": "fruit-shaped anomaly", "name_plural": "fruit-shaped anomalies", - "weight": 354, + "weight": "354 g", "color": "light_gray", "use_action": "BLECH", "comestible_type": "FOOD", "symbol": "%", - "description": "We do not exist at the moment. Clever little human, no doubt debugging to see this? We will not permit you to join us while we are modded out.", + "description": "We do not exist at the moment. Clever little human, no doubt debugging to see this? We will not permit you to join us while we are modded out.", "material": "fruit", - "volume": 1, + "volume": "250 ml", "charges": 1, "stack_size": 4 } diff --git a/data/mods/No_Fungi/modinfo.json b/data/mods/No_Fungi/modinfo.json index 362117b75b5af..a95f83e5faef1 100644 --- a/data/mods/No_Fungi/modinfo.json +++ b/data/mods/No_Fungi/modinfo.json @@ -32,7 +32,6 @@ }, { "type": "region_overlay", - "id": "No_Fungi_region_overlay", "regions": [ "all" ], "overmap_feature_flag_settings": { "blacklist": [ "FUNGAL" ] } } diff --git a/data/mods/No_NPC_Food/modinfo.json b/data/mods/No_NPC_Food/modinfo.json index 885dd696769cd..2d195ff3ff312 100644 --- a/data/mods/No_NPC_Food/modinfo.json +++ b/data/mods/No_NPC_Food/modinfo.json @@ -12,7 +12,6 @@ { "type": "EXTERNAL_OPTION", "name": "NO_NPC_FOOD", - "info": "Disables tracking food, thirst and ( partially ) fatigue for NPCs. If true, NPCs won't need to eat or drink and will only get tired enough to sleep, not to get penalties.", "stype": "bool", "value": true } diff --git a/data/mods/No_Rail_Stations/region_overlay.json b/data/mods/No_Rail_Stations/region_overlay.json index a33c079592501..d6bdd5e6c83b2 100644 --- a/data/mods/No_Rail_Stations/region_overlay.json +++ b/data/mods/No_Rail_Stations/region_overlay.json @@ -1,7 +1,6 @@ [ { "type": "region_overlay", - "id": "no_rail_yards", "regions": [ "all" ], "city": { "houses": { "railroad_city": 0 } } } diff --git a/data/mods/No_Triffids/modinfo.json b/data/mods/No_Triffids/modinfo.json index 58c7d83f38ce2..dbd50829ecf0b 100644 --- a/data/mods/No_Triffids/modinfo.json +++ b/data/mods/No_Triffids/modinfo.json @@ -19,7 +19,6 @@ }, { "type": "region_overlay", - "id": "No_Triffids_region_overlay", "regions": [ "all" ], "overmap_feature_flag_settings": { "blacklist": [ "TRIFFID" ] } } diff --git a/data/mods/Safe_autodoc/game_balance.json b/data/mods/Safe_autodoc/game_balance.json index 3a15c0e456e63..c6f303e404865 100644 --- a/data/mods/Safe_autodoc/game_balance.json +++ b/data/mods/Safe_autodoc/game_balance.json @@ -2,7 +2,6 @@ { "type": "EXTERNAL_OPTION", "name": "SAFE_AUTODOC", - "info": "Makes autodoc operations completely safe, independent of the player's skill", "stype": "bool", "value": true } diff --git a/data/mods/Salvaged_Robots/corpses.json b/data/mods/Salvaged_Robots/corpses.json index 7f458378bab4b..920c4317c40ce 100644 --- a/data/mods/Salvaged_Robots/corpses.json +++ b/data/mods/Salvaged_Robots/corpses.json @@ -9,8 +9,8 @@ "category": "other", "description": "A broken set of power armor fitted with an AI core for automated use. It cannot be worn or disassembled until re-crafted into an undamaged robot.", "material": [ "superalloy", "plastic" ], - "weight": 9310, - "volume": 220, + "weight": "9310 g", + "volume": "55 L", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -23,8 +23,8 @@ "looks_like": "power_armor_basic", "name": "broken basic auto armor", "description": "A broken set of power armor fitted with an AI core for automated use. It cannot be worn or disassembled until re-crafted into an undamaged robot.", - "weight": 28010, - "volume": 300, + "weight": "28010 g", + "volume": "75 L", "flags": [ "TRADER_AVOID" ] }, { @@ -35,8 +35,8 @@ "category": "other", "looks_like": "power_armor_heavy", "description": "A broken set of power armor fitted with an AI core for automated use. It cannot be worn or disassembled until re-crafted into an undamaged robot.", - "weight": 30650, - "volume": 350, + "weight": "30650 g", + "volume": "87500 ml", "flags": [ "TRADER_AVOID" ] }, { @@ -45,12 +45,12 @@ "symbol": ",", "color": "light_gray", "looks_like": "broken_tribot", - "name": "dead craftbuddy", + "name": { "str": "dead craftbuddy", "str_pl": "dead craftbuddies" }, "category": "other", "description": "A broken repair robot, now limp and unmoving. Could be gutted for parts or re-crafted into a functioning pal.", "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -192,8 +192,8 @@ "price": 30000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -239,8 +239,8 @@ "category": "other", "description": "A broken cyborg, now limp and unmoving. Could be gutted for parts or crafted into a salvaged robot.", "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -255,8 +255,8 @@ "category": "other", "description": "A broken cyborg, now limp and unmoving. Could be stripped down or re-crafted into a salvaged robot.", "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -292,7 +292,7 @@ "copy-from": "broken_defbot_disarmed", "color": "light_gray", "name": "broken security robot", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." }, { "type": "GENERIC", @@ -300,7 +300,7 @@ "copy-from": "broken_defbot_disarmed", "color": "light_gray", "name": "broken defense bot", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." }, { "type": "GENERIC", @@ -308,7 +308,7 @@ "copy-from": "broken_defbot_disarmed", "color": "light_gray", "name": "broken riotcontrol robot", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot." }, { "type": "GENERIC", @@ -316,7 +316,7 @@ "copy-from": "broken_defbot_disarmed", "color": "brown", "name": "broken junkyard cowboy", - "description": "A broken salvaged robot. Could be stripped for parts or re-crafted." + "description": "A broken salvaged robot. Could be stripped for parts or re-crafted." }, { "type": "GENERIC", @@ -324,7 +324,7 @@ "copy-from": "broken_defbot_disarmed", "color": "cyan", "name": "broken shortcircuit samurai", - "description": "A broken salvaged robot. Could be stripped for parts or re-crafted." + "description": "A broken salvaged robot. Could be stripped for parts or re-crafted." }, { "type": "GENERIC", @@ -332,7 +332,7 @@ "copy-from": "broken_defbot_disarmed", "color": "red", "name": "broken slapdash paladin", - "description": "A broken salvaged robot. Could be stripped for parts or re-crafted." + "description": "A broken salvaged robot. Could be stripped for parts or re-crafted." }, { "type": "GENERIC", @@ -342,12 +342,12 @@ "looks_like": "broken_secubot", "name": "broken disarmed military bot", "category": "other", - "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", + "description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", "price": 30000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -359,7 +359,7 @@ "copy-from": "broken_milbot_disarmed", "color": "light_gray", "name": "broken military trainer robot", - "description": "A broken military trainer robot, shattered and inert. This one is armed with an integrated paintball gun. Could be stripped for parts." + "description": "A broken military trainer robot, shattered and inert. This one is armed with an integrated paintball gun. Could be stripped for parts." }, { "type": "GENERIC", @@ -367,7 +367,7 @@ "copy-from": "broken_milbot_disarmed", "color": "light_gray", "name": "broken military robot", - "description": "A broken military robot, shattered and inert. This one is armed with an integrated 5.56mm firearm. Could be stripped for parts." + "description": "A broken military robot, shattered and inert. This one is armed with an integrated 5.56mm firearm. Could be stripped for parts." }, { "type": "GENERIC", @@ -375,7 +375,7 @@ "copy-from": "broken_milbot_disarmed", "color": "light_gray", "name": "broken military robot", - "description": "A broken military robot, shattered and inert. This one is armed with an integrated 7.62mm firearm. Could be stripped for parts." + "description": "A broken military robot, shattered and inert. This one is armed with an integrated 7.62mm firearm. Could be stripped for parts." }, { "type": "GENERIC", @@ -383,7 +383,7 @@ "copy-from": "broken_milbot_disarmed", "color": "light_gray", "name": "broken military robot", - "description": "A broken military robot, shattered and inert. This one is armed with an integrated 50 caliber firearm. Could be stripped for parts." + "description": "A broken military robot, shattered and inert. This one is armed with an integrated 50 caliber firearm. Could be stripped for parts." }, { "type": "GENERIC", @@ -391,7 +391,7 @@ "copy-from": "broken_milbot_disarmed", "color": "light_gray", "name": "broken military robot", - "description": "A broken military robot, shattered and inert. This one is armed with an integrated 8x40mm firearm. Could be stripped for parts." + "description": "A broken military robot, shattered and inert. This one is armed with an integrated 8x40mm firearm. Could be stripped for parts." }, { "type": "GENERIC", @@ -399,7 +399,7 @@ "copy-from": "broken_milbot_disarmed", "color": "light_gray", "name": "broken military robot", - "description": "A broken military robot, shattered and inert. This one is armed with an integrated flechette gun. Could be stripped for parts." + "description": "A broken military robot, shattered and inert. This one is armed with an integrated flechette gun. Could be stripped for parts." }, { "type": "GENERIC", @@ -407,7 +407,7 @@ "copy-from": "broken_milbot_disarmed", "color": "red", "name": "broken military robot", - "description": "A broken military robot, shattered and inert. This one is armed with an integrated 40mm grenade launcher. Could be stripped for parts." + "description": "A broken military robot, shattered and inert. This one is armed with an integrated 40mm grenade launcher. Could be stripped for parts." }, { "type": "GENERIC", @@ -415,7 +415,7 @@ "copy-from": "broken_milbot_disarmed", "color": "red", "name": "broken military flame robot", - "description": "A broken military robot, shattered and inert. This one is armed with an integrated flamethrower. Could be stripped for parts." + "description": "A broken military robot, shattered and inert. This one is armed with an integrated flamethrower. Could be stripped for parts." }, { "type": "GENERIC", @@ -423,7 +423,7 @@ "copy-from": "broken_milbot_disarmed", "color": "white", "name": "broken robo-guardian", - "description": "A broken salvaged robot. Could be stripped or recrafted." + "description": "A broken salvaged robot. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -431,7 +431,7 @@ "copy-from": "broken_milbot_disarmed", "color": "yellow", "name": "broken robote deluxe", - "description": "A broken deluxe robot. Could be stripped or recrafted." + "description": "A broken deluxe robot. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -439,7 +439,7 @@ "copy-from": "broken_milbot_disarmed", "color": "green", "name": "broken robo-protector", - "description": "A broken salvaged robot. Could be stripped or recrafted." + "description": "A broken salvaged robot. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -447,7 +447,7 @@ "copy-from": "broken_milbot_disarmed", "color": "red", "name": "broken robo-defender", - "description": "A broken salvaged robot. Could be stripped or recrafted." + "description": "A broken salvaged robot. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -457,12 +457,12 @@ "looks_like": "broken_copbot", "name": "broken disarmed advanced bot", "category": "other", - "description": "A broken advanced robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", + "description": "A broken advanced robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot.", "price": 30000, "price_postapoc": 1000, "material": [ "superalloy", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -474,7 +474,7 @@ "copy-from": "broken_advbot_disarmed", "color": "yellow", "name": "broken advanced robot", - "description": "A broken advanced robot. This one is armed with an integrated laser-emitter. Could be stripped for parts." + "description": "A broken advanced robot. This one is armed with an integrated laser-emitter. Could be stripped for parts." }, { "type": "GENERIC", @@ -482,7 +482,7 @@ "copy-from": "broken_advbot_disarmed", "color": "magenta", "name": "broken advanced robot", - "description": "A broken advanced robot. This one is armed with an integrated plasma-ejector. Could be stripped for parts." + "description": "A broken advanced robot. This one is armed with an integrated plasma-ejector. Could be stripped for parts." }, { "type": "GENERIC", @@ -490,7 +490,7 @@ "copy-from": "broken_advbot_disarmed", "color": "magenta", "name": "broken advanced robot", - "description": "A broken advanced robot. This one is armed with an integrated laser-emitter. Could be stripped for parts." + "description": "A broken advanced robot. This one is armed with an integrated laser-emitter. Could be stripped for parts." }, { "type": "GENERIC", @@ -498,7 +498,7 @@ "copy-from": "broken_advbot_disarmed", "color": "light_blue", "name": "broken advanced robot", - "description": "A broken advanced robot. This one is armed with an integrated electro-caster. Could be stripped for parts." + "description": "A broken advanced robot. This one is armed with an integrated electro-caster. Could be stripped for parts." }, { "type": "GENERIC", @@ -506,15 +506,15 @@ "copy-from": "broken_advbot_disarmed", "color": "light_blue", "name": "broken advanced robot", - "description": "A broken advanced robot. This one is armed with an integrated EMP projector. Could be stripped for parts." + "description": "A broken advanced robot. This one is armed with an integrated EMP projector. Could be stripped for parts." }, { "type": "GENERIC", "id": "broken_advbot_glitter", "copy-from": "broken_advbot_disarmed", "color": "yellow", - "name": "broken glittering lady", - "description": "A broken salvaged robot. Could be stripped or recrafted." + "name": { "str": "broken glittering lady", "str_pl": "broken glittering ladies" }, + "description": "A broken salvaged robot. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -522,7 +522,7 @@ "copy-from": "broken_advbot_disarmed", "color": "light_green", "name": "broken bitter spinster", - "description": "A broken salvaged robot. Could be stripped or recrafted." + "description": "A broken salvaged robot. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -530,7 +530,7 @@ "copy-from": "broken_chickenbot_disarmed", "color": "red", "name": "broken chainsaw horror", - "description": "A broken salvaged robot. Thank God it's finally dead. Could be stripped or recrafted." + "description": "A broken salvaged robot. Thank God it's finally dead. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -538,7 +538,7 @@ "copy-from": "broken_chickenbot_disarmed", "color": "red", "name": "broken screeching terror", - "description": "A broken salvaged robot. Thank God it's finally dead. Could be stripped or recrafted." + "description": "A broken salvaged robot. Thank God it's finally dead. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -546,7 +546,7 @@ "copy-from": "broken_chickenbot_disarmed", "color": "red", "name": "broken hooked nightmare", - "description": "A broken salvaged robot. Thank God it's finally dead. Could be stripped or recrafted." + "description": "A broken salvaged robot. Thank God it's finally dead. Could be stripped or recrafted." }, { "type": "GENERIC", @@ -575,8 +575,8 @@ "price": 20000, "price_postapoc": 1000, "material": [ "steel", "plastic" ], - "weight": 170200, - "volume": 250, + "weight": "170200 g", + "volume": "62500 ml", "bashing": 6, "cutting": 10, "to_hit": -3, @@ -592,8 +592,8 @@ "description": "A broken tribot. Now that its legs lie broken and immobile, the world seems a little less threatening. Could be gutted for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": 430000, - "volume": 750, + "weight": "430 kg", + "volume": "187500 ml", "bashing": 10, "cutting": 6, "to_hit": -2, diff --git a/data/mods/Salvaged_Robots/items.json b/data/mods/Salvaged_Robots/items.json index 3694e7b56e08e..59f3a738993a0 100644 --- a/data/mods/Salvaged_Robots/items.json +++ b/data/mods/Salvaged_Robots/items.json @@ -4,7 +4,7 @@ "id": "necro_head", "category": "other", "name": "necrotic head", - "weight": 760, + "weight": "760 g", "color": "dark_gray", "looks_like": "etched_skull", "spoils_in": 24, @@ -15,7 +15,7 @@ "nutrition": 1, "description": "The severed head of a zombie necromancer. Its eyes still roll in its head and its jaws snap menacingly.", "material": "hflesh", - "volume": 10, + "volume": "2500 ml", "price": 0, "price_postapoc": 0, "fun": -150 @@ -29,8 +29,8 @@ "comestible_type": "FOOD", "price": 10000, "price_postapoc": 10000, - "weight": 250, - "volume": 1, + "weight": "250 g", + "volume": "250 ml", "symbol": "%", "color": "light_green", "use_action": { "type": "mutagen" }, @@ -41,7 +41,7 @@ { "id": "honey", "type": "COMESTIBLE", - "comment": "uncontained so it can bleed to the ground.", + "//": "uncontained so it can bleed to the ground.", "symbol": "~", "color": "yellow", "name": "honey", @@ -49,8 +49,8 @@ "description": "Honey, that stuff bees make.", "price": 800, "material": "honey", - "weight": 63, - "volume": 1, + "weight": "63 g", + "volume": "250 ml", "comestible_type": "DRINK", "quench": 2, "calories": 61, @@ -62,11 +62,10 @@ { "id": "textbook_robots", "type": "BOOK", - "name": "Hacking Robots for Fun & Profit", - "name_plural": "Hacking Robots for Fun & Profit", - "description": "A book on illegally obtaining, reprogramming, and modifying robots. It has lots of helpful step-by-step guides and example blueprints.", - "weight": 2063, - "volume": 8, + "name": { "str": "Hacking Robots for Fun & Profit", "str_pl": "copies of Hacking Robots for Fun & Profit" }, + "description": "A book on illegally obtaining, reprogramming, and modifying robots. It has lots of helpful step-by-step guides and example blueprints.", + "weight": "2063 g", + "volume": "2 L", "price": 1000, "price_postapoc": 1000, "bashing": 8, @@ -83,11 +82,10 @@ { "id": "mag_robotics", "type": "BOOK", - "name": "Popular Robotics", - "name_plural": "Popular Robotics", + "name": { "str": "Popular Robotics", "str_pl": "issues of Popular Robotics" }, "description": "A magazine about building and altering your own robots.", - "weight": 45, - "volume": 1, + "weight": "45 g", + "volume": "250 ml", "price": 450, "price_postapoc": 100, "material": [ "paper" ], @@ -137,14 +135,14 @@ "symbol": ";", "color": "light_gray", "looks_like": "mon_tripod", - "name": "inactive craftbuddy", + "name": { "str": "inactive craftbuddy", "str_pl": "inactive craftbuddies" }, "category": "other", "description": "A robot crafting assistant. Useable in its current state as a portable workbench, or deployable as a traveling companion.", "price": 1000000, "price_postapoc": 1000000, "material": [ "superalloy", "plastic" ], - "weight": 19310, - "volume": 220, + "weight": "19310 g", + "volume": "55 L", "bashing": 8, "to_hit": -3, "ammo": "battery", @@ -212,8 +210,8 @@ "price": 0, "price_postapoc": 0, "material": [ "superalloy", "plastic" ], - "weight": 9310, - "volume": 220, + "weight": "9310 g", + "volume": "55 L", "bashing": 6, "cutting": 6, "to_hit": -3, @@ -226,8 +224,8 @@ "looks_like": "power_armor_basic", "name": "basic auto armor", "description": "A set of light power armor fitted with an AI core for automated use. Activate it to deploy the robot or disassemble it to use as armor.", - "weight": 28010, - "volume": 300, + "weight": "28010 g", + "volume": "75 L", "use_action": { "type": "place_monster", "monster_id": "mon_autoarmor_basic", "moves": 100 } }, { @@ -238,8 +236,8 @@ "name": "heavy auto armor", "category": "other", "description": "A set of light power armor fitted with an AI core for automated use. Activate it to deploy the robot or disassemble it to use as armor.", - "weight": 30650, - "volume": 350, + "weight": "30650 g", + "volume": "87500 ml", "use_action": { "type": "place_monster", "monster_id": "mon_autoarmor_light", "moves": 100 } }, { @@ -247,8 +245,8 @@ "type": "TOOL", "name": "inactive hack", "description": "This is an inactive manhack. Manhacks are fist-sized robots that fly through the air. They are covered with whirring blades and attack by throwing themselves against their target. Use this item to reprogram and activate the manhack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.", - "weight": 5400, - "volume": 3, + "weight": "5400 g", + "volume": "750 ml", "price": 10000, "price_postapoc": 10000, "to_hit": -3, @@ -310,7 +308,7 @@ "type": "place_monster", "monster_id": "mon_arson_hack", "friendly_msg": "The arson hack flies from your hand! Get clear!", - "hostile_msg": "You misprogram the arson hack! Run!", + "hostile_msg": "You misprogram the arson hack! Run!", "difficulty": 1, "moves": 60, "place_randomly": true, @@ -363,8 +361,8 @@ "price": 10000, "price_postapoc": 10000, "material": [ "steel", "plastic" ], - "weight": 62650, - "volume": 120, + "weight": "62650 g", + "volume": "30 L", "bashing": 4, "cutting": 4, "to_hit": -3, @@ -377,7 +375,7 @@ "type": "TOOL", "copy-from": "bot_eyebot_base", "name": "inactive floating heater", - "description": "A salvaged eyebot repurposed into a floating space heater. It emits a constant jet of warm air to heat an enclosed space. It is non-aggressive and has no weapons systems. Activate this item to deploy the robot.", + "description": "A salvaged eyebot repurposed into a floating space heater. It emits a constant jet of warm air to heat an enclosed space. It is non-aggressive and has no weapons systems. Activate this item to deploy the robot.", "color": "pink", "use_action": { "type": "place_monster", @@ -393,7 +391,7 @@ "type": "TOOL", "copy-from": "bot_eyebot_base", "name": "inactive floating furnace", - "description": "A salvaged eyebot repurposed into a floating space heater. It emits a constant jet of dangerously hot air to heat an enclosed space. It is non-aggressive and has no weapons systems. Activate this item to deploy the robot.", + "description": "A salvaged eyebot repurposed into a floating space heater. It emits a constant jet of dangerously hot air to heat an enclosed space. It is non-aggressive and has no weapons systems. Activate this item to deploy the robot.", "color": "red", "use_action": { "type": "place_monster", @@ -427,8 +425,8 @@ "looks_like": "mon_cleanerbot", "price": 10000, "price_postapoc": 10000, - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "to_hit": -3, "bashing": 8, "material": [ "steel", "aluminum" ], @@ -473,7 +471,7 @@ "type": "TOOL", "copy-from": "bot_utilibot_base", "name": "inactive digestron", - "description": "A salvaged utility robot converted into an automated vacuum cleaner. It will suck stray items off the ground and dissolve them with its internal acid reserves. It is non aggressive and has no weapon systems. Activate this item to deploy the robot.", + "description": "A salvaged utility robot converted into an automated vacuum cleaner. It will suck stray items off the ground and dissolve them with its internal acid reserves. It is non aggressive and has no weapon systems. Activate this item to deploy the robot.", "color": "light_green", "use_action": { "type": "place_monster", @@ -506,8 +504,8 @@ "looks_like": "mon_tripod", "name": "inactive medibot", "material": [ "steel", "plastic" ], - "weight": 70000, - "volume": 200, + "weight": "70 kg", + "volume": "50 L", "price": 10000, "price_postapoc": 10000, "to_hit": -3, @@ -521,7 +519,7 @@ "type": "TOOL", "copy-from": "bot_medibot_base", "name": "inactive assassin robot", - "description": "A salvaged medical robot repurposed into a murder machine. It will attack hostile targets with a set of blades and a toxic needle. Activate this item to deploy the robot.", + "description": "A salvaged medical robot repurposed into a murder machine. It will attack hostile targets with a set of blades and a toxic needle. Activate this item to deploy the robot.", "color": "red", "use_action": { "type": "place_monster", @@ -571,8 +569,8 @@ "name": "inactive skitterbot", "looks_like": "broken_skitterbot", "material": [ "steel", "plastic" ], - "weight": 62650, - "volume": 120, + "weight": "62650 g", + "volume": "30 L", "price": 10000, "price_postapoc": 10000, "to_hit": -3, @@ -586,7 +584,7 @@ "type": "TOOL", "copy-from": "bot_skitterbot_base", "name": "inactive rat snatcher", - "description": "A salvaged skitterbot repurposed for hunting small game. It attacks targets with pincers and an integrated tazer. Activate this item to deploy the robot.", + "description": "A salvaged skitterbot repurposed for hunting small game. It attacks targets with pincers and an integrated tazer. Activate this item to deploy the robot.", "color": "dark_gray", "use_action": { "type": "place_monster", @@ -634,8 +632,8 @@ "type": "TOOL", "name": "inactive cyborg", "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, "to_hit": -3, @@ -649,7 +647,7 @@ "type": "TOOL", "copy-from": "bot_cyborg_base", "name": "inactive necrotic cyborg", - "description": "A salvaged cyborg refitted with the head of a zombie necromancer. The animate head retains some of its ability to revive zombies. Activate this item to deploy the robot.", + "description": "A salvaged cyborg refitted with the head of a zombie necromancer. The animate head retains some of its ability to revive zombies. Activate this item to deploy the robot.", "color": "dark_gray", "use_action": { "type": "place_monster", @@ -666,8 +664,8 @@ "name": "inactive defense robot", "looks_like": "mon_riotbot", "material": [ "steel", "plastic" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, "to_hit": -3, @@ -713,7 +711,7 @@ "type": "TOOL", "copy-from": "bot_defbot_base", "name": "inactive slapdash paladin", - "description": "A salvaged defense robot refitted with a homemade flamethrower and two searing hot blades. Activate this item, with gasoline in your inventory, to load and deploy the robot... preferably far from anything flammable", + "description": "A salvaged defense robot refitted with a homemade flamethrower and two searing hot blades. Activate this item, with gasoline in your inventory, to load and deploy the robot… preferably far from anything flammable", "color": "red", "use_action": { "type": "place_monster", @@ -730,8 +728,8 @@ "name": "inactive military robot", "looks_like": "mon_secubot", "material": [ "steel", "kevlar" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, "to_hit": -3, @@ -827,8 +825,8 @@ "name": "inactive advanced robot", "looks_like": "mon_copbot", "material": [ "superalloy", "plastic" ], - "weight": 120000, - "volume": 250, + "weight": "120 kg", + "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, "to_hit": -3, @@ -840,7 +838,7 @@ "id": "bot_advbot_glitter", "type": "TOOL", "copy-from": "bot_advbot_base", - "name": "inactive glittering lady", + "name": { "str": "inactive glittering lady", "str_pl": "inactive glittering ladies" }, "description": "A salvaged advanced robot transformed into a luminous beacon of destruction. It attacks hostile targets with its two integral lasers and blinding flashes. Activate this item to deploy the robot.", "color": "yellow", "use_action": { @@ -874,8 +872,8 @@ "name": "inactive chickenwalker", "looks_like": "mon_chickenbot", "material": [ "steel", "kevlar" ], - "weight": 140000, - "volume": 250, + "weight": "140 kg", + "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, "to_hit": -3, @@ -938,8 +936,8 @@ "name": "inactive tankbot", "looks_like": "mon_tankbot", "material": [ "steel", "kevlar" ], - "weight": 120000, - "volume": 250, + "weight": "120 kg", + "volume": "62500 ml", "price": 10000, "price_postapoc": 10000, "to_hit": -3, diff --git a/data/mods/Salvaged_Robots/monstergroups.json b/data/mods/Salvaged_Robots/monstergroups.json index a5483d0b38d2f..cae40abd8af95 100644 --- a/data/mods/Salvaged_Robots/monstergroups.json +++ b/data/mods/Salvaged_Robots/monstergroups.json @@ -125,7 +125,7 @@ "type": "monstergroup", "name": "GROUP_HOSPITAL", "default": "mon_null", - "//": "Hospital monster spawns. Same as GROUP_ZOMBIE, but without Z-dogs.", + "//": "Hospital monster spawns. Same as GROUP_ZOMBIE, but without Z-dogs.", "monsters": [ { "monster": "mon_medibot", "freq": 15, "cost_multiplier": 20, "pack_size": [ 2, 3 ] } ] }, { diff --git a/data/mods/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json index b43f9c3928626..46df1208da49c 100644 --- a/data/mods/Salvaged_Robots/monsters.json +++ b/data/mods/Salvaged_Robots/monsters.json @@ -12,7 +12,8 @@ "description": "A mobile crafting station used by workers in mines, on oil rigs, and in other remote locales. In it's active state, the craftbuddy merely follows its user. In it's deactivated state, the craft buddy is useable as a toolbench and multipurpose workstation.", "default_faction": "utility_bot", "species": [ "ROBOT" ], - "size": "SMALL", + "volume": "30000 ml", + "weight": "40750 g", "hp": 150, "armor_fire": 6, "armor_acid": 6, @@ -38,11 +39,12 @@ "id": "mon_autoarmor_base", "type": "MONSTER", "name": "automated armor", - "description": "A suit of power armor temporarily controlled by an attached AI-core. Originally intended as a way to retrieve dead or wounded operators from combat, it was more commonly used for transporting the suit itself. The AI is limited, and makes a poor combatant.", + "description": "A suit of power armor temporarily controlled by an attached AI-core. Originally intended as a way to retrieve dead or wounded operators from combat, it was more commonly used for transporting the suit itself. The AI is limited, and makes a poor combatant.", "default_faction": "military", "species": [ "ROBOT" ], "diff": 10, - "size": "LARGE", + "volume": "92500 ml", + "weight": "120 kg", "hp": 120, "speed": 100, "material": [ "superalloy", "plastic" ], @@ -150,7 +152,7 @@ "type": "MONSTER", "name": "arsonhack", "looks_like": "bot_manhack", - "description": "A salvaged drone repurposed to spread flame and cause property damage. It's almost as dangerous to its user as it is to the surroundings. The arsonhack cannot be recovered once activated. Only a reckless madman would dare to build this.", + "description": "A salvaged drone repurposed to spread flame and cause property damage. It's almost as dangerous to its user as it is to the surroundings. The arsonhack cannot be recovered once activated. Only a reckless madman would dare to build this.", "diff": 10, "speed": 250, "luminance": 5, @@ -197,7 +199,7 @@ "ammo_type": "water", "fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ], "fake_dex": 9, - "no_ammo_sound": "drip. drip.", + "no_ammo_sound": "drip. drip.", "ranges": [ [ 0, 10, "BURST" ] ] } ] @@ -211,7 +213,8 @@ "default_faction": "cop_bot", "species": [ "ROBOT" ], "diff": 2, - "size": "SMALL", + "volume": "30000 ml", + "weight": "40750 g", "hp": 20, "speed": 120, "material": [ "steel" ], @@ -238,7 +241,7 @@ "color": "pink", "luminance": 8, "armor_fire": 10, - "description": "A salvaged eyebot repurposed into a floating space heater. It emits a constant jet of warm air to heat an enclosed space.", + "description": "A salvaged eyebot repurposed into a floating space heater. It emits a constant jet of warm air to heat an enclosed space.", "revert_to_itype": "bot_eyebot_heater", "fear_triggers": [ "HURT" ], "emit_fields": [ "emit_hot_air2_stream" ], @@ -267,7 +270,7 @@ "color": "red", "luminance": 100, "armor_fire": 12, - "description": "A salvaged eyebot refitted with a laser weapon. The lack of recoil allows the hovering robot to aim and fire without penalty. It has decent range and damage, but requires an extended recharge time between shots.", + "description": "A salvaged eyebot refitted with a laser weapon. The lack of recoil allows the hovering robot to aim and fire without penalty. It has decent range and damage, but requires an extended recharge time between shots.", "revert_to_itype": "bot_eyebot_burn", "special_attacks": [ { @@ -276,7 +279,6 @@ "gun_type": "robogun_laser", "fake_skills": [ [ "gun", 6 ], [ "rifle", 6 ] ], "fake_dex": 10, - "range": 20, "ranges": [ [ 0, 30, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -295,7 +297,8 @@ "description": "One of the many models of utility robot formerly in use by government agencies, private corporations, and civilians alike.", "default_faction": "utility_bot", "species": [ "ROBOT" ], - "size": "MEDIUM", + "volume": "62500 ml", + "weight": "81500 g", "hp": 120, "speed": 70, "material": [ "steel" ], @@ -333,7 +336,7 @@ "type": "MONSTER", "copy-from": "mon_utilibot", "name": "construction robot", - "description": "One of the many models of construction robot formerly in use by government agencies and private corporations. It is equipped with an integrated welder, flashlight, nailgun, and jackhammer.", + "description": "One of the many models of construction robot formerly in use by government agencies and private corporations. It is equipped with an integrated welder, flashlight, nailgun, and jackhammer.", "color": "yellow", "luminance": 10, "melee_skill": 2, @@ -348,7 +351,6 @@ "gun_type": "robogun_nail", "fake_skills": [ [ "gun", 0 ], [ "pistol", 2 ] ], "fake_dex": 8, - "range": 3, "ranges": [ [ 0, 3, "BURST" ] ] } ] @@ -358,7 +360,7 @@ "type": "MONSTER", "copy-from": "mon_utilibot", "name": "firefighter robot", - "description": "One of the many models of fire-fighting robot formerly in use by local fire departments and emergency services. Designed for entering burning buildings and other situations deemed too dangerous for human firefighters.", + "description": "One of the many models of fire-fighting robot formerly in use by local fire departments and emergency services. Designed for entering burning buildings and other situations deemed too dangerous for human firefighters.", "color": "yellow", "luminance": 100, "melee_skill": 3, @@ -373,7 +375,6 @@ "gun_type": "watercannon", "fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ], "fake_dex": 8, - "range": 5, "ranges": [ [ 0, 5, "BURST" ] ] } ], @@ -385,7 +386,7 @@ "copy-from": "mon_utilibot", "name": "blob breeder", "revert_to_itype": "bot_utilibot_blob", - "description": "A salvaged utility robot converted into a mobile incubator for the alien blob. It will intermittently release a group of living blobs. Why on Earth would you build this?", + "description": "A salvaged utility robot converted into a mobile incubator for the alien blob. It will intermittently release a group of living blobs. Why on Earth would you build this?", "armor_bash": 12, "reproduction": { "baby_monster": "mon_blob", "baby_count": 10, "baby_timer": 1 } }, @@ -404,7 +405,7 @@ "type": "MONSTER", "copy-from": "mon_utilibot", "name": "digestron", - "description": "A salvaged utility robot converted into an automated vacuum cleaner. It will suck stray items off the ground and dissolve them with its internal acid reserves. A useful helper for keeping your front lawn clean of debris... or corpses.", + "description": "A salvaged utility robot converted into an automated vacuum cleaner. It will suck stray items off the ground and dissolve them with its internal acid reserves. A useful helper for keeping your front lawn clean of debris… or corpses.", "speed": 100, "aggression": 10, "morale": 10, @@ -427,7 +428,7 @@ "revert_to_itype": "bot_utilibot_beehive", "reproduction": { "baby_egg": "honeycomb", "baby_count": 50, "baby_timer": 5 }, "baby_flags": [ "SUMMER" ], - "comment": [ "emit_bee_trail" ], + "//": [ "emit_bee_trail" ], "starting_ammo": { "bolt_wood": 100 }, "special_attacks": [ [ "PARROT", 10 ], @@ -439,7 +440,6 @@ "fake_skills": [ [ "gun", 3 ], [ "archery", 3 ] ], "fake_dex": 8, "no_ammo_sound": "click!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ] } ], @@ -454,7 +454,8 @@ "description": "A free roaming medical robot capable of administering powerful anesthetics and performing complex surgical operations, usually in that order. Faulty bio-diagnostic programs resulted in numerous lawsuits before the Cataclysm.", "default_faction": "utility_bot", "species": [ "ROBOT" ], - "size": "MEDIUM", + "volume": "62500 ml", + "weight": "81500 g", "hp": 70, "speed": 80, "material": [ "steel", "plastic" ], @@ -482,7 +483,7 @@ "type": "MONSTER", "copy-from": "mon_medibot", "name": "assassination robot", - "description": "A salvaged medical robot repurposed into a murder machine. Its surgical tools have been replaced with a fearsome set of blades, and its hypodermic needle now delivers powerful toxins.", + "description": "A salvaged medical robot repurposed into a murder machine. Its surgical tools have been replaced with a fearsome set of blades, and its hypodermic needle now delivers powerful toxins.", "speed": 120, "color": "red", "aggression": 100, @@ -510,7 +511,7 @@ "type": "MONSTER", "copy-from": "mon_medibot", "name": "elixirator", - "description": "This doesn't work yet. Don't build it... A salvaged medibot with its internal pharma-fabricators repurposed to produce mutagen.", + "description": "This doesn't work yet. Don't build it… A salvaged medibot with its internal pharma-fabricators repurposed to produce mutagen.", "color": "light_green", "aggression": 10, "morale": 10, @@ -551,7 +552,8 @@ "default_faction": "defense_bot", "species": [ "ROBOT" ], "diff": 2, - "size": "SMALL", + "volume": "30000 ml", + "weight": "40750 g", "hp": 40, "speed": 130, "material": [ "steel" ], @@ -576,7 +578,7 @@ "type": "MONSTER", "copy-from": "mon_skitterbot", "name": "rat snatcher", - "description": "A salvaged skitterbot repurposed for hunting small game. It's faster than the original model but far less sturdy.", + "description": "A salvaged skitterbot repurposed for hunting small game. It's faster than the original model but far less sturdy.", "color": "light_gray", "speed": 250, "hp": 30, @@ -617,7 +619,7 @@ "type": "MONSTER", "copy-from": "mon_skitterbot", "name": "pest hunter", - "description": "A salvaged skitterbot refitted with an 8mm integrated firearm. The robot's small size precludes rapid fire, due to recoil, and requires the use of lightweight caseless ammo.", + "description": "A salvaged skitterbot refitted with an 8mm integrated firearm. The robot's small size precludes rapid fire, due to recoil, and requires the use of lightweight caseless ammo.", "color": "dark_gray", "aggression": 100, "speed": 200, @@ -637,7 +639,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 6 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ] } ] @@ -649,7 +650,8 @@ "description": "A robot body with the head of a human. All kinds of electronic wires and devices are implanted in its head. This cyborg moves erratically and has a confused and deranged look in its eyes.", "default_faction": "science", "species": [ "ROBOT" ], - "size": "MEDIUM", + "volume": "62500 ml", + "weight": "81500 g", "hp": 60, "speed": 90, "material": [ "steel" ], @@ -690,7 +692,7 @@ "type": "MONSTER", "copy-from": "mon_defbot_base", "name": "security robot", - "description": "An automated defense robot still active due to its internal power source. This one is equipped with an electric prod and an integrated shotgun.", + "description": "An automated defense robot still active due to its internal power source. This one is equipped with an electric prod and an integrated shotgun.", "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "starting_ammo": { "shot_00": 100 }, "special_attacks": [ @@ -703,7 +705,6 @@ "fake_skills": [ [ "gun", 2 ], [ "shotgun", 2 ] ], "fake_dex": 9, "no_ammo_sound": "click click!", - "range": 8, "ranges": [ [ 0, 8, "DEFAULT" ] ] } ] @@ -713,10 +714,11 @@ "type": "MONSTER", "looks_like": "mon_secubot", "name": "military robot", - "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 5.56mm firearm.", + "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 5.56mm firearm.", "default_faction": "military", "species": [ "ROBOT" ], - "size": "MEDIUM", + "volume": "62500 ml", + "weight": "81500 g", "hp": 80, "speed": 100, "material": [ "steel" ], @@ -764,7 +766,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 4 ] ], "fake_dex": 9, "no_ammo_sound": "click!", - "range": 15, "ranges": [ [ 0, 15, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -796,7 +797,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 5, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -829,7 +829,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 20, "ranges": [ [ 0, 5, "DEFAULT" ], [ 6, 10, "BURST" ], [ 11, 20, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -861,7 +860,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 20, "ranges": [ [ 0, 5, "DEFAULT" ], [ 6, 10, "BURST" ], [ 11, 20, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -893,7 +891,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 6 ] ], "fake_dex": 10, "no_ammo_sound": "whirrrr!", - "range": 24, "ranges": [ [ 0, 5, "BURST" ], [ 6, 10, "AUTO" ], [ 11, 24, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -925,7 +922,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 4, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -942,7 +938,7 @@ "type": "MONSTER", "copy-from": "mon_milbot_base", "name": "grenadier robot", - "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 40mm grenade launcher.", + "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 40mm grenade launcher.", "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "color": "dark_gray_red", @@ -958,7 +954,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 30, "ranges": [ [ 6, 30, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -975,7 +970,7 @@ "type": "MONSTER", "copy-from": "mon_milbot_base", "name": "military flame robot", - "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated flamethrower.", + "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated flamethrower.", "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "starting_ammo": { "napalm": 200 }, @@ -989,7 +984,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ], "fake_dex": 10, "no_ammo_sound": "hiss!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1007,7 +1001,7 @@ "copy-from": "mon_defbot_base", "looks_like": "mon_copbot", "name": "advanced robot", - "description": "An advanced robot still functioning due to its internal fusion core. This model is armed with a powerful laser-emitter.", + "description": "An advanced robot still functioning due to its internal fusion core. This model is armed with a powerful laser-emitter.", "default_faction": "science", "species": [ "ROBOT" ], "hp": 100, @@ -1027,7 +1021,7 @@ "type": "MONSTER", "copy-from": "mon_advbot_base", "name": "laser-emitting robot", - "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful laser-emitter.", + "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful laser-emitter.", "diff": 20, "luminance": 120, "special_attacks": [ @@ -1038,7 +1032,6 @@ "gun_type": "robogun_laser", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 0, 8, "AUTO" ], [ 8, 16, "BURST" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1055,7 +1048,7 @@ "type": "MONSTER", "copy-from": "mon_advbot_base", "name": "plasma-ejecting robot", - "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful plasma-ejector.", + "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful plasma-ejector.", "diff": 20, "color": "magenta", "luminance": 200, @@ -1067,7 +1060,6 @@ "gun_type": "robogun_plasma", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 4, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1085,7 +1077,7 @@ "type": "MONSTER", "copy-from": "mon_advbot_base", "name": "railgun robot", - "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful railgun.", + "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful railgun.", "diff": 30, "special_attacks": [ { @@ -1096,7 +1088,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "buzz!", - "range": 18, "ranges": [ [ 0, 18, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1115,7 +1106,7 @@ "copy-from": "mon_advbot_base", "name": "electro-casting robot", "color": "white_cyan", - "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful electro-caster.", + "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful electro-caster.", "diff": 20, "luminance": 100, "special_attacks": [ @@ -1125,7 +1116,6 @@ "gun_type": "robogun_lightning", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 12, "ranges": [ [ 0, 12, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1143,7 +1133,7 @@ "type": "MONSTER", "copy-from": "mon_advbot_base", "name": "EMP-projecting robot", - "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful EMP-projector.", + "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful EMP-projector.", "diff": 10, "luminance": 120, "special_attacks": [ @@ -1153,7 +1143,6 @@ "gun_type": "robogun_emp", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 4, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1170,7 +1159,7 @@ "type": "MONSTER", "copy-from": "mon_defbot_base", "name": "junkyard cowboy", - "description": "A salvaged defense robot refitted with a shotgun and two circular buzzsaws. Due to bootleg targeting software, it can only attack nearby targets.", + "description": "A salvaged defense robot refitted with a shotgun and two circular buzzsaws. Due to bootleg targeting software, it can only attack nearby targets.", "speed": 100, "color": "brown", "luminance": 0, @@ -1192,7 +1181,6 @@ "fake_skills": [ [ "gun", 2 ], [ "shotgun", 2 ] ], "fake_dex": 9, "no_ammo_sound": "click!", - "range": 3, "ranges": [ [ 0, 3, "DEFAULT" ] ] } ] @@ -1226,7 +1214,7 @@ "type": "MONSTER", "copy-from": "mon_defbot_base", "name": "slapdash paladin", - "description": "A salvaged defense robot refitted with a homemade flamethrower and two searing hot blades. The burning fuel reserves make the robot noisy and smokey.", + "description": "A salvaged defense robot refitted with a homemade flamethrower and two searing hot blades. The burning fuel reserves make the robot noisy and smokey.", "speed": 100, "color": "red", "luminance": 30, @@ -1255,7 +1243,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ], "fake_dex": 10, "no_ammo_sound": "hiss!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ] } ], @@ -1266,7 +1253,7 @@ "type": "MONSTER", "copy-from": "mon_milbot_base", "name": "robo-guardian", - "description": "A salvaged military robot refitted with a pair of integrated 9mm firearms. Multiple weapons provide a high rate of fire, but jury-rigged sensors limit the effective range and accuracy. It makes for a good close range bodyguard.", + "description": "A salvaged military robot refitted with a pair of integrated 9mm firearms. Multiple weapons provide a high rate of fire, but jury-rigged sensors limit the effective range and accuracy. It makes for a good close range bodyguard.", "diff": 10, "speed": 70, "color": "green", @@ -1286,7 +1273,6 @@ "fake_skills": [ [ "gun", 3 ], [ "smg", 3 ] ], "fake_dex": 9, "no_ammo_sound": "click click!", - "range": "10", "ranges": [ [ 0, 10, "AUTO" ] ] } ] @@ -1306,7 +1292,7 @@ "type": "MONSTER", "copy-from": "mon_milbot_base", "name": "robo-protector", - "description": "A salvaged military robot refitted with an integrated 5.56mm rifle. The modified firearm is only capable of three round bursts, but range and accuracy are decent. It makes for a solid combat ally.", + "description": "A salvaged military robot refitted with an integrated 5.56mm rifle. The modified firearm is only capable of three round bursts, but range and accuracy are decent. It makes for a solid combat ally.", "diff": 20, "speed": 100, "color": "green", @@ -1325,7 +1311,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 18, "ranges": [ [ 0, 16, "BURST" ] ], "require_targeting_player": true } @@ -1336,7 +1321,7 @@ "type": "MONSTER", "copy-from": "mon_milbot_base", "name": "robo-defender", - "description": "A salvaged military robot refitted with an integrated 50bmg rifle. Improved optics provide nightvision and excellent range, but glitchy targeting software requires an extended pause between shots. It makes for a good long range sniper.", + "description": "A salvaged military robot refitted with an integrated 50bmg rifle. Improved optics provide nightvision and excellent range, but glitchy targeting software requires an extended pause between shots. It makes for a good long range sniper.", "diff": 30, "speed": 70, "color": "green", @@ -1357,7 +1342,6 @@ "fake_dex": 11, "fake_per": 10, "no_ammo_sound": "click!", - "range": 30, "ranges": [ [ 0, 30, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1391,7 +1375,6 @@ "gun_type": "robogun_laser", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 8, - "range": 5, "ranges": [ [ 0, 5, "AUTO" ] ] } ] @@ -1438,14 +1421,15 @@ }, { "abstract": "mon_chickenbot_base", - "comment": "remove-special-attack doesn't work, so add this def without guns.", + "//": "remove-special-attack doesn't work, so add this def without guns.", "type": "MONSTER", "name": "chicken walker", "looks_like": "mon_chickenbot", "description": "The Northrup ATSV, a massive, heavily-armed and armored robot walking on a pair of reverse-jointed legs. Armed with a 40mm anti-vehicle grenade launcher, 5.56 anti-personnel gun, and the ability to electrify itself against attackers, it is an effective automated sentry, though production was limited due to a legal dispute.", "default_faction": "military", "species": [ "ROBOT" ], - "size": "LARGE", + "volume": "92500 ml", + "weight": "120 kg", "hp": 90, "speed": 115, "material": [ "steel" ], @@ -1484,7 +1468,6 @@ "vision_day": 20, "vision_night": 10, "revert_to_itype": "bot_chickenbot_horror", - "remove:special_attack": [ "CHICKENBOT" ], "special_attacks": [ [ "SMASH", 30 ], [ "SHRIEK", 10 ], [ "SHRIEK_STUN", 10 ] ] }, { @@ -1492,7 +1475,7 @@ "type": "MONSTER", "name": "screeching terror", "copy-from": "mon_chickenbot_base", - "description": "A salvaged chickenwalker modified into a horrific monster adorned with skulls and spikes. It has traded its long range weapons for a set of piston-driven lances. A speaker system has been installed to blast terrifying shrieks of distorted music. No one in their right mind would craft such a hellish beast.", + "description": "A salvaged chickenwalker modified into a horrific monster adorned with skulls and spikes. It has traded its long range weapons for a set of piston-driven lances. A speaker system has been installed to blast terrifying shrieks of distorted music. No one in their right mind would craft such a hellish beast.", "diff": 5, "hp": 90, "speed": 115, @@ -1503,7 +1486,6 @@ "vision_day": 20, "vision_night": 10, "revert_to_itype": "bot_chickenbot_terror", - "remove:special_attack": [ "CHICKENBOT" ], "special_attacks": [ [ "SMASH", 30 ], [ "SHRIEK", 10 ], [ "SHRIEK_STUN", 10 ] ] }, { @@ -1511,7 +1493,7 @@ "type": "MONSTER", "name": "hooked nightmare", "copy-from": "mon_chickenbot_base", - "description": "A salvaged chickenwalker modified into a horrific monster adorned with skulls and spikes. It has traded its long range weapons for a set of spinning chains terminating in bloody hooks. A speaker system has been installed to blast terrifying shrieks of distorted music. No one in their right mind would craft such a twisted abomination.", + "description": "A salvaged chickenwalker modified into a horrific monster adorned with skulls and spikes. It has traded its long range weapons for a set of spinning chains terminating in bloody hooks. A speaker system has been installed to blast terrifying shrieks of distorted music. No one in their right mind would craft such a twisted abomination.", "diff": 5, "hp": 90, "speed": 115, @@ -1522,7 +1504,6 @@ "vision_day": 20, "vision_night": 10, "revert_to_itype": "bot_chickenbot_nightmare", - "remove:special_attack": [ "CHICKENBOT" ], "special_attacks": [ [ "SMASH", 30 ], [ "SHRIEK", 10 ], [ "SHRIEK_STUN", 10 ], [ "RANGED_PULL", 10 ], [ "GRAB_DRAG", 10 ] ], "extend": { "flags": [ "GRABS" ] } }, @@ -1535,14 +1516,15 @@ }, { "abstract": "mon_tankbot_base", - "comment": "remove-special-attack doesn't work, so add this def without gun attack.", + "//": "remove-special-attack doesn't work, so add this def without gun attack.", "type": "MONSTER", "name": "Beagle Mini-Tank UGV", "looks_like": "mon_tankbot", "description": "The Northrup Beagle is a refrigerator-sized urban warfare UGV. Sporting an anti-tank missile launcher, 40mm grenade launcher, and numerous anti-infantry weapons, it's designed for high-risk urban fighting.", "default_faction": "military", "species": [ "ROBOT" ], - "size": "HUGE", + "volume": "875000 ml", + "weight": "200 kg", "hp": 240, "speed": 75, "material": [ "steel" ], @@ -1583,7 +1565,6 @@ "attack_effs": [ { "id": "downed", "chance": 20, "duration": 10 }, { "id": "stunned", "chance": 20, "duration": 10 } ], "vision_day": 20, "revert_to_itype": "bot_tankbot_king", - "remove:special_attack": [ "MULTI_ROBOT" ], "special_attacks": [ [ "SMASH", 15 ] ] }, { @@ -1606,7 +1587,6 @@ "vision_day": 20, "revert_to_itype": "bot_tankbot_sultan", "emit_fields": [ "emit_nuclear_trail" ], - "remove:special_attack": [ "MULTI_ROBOT" ], "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 20 ] ], "extend": { "flags": [ "STUMBLES", "GRABS" ] } } diff --git a/data/mods/Salvaged_Robots/recipe.json b/data/mods/Salvaged_Robots/recipe.json index 2e51080582a10..720c3dd4443b4 100644 --- a/data/mods/Salvaged_Robots/recipe.json +++ b/data/mods/Salvaged_Robots/recipe.json @@ -9,7 +9,7 @@ "difficulty": 8, "time": 2500, "reversible": true, - "auto_learn": true, + "autolearn": true, "tools": [ [ [ "electrohack", 20 ] ] ], "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], @@ -33,7 +33,7 @@ "difficulty": 3, "time": 2500, "reversible": true, - "auto_learn": true, + "autolearn": true, "tools": [ [ [ "electrohack", 20 ] ] ], "qualities": [ { "id": "SCREW", "level": 1 } ] }, @@ -68,7 +68,7 @@ "difficulty": 6, "time": 25000, "reversible": false, - "auto_learn": true, + "autolearn": true, "tools": [ [ [ "electrohack", 20 ] ] ], "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ] diff --git a/data/mods/Salvaged_Robots/robot_additions/40mm.json b/data/mods/Salvaged_Robots/robot_additions/40mm.json index 9f9fb4ec40d41..65f252affd2d0 100644 --- a/data/mods/Salvaged_Robots/robot_additions/40mm.json +++ b/data/mods/Salvaged_Robots/robot_additions/40mm.json @@ -5,8 +5,8 @@ "name": "40mm EMP grenade", "name_plural": "40mm EMP grenades", "description": "A 40mm grenade with an EMP charge. It will release an electromagnetic pulse capable of damaging robots and some equipment.", - "weight": 230, - "volume": 1, + "weight": "230 g", + "volume": "250 ml", "price": 40000, "material": [ "steel", "powder" ], "symbol": "=", @@ -28,8 +28,8 @@ "category": "weapons", "name": "active EMP grenade", "description": "This EMP grenade is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy. You may not want to be holding it much longer.", - "weight": 400, - "volume": 1, + "weight": "400 g", + "volume": "250 ml", "price": 0, "to_hit": -1, "bashing": 5, diff --git a/data/mods/Salvaged_Robots/robot_additions/items.json b/data/mods/Salvaged_Robots/robot_additions/items.json index 61581b600fda5..53b1ad1d4e380 100644 --- a/data/mods/Salvaged_Robots/robot_additions/items.json +++ b/data/mods/Salvaged_Robots/robot_additions/items.json @@ -4,8 +4,8 @@ "type": "GENERIC", "name": "robot carrier", "description": "A heavy frame outfitted with tie-downs and attachment points for carrying cargo, with additional railings to keep a large machine in place. It is meant to hold large drones and robots for transport. Use it on a suitable robot to capture, use it on an empty tile to release.", - "weight": 96000, - "volume": 250, + "weight": "96 kg", + "volume": "62500 ml", "price": 48000, "category": "veh_parts", "material": [ "steel", "plastic" ], @@ -26,8 +26,8 @@ "color": "pink", "description": "A small plastic ball filled with glowing chemicals.", "material": "plastic", - "volume": 1, - "weight": 1, + "volume": "250 ml", + "weight": "1 g", "to_hit": -3, "bashing": 1, "initial_charges": 40, diff --git a/data/mods/Salvaged_Robots/robot_additions/paintball.json b/data/mods/Salvaged_Robots/robot_additions/paintball.json index 2e315d2ae4706..fa18858613b90 100644 --- a/data/mods/Salvaged_Robots/robot_additions/paintball.json +++ b/data/mods/Salvaged_Robots/robot_additions/paintball.json @@ -8,8 +8,8 @@ "color": "pink", "description": "A tube of small glowballs taken off the market due to hazardous chemicals. They deal virtually no damage, but light up on impact. Useful for illuminating an area without lighting up yourself in the process.", "material": "plastic", - "volume": 1, - "weight": 1, + "volume": "250 ml", + "weight": "1 g", "ammo_type": "paintball", "damage": 2, "dispersion": 100, diff --git a/data/mods/Salvaged_Robots/speech.json b/data/mods/Salvaged_Robots/speech.json index 9ac2e4dfca90f..9c71c9e5601b5 100644 --- a/data/mods/Salvaged_Robots/speech.json +++ b/data/mods/Salvaged_Robots/speech.json @@ -170,19 +170,19 @@ { "type": "speech", "speaker": "mon_craftbuddy", - "sound": "\"Bedeep. Whurrrrrmmmm.\"", + "sound": "\"Bedeep. Whurrrrrmmmm.\"", "volume": 10 }, { "type": "speech", "speaker": "mon_craftbuddy", - "sound": "\"Pwwowm. Fsht fshrrrr.\"", + "sound": "\"Pwwowm. Fsht fshrrrr.\"", "volume": 10 }, { "type": "speech", "speaker": "mon_craftbuddy", - "sound": "\"Click. Clicliclick. Vrnnnk.\"", + "sound": "\"Click. Clicliclick. Vrnnnk.\"", "volume": 10 }, { @@ -212,7 +212,7 @@ { "type": "speech", "speaker": "mon_defbot_paladin", - "sound": "\"Creak! Clang clang.\"", + "sound": "\"Creak! Clang clang.\"", "volume": 50 }, { diff --git a/data/mods/Salvaged_Robots/uncraft_corpse.json b/data/mods/Salvaged_Robots/uncraft_corpse.json index 3130245aa672b..148727113fc0f 100644 --- a/data/mods/Salvaged_Robots/uncraft_corpse.json +++ b/data/mods/Salvaged_Robots/uncraft_corpse.json @@ -11,7 +11,6 @@ { "result": "broken_light_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -29,7 +28,6 @@ { "result": "broken_distract_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -47,7 +45,6 @@ { "result": "broken_arson_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, @@ -65,7 +62,6 @@ { "result": "broken_spore_hack", "type": "uncraft", - "override": true, "skill_used": "electronics", "difficulty": 4, "time": 2000, diff --git a/data/mods/Sleep_Deprivation/effects.json b/data/mods/Sleep_Deprivation/effects.json index c3176ad5060e3..727018df54fd9 100644 --- a/data/mods/Sleep_Deprivation/effects.json +++ b/data/mods/Sleep_Deprivation/effects.json @@ -3,7 +3,7 @@ "type": "effect_type", "id": "sleep_deprived", "name": [ "Sleep Deprived" ], - "desc": [ "Your sleep debt has been steadily increasing for a while. You should get some rest." ], + "desc": [ "Your sleep debt has been steadily increasing for a while. You should get some rest." ], "rating": "bad", "max_intensity": 20160, "int_dur_factor": 1440, diff --git a/data/mods/Sleep_Deprivation/game_balance.json b/data/mods/Sleep_Deprivation/game_balance.json index 67d20b998c125..594bb55a809b3 100644 --- a/data/mods/Sleep_Deprivation/game_balance.json +++ b/data/mods/Sleep_Deprivation/game_balance.json @@ -2,7 +2,6 @@ { "type": "EXTERNAL_OPTION", "name": "SLEEP_DEPRIVATION", - "info": "Enables sleep deprivation mechanics. If true, stimulants will only help you so far, and you might have to enforce proper sleep hygiene for a while.", "stype": "bool", "value": true } diff --git a/data/mods/Sleep_Deprivation/items/comestibles/med.json b/data/mods/Sleep_Deprivation/items/comestibles/med.json index cbc27f87634e6..b46ca75e7ea59 100644 --- a/data/mods/Sleep_Deprivation/items/comestibles/med.json +++ b/data/mods/Sleep_Deprivation/items/comestibles/med.json @@ -5,8 +5,8 @@ "comestible_type": "MED", "name": "magnesium tablet", "description": "Over-the-counter magnesium supplements, commonly prescribed to treat sleep deprivation and to mitigate its effects. One tablet a day combined with a good night's sleep will help you recover faster.", - "weight": 1, - "volume": 1, + "weight": "1 g", + "volume": "250 ml", "price": 400, "price_postapoc": 4000, "charges": 1, diff --git a/data/mods/Tanks/items.json b/data/mods/Tanks/items.json index d683a37cb5729..ce43d124d2be9 100644 --- a/data/mods/Tanks/items.json +++ b/data/mods/Tanks/items.json @@ -27,7 +27,7 @@ "copy-from": "ammolink", "type": "GENERIC", "name": "30x113mm autocannon belt linkage", - "weight": 6, + "weight": "6 g", "volume": "10ml", "stackable": true, "use_action": { "type": "ammobelt", "belt": "belt30mm" } @@ -42,8 +42,8 @@ "color": "dark_gray", "description": "A 30x113mm autocannon round using a high-explosive, dual-purpose shell. Used primarily against light armored vehicles.", "material": [ "steel", "powder" ], - "volume": 5, - "weight": 350, + "volume": "1250 ml", + "weight": "350 g", "bashing": 1, "ammo_type": "30mm", "casing": "30mm_casing", @@ -67,8 +67,8 @@ "color": "dark_gray", "description": "A 30x113mm autocannon round, high explosive incendiary. Designed for use against unarmored vehicles and to suppress infantry.", "material": [ "steel", "powder" ], - "volume": 5, - "weight": 380, + "volume": "1250 ml", + "weight": "380 g", "bashing": 1, "ammo_type": "30mm", "casing": "30mm_casing", @@ -92,8 +92,8 @@ "color": "dark_gray", "description": "A 30x113mm autocannon round with its primer replaced, and loaded with a basic lead projectile. Not as effective as the real thing.", "material": [ "steel", "powder" ], - "volume": 5, - "weight": 380, + "volume": "1250 ml", + "weight": "380 g", "bashing": 1, "ammo_type": "30mm", "casing": "30mm_casing", @@ -114,8 +114,8 @@ "color": "dark_gray", "description": "A 120mm High Explosive Anti Tank round. It could ruin anyone's whole day.", "material": [ "steel", "powder" ], - "volume": 10, - "weight": 22500, + "volume": "2500 ml", + "weight": "22500 g", "bashing": 1, "ammo_type": "120mm_usable", "casing": "120mm_casing", @@ -138,8 +138,8 @@ "color": "dark_gray", "description": "A 120mm Armor-Piercing Fin-Stabilized Discarding Sabot round. Uses a depleted uranium projectile to give whatever it hits a really bad day.", "material": [ "steel", "powder" ], - "volume": 10, - "weight": 22000, + "volume": "2500 ml", + "weight": "22 kg", "bashing": 1, "ammo_type": "120mm_usable", "casing": "120mm_casing", @@ -160,8 +160,8 @@ "color": "dark_gray", "description": "A 120mm shell with a new electric primer installed, filled with a large amount of buckshot. Effectively similar to no-longer-produced canister shot, but of lower quality.", "material": [ "steel", "powder" ], - "volume": 10, - "weight": 15000, + "volume": "2500 ml", + "weight": "15 kg", "bashing": 1, "ammo_type": "120mm_usable", "casing": "120mm_casing", @@ -182,8 +182,8 @@ "color": "dark_gray", "description": "A 120mm shell with a new electric primer installed, loaded with a large handmade slug. While hardly ideal, it packs quite a punch.", "material": [ "steel", "powder" ], - "volume": 10, - "weight": 20000, + "volume": "2500 ml", + "weight": "20 kg", "bashing": 1, "ammo_type": "120mm_usable", "casing": "120mm_casing", @@ -204,8 +204,8 @@ "color": "dark_gray", "description": "A 155mm High Explosive Anti Tank round. More than enough firepower for whatever you could think to point it at.", "material": [ "steel", "powder" ], - "volume": 15, - "weight": 45000, + "volume": "3750 ml", + "weight": "45 kg", "bashing": 1, "ammo_type": "155mm", "casing": "155mm_casing", @@ -228,8 +228,8 @@ "color": "dark_gray", "description": "A 155mm High Explosive Fragmentation round. Designed to give anything near what you hit a really bad day.", "material": [ "steel", "powder" ], - "volume": 15, - "weight": 35000, + "volume": "3750 ml", + "weight": "35 kg", "bashing": 1, "ammo_type": "155mm", "casing": "155mm_casing", @@ -252,8 +252,8 @@ "color": "dark_gray", "description": "A 155mm shell with a new electric primer installed, filled with a huge amount of buckshot. Effectively turns a howitzer into a punt gun on steroids.", "material": [ "steel", "powder" ], - "volume": 15, - "weight": 44000, + "volume": "3750 ml", + "weight": "44 kg", "bashing": 1, "ammo_type": "155mm", "casing": "155mm_casing", @@ -274,8 +274,8 @@ "color": "dark_gray", "description": "A 155mm shell with a new electric primer installed, filled with a massive handmade slug. Despite the lower effectiveness, whatever it hits is sure to feel it.", "material": [ "steel", "powder" ], - "volume": 15, - "weight": 42500, + "volume": "3750 ml", + "weight": "42500 g", "bashing": 1, "ammo_type": "155mm", "casing": "155mm_casing", @@ -293,7 +293,7 @@ "copy-from": "artillery_casing", "name": "30mm canister", "description": "A canister from a spent 30mm shell.", - "volume": 5, + "volume": "1250 ml", "weight": 20 }, { @@ -304,7 +304,7 @@ "color": "dark_gray", "description": "A large canister from a spent 120mm shell, now an expensive paperweight.", "material": "steel", - "volume": 10, + "volume": "2500 ml", "weight": 300 }, { @@ -313,7 +313,7 @@ "copy-from": "artillery_casing", "name": "155mm canister", "description": "A large canister from a spent 155mm shell, now an expensive paperweight.", - "volume": 15, + "volume": "3750 ml", "weight": 400 }, { @@ -326,8 +326,8 @@ "color": "dark_gray", "description": "Primer for an autocannon shell. Seems to use an electric ignition.", "material": [ "steel", "powder" ], - "volume": 1, - "weight": 40, + "volume": "250 ml", + "weight": "40 g", "ammo_type": "components", "count": 10, "effects": [ "COOKOFF" ] @@ -342,8 +342,8 @@ "color": "dark_gray", "description": "Primer for a tank or artillery shell. Seems to use an electric ignition.", "material": [ "steel", "powder" ], - "volume": 1, - "weight": 250, + "volume": "250 ml", + "weight": "250 g", "ammo_type": "components", "count": 5, "effects": [ "COOKOFF" ] @@ -361,8 +361,8 @@ "flags": [ "NO_RELOAD", "MOUNTED_GUN" ], "skill": "launcher", "ammo": "30mm", - "weight": 200000, - "volume": 30, + "weight": "200 kg", + "volume": "7500 ml", "bashing": 12, "to_hit": -1, "dispersion": 0, @@ -385,8 +385,8 @@ "flags": [ "NEVER_JAMS", "NO_RELOAD", "MOUNTED_GUN" ], "skill": "launcher", "ammo": "120mm_usable", - "weight": 3000000, - "volume": 35, + "weight": "3000 kg", + "volume": "8750 ml", "bashing": 12, "to_hit": -6, "range": 40, @@ -408,8 +408,8 @@ "material": "hardsteel", "skill": "launcher", "ammo": "120mm_usable", - "weight": 3300000, - "volume": 40, + "weight": "3300 kg", + "volume": "10 L", "bashing": 12, "to_hit": -6, "range": 50, @@ -432,8 +432,8 @@ "material": "hardsteel", "skill": "launcher", "ammo": "120mm_usable", - "weight": 3500000, - "volume": 45, + "weight": "3500 kg", + "volume": "11250 ml", "bashing": 12, "to_hit": -6, "range": 50, @@ -457,8 +457,8 @@ "flags": [ "NEVER_JAMS", "NO_RELOAD", "MOUNTED_GUN" ], "skill": "launcher", "ammo": "155mm", - "weight": 4300000, - "volume": 40, + "weight": "4300 kg", + "volume": "10 L", "bashing": 13, "to_hit": -6, "range": 70, @@ -480,8 +480,8 @@ "material": "hardsteel", "skill": "launcher", "ammo": "atgm", - "weight": 600000, - "volume": 40, + "weight": "600 kg", + "volume": "10 L", "bashing": 12, "to_hit": -6, "dispersion": 0, @@ -495,16 +495,15 @@ { "type": "BOOK", "id": "textbook_launcher", - "name": "Artillery and Field Gunnery", - "name_plural": "copies of Artillery and Field Gunnery", + "name": { "str": "Artillery and Field Gunnery", "str_pl": "copies of Artillery and Field Gunnery" }, "max_level": 6, "description": "A textbook on the history of modern artillery, with a number of illustrations and excerpts from various field manuals. A competent handloader or mechanic might find additional uses for the more technical parts of the text.", - "weight": 1120, + "weight": "1120 g", "color": "green", "intelligence": 8, "symbol": "?", "material": [ "paper" ], - "volume": 4, + "volume": "1 L", "bashing": 8, "time": 30, "fun": 0, diff --git a/data/mods/Tanks/recipes.json b/data/mods/Tanks/recipes.json index 9200c1d743297..f0d36de33914b 100644 --- a/data/mods/Tanks/recipes.json +++ b/data/mods/Tanks/recipes.json @@ -2,7 +2,6 @@ { "type": "uncraft", "result": "broken_tankbot", - "override": true, "skill_used": "electronics", "difficulty": 8, "time": 600000, diff --git a/data/mods/Tolerate_This/comestibles.json b/data/mods/Tolerate_This/comestibles.json index ba97a14c609e0..6924b8be81390 100644 --- a/data/mods/Tolerate_This/comestibles.json +++ b/data/mods/Tolerate_This/comestibles.json @@ -4,7 +4,7 @@ "id": "gffish_sandwich", "name": "gluten free fish sandwich", "name_plural": "gluten free fish sandwiches", - "weight": 222, + "weight": "222 g", "color": "yellow", "spoils_in": 24, "container": "wrapper", @@ -14,7 +14,7 @@ "description": "Gluten free and a delicious fish sandwich.", "price": 800, "material": [ "flesh" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "//": "Four portions seems like a lot, but given the amount of ingredients needed, it's a good perk.", "fun": 14 @@ -24,7 +24,7 @@ "id": "gfsandwich_veggy", "name": "gluten free vegetable sandwich", "name_plural": "gluten free vegetable sandwiches", - "weight": 190, + "weight": "190 g", "color": "light_gray", "spoils_in": 48, "container": "wrapper", @@ -36,7 +36,7 @@ "description": "Gluen free bread and vegetables, that's it.", "price": 800, "material": [ "veggy" ], - "volume": 1, + "volume": "250 ml", "charges": 3, "flags": [ "EATEN_COLD" ], "fun": 1 @@ -45,7 +45,7 @@ "type": "COMESTIBLE", "id": "gfgranola", "name": "gluten free granola", - "weight": 86, + "weight": "86 g", "color": "brown", "spoils_in": 4320, "container": "bag_plastic", @@ -57,7 +57,7 @@ "description": "A tasty and nutritious mixture of oats, honey, and other ingredients that has been baked until crisp.", "price": 350, "material": [ "fruit" ], - "volume": 2, + "volume": "500 ml", "charges": 8, "fun": 3 }, @@ -66,7 +66,7 @@ "id": "gfsandwich_t", "name": "gluten free meat sandwich", "name_plural": "gluten free meat sandwiches", - "weight": 186, + "weight": "186 g", "color": "light_gray", "spoils_in": 36, "container": "wrapper", @@ -76,7 +76,7 @@ "description": "Gluten free bread and meat, that's it.", "price": 900, "material": [ "flesh", "veggy" ], - "volume": 1, + "volume": "250 ml", "charges": 3, "fun": 2 }, @@ -85,7 +85,7 @@ "id": "gfsandwich_pb", "name": "gluten free peanut butter sandwich", "name_plural": "gluten free peanut butter sandwiches", - "weight": 186, + "weight": "186 g", "color": "brown", "spoils_in": 36, "container": "wrapper", @@ -96,7 +96,7 @@ "description": "Some peanut butter smothered between two pieces of gluten free bread. Not very filling and will stick to the roof of your mouth like glue.", "price": 250, "material": "veggy", - "volume": 1, + "volume": "250 ml", "fun": 3 }, { @@ -104,7 +104,7 @@ "id": "gfsandwich_pbj", "name": "gluten free PB&J sandwich", "name_plural": "gluten free PB&J sandwiches", - "weight": 186, + "weight": "186 g", "color": "brown", "spoils_in": 36, "container": "wrapper", @@ -115,7 +115,7 @@ "description": "A delicious peanut butter and jelly gluten free sandwich. It reminds you of the times your mother would make you lunch.", "price": 175, "material": [ "fruit", "veggy" ], - "volume": 1, + "volume": "250 ml", "fun": 6 }, { @@ -123,7 +123,7 @@ "id": "gfsandwich_pbh", "name": "gluten free PB&H sandwich", "name_plural": "gluten free PB&H sandwiches", - "weight": 186, + "weight": "186 g", "color": "brown", "spoils_in": 36, "container": "wrapper", @@ -131,10 +131,10 @@ "symbol": "%", "quench": 8, "nutrition": 45, - "description": "Some damned fool put honey on this peanut butter sandwich, who in their right mind- oh wait this is pretty good. Gluten free too!", + "description": "Some damned fool put honey on this peanut butter sandwich, who in their right mind- oh wait this is pretty good. Gluten free too!", "price": 175, "material": [ "veggy", "honey" ], - "volume": 1, + "volume": "250 ml", "fun": 6 }, { @@ -142,7 +142,7 @@ "id": "gfsandwich_pbm", "name": "gluten free PB&M sandwich", "name_plural": "gluten free PB&M sandwiches", - "weight": 186, + "weight": "186 g", "color": "brown", "spoils_in": 36, "container": "wrapper", @@ -153,14 +153,14 @@ "description": "Who knew you could mix maple syrup and peanut butter to create yet another different gluten free sandwich?", "price": 175, "material": "veggy", - "volume": 1, + "volume": "250 ml", "fun": 6 }, { "type": "COMESTIBLE", "id": "lfhickory_nut_ambrosia", "name": "lactose free hickory nut ambrosia", - "weight": 254, + "weight": "254 g", "color": "brown", "spoils_in": 259, "container": "bottle_plastic", @@ -168,10 +168,10 @@ "symbol": "~", "quench": 10, "nutrition": 15, - "description": "Delicious hickory nut ambrosia. A drink worthy of the gods. This one was made with an alternative to cows milk.", + "description": "Delicious hickory nut ambrosia. A drink worthy of the gods. This one was made with an alternative to cows milk.", "price": 100, "material": [ "veggy" ], - "volume": 1, + "volume": "250 ml", "phase": "liquid", "charges": 4, "flags": [ "EATEN_HOT" ], @@ -181,7 +181,7 @@ "type": "COMESTIBLE", "id": "cornmeal", "name": "cornmeal", - "weight": 37, + "weight": "37 g", "color": "white", "spoils_in": 8640, "container": "box_small", @@ -189,10 +189,10 @@ "symbol": "%", "quench": -1, "nutrition": 2, - "description": "You think this is cornflour... or rice flour... Or something else. However, it certainly is not wheat flour! It is useful for baking though.", + "description": "You think this is cornflour… or rice flour… Or something else. However, it certainly is not wheat flour! It is useful for baking though.", "price": 450, "material": [ "veggy", "powder" ], - "volume": 1, + "volume": "250 ml", "charges": 12, "fun": -5 }, @@ -200,17 +200,17 @@ "type": "COMESTIBLE", "id": "gfjohnnycake", "name": "gluten free johnnycake", - "weight": 46, + "weight": "46 g", "color": "yellow", "spoils_in": 480, "comestible_type": "FOOD", "symbol": "%", "healthy": 1, "nutrition": 20, - "description": "We all crave for cake sometimes. This is not perfect, but it is a tasty and nutritious gluten free fried bread treat. ", + "description": "We all crave for cake sometimes. This is not perfect, but it is a tasty and nutritious gluten free fried bread treat. ", "price": 550, "material": [ "veggy", "junk" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 2 @@ -220,7 +220,7 @@ "id": "gffruit_pancakes", "name": "gluten free fruit pancake", "name_plural": "gluten free fruit pancakes", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -230,7 +230,7 @@ "description": "Fluffy and delicious gluten free pancakes with real maple syrup, made sweeter and healthier with the addition of wholesome fruit.", "price": 650, "material": [ "junk", "fruit" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 3 @@ -240,7 +240,7 @@ "id": "lffruit_pancakes", "name": "lactose free fruit pancake", "name_plural": "lactose free fruit pancakes", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -250,7 +250,7 @@ "description": "Fluffy and delicious lactose free pancakes with real maple syrup, made sweeter and healthier with the addition of wholesome fruit.", "price": 650, "material": [ "wheat", "fruit" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 3 @@ -260,17 +260,17 @@ "id": "gflffruit_pancakes", "name": "gluten free lactose free fruit pancake", "name_plural": "gluten free lactose free fruit pancakes", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", "symbol": "%", "healthy": 1, "nutrition": 25, - "description": "Fluffy and delicious pancakes made out of the only things you can still eat. But at least it has real maple syrup, made sweeter and healthier with the addition of wholesome fruit.", + "description": "Fluffy and delicious pancakes made out of the only things you can still eat. But at least it has real maple syrup, made sweeter and healthier with the addition of wholesome fruit.", "price": 650, "material": [ "junk", "fruit" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 3 @@ -280,7 +280,7 @@ "id": "gfchoc_pancakes", "name": "gluten free chocolate pancake", "name_plural": "gluten free chocolate pancakes", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -289,7 +289,7 @@ "description": "Fluffy and delicious gluten free pancakes with real maple syrup, with delicious chocolate baked right in.", "price": 700, "material": [ "veggy", "junk" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 6 @@ -299,7 +299,7 @@ "id": "gffrenchtoast", "name": "gluten free French toast", "name_plural": "gluten free French toasts", - "weight": 246, + "weight": "246 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -309,7 +309,7 @@ "description": "Slices of gluten free bread dipped in a milk and egg mixture then fried.", "price": 600, "material": [ "junk", "milk", "egg" ], - "volume": 1, + "volume": "250 ml", "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 8 @@ -319,17 +319,17 @@ "id": "gflffrenchtoast", "name": "gluten free lactose free French toast", "name_plural": "gluten free lactose free French toasts", - "weight": 246, + "weight": "246 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", "symbol": "%", "healthy": 1, "nutrition": 45, - "description": "Slices of gluten free bread dipped in a lactose free milk and egg mixture then fried. You never thought it was possible, but now you truly feel like a post millennial.", + "description": "Slices of gluten free bread dipped in a lactose free milk and egg mixture then fried. You never thought it was possible, but now you truly feel like a post millennial.", "price": 600, "material": [ "veggy", "egg" ], - "volume": 1, + "volume": "250 ml", "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 8 @@ -338,7 +338,7 @@ "type": "COMESTIBLE", "id": "gfbiscuit", "name": "gluten free biscuit", - "weight": 136, + "weight": "136 g", "color": "brown", "spoils_in": 180, "container": "box_small", @@ -349,7 +349,7 @@ "description": "Delicious and filling, this home made gluten free biscuit is good, and good for you!", "price": 230, "material": "junk", - "volume": 4, + "volume": "1 L", "charges": 8, "flags": [ "EATEN_HOT" ], "fun": 1 @@ -358,7 +358,7 @@ "type": "COMESTIBLE", "id": "gfpie", "name": "gluten free fruit pie", - "weight": 252, + "weight": "252 g", "color": "brown", "spoils_in": 72, "stim": 2, @@ -371,7 +371,7 @@ "description": "A delicious baked gluten free pie with a sweet fruit filling.", "price": 1250, "material": [ "veggy", "fruit" ], - "volume": 4, + "volume": "1 L", "charges": 6, "flags": [ "EATEN_HOT" ], "fun": 3 @@ -380,7 +380,7 @@ "type": "COMESTIBLE", "id": "gfpie_veggy", "name": "gluten free vegetable pie", - "weight": 252, + "weight": "252 g", "color": "brown", "spoils_in": 72, "container": "box_small", @@ -392,7 +392,7 @@ "description": "A delicious baked gluten free pie with a delicious vegetable filling.", "price": 1250, "material": [ "veggy" ], - "volume": 4, + "volume": "1 L", "charges": 6, "flags": [ "EATEN_HOT" ], "fun": 3 @@ -401,7 +401,7 @@ "type": "COMESTIBLE", "id": "gfpie_meat", "name": "gluten free meat pie", - "weight": 260, + "weight": "260 g", "color": "brown", "spoils_in": 80, "container": "box_small", @@ -413,7 +413,7 @@ "description": "A delicious baked gluten free pie with a delicious meat filling.", "price": 1350, "material": [ "flesh" ], - "volume": 4, + "volume": "1 L", "charges": 6, "flags": [ "EATEN_HOT" ], "fun": 3 @@ -422,7 +422,7 @@ "type": "COMESTIBLE", "id": "gfpie_maple", "name": "gluten free maple pie", - "weight": 252, + "weight": "252 g", "color": "brown", "spoils_in": 72, "stim": 2, @@ -435,7 +435,7 @@ "description": "A sweet and delicious baked gluten free pie with pure maple syrup.", "price": 1850, "material": [ "junk", "milk" ], - "volume": 4, + "volume": "1 L", "charges": 6, "flags": [ "EATEN_HOT" ], "fun": 6 @@ -444,7 +444,7 @@ "type": "COMESTIBLE", "id": "gfpizza_veggy", "name": "gluten free vegetable pizza", - "weight": 175, + "weight": "175 g", "color": "light_green", "spoils_in": 48, "container": "box_small", @@ -454,7 +454,7 @@ "description": "A vegetarian gluten free pizza, with delicious tomato sauce and a fluffy crust. Its smell brings back great memories.", "price": 990, "material": [ "veggy" ], - "volume": 8, + "volume": "2 L", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 10 @@ -463,7 +463,7 @@ "type": "COMESTIBLE", "id": "gfpizza_cheese", "name": "gluten free cheese pizza", - "weight": 175, + "weight": "175 g", "color": "yellow", "spoils_in": 48, "stim": 1, @@ -474,7 +474,7 @@ "description": "A delicious gluten free pizza with molten cheese on top.", "price": 990, "material": [ "junk", "milk" ], - "volume": 8, + "volume": "2 L", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 10 @@ -483,7 +483,7 @@ "type": "COMESTIBLE", "id": "gfpizza_meat", "name": "gluten free meat pizza", - "weight": 175, + "weight": "175 g", "color": "light_red", "spoils_in": 48, "container": "box_small", @@ -493,7 +493,7 @@ "description": "A meat gluten free pizza, for all the carnivores out there. Chock full of minced meat and heavily seasoned.", "price": 1090, "material": [ "junk", "flesh" ], - "volume": 8, + "volume": "2 L", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 10 @@ -502,7 +502,7 @@ "type": "COMESTIBLE", "id": "gfcheeseburger", "name": "gluten free cheeseburger", - "weight": 340, + "weight": "340 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -513,7 +513,7 @@ "description": "A gluten free sandwich of minced meat and cheese with condiments. The apex of pre-Cataclysm culinary achievement.", "price": 1000, "material": [ "flesh", "veggy" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT", "ALLERGEN_MILK" ], "fun": 5 @@ -522,7 +522,7 @@ "type": "COMESTIBLE", "id": "gfhamburger", "name": "gluten free hamburger", - "weight": 300, + "weight": "300 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -533,7 +533,7 @@ "description": "A gluten free sandwich of minced meat with condiments.", "price": 900, "material": [ "flesh", "veggy" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 4 @@ -542,7 +542,7 @@ "type": "COMESTIBLE", "id": "gfsloppyjoe", "name": "gluten free sloppy joe", - "weight": 300, + "weight": "300 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -553,7 +553,7 @@ "description": "A gluten free sandwich, consisting of ground meat and tomato sauce served on a hamburger bun.", "price": 900, "material": [ "flesh", "veggy" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 4 @@ -562,7 +562,7 @@ "type": "COMESTIBLE", "id": "gfblt", "name": "gluten free BLT", - "weight": 250, + "weight": "250 g", "color": "brown", "spoils_in": 60, "stim": 1, @@ -574,7 +574,7 @@ "description": "A bacon, lettuce, and tomato gluten free sandwich on toasted bread.", "price": 400, "material": [ "flesh", "veggy" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 5 @@ -584,7 +584,7 @@ "id": "gfsweetbread", "name": "gluten free sweetbread", "name_plural": "gluten free sweetbreads", - "weight": 150, + "weight": "150 g", "color": "brown", "spoils_in": 48, "comestible_type": "FOOD", @@ -595,7 +595,7 @@ "description": "Delicious and tender organ meats. First boiled, then gluten free breaded crumbs added and fried. They have interesting flavor and unparalleled texture.", "price": 500, "material": [ "veggy", "flesh" ], - "volume": 1, + "volume": "250 ml", "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 8 @@ -605,7 +605,7 @@ "id": "gfsandwich_cheese", "name": "gluten free cheese sandwich", "name_plural": "gluten free cheese sandwiches", - "weight": 187, + "weight": "187 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -616,7 +616,7 @@ "description": "A simple gluten free cheese sandwich.", "price": 500, "material": [ "milk", "veggy" ], - "volume": 1, + "volume": "250 ml", "fun": 8 }, { @@ -624,7 +624,7 @@ "id": "gfsandwich_cheese_grilled", "name": "gluten free grilled cheese sandwich", "name_plural": "gluten free grilled cheese sandwiches", - "weight": 188, + "weight": "188 g", "color": "brown", "spoils_in": 34, "stim": 1, @@ -636,7 +636,7 @@ "description": "A delicious gluten free grilled cheese sandwich, because everything is better with melted cheese.", "price": 550, "material": [ "milk", "veggy" ], - "volume": 1, + "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 10 }, @@ -645,7 +645,7 @@ "id": "gfsandwich_deluxe", "name": "gluten free deluxe sandwich", "name_plural": "gluten free deluxe sandwiches", - "weight": 340, + "weight": "340 g", "color": "brown", "spoils_in": 32, "stim": 1, @@ -658,7 +658,7 @@ "description": "A gluten free sandwich of meat, vegetables, and cheese with condiments. Tasty and nutritious!", "price": 1200, "material": [ "flesh", "veggy", "milk" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "fun": 12 }, @@ -667,7 +667,7 @@ "id": "gfsandwich_cucumber", "name": "gluten free cucumber sandwich", "name_plural": "gluten free cucumber sandwiches", - "weight": 187, + "weight": "187 g", "color": "light_green", "spoils_in": 36, "container": "wrapper", @@ -678,7 +678,7 @@ "nutrition": 26, "description": "A refreshing gluten free cucumber sandwich. Not very filling, but quite tasty.", "price": 200, - "volume": 1, + "volume": "250 ml", "charges": 2, "material": [ "veggy" ], "flags": [ "EATEN_COLD" ], @@ -689,7 +689,7 @@ "id": "sandwich_cheese", "name": "cheese sandwich", "name_plural": "cheese sandwiches", - "weight": 187, + "weight": "187 g", "color": "brown", "spoils_in": 36, "stim": 1, @@ -700,7 +700,7 @@ "description": "A simple cheese sandwich.", "price": 500, "material": [ "milk", "wheat" ], - "volume": 1, + "volume": "250 ml", "fun": 8 }, { @@ -708,7 +708,7 @@ "id": "gfsandwich_jam", "name": "gluten free jam sandwich", "name_plural": "gluten free jam sandwiches", - "weight": 189, + "weight": "189 g", "color": "brown", "spoils_in": 37, "container": "wrapper", @@ -719,7 +719,7 @@ "description": "A delicious gluten free jam sandwich.", "price": 200, "material": [ "fruit", "veggy" ], - "volume": 1, + "volume": "250 ml", "fun": 15 }, { @@ -727,7 +727,7 @@ "id": "gfsandwich_honey", "name": "gluten free honey sandwich", "name_plural": "gluten free honey sandwiches", - "weight": 189, + "weight": "189 g", "color": "brown", "spoils_in": 240, "container": "wrapper", @@ -739,7 +739,7 @@ "description": "A delicious gluten free honey sandwich.", "price": 500, "material": [ "honey", "veggy" ], - "volume": 1, + "volume": "250 ml", "fun": 10 }, { @@ -747,7 +747,7 @@ "id": "gfsandwich_sauce", "name": "gluten free boring sandwich", "name_plural": "gluten free boring sandwiches", - "weight": 187, + "weight": "187 g", "color": "brown", "spoils_in": 46, "container": "wrapper", @@ -755,26 +755,26 @@ "symbol": "%", "quench": 1, "nutrition": 48, - "description": "A simple gluten free sauce sandwich. Not very filling but beats eating just the bread... especially if it is the wrong type of bread!", + "description": "A simple gluten free sauce sandwich. Not very filling but beats eating just the bread… especially if it is the wrong type of bread!", "price": 200, "material": [ "veggy" ], - "volume": 1, + "volume": "250 ml", "fun": 2 }, { "type": "COMESTIBLE", "id": "gfwaffles", "name": "gluten free waffle", - "weight": 246, + "weight": "246 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", "symbol": "%", "nutrition": 37, - "description": "Gluten free waffle. It's basically a pancake in hashtag form.", + "description": "Gluten free waffle. It's basically a pancake in hashtag form.", "price": 550, "material": [ "veggy", "milk" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 5 @@ -783,16 +783,16 @@ "type": "COMESTIBLE", "id": "lfwaffles", "name": "lactose free waffle", - "weight": 246, + "weight": "246 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", "symbol": "%", "nutrition": 37, - "description": "Lactose free waffle. It's basically a pancake in hashtag form.", + "description": "Lactose free waffle. It's basically a pancake in hashtag form.", "price": 550, "material": "wheat", - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 5 @@ -801,16 +801,16 @@ "type": "COMESTIBLE", "id": "gflfwaffles", "name": "lactose free waffle", - "weight": 246, + "weight": "246 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", "symbol": "%", "nutrition": 37, - "description": "Gluten free and lactose free waffle. It's basically a pancake in hashtag form.", + "description": "Gluten free and lactose free waffle. It's basically a pancake in hashtag form.", "price": 550, "material": "junk", - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 5 @@ -819,7 +819,7 @@ "type": "COMESTIBLE", "id": "gffruit_waffles", "name": "gluten free fruit waffle", - "weight": 354, + "weight": "354 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", @@ -829,7 +829,7 @@ "description": "Crunchy and delicious gluten free waffles with real maple syrup, made sweeter and healthier with the addition of wholesome fruit.", "price": 600, "material": [ "fruit", "milk" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 6 @@ -838,7 +838,7 @@ "type": "COMESTIBLE", "id": "gflffruit_waffles", "name": "gluten free lactose free fruit waffle", - "weight": 354, + "weight": "354 g", "color": "yellow", "spoils_in": 240, "comestible_type": "FOOD", @@ -848,7 +848,7 @@ "description": "Crunchy and delicious gluten free and lactose free waffles with real maple syrup, made sweeter and healthier with the addition of wholesome fruit.", "price": 600, "material": [ "fruit" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 6 @@ -857,7 +857,7 @@ "type": "COMESTIBLE", "id": "gfchoc_waffles", "name": "gluten free chocolate waffle", - "weight": 354, + "weight": "354 g", "color": "brown", "spoils_in": 240, "comestible_type": "FOOD", @@ -866,7 +866,7 @@ "description": "Crunchy and delicious gluten free waffles with real maple syrup, with delicious chocolate baked right in.", "price": 650, "material": [ "junk" ], - "volume": 1, + "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 12 @@ -876,7 +876,7 @@ "id": "rice_milk", "name": "rice milk", "name_plural": "rice milk", - "weight": 263, + "weight": "263 g", "color": "white", "spoils_in": 24, "container": "bottle_plastic", @@ -885,11 +885,11 @@ "quench": 25, "healthy": 1, "nutrition": 8, - "description": "Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils rapidly.", + "description": "Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils rapidly.", "price": 48, - "//": "I am assuming it costs more than cows milk. TB", + "//": "I am assuming it costs more than cows milk. TB", "material": "junk", - "volume": 1, + "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], "fun": 1 @@ -899,7 +899,7 @@ "id": "coconut_water", "name": "coconut water", "name_plural": "coconut water", - "weight": 263, + "weight": "263 g", "color": "white", "spoils_in": 24, "container": "bottle_plastic", @@ -908,11 +908,11 @@ "quench": 25, "healthy": 1, "nutrition": 8, - "description": "Coconut milk, with water added to make it go further. Tastes ok though. Spoils rapidly.", + "description": "Coconut milk, with water added to make it go further. Tastes ok though. Spoils rapidly.", "price": 58, - "//": "More expensive than regular milk. Sometimes about twice the price. TB", + "//": "More expensive than regular milk. Sometimes about twice the price. TB", "material": "veggy", - "volume": 1, + "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], "fun": 1 @@ -922,7 +922,7 @@ "id": "jar_cream_coconut", "name": "jarred coconut milk", "name_plural": "jarred coconut milk", - "weight": 258, + "weight": "258 g", "color": "white", "spoils_in": 24, "container": "jar_glass", @@ -933,7 +933,7 @@ "description": "This deliciously rich coconut cream is a more concentrated, thicker version of the coconut milk.", "price": 700, "material": [ "junk" ], - "volume": 1, + "volume": "250 ml", "phase": "liquid", "fun": 3 }, @@ -942,7 +942,7 @@ "id": "rice_flour", "name": "rice flour", "name_plural": "rice flour", - "weight": 45, + "weight": "45 g", "color": "white", "container": "box_small", "comestible_type": "FOOD", @@ -952,7 +952,7 @@ "description": "This rice flour is useful for baking.", "price": 450, "material": [ "powder" ], - "volume": 1, + "volume": "250 ml", "charges": 10, "fun": -5 } diff --git a/data/mods/Tolerate_This/modinfo.json b/data/mods/Tolerate_This/modinfo.json index 6bb1df626b6a8..a656d05c8ec32 100644 --- a/data/mods/Tolerate_This/modinfo.json +++ b/data/mods/Tolerate_This/modinfo.json @@ -5,7 +5,7 @@ "name": "Bens GF recipes", "authors": [ "TechyBen" ], "maintainers": [ "TechyBen" ], - "description": "Some simple gluten free and lactose free alternative recipe options. NOT EXHAUSTIVE.", + "description": "Some simple gluten free and lactose free alternative recipe options. NOT EXHAUSTIVE.", "category": "items", "dependencies": [ "dda" ] } diff --git a/data/mods/Tolerate_This/recipe_food.json b/data/mods/Tolerate_This/recipe_food.json index 234a19d8466e7..352678b73afe6 100644 --- a/data/mods/Tolerate_This/recipe_food.json +++ b/data/mods/Tolerate_This/recipe_food.json @@ -708,7 +708,7 @@ "skill_used": "cooking", "time": 40000, "autolearn": true, - "note": "the cooking oil isn't supposed to be expended since you can recycle it after frying the sweetbreads", + "//": "the cooking oil isn't supposed to be expended since you can recycle it after frying the sweetbreads", "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "BOIL", "level": 2 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ], [ [ "frying_oil", 7, "LIST" ] ] ], diff --git a/data/mods/Urban_Development/building_jsons/urban_37_office_tower_beehive.json b/data/mods/Urban_Development/building_jsons/urban_37_office_tower_beehive.json index cdfb3dda14ab3..dab1b05b962fa 100644 --- a/data/mods/Urban_Development/building_jsons/urban_37_office_tower_beehive.json +++ b/data/mods/Urban_Development/building_jsons/urban_37_office_tower_beehive.json @@ -7,7 +7,7 @@ "symbol": "}", "color": [ "dark_gray" ], "move_cost_mod": 2, - "max_volume": 4000, + "max_volume": "1000 L", "required_str": 8, "bash": { "str_min": 8, diff --git a/data/mods/Urban_Development/overmap_terrain.json b/data/mods/Urban_Development/overmap_terrain.json index 95149e5a57d0d..44c5a915bf668 100644 --- a/data/mods/Urban_Development/overmap_terrain.json +++ b/data/mods/Urban_Development/overmap_terrain.json @@ -2327,7 +2327,6 @@ "color": "yellow", "see_cost": 5, "mondensity": 2, - "subway": true, "flags": [ "SIDEWALK" ] }, { diff --git a/data/mods/Urban_Development/regional_overlay.json b/data/mods/Urban_Development/regional_overlay.json index ba94a7e5e2da4..2d5e95d44c759 100644 --- a/data/mods/Urban_Development/regional_overlay.json +++ b/data/mods/Urban_Development/regional_overlay.json @@ -1,7 +1,6 @@ [ { "type": "region_overlay", - "id": "urban_buildings_overlay", "regions": [ "all" ], "city": { "houses": { diff --git a/data/mods/alt_map_key/modinfo.json b/data/mods/alt_map_key/modinfo.json index 64bcfe53503c4..12dac535767b1 100644 --- a/data/mods/alt_map_key/modinfo.json +++ b/data/mods/alt_map_key/modinfo.json @@ -4,7 +4,7 @@ "ident": "alt_map_key", "name": "Alternative Map Key", "authors": [ "Sunshine" ], - "description": "Changes the overmap to be more readable. Buildings are color coded by type and use initial letter of their names instead of ^v<>.", + "description": "Changes the overmap to be more readable. Buildings are color coded by type and use initial letter of their names instead of ^v<>.", "category": "misc_additions", "dependencies": [ "dda" ] } diff --git a/data/mods/alt_map_key/overmap_terrain.json b/data/mods/alt_map_key/overmap_terrain.json index 212ac5e59bcd8..0ab94a4eeb173 100644 --- a/data/mods/alt_map_key/overmap_terrain.json +++ b/data/mods/alt_map_key/overmap_terrain.json @@ -182,14 +182,6 @@ "sym": "^", "color": "light_green" }, - { - "type": "overmap_terrain", - "id": "house_base", - "copy-from": "house_base", - "name": "house", - "sym": "^", - "color": "light_green" - }, { "type": "overmap_terrain", "id": "house_prepper", @@ -887,8 +879,7 @@ "id": "megastore_1_2_0", "copy-from": "megastore_1_2_0", "name": "megastore entrance", - "color": "i_magenta", - "symbol": "M" + "color": "i_magenta" }, { "type": "overmap_terrain", @@ -1891,38 +1882,6 @@ "sym": "t", "color": "pink" }, - { - "type": "overmap_terrain", - "id": "haz_sar_entrance", - "copy-from": "haz_sar_entrance", - "name": "hazardous waste sarcophagus", - "sym": "H", - "color": "i_pink" - }, - { - "type": "overmap_terrain", - "id": "haz_sar", - "copy-from": "haz_sar", - "name": "hazardous waste sarcophagus", - "sym": "h", - "color": "i_pink" - }, - { - "type": "overmap_terrain", - "id": "haz_sar_entrance_b1", - "copy-from": "haz_sar_entrance_b1", - "name": "hazardous waste sarcophagus", - "sym": "H", - "color": "i_pink" - }, - { - "type": "overmap_terrain", - "id": "haz_sar_b1", - "copy-from": "haz_sar_b1", - "name": "hazardous waste sarcophagus", - "sym": "h", - "color": "i_pink" - }, { "type": "overmap_terrain", "id": "cave", diff --git a/data/mods/blazemod/blaze_ammo.json b/data/mods/blazemod/blaze_ammo.json index 16b1b1385d1c3..a06d5ea16d89b 100644 --- a/data/mods/blazemod/blaze_ammo.json +++ b/data/mods/blazemod/blaze_ammo.json @@ -18,8 +18,8 @@ "type": "AMMO", "name": "blast canister", "description": "An IED composed of a sealed container filled with a payload material that triggers on impact. Carries a substantial explosive payload.", - "weight": 3816, - "volume": 1, + "weight": "3816 g", + "volume": "250 ml", "price": 1000, "count": 1, "stack_size": 1, @@ -32,8 +32,8 @@ "type": "AMMO", "name": "Big Bang canister", "description": "An IED composed of a sealed container filled with a payload material that triggers on impact. Carries a VERY substantial explosive payload.", - "weight": 15160, - "volume": 5, + "weight": "15160 g", + "volume": "1250 ml", "price": 1000, "count": 5, "stack_size": 5, @@ -46,8 +46,8 @@ "type": "AMMO", "name": "fire canister", "description": "An IED composed of a container filled with a payload material and a means to trigger it. Intended to be fired from a specialized launcher. This one is designed to douse a small area with deadly flames.", - "weight": 3816, - "volume": 1, + "weight": "3816 g", + "volume": "250 ml", "price": 600, "count": 1, "stack_size": 1, @@ -60,8 +60,8 @@ "type": "AMMO", "name": "inferno canister", "description": "An IED composed of a container filled with a payload material and a means to trigger it. Intended to be fired from a specialized launcher. This one is designed to douse a large area with deadly flames.", - "weight": 6816, - "volume": 1, + "weight": "6816 g", + "volume": "250 ml", "price": 2200, "count": 1, "stack_size": 1, @@ -74,8 +74,8 @@ "type": "AMMO", "name": "fragmentation canister", "description": "An IED composed of a container filled with a payload material and a means to trigger it. Intended to be fired from a specialized launcher. This one is designed to spray the immediate area with deadly shrapnel.", - "weight": 4816, - "volume": 1, + "weight": "4816 g", + "volume": "250 ml", "price": 800, "count": 1, "stack_size": 1, @@ -87,8 +87,8 @@ "type": "AMMO", "name": "modified mininuke", "description": "A heavy modified handheld nuclear device. Intended to be fired from a specialized launcher, its case has been cut down and it has been rigged to explode on impact. While it is now somewhat lighter than before, it can no longer be triggered manually.", - "weight": 3816, - "volume": 1, + "weight": "3816 g", + "volume": "250 ml", "price": 180000, "bashing": 8, "material": "plastic", @@ -106,8 +106,8 @@ "type": "AMMO", "name": "harpoon", "description": "A large spear carved from wood. This was fashioned specifically to be fired from a compatible weapon; thus unsuitable for melee combat.", - "weight": 1455, - "volume": 10, + "weight": "1455 g", + "volume": "2500 ml", "price": 1000, "bashing": 5, "material": "wood", @@ -123,7 +123,7 @@ "abstract": "hbolt_generic", "type": "AMMO", "name": "IED on a bolt", - "volume": 1, + "volume": "250 ml", "bashing": 8, "material": "iron", "symbol": "*", @@ -141,7 +141,7 @@ "type": "AMMO", "name": "nova bolt", "description": "An IED composed of a sealed container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. Carries a substantial explosive payload.", - "weight": 3816, + "weight": "3816 g", "price": 1000, "extend": { "effects": [ "EXPLOSIVE_BIG" ] } }, @@ -151,7 +151,7 @@ "type": "AMMO", "name": "supernova bolt", "description": "An IED composed of a sealed container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. Carries a very substantial explosive payload.", - "weight": 3816, + "weight": "3816 g", "price": 1000, "extend": { "effects": [ "EXPLOSIVE_HUGE" ] } }, @@ -161,7 +161,7 @@ "type": "AMMO", "name": "searing bolt", "description": "An IED composed of a container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. This one is designed to douse a small area with deadly flames.", - "weight": 3816, + "weight": "3816 g", "price": 600, "extend": { "effects": [ "FLAME" ] } }, @@ -171,7 +171,7 @@ "type": "AMMO", "name": "napalm bolt", "description": "An IED composed of a container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. This one is designed to douse a large area with deadly flames.", - "weight": 6816, + "weight": "6816 g", "price": 2200, "extend": { "effects": [ "NAPALM" ] } }, @@ -181,7 +181,7 @@ "type": "AMMO", "name": "shatter bolt", "description": "An IED composed of a container filled with a payload material affixed to the end of a large ballista bolt. Intended to be fired from a specialized launcher. This one is designed to spray the immediate area with deadly shrapnel.", - "weight": 4816, + "weight": "4816 g", "price": 800, "extend": { "effects": [ "FRAG" ] } }, @@ -190,8 +190,8 @@ "type": "AMMO", "name": "steel ballista bolt", "description": "A long shaft carved from wood ending in a tip of sharpened metal. It's quite heavy, capable of dealing large amounts of damage, but isn't particularly accurate. Stands a good chance of remaining intact once fired.", - "weight": 2055, - "volume": 5, + "weight": "2055 g", + "volume": "1250 ml", "price": 2000, "bashing": 1, "material": [ "wood", "iron" ], @@ -209,8 +209,8 @@ "type": "AMMO", "name": "nuclear bolt", "description": "A heavy modified handheld nuclear device affixed to the end of a large ballista bolt. Its case has been cut down and it has been rigged to explode on impact. It can no longer be triggered manually.", - "weight": 3816, - "volume": 1, + "weight": "3816 g", + "volume": "250 ml", "price": 180000, "bashing": 8, "material": "plastic", @@ -228,8 +228,8 @@ "type": "AMMO", "name": "wood ballista bolt", "description": "A sharpened bolt carved from wood. It's fairly heavy, capable of dealing large amounts of damage, but isn't particularly accurate. Stands a good chance of remaining intact once fired.", - "weight": 1555, - "volume": 5, + "weight": "1555 g", + "volume": "1250 ml", "price": 1000, "bashing": 1, "material": "wood", @@ -247,8 +247,8 @@ "type": "AMMO", "name": "lead ball", "description": "A heavy lead ball about 8cm in diameter. Could pack quite a bit of a punch if you had something to launch it.", - "weight": 400, - "volume": 1, + "weight": "400 g", + "volume": "250 ml", "price": 200, "to_hit": -3, "bashing": 8, @@ -266,8 +266,8 @@ "type": "AMMO", "name": "serrated disc", "description": "A metal disc surrounded by serrated edges. It's as menacing as it sounds.", - "weight": 1255, - "volume": 1, + "weight": "1255 g", + "volume": "250 ml", "price": 200, "bashing": 1, "material": [ "steel" ], @@ -285,8 +285,8 @@ "type": "AMMO", "name": "metal fragment", "description": "Small slivers of metal. Can't see much use for them.", - "weight": 1, - "volume": 1, + "weight": "1 g", + "volume": "250 ml", "price": 0, "bashing": 1, "material": "iron", diff --git a/data/mods/blazemod/blaze_blob.json b/data/mods/blazemod/blaze_blob.json index bc7591332281f..f11aff69e9fc2 100644 --- a/data/mods/blazemod/blaze_blob.json +++ b/data/mods/blazemod/blaze_blob.json @@ -5,8 +5,8 @@ "category": "veh_parts", "name": "Gelatinous track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": 32368, - "volume": 200, + "weight": "32368 g", + "volume": "50 L", "price": 25500, "to_hit": -3, "bashing": 30, @@ -22,8 +22,8 @@ "category": "veh_parts", "name": "Oozing track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": 32368, - "volume": 200, + "weight": "32368 g", + "volume": "50 L", "price": 25500, "to_hit": -3, "bashing": 30, @@ -39,8 +39,8 @@ "category": "veh_parts", "name": "Gray track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": 32368, - "volume": 200, + "weight": "32368 g", + "volume": "50 L", "price": 25500, "to_hit": -3, "bashing": 30, @@ -57,7 +57,7 @@ "name": "liquified blob feed", "name_plural": "bfeedfuel", "description": "Liquified blob feed, useful for fueling certain blob based vehicle parts", - "weight": 1, + "weight": "1 g", "volume": "200ml", "price": 40, "price_postapoc": 800, @@ -86,9 +86,9 @@ "category": "fuel", "name": "blob feed", "name_plural": "blob feed", - "description": "An amalgam of various types of organic material, contains everything the blob needs to be healthy. You think...", - "weight": 50, - "volume": 1, + "description": "An amalgam of various types of organic material, contains everything the blob needs to be healthy. You think…", + "weight": "50 g", + "volume": "250 ml", "to_hit": -3, "bashing": 8, "material": "flesh", @@ -104,8 +104,8 @@ "category": "tools", "name": "growing blob frame", "description": "A growing vehicle frame made of bone. It's coated in a thick layer of ooze, though there's greater amounts on the bindings. It's not quite tough enough to use.", - "weight": 3662, - "volume": 40, + "weight": "3662 g", + "volume": "10 L", "price": 100, "to_hit": -2, "material": [ "bone", "flesh" ], @@ -123,9 +123,9 @@ "id": "biter", "type": "GUN", "name": "biting blob", - "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. It has evolved the ability to constantly generate calcified protrusions which are then controlled by sinuous tensile strands. These \"teeth\" can then be used to latch and wound anything unfortunate enough to be nearby. The outer membrane has also become significantly thicker in order to support its more strenuous movement; though it seems pliable enough to pull apart...", - "weight": 18331, - "volume": 22, + "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. It has evolved the ability to constantly generate calcified protrusions which are then controlled by sinuous tensile strands. These \"teeth\" can then be used to latch and wound anything unfortunate enough to be nearby. The outer membrane has also become significantly thicker in order to support its more strenuous movement; though it seems pliable enough to pull apart…", + "weight": "18331 g", + "volume": "5500 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -150,8 +150,8 @@ "name": "growing keratinous mass", "name_plural": "growing keratinous mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, - "volume": 18, + "weight": "12140 g", + "volume": "4500 ml", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -169,9 +169,9 @@ "id": "clutter", "type": "GUN", "name": "gel shooter", - "description": "A living blob turned into an autonomous weapon. It trawls the ground for material, which it then strips of nutrition. The remainder is then expelled out at significant velocity towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it. It seems pliable enough to pull apart...", - "weight": 7252, - "volume": 12, + "description": "A living blob turned into an autonomous weapon. It trawls the ground for material, which it then strips of nutrition. The remainder is then expelled out at significant velocity towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it. It seems pliable enough to pull apart…", + "weight": "7252 g", + "volume": "3 L", "to_hit": -5, "bashing": 10, "material": [ "flesh", "bone" ], @@ -194,8 +194,8 @@ "name": "growing beaded mass", "name_plural": "growing beaded mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 5410, - "volume": 10, + "weight": "5410 g", + "volume": "2500 ml", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -214,8 +214,8 @@ "type": "GUN", "name": "frost lancer", "description": "A living blob turned into an autonomous weapon. A biological aberration that exists at sub-zero temperatures. After filtering nutrients from the water, it freezes the remainder into an incredibly sharp spear of ice; which it then launches at nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 21331, - "volume": 18, + "weight": "21331 g", + "volume": "4500 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -240,8 +240,8 @@ "name": "growing icy mass", "name_plural": "growing icy mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 15140, - "volume": 12, + "weight": "15140 g", + "volume": "3 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -260,9 +260,9 @@ "type": "TOOL", "category": "tools", "name": "gelacier", - "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It seems pliable enough to pull apart...", - "weight": 6112, - "volume": 20, + "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It seems pliable enough to pull apart…", + "weight": "6112 g", + "volume": "5 L", "price": 500, "to_hit": -3, "bashing": 9, @@ -276,8 +276,8 @@ "category": "veh_parts", "name": "gelacier wheel", "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It has formed itself into a wide boat frame.", - "weight": 6112, - "volume": 20, + "weight": "6112 g", + "volume": "5 L", "to_hit": -3, "bashing": 9, "material": [ "flesh" ], @@ -292,8 +292,8 @@ "category": "veh_parts", "name": "gelacier wheel", "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It has formed itself into a wide, crude wheel.", - "weight": 6112, - "volume": 20, + "weight": "6112 g", + "volume": "5 L", "to_hit": -3, "bashing": 9, "material": [ "flesh" ], @@ -309,8 +309,8 @@ "name": "growing cold mass", "name_plural": "growing cold mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 3562, - "volume": 8, + "weight": "3562 g", + "volume": "2 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -329,8 +329,8 @@ "type": "GUN", "name": "snapping ooze", "description": "A living blob turned into an autonomous weapon. A baffling mutation in an already baffling creature, this blob is encased in a thick coat of fur, which serves as a form of protection. In addition, it is capable of projecting rows of calcified sharp fragments in a manner mimicking the jaw of a more recognizable creature. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 22331, - "volume": 26, + "weight": "22331 g", + "volume": "6500 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -355,8 +355,8 @@ "name": "growing hairy mass", "name_plural": "growing hairy mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 18140, - "volume": 20, + "weight": "18140 g", + "volume": "5 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -377,8 +377,8 @@ "name": "gelatinous mass", "name_plural": "gelatinous mass", "description": "An experiment gone horribly right. While the original intent was to combine the structure of a bone frame with the impact absorption of the blob; the blob seems to have completely consumed the bone. Instead, what remains is an amorphous mass of goo with what seems to be numerous thin filaments floating within. With a bit of effort, you can grasp the fibers and stretch the mass into a multitude of shapes. The mass is able to retain the new shape even under force, though the mass yields at your touch. With enough strength, you think you can pull it apart.", - "weight": 6662, - "volume": 20, + "weight": "6662 g", + "volume": "5 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -404,8 +404,8 @@ "name": "multiplying gelatinous mass", "name_plural": "multiplying gelatinous mass", "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": 8662, - "volume": 20, + "weight": "8662 g", + "volume": "5 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -434,14 +434,14 @@ "name": "gelatinous capsule", "name_plural": "gelatinous capsules", "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": 6662, - "volume": 20, + "weight": "6662 g", + "volume": "5 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], "symbol": ";", "color": "light_green", - "contains": 40, + "contains": "10 L", "seals": true, "watertight": true }, @@ -451,7 +451,7 @@ "name": "gelatinous tank", "name_plural": "gelatinous tanks", "copy-from": "gloople_tank", - "volume": 240, + "volume": "60 L", "contains": 240 }, { @@ -460,8 +460,8 @@ "category": "veh_parts", "name": "gelatinous wheel", "description": "Filling a gelatinous mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": 30062, - "volume": 50, + "weight": "30062 g", + "volume": "12500 ml", "to_hit": -3, "bashing": 9, "material": [ "flesh" ], @@ -477,8 +477,8 @@ "name": "growing gelatinous mass", "name_plural": "growing gelatinous mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 3562, - "volume": 8, + "weight": "3562 g", + "volume": "2 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -498,9 +498,9 @@ "category": "veh_parts", "name": "gelectrode", "//": "No Snake, eating it will not refill your batteries.", - "description": "A biological mystery, this blob has evolved the ability to slowly generate electricity through some unknown process. It emits a low phosphorescent glow while doing so. It is also capable of storing electricity from other sources, but doing so renders it inactive. It seems pliable enough to pull apart...", - "weight": 5132, - "volume": 20, + "description": "A biological mystery, this blob has evolved the ability to slowly generate electricity through some unknown process. It emits a low phosphorescent glow while doing so. It is also capable of storing electricity from other sources, but doing so renders it inactive. It seems pliable enough to pull apart…", + "weight": "5132 g", + "volume": "5 L", "price": 500, "to_hit": -3, "bashing": 9, @@ -517,8 +517,8 @@ "name": "growing glowing mass", "name_plural": "growing glowing mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 3562, - "volume": 8, + "weight": "3562 g", + "volume": "2 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -539,8 +539,8 @@ "name": "gray mass", "name_plural": "gray mass", "description": "This internal structures of this creature have developed significantly. While retaining the resilience and malleability of its once simpler form, it has gained the considerable abilities of perception and stimulus response. When directly threatened, it is able to shift and alter its microfibers, hardening its membrane to an almost steel-hard shell. You can still pull it apart with enough force. It's also really gray.", - "weight": 19120, - "volume": 60, + "weight": "19120 g", + "volume": "15 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -566,8 +566,8 @@ "name": "multiplying gray mass", "name_plural": "multiplying gray mass", "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": 19662, - "volume": 20, + "weight": "19662 g", + "volume": "5 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -596,14 +596,14 @@ "name": "gray cocoon", "name_plural": "gray cocoons", "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": 19120, - "volume": 40, + "weight": "19120 g", + "volume": "10 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], "symbol": ";", "color": "light_gray", - "contains": 120, + "contains": "30 L", "seals": true, "watertight": true }, @@ -613,7 +613,7 @@ "name": "gray tank", "name_plural": "gray tanks", "copy-from": "gray_tank", - "volume": 400, + "volume": "100 L", "contains": 400 }, { @@ -622,8 +622,8 @@ "category": "veh_parts", "name": "gray wheel", "description": "Filling a gray mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": 53262, - "volume": 120, + "weight": "53262 g", + "volume": "30 L", "to_hit": -3, "bashing": 9, "material": [ "flesh" ], @@ -639,8 +639,8 @@ "name": "growing gray mass", "name_plural": "growing gray mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 16335, - "volume": 60, + "weight": "16335 g", + "volume": "15 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -660,8 +660,8 @@ "category": "veh_parts", "name": "earthen roller", "description": "A large, spherical blob the size of a large truck tire. The outer layer has compacted itself into a solid shell; offering great resilience. Having grown to full size, it seems content to simply sit there.", - "weight": 204540, - "volume": 200, + "weight": "204540 g", + "volume": "50 L", "price": 500, "to_hit": -3, "bashing": 9, @@ -676,8 +676,8 @@ "type": "GUN", "name": "blobsaw", "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. While its simpler cousins have a limit to the number of keratinous protrusions they can project and control; this blob can utilize hundreds of these sharp fangs to shred anything it detects as a threat into unrecognizable ribbons. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 24331, - "volume": 30, + "weight": "24331 g", + "volume": "7500 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -702,8 +702,8 @@ "name": "growing spike-studded mass", "name_plural": "growing spike-studded mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 20140, - "volume": 22, + "weight": "20140 g", + "volume": "5500 ml", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -723,8 +723,8 @@ "name": "fuel puffer", "//": "God Dangit Blobby.", "description": "A living blob turned into an autonomous weapon. A rather picky eater, it feeds on chemicals found within gasoline. The digestion process turns the result incredibly viscous which, when threats come near, is launched; ensnaring anything it hits. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 15531, - "volume": 16, + "weight": "15531 g", + "volume": "4 L", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -748,8 +748,8 @@ "name": "growing gasoline-laced mass", "name_plural": "growing gasoline-laced mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, - "volume": 12, + "weight": "12140 g", + "volume": "3 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -768,8 +768,8 @@ "type": "GUN", "name": "acid puffer", "description": "A living blob turned into an autonomous weapon. A filter feeder, the digestion process produces highly acidic byproducts; which is then expelled at any nearby enemies. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 15553, - "volume": 18, + "weight": "15553 g", + "volume": "4500 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -793,8 +793,8 @@ "name": "growing acidic mass", "name_plural": "growing acidic mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, - "volume": 12, + "weight": "12140 g", + "volume": "3 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -815,8 +815,8 @@ "name": "oozing mass", "name_plural": "oozing mass", "description": "An amorphous mass that has undergone a significant growth. In addition to the increased amount of goo and sinuous filaments, it seems to have started developing other internal structures. Like its smaller counterpart, it can be shaped into various structures; albeit with significantly greater tensile strength due to the increased number of supporting filaments. You believe you can split it apart with enough force.", - "weight": 16262, - "volume": 60, + "weight": "16262 g", + "volume": "15 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -842,8 +842,8 @@ "name": "multiplying oozing mass", "name_plural": "multiplying oozing mass", "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": 16662, - "volume": 20, + "weight": "16662 g", + "volume": "5 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -871,14 +871,14 @@ "name": "oozing pod", "name_plural": "oozing pods", "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": 16262, - "volume": 30, + "weight": "16262 g", + "volume": "7500 ml", "price": 100, "to_hit": -2, "material": [ "flesh" ], "symbol": ";", "color": "green", - "contains": 80, + "contains": "20 L", "seals": true, "watertight": true }, @@ -888,7 +888,7 @@ "name": "oozing tank", "name_plural": "oozing tanks", "copy-from": "oozle_tank", - "volume": 320, + "volume": "80 L", "contains": 320 }, { @@ -897,8 +897,8 @@ "category": "veh_parts", "name": "oozing wheel", "description": "Filling an oozing mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": 50262, - "volume": 120, + "weight": "50262 g", + "volume": "30 L", "to_hit": -3, "bashing": 9, "material": [ "flesh" ], @@ -914,8 +914,8 @@ "name": "growing ooze", "name_plural": "growing ooze", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12662, - "volume": 40, + "weight": "12662 g", + "volume": "10 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -933,9 +933,9 @@ "id": "queen", "type": "GENERIC", "name": "amorphous heart", - "description": "This amorphous mass seems to have finished developing; its advanced internal structures testifying to that. It is capable of locomotion through internal hydraulic pressure, capable of moving substantial loads, and, in an astounding display of intelligence, is capable of manipulating anything it's attached to, whether blob-based or otherwise, through extended pseudopods. You think you might be able to manipulate it, and through it, all its attached parts. Though to do so you'll have to position yourself to be in contact with it; and it appears unnervingly willing to accommodate you...", - "weight": 21331, - "volume": 80, + "description": "This amorphous mass seems to have finished developing; its advanced internal structures testifying to that. It is capable of locomotion through internal hydraulic pressure, capable of moving substantial loads, and, in an astounding display of intelligence, is capable of manipulating anything it's attached to, whether blob-based or otherwise, through extended pseudopods. You think you might be able to manipulate it, and through it, all its attached parts. Though to do so you'll have to position yourself to be in contact with it; and it appears unnervingly willing to accommodate you…", + "weight": "21331 g", + "volume": "20 L", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -949,8 +949,8 @@ "name": "growing mass of tendrils", "name_plural": "growing mass of tendrils", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 25325, - "volume": 60, + "weight": "25325 g", + "volume": "15 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -969,8 +969,8 @@ "type": "GUN", "name": "gel spiker", "description": "A living blob turned into an autonomous weapon. Capable of calcifying large numbers of fang-like fragments within itself. It hurls groups of these fragments along with a small portion of itself. When it reaches its destination, the detached remains shoot these fragments in all directions, expiring in the process. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 24121, - "volume": 26, + "weight": "24121 g", + "volume": "6500 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -995,8 +995,8 @@ "name": "growing spiked mass", "name_plural": "growing spiked mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 18140, - "volume": 20, + "weight": "18140 g", + "volume": "5 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -1015,8 +1015,8 @@ "type": "GUN", "name": "gel spouter", "description": "A living blob turned into an autonomous weapon. It can suck in water from a vehicle tank, and forcibly expel it in a wide cone. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 21331, - "volume": 80, + "weight": "21331 g", + "volume": "20 L", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -1039,8 +1039,8 @@ "type": "GUN", "name": "gel lancer", "description": "A living blob turned into an autonomous weapon. Evolving incredible abilities of perception, it is capable of locating and discerning possible threats within a large radius. When a potential threat is located, it fires a small, calcified projectile with incredible speed and accuracy. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 15103, - "volume": 16, + "weight": "15103 g", + "volume": "4 L", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -1064,8 +1064,8 @@ "name": "growing spiny mass", "name_plural": "growing spiny mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 11140, - "volume": 14, + "weight": "11140 g", + "volume": "3500 ml", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -1084,8 +1084,8 @@ "type": "GUN", "name": "gel razor", "description": "A living blob turned into an autonomous weapon. An enhanced metabolism allows it to calcify large, toothy discs which are then launched towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 17121, - "volume": 22, + "weight": "17121 g", + "volume": "5500 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh", "bone" ], @@ -1109,8 +1109,8 @@ "name": "growing spiky mass", "name_plural": "growing spiky mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, - "volume": 16, + "weight": "12140 g", + "volume": "4 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -1129,8 +1129,8 @@ "type": "GUN", "name": "shock bulb", "description": "A living blob turned into an autonomous weapon. Shockingly, it somehow is able to project electricity, which it then discharges at any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 14321, - "volume": 15, + "weight": "14321 g", + "volume": "3750 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -1152,8 +1152,8 @@ "name": "growing bright mass", "name_plural": "growing bright mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 11140, - "volume": 12, + "weight": "11140 g", + "volume": "3 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -1172,8 +1172,8 @@ "type": "GUN", "name": "gel puffer", "description": "A living blob turned into an autonomous weapon. A filter feeder, it strips any water it processes of nutrients and expels the remainder towards any nearby threats. The process of filter-feeding also makes the remaining liquid viscous, though it also dissipates fairly quickly. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 11331, - "volume": 18, + "weight": "11331 g", + "volume": "4500 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -1197,8 +1197,8 @@ "name": "growing viscous mass", "name_plural": "growing viscous mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 8140, - "volume": 12, + "weight": "8140 g", + "volume": "3 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -1218,8 +1218,8 @@ "name": "fire puffer", "//": "Need a light?", "description": "A living blob turned into an autonomous weapon. A rather picky eater, it feeds on chemicals found within gasoline. The digested material is still highly flammable, and when launched, also activates an ignition gland located on the outer membrane. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 16331, - "volume": 16, + "weight": "16331 g", + "volume": "4 L", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -1244,8 +1244,8 @@ "name": "growing warm mass", "name_plural": "growing warm mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, - "volume": 12, + "weight": "12140 g", + "volume": "3 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], @@ -1264,8 +1264,8 @@ "type": "GUN", "name": "spark blight", "description": "A living blob turned into an autonomous weapon. It is capable of storing energy from sunlight inside itself in the form of electricity. Then, in a truly baffling show of force, projects a highly concentrated stream of electricity towards any possible threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": 17331, - "volume": 21, + "weight": "17331 g", + "volume": "5250 ml", "to_hit": -5, "bashing": 10, "material": [ "flesh" ], @@ -1287,8 +1287,8 @@ "name": "growing electrified mass", "name_plural": "growing electrified mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": 12140, - "volume": 16, + "weight": "12140 g", + "volume": "4 L", "price": 100, "to_hit": -2, "material": [ "flesh" ], diff --git a/data/mods/blazemod/blaze_blob_monster.json b/data/mods/blazemod/blaze_blob_monster.json index 94cbccaaa4f2b..4447bd5afa78e 100644 --- a/data/mods/blazemod/blaze_blob_monster.json +++ b/data/mods/blazemod/blaze_blob_monster.json @@ -24,7 +24,8 @@ "description": "An escaping noisy blob, catch it before it brings in every zombie for miles!", "default_faction": "blob", "species": [ "BLOB" ], - "size": "SMALL", + "volume": "30000 ml", + "weight": "40750 g", "hp": 1, "speed": 60, "material": [ "flesh" ], @@ -53,7 +54,8 @@ "description": "An escaping noisy blob, catch it before it brings in every zombie for miles!", "default_faction": "blob", "species": [ "BLOB" ], - "size": "HUGE", + "volume": "875000 ml", + "weight": "200 kg", "hp": 1, "speed": 60, "material": [ "flesh" ], @@ -82,7 +84,8 @@ "description": "An escaping noisy blob, catch it before it brings in every zombie for miles!", "default_faction": "blob", "species": [ "BLOB" ], - "size": "LARGE", + "volume": "92500 ml", + "weight": "120 kg", "hp": 1, "speed": 60, "material": [ "flesh" ], diff --git a/data/mods/blazemod/blaze_blob_parts.json b/data/mods/blazemod/blaze_blob_parts.json index 0b35b4d25d672..3a797d6b08e98 100644 --- a/data/mods/blazemod/blaze_blob_parts.json +++ b/data/mods/blazemod/blaze_blob_parts.json @@ -13,7 +13,7 @@ "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A set of continuous, interlocking tracks made out of blob. They can be used in place of wheels, and provide good traction and off-road performance.", + "description": "A set of continuous, interlocking tracks made out of blob. They can be used in place of wheels, and provide good traction and off-road performance.", "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, "wheel_type": "treads", "contact_area": 2500, @@ -47,12 +47,11 @@ "color": "blue", "broken_color": "blue", "durability": 400, - "range": 1, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "bitergrow" } ], "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "descriptions": "A living blob, transformed into a heavy vehicle weapon.", + "description": "A living blob, transformed into a heavy vehicle weapon.", "flags": [ "TURRET", "FOLDABLE", "OBSTACLE" ] }, { @@ -66,7 +65,6 @@ "color": "magenta", "broken_color": "magenta", "durability": 200, - "range": 8, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "cluttergrow" } ], @@ -85,7 +83,6 @@ "color": "light_blue", "broken_color": "light_blue", "durability": 200, - "range": 18, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "freeziegrow" } ], @@ -200,7 +197,6 @@ "color": "brown", "broken_color": "brown", "durability": 600, - "range": 1, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "fuzzlegrow" } ], @@ -1179,7 +1175,6 @@ "color": "blue", "broken_color": "blue", "durability": 1000, - "range": 1, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "horrorgrow" } ], @@ -1197,7 +1192,6 @@ "color": "brown", "broken_color": "brown", "durability": 200, - "range": 8, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "inkiegrow" } ], @@ -1215,7 +1209,6 @@ "color": "light_red", "broken_color": "light_red", "durability": 200, - "range": 8, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "meltiegrow" } ], @@ -1631,7 +1624,6 @@ "color": "red", "broken_color": "red", "durability": 200, - "range": 60, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "queengrow" } ], @@ -1650,7 +1642,6 @@ "color": "cyan", "broken_color": "cyan", "durability": 200, - "range": 18, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "razorqueengrow" } ], @@ -1669,7 +1660,6 @@ "color": "light_blue", "broken_color": "light_blue", "durability": 200, - "range": 16, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "sharpgrow" } ], @@ -1688,7 +1678,6 @@ "color": "blue", "broken_color": "blue", "durability": 200, - "range": 12, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "sicklegrow" } ], @@ -1707,7 +1696,6 @@ "color": "cyan", "broken_color": "cyan", "durability": 200, - "range": 16, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "sparkiegrow" } ], @@ -1726,7 +1714,6 @@ "color": "yellow", "broken_color": "yellow", "durability": 200, - "range": 8, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "stickiegrow" } ], @@ -1745,7 +1732,6 @@ "color": "light_red", "broken_color": "light_red", "durability": 200, - "range": 10, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "torchiegrow" } ], @@ -1764,7 +1750,6 @@ "color": "cyan", "broken_color": "cyan", "durability": 200, - "range": 12, "damage_modifier": 10, "folded_volume": 1, "breaks_into": [ { "item": "voideatergrow" } ], diff --git a/data/mods/blazemod/blaze_blob_recipes.json b/data/mods/blazemod/blaze_blob_recipes.json index 35915b7cd5cf9..6115e6ebddb08 100644 --- a/data/mods/blazemod/blaze_blob_recipes.json +++ b/data/mods/blazemod/blaze_blob_recipes.json @@ -225,7 +225,12 @@ "time": 30000, "autolearn": true, "qualities": [ { "id": "CHEM", "level": 2 } ], - "components": [ [ [ "biter", 1 ] ], [ [ "bfeed", 250 ] ], [ [ "raw_fur", 150 ], [ "fur", 24 ] ], [ [ "mutagen", 1 ] ] ] + "components": [ + [ [ "biter", 1 ] ], + [ [ "bfeed", 250 ] ], + [ [ "raw_fur", 150 ], [ "raw_hfur", 150 ], [ "fur", 24 ] ], + [ [ "mutagen", 1 ] ] + ] }, { "result": "gloople", diff --git a/data/mods/blazemod/blaze_magazines.json b/data/mods/blazemod/blaze_magazines.json index d94139f15b5b9..4f23ba24786d3 100644 --- a/data/mods/blazemod/blaze_magazines.json +++ b/data/mods/blazemod/blaze_magazines.json @@ -4,8 +4,8 @@ "type": "MAGAZINE", "name": "BB hopper", "description": "An improvised magazine for a vehicle mounted weapon. A simple metal box with some plastic guide rails, it acts as a gravity fed hopper to drop a small round shot into the weapon's chamber below. It is not very reliable, but quick to reload.", - "weight": 1840, - "volume": 12, + "weight": "1840 g", + "volume": "3 L", "price": 16600, "material": "steel", "symbol": "#", @@ -20,8 +20,8 @@ "type": "MAGAZINE", "name": "bolt hopper", "description": "An improvised magazine for a vehicle mounted crossbow. A simple metal box with some plastic guide rails, it acts as a gravity fed hopper to drop a crossbow bolt into the weapon below. It is awkward to reload and not especially reliable.", - "weight": 1840, - "volume": 12, + "weight": "1840 g", + "volume": "3 L", "price": 16600, "material": "steel", "symbol": "#", @@ -36,8 +36,8 @@ "type": "MAGAZINE", "name": "canister rack", "description": "An improvised magazine for a vehicle mounted weapon. A simple metal box with some plastic guide rails, it acts as a gravity fed hopper to drop a heavy canister into the weapon below. It is awkward to reload and not especially reliable.", - "weight": 1840, - "volume": 12, + "weight": "1840 g", + "volume": "3 L", "price": 16600, "material": "steel", "symbol": "#", @@ -52,8 +52,8 @@ "type": "MAGAZINE", "name": "pebble hopper", "description": "An improvised magazine for a vehicle mounted weapon. A simple metal box with some plastic guide rails, it acts as a gravity fed hopper to drop a small round shot into the weapon's chamber below. It is not very reliable, but quick to reload.", - "weight": 1840, - "volume": 12, + "weight": "1840 g", + "volume": "3 L", "price": 16600, "material": "steel", "symbol": "#", diff --git a/data/mods/blazemod/blaze_other.json b/data/mods/blazemod/blaze_other.json index 046e56f8f5186..53ec86b273209 100644 --- a/data/mods/blazemod/blaze_other.json +++ b/data/mods/blazemod/blaze_other.json @@ -5,8 +5,8 @@ "type": "ENGINE", "name": "large steam engine", "description": "A large steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condensor recaptures the water, making this a closed cycle system.", - "weight": 280000, - "volume": 380, + "weight": "280 kg", + "volume": "95 L", "epower": 0, "power": 242450, "energy_consumption": 484890, @@ -19,8 +19,8 @@ "type": "ENGINE", "name": "huge steam engine", "description": "A huge steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condensor recaptures the water, making this a closed cycle system.", - "weight": 835000, - "volume": 700, + "weight": "835 kg", + "volume": "175 L", "epower": 0, "power": 447600, "energy_consumption": 895200, @@ -33,8 +33,8 @@ "type": "ENGINE", "name": "small steam turbine", "description": "A small steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": 80000, - "volume": 75, + "weight": "80 kg", + "volume": "18750 ml", "//": "Steam turbine efficiency sucks - ideally 47% efficient with reheat cycles, versus 55% for a modern gas engine. Going with 33% efficieny for easy math", "power": 93250, "energy_consumption": 279750, @@ -47,8 +47,8 @@ "type": "ENGINE", "name": "medium steam turbine", "description": "A medium sized steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": 120000, - "volume": 110, + "weight": "120 kg", + "volume": "27500 ml", "power": 149200, "energy_consumption": 347700, "price": 380000, @@ -60,8 +60,8 @@ "type": "ENGINE", "name": "large steam turbine", "description": "A large steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": 190000, - "volume": 180, + "weight": "190 kg", + "volume": "45 L", "power": 242450, "energy_consumption": 727350, "price": 595000, @@ -73,8 +73,8 @@ "type": "ENGINE", "name": "huge steam turbine", "description": "A huge steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": 345000, - "volume": 325, + "weight": "345 kg", + "volume": "81250 ml", "power": 447600, "energy_consumption": 1342800, "price": 1060000, @@ -86,8 +86,8 @@ "category": "veh_parts", "name": "solar array", "description": "A dozen solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able track the sun. However, this comes at the cost of being prohibitively heavy.", - "weight": 265400, - "volume": 250, + "weight": "265400 g", + "volume": "62500 ml", "price": 120000, "to_hit": -4, "bashing": 1, @@ -101,8 +101,8 @@ "category": "veh_parts", "name": "upgraded solar array", "description": "A dozen upgraded solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.", - "weight": 319328, - "volume": 250, + "weight": "319328 g", + "volume": "62500 ml", "price": 150000, "to_hit": -4, "bashing": 1, @@ -116,8 +116,8 @@ "category": "veh_parts", "name": "upgraded reinforced solar array", "description": "A dozen upgraded reinforced solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.", - "weight": 382736, - "volume": 322, + "weight": "382736 g", + "volume": "80500 ml", "price": 150000, "to_hit": -4, "bashing": 1, @@ -131,8 +131,8 @@ "category": "veh_parts", "name": "Rubber Caterpillar Track", "description": "A short, interlocking set of hard rubber tracks reinforced by stiff wire held in place by a set of smaller wheels. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": 32368, - "volume": 200, + "weight": "32368 g", + "volume": "50 L", "price": 25500, "to_hit": -3, "bashing": 30, @@ -148,8 +148,8 @@ "category": "veh_parts", "name": "Steel Caterpillar Track", "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on large construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is very heavy.", - "weight": 95968, - "volume": 300, + "weight": "95968 g", + "volume": "75 L", "price": 45500, "to_hit": -3, "bashing": 30, @@ -165,8 +165,8 @@ "category": "veh_parts", "name": "Reinforced Caterpillar Track", "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on APCs and armored vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is extremely heavy.", - "weight": 287824, - "volume": 350, + "weight": "287824 g", + "volume": "87500 ml", "price": 75500, "to_hit": -3, "bashing": 30, @@ -180,11 +180,10 @@ "id": "turretframe", "type": "GENERIC", "category": "veh_parts", - "name": "turret chassis", - "name_plural": "turret chassis", + "name": { "str": "turret chassis", "str_pl": "turret chassis" }, "description": "A frame capable of rotating a full 360 degrees, capable of mounting multiple weapon systems either welded directly onto it or secured via the straps. It comes with a easily modified container for ammunition storage, a rudimentary ammo feed system for easy access, and a section for a movement system. It is controlled by a targeting AI that can adapt to the usage of whatever weapon that has been loading, with proper programming.", - "weight": 38604, - "volume": 80, + "weight": "38604 g", + "volume": "20 L", "price": 8000, "to_hit": -3, "bashing": 15, diff --git a/data/mods/blazemod/blaze_other_parts.json b/data/mods/blazemod/blaze_other_parts.json index 46e303a047f3a..3507132c350dc 100644 --- a/data/mods/blazemod/blaze_other_parts.json +++ b/data/mods/blazemod/blaze_other_parts.json @@ -46,11 +46,11 @@ "copy-from": "engine_combustion", "type": "vehicle_part", "fuel_type": "coal_lump", - "cold_affects_start": true, "looks_like": "diesel_engine_v12", "m2c": 75, "//": "45% energy efficiency", - "description": "A closed cycle, external combustion steam turbine. Burns coal from a bunker in the vehicle to produce steam." + "description": "A closed cycle, external combustion steam turbine. Burns coal from a bunker in the vehicle to produce steam.", + "extend": { "flags": [ "E_COLD_START" ] } }, { "id": "engine_steam_turbine_small", @@ -328,7 +328,6 @@ "id": "turretframe", "type": "vehicle_part", "name": "turret chassis", - "name_plural": "turret chassis", "item": "turretframe", "symbol": "Y", "broken_symbol": "#", diff --git a/data/mods/blazemod/blaze_override.json b/data/mods/blazemod/blaze_override.json index b8a9ec67a12dc..3ade71f8a5b37 100644 --- a/data/mods/blazemod/blaze_override.json +++ b/data/mods/blazemod/blaze_override.json @@ -14,8 +14,7 @@ "copy-from": "flamethrower", "type": "vehicle_part", "name": "manual flamethrower", - "broken_symbol": "#", - "range": 5 + "broken_symbol": "#" }, { "id": "auto_m1918", @@ -25,8 +24,7 @@ "symbol": "t", "broken_symbol": "#", "color": "brown", - "size": 40, - "range": 12 + "size": 40 }, { "id": "am249", @@ -34,16 +32,14 @@ "type": "vehicle_part", "name": "M249 turret", "broken_symbol": "#", - "size": 40, - "range": 12 + "size": 40 }, { "id": "aplasma_gun", "copy-from": "plasma_gun", "type": "vehicle_part", "name": "plasma turret", - "broken_symbol": "#", - "range": 12 + "broken_symbol": "#" }, { "id": "afusion_gun", @@ -51,8 +47,7 @@ "type": "vehicle_part", "name": "fusion turret", "broken_symbol": "#", - "size": 10, - "range": 12 + "size": 10 }, { "id": "am2browning", @@ -60,8 +55,7 @@ "type": "vehicle_part", "name": "M2 Browning turret", "broken_symbol": "#", - "size": 40, - "range": 12 + "size": 40 }, { "id": "auto_m240", @@ -69,8 +63,7 @@ "type": "vehicle_part", "name": "M240 turret", "broken_symbol": "#", - "size": 40, - "range": 12 + "size": 40 }, { "id": "auto_m60", @@ -78,8 +71,7 @@ "type": "vehicle_part", "name": "M60 turret", "broken_symbol": "#", - "size": 40, - "range": 12 + "size": 40 }, { "id": "auto_abzats", @@ -87,8 +79,7 @@ "type": "vehicle_part", "name": "auto-shotgun turret", "broken_symbol": "#", - "size": 40, - "range": 12 + "size": 40 }, { "id": "auto_m134", @@ -96,8 +87,7 @@ "type": "vehicle_part", "name": "M134D-H Minigun turret", "broken_symbol": "#", - "size": 40, - "range": 12 + "size": 40 }, { "id": "auto_mk19", @@ -105,8 +95,7 @@ "type": "vehicle_part", "name": "Mark 19 turret", "broken_symbol": "#", - "size": 40, - "range": 12 + "size": 40 }, { "id": "auto_rm614", @@ -115,8 +104,7 @@ "name": "RM614 turret", "broken_symbol": "#", "broken_color": "light_gray", - "size": 40, - "range": 12 + "size": 40 }, { "id": "auto_rm298", @@ -125,16 +113,14 @@ "name": "RM298 turret", "broken_symbol": "#", "broken_color": "light_gray", - "size": 40, - "range": 12 + "size": 40 }, { "id": "awatercannon", "copy-from": "watercannon", "type": "vehicle_part", "name": "water cannon turret", - "broken_symbol": "#", - "range": 7 + "broken_symbol": "#" }, { "id": "pool_ball", diff --git a/data/mods/blazemod/blaze_test.json b/data/mods/blazemod/blaze_test.json index 4ef5b9ed47f9a..38f1e0e0ce4e2 100644 --- a/data/mods/blazemod/blaze_test.json +++ b/data/mods/blazemod/blaze_test.json @@ -369,9 +369,9 @@ "id": "dcluster", "type": "TOOL", "name": "diamond cluster", - "description": "A cluster of artificial crystals that have broken off of a diamond matrix. While the substance usually decays when separated from the catalyst; this cluster seems to be self-sustaining by some unknown mechanism. ", - "weight": 350, - "volume": 1, + "description": "A cluster of artificial crystals that have broken off of a diamond matrix. While the substance usually decays when separated from the catalyst; this cluster seems to be self-sustaining by some unknown mechanism. ", + "weight": "350 g", + "volume": "250 ml", "price": 300000, "to_hit": -5, "material": "diamond", @@ -470,8 +470,8 @@ "name": "diamond frame", "//": "Sempai can't resist me now!", "description": "A brilliantly sparkling diamond vehicle frame. Incredibly strong for its weight.", - "weight": 9498, - "volume": 40, + "weight": "9498 g", + "volume": "10 L", "price": 10000000, "to_hit": -3, "bashing": 15, @@ -485,8 +485,8 @@ "type": "GUN", "name": "diamond lance", "description": "A weapon that is as deadly as it is dazzling. The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness. The substance rapidly decays when separated from the catalyst; thus a pre-shaped lump of carbon is brought into contact with the matrix, immediately crystallized and launched just as quickly. The launcher requires a specialized chassis in order to be brought to bear on its unfortunate targets.", - "weight": 16050, - "volume": 22, + "weight": "16050 g", + "volume": "5500 ml", "price": 60000, "to_hit": -1, "bashing": 12, @@ -540,8 +540,8 @@ "name": "diamond nova", "//": "Behold, the bringer of light.", "description": "A weapon that is as deadly as it is dazzling. The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness. The substance rapidly decays when separated from the catalyst, and at sizes as large as the projectile used, also rapidly decays when in contact with other matter. Thus the projectile is held and launched by the use of pressurized air from a vortex stone. Upon striking its target, the projectile undergoes explosive decomposition; shattering into a brilliant burst of diamond fragments.", - "weight": 25815, - "volume": 22, + "weight": "25815 g", + "volume": "5500 ml", "price": 60000, "to_hit": -1, "bashing": 12, @@ -567,8 +567,8 @@ "category": "veh_parts", "name": "diamond plating", "description": "A piece of armor plating made of clear diamond. Incredibly strong for its weight.", - "weight": 6130, - "volume": 12, + "weight": "6130 g", + "volume": "3 L", "price": 12000000, "to_hit": -3, "bashing": 15, @@ -582,8 +582,8 @@ "type": "AMMO", "name": "diamond fragments", "description": "These small fragments of diamond are formed as a byproduct from the crystallization process of a diamond matrix. While the substance usually decays when separated from the catalyst; these fragments are small enough to remain stable.", - "weight": 3, - "volume": 1, + "weight": "3 g", + "volume": "250 ml", "price": 10000, "bashing": 1, "material": "diamond", @@ -621,9 +621,9 @@ "type": "GENERIC", "category": "veh_parts", "name": "stabilized portal", - "description": "As you gaze into the seemingly infinite depths of this portable hole in reality, a phrase from a time forever gone echoes in your mind. \"There are two things that are infinite: the universe and human kleptomania.\"", - "weight": 22813, - "volume": 200, + "description": "As you gaze into the seemingly infinite depths of this portable hole in reality, a phrase from a time forever gone echoes in your mind. \"There are two things that are infinite: the universe and human kleptomania.\"", + "weight": "22813 g", + "volume": "50 L", "price": 1500000, "to_hit": -4, "bashing": 2, @@ -659,8 +659,8 @@ "name": "diamond matrix", "name_plural": "diamond matrices", "description": "A sparkling diamond with a dazzling spiral pattern. Small pieces of glittering crystal form on the edges as you hold it.", - "weight": 250, - "volume": 1, + "weight": "250 g", + "volume": "250 ml", "price": 5000000, "to_hit": -5, "material": "diamond", @@ -670,7 +670,7 @@ "revert_to": "spiral_matrix", "use_action": { "target": "spiral_matrix", - "msg": "Your senses dull as you gaze into the depths of this gemstone's center...", + "msg": "Your senses dull as you gaze into the depths of this gemstone's center…", "moves": 60000, "type": "transform" } @@ -680,9 +680,9 @@ "type": "TOOL", "category": "veh_parts", "name": "vortex engine", - "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allows it to be attached to a vehicle to render it mobile.", - "weight": 62071, - "volume": 225, + "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allows it to be attached to a vehicle to render it mobile.", + "weight": "62071 g", + "volume": "56250 ml", "price": 1500000, "bashing": 4, "rigid": true, @@ -761,9 +761,9 @@ "type": "TOOL", "category": "veh_parts", "name": "vortex generator", - "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allow it to be hooked up to a battery to store the power generated.", - "weight": 48066, - "volume": 200, + "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allow it to be hooked up to a battery to store the power generated.", + "weight": "48066 g", + "volume": "50 L", "price": 1500000, "bashing": 4, "rigid": true, @@ -776,8 +776,8 @@ "type": "GUN", "name": "vortex accelerator", "description": "This weapon uses powerful bursts of air to launch sharp fragments at its target at high speed. You'll need some form of platform to mount it on.", - "weight": 10700, - "volume": 10, + "weight": "10700 g", + "volume": "2500 ml", "price": 60000, "to_hit": -1, "bashing": 12, @@ -829,8 +829,8 @@ "type": "GUN", "name": "vortex bolter", "description": "This weapon uses powerful bursts of air to launch bolts at its target at high speed. You'll need some form of platform to mount it on.", - "weight": 8310, - "volume": 10, + "weight": "8310 g", + "volume": "2500 ml", "price": 90000, "to_hit": -1, "bashing": 12, @@ -874,7 +874,6 @@ "color": "pink", "broken_color": "pink", "size": 10, - "range": 18, "folded_volume": 20, "breaks_into": [ { "item": "vortexcannon", "count": [ 0, 1 ] } ], "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } @@ -884,8 +883,8 @@ "type": "GUN", "name": "vortex cannon", "description": "Essentially a large pneumatic gun made to hurl sharpened metal rails. Instead of a mechanical system, you've managed to harness the vortex to power this gun. While powerful for its size, you'll need some form of platform to mount it on.", - "weight": 21831, - "volume": 20, + "weight": "21831 g", + "volume": "5 L", "price": 60000, "to_hit": -1, "bashing": 12, @@ -923,8 +922,8 @@ "type": "GUN", "name": "vortex rifle", "description": "This weapon uses powerful bursts of air to launch small projectiles at its target at high speed. You'll need some form of platform to mount it on.", - "weight": 11759, - "volume": 10, + "weight": "11759 g", + "volume": "2500 ml", "price": 90000, "to_hit": -1, "bashing": 12, diff --git a/data/mods/blazemod/blaze_weapons.json b/data/mods/blazemod/blaze_weapons.json index 4d342188fb39c..8e52b6f8d1c6b 100644 --- a/data/mods/blazemod/blaze_weapons.json +++ b/data/mods/blazemod/blaze_weapons.json @@ -5,8 +5,8 @@ "reload_noise_volume": 10, "name": "storm bolter", "description": "This pneumatic bolt thrower has been greatly enhanced, allowing multiple bolts to be launched accurately and in quick succession. It requires a support of some sort in order to be operated.", - "weight": 7110, - "volume": 15, + "weight": "7110 g", + "volume": "3750 ml", "price": 350000, "to_hit": -3, "bashing": 6, @@ -32,8 +32,8 @@ "reload_noise_volume": 10, "name": "slingshot cannon", "description": "Essentially several long drawstrings held by two long, reinforced sides and a mechanism attached to a crank to draw and fire it. It's deceptively powerful and surprisingly accurate, but far too large to be used without some sort of stable platform.", - "weight": 12359, - "volume": 22, + "weight": "12359 g", + "volume": "5500 ml", "price": 60000, "to_hit": -1, "bashing": 12, @@ -59,8 +59,8 @@ "reload_noise_volume": 10, "name": "lacerator", "description": "This weapon launches serrated metal disks at nearby enemies. It draws its power from a vehicle's engines, and thus must be mounted on such in order to be operated.", - "weight": 4624, - "volume": 8, + "weight": "4624 g", + "volume": "2 L", "price": 10000, "to_hit": -1, "bashing": 10, @@ -84,8 +84,8 @@ "reload_noise_volume": 10, "name": "rotary cannon", "description": "This fearsome weapon sports 3 barrels in a cyclic configuration. A specialized mechanism loads the otherwise troublesome rounds; allowing it to be fired in quick succession. However, this renders it incredibly unwieldy, and it must be mounted on a support structure in order to be fired.", - "weight": 11713, - "volume": 15, + "weight": "11713 g", + "volume": "3750 ml", "price": 80000, "to_hit": -1, "bashing": 12, @@ -110,8 +110,8 @@ "reload_noise_volume": 10, "name": "laser cannon", "description": "This enhanced laser cannon sacrifices efficiency for destructive power. The increased power requirements require a significant power source and the size of the firing mechanism also requires support.", - "weight": 6650, - "volume": 12, + "weight": "6650 g", + "volume": "3 L", "price": 270000, "to_hit": -1, "bashing": 8, @@ -135,8 +135,8 @@ "reload_noise_volume": 10, "name": "pulse laser", "description": "Augmented damage capability and rapid bursts make this a powerful weapon. The increased power requirements require a significant power source and the firing mechanism also requires a specialized chassis.", - "weight": 4825, - "volume": 12, + "weight": "4825 g", + "volume": "3 L", "price": 750000, "to_hit": -1, "bashing": 8, @@ -161,8 +161,8 @@ "reload_noise_volume": 10, "name": "turbolaser cannon", "description": "With an augmented emitter and capacitor, this mounted laser is capable of superheating most materials to the point of exploding. The firing mechanism also requires the services of a specialized chassis, and one must be wary of the prodigious power needs of such a weapon.", - "weight": 9500, - "volume": 18, + "weight": "9500 g", + "volume": "4500 ml", "price": 750000, "to_hit": -1, "bashing": 8, @@ -186,8 +186,8 @@ "reload_noise_volume": 10, "name": "perforator", "description": "A coilgun with improved electromagnetic circuits to be able to propel a metallic projectile at high speed and with great accuracy. Capable of piercing armor with little issue, though the projectile itself lacks damage due to its small size. It must be mounted on a specialized chassis in order to be fired.", - "weight": 6152, - "volume": 10, + "weight": "6152 g", + "volume": "2500 ml", "price": 50000, "to_hit": -1, "bashing": 12, @@ -214,8 +214,8 @@ "type": "GUN", "name": "needler", "description": "This improved nailgun features a special firing mechanism that is set to fire a spread of up to 5 nails at once; sure to drop the hammer on its unfortunate targets. However, these features render it incredibly unwieldy, and it must be mounted on a supporting frame in order to be fired.", - "weight": 7827, - "volume": 15, + "weight": "7827 g", + "volume": "3750 ml", "price": 110000, "to_hit": -1, "bashing": 12, @@ -242,8 +242,8 @@ "type": "GUN", "name": "hypervelocity driver", "description": "A single-shot, electrically propelled, steel rail launcher. The powerful, and frankly dangerous, improvements made to the power systems of this weapon is capable imbuing a massive charge into a single-rail; so much that it often shatters into deadly fragments on impact. It's capabilities are limited by its prodigious power requirements however, and its large size necessitates an appropriately-equipped vehicle.", - "weight": 10135, - "volume": 16, + "weight": "10135 g", + "volume": "4 L", "price": 550000, "to_hit": -3, "bashing": 10, @@ -269,8 +269,8 @@ "reload_noise_volume": 10, "name": "ripper", "description": "This menacing weapon rapidly launches bladed disks that rips through enemies with devastating effect. It draws its power from a vehicle's engines, and thus must be mounted on such in order to be operated.", - "weight": 12952, - "volume": 15, + "weight": "12952 g", + "volume": "3750 ml", "price": 95000, "to_hit": -1, "bashing": 12, @@ -297,8 +297,8 @@ "reload_noise_volume": 10, "name": "rotary speargun", "description": "This pneumatic speargun features a revolving barrel behind its launcher, allowing projectiles to be rapidly loaded and fired. However, the weight requires an external support measure.", - "weight": 17308, - "volume": 18, + "weight": "17308 g", + "volume": "4500 ml", "price": 280000, "to_hit": -1, "bashing": 12, @@ -324,8 +324,8 @@ "reload_noise_volume": 10, "name": "scorpion ballista", "description": "A massive tension-operated crossbow. The hand-crank allows one to draw it without the need for heavy labor. It's far too massive to be used on foot, and thus needs to be mounted on a vehicle in order to be operated.", - "weight": 18308, - "volume": 20, + "weight": "18308 g", + "volume": "5 L", "price": 150000, "to_hit": -1, "bashing": 12, @@ -350,8 +350,8 @@ "reload_noise_volume": 10, "name": "splintergun", "description": "A heavily modified coilgun that fires tiny fragments of metal at high speeds extremely quickly. The resulting barrage is highly inaccurate, but can turn unarmored targets into pulp. It must be mounted on a specialized chassis in order to be fired.", - "weight": 5852, - "volume": 14, + "weight": "5852 g", + "volume": "3500 ml", "price": 50000, "to_hit": -1, "bashing": 12, @@ -379,8 +379,8 @@ "reload_noise_volume": 10, "name": "harpoon gun", "description": "A tension-operated speargun. A hand-crank lets one draw the strings quickly, but it's too unwieldy to handle without a support of some sort.", - "weight": 18500, - "volume": 16, + "weight": "18500 g", + "volume": "4 L", "price": 110000, "to_hit": -1, "bashing": 12, @@ -407,8 +407,8 @@ "reload_noise_volume": 10, "name": "Tesla cannon", "description": "This alteration of the Chain Lightning bionic fires artificial lightning bolts that arc to nearby enemies. It must be attached to a large power source, but it allows for much more powerful bolts.", - "weight": 5141, - "volume": 15, + "weight": "5141 g", + "volume": "3750 ml", "price": 280000, "to_hit": -1, "bashing": 8, @@ -431,8 +431,8 @@ "reload_noise_volume": 10, "name": "avalanche rifle", "description": "This pneumatic assault rifle has been greatly enhanced, firing projectiles faster and with higher velocity. However, these features render it incredibly unwieldy, and it must be mounted on a supporting platform in order to be fired.", - "weight": 7311, - "volume": 15, + "weight": "7311 g", + "volume": "3750 ml", "price": 155000, "to_hit": -3, "bashing": 6, diff --git a/data/mods/blazemod/snippets.json b/data/mods/blazemod/snippets.json index 9a8466ff8ee85..953a067c2d546 100644 --- a/data/mods/blazemod/snippets.json +++ b/data/mods/blazemod/snippets.json @@ -5,7 +5,7 @@ "text": [ { "id": "note_blazemod_1", - "text": "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" + "text": "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" }, { "id": "note_blazemod_2", "text": "\"My friend died, but at least I made her into a blob turret.\"" }, { @@ -14,10 +14,10 @@ }, { "id": "note_blazemod_4", - "text": "\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably forward. Giant rollers on front demolish forest. Maine, here I come.\"" + "text": "\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably forward. Giant rollers on front demolish forest. Maine, here I come.\"" }, - { "id": "note_blazemod_5", "text": "\"my car is a diamond in the rough... literally\"" }, - { "id": "note_blazemod_6", "text": "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" }, + { "id": "note_blazemod_5", "text": "\"my car is a diamond in the rough… literally\"" }, + { "id": "note_blazemod_6", "text": "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" }, { "id": "note_blazemod_7", "text": "\"Added so many things to my taxi that it went a-blaze. Whoops.\"" }, { "id": "note_blazemod_8", @@ -26,7 +26,7 @@ { "id": "note_blazemod_9", "text": "\"one day, i will be part of car, too\"" }, { "id": "note_blazemod_10", - "text": "\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM! You goin' somewhere.\"" + "text": "\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM! You goin' somewhere.\"" } ] } diff --git a/data/mods/cbm_slots/game_balance.json b/data/mods/cbm_slots/game_balance.json index 64e033bce1805..44a7ac6efe946 100644 --- a/data/mods/cbm_slots/game_balance.json +++ b/data/mods/cbm_slots/game_balance.json @@ -2,7 +2,6 @@ { "type": "EXTERNAL_OPTION", "name": "CBM_SLOTS_ENABLED", - "info": "Enables CBM slots mechanics. If true CBM slots are enabled.", "stype": "bool", "value": true } diff --git a/data/mods/classic_zombies/exclusions.json b/data/mods/classic_zombies/exclusions.json index 79266474b911c..1232d0d1b7d2d 100644 --- a/data/mods/classic_zombies/exclusions.json +++ b/data/mods/classic_zombies/exclusions.json @@ -1,7 +1,6 @@ [ { "type": "region_overlay", - "id": "classic_overmap", "regions": [ "all" ], "overmap_feature_flag_settings": { "whitelist": [ "CLASSIC" ] } }, @@ -13,13 +12,11 @@ { "type": "EXTERNAL_OPTION", "name": "DISABLE_ROBOT_RESPONSE", - "info": "Disables robot spawning from alerts and from being wanted.", "stype": "bool", "value": true }, { "type": "region_overlay", - "id": "classic_extras", "regions": [ "all" ], "map_extras": { "forest": { "chance": 20, "extras": { "mx_portal": 0, "mx_portal_in": 0, "mx_anomaly": 0, "mx_spider": 0 } }, diff --git a/data/mods/desert_region/desert_insect_spider.json b/data/mods/desert_region/desert_insect_spider.json index db485f0a73d70..6265f6122f173 100644 --- a/data/mods/desert_region/desert_insect_spider.json +++ b/data/mods/desert_region/desert_insect_spider.json @@ -8,7 +8,7 @@ "bodytype": "insect", "species": [ "INSECT" ], "volume": "62500 ml", - "weight": 81500, + "weight": "81500 g", "hp": 85, "speed": 100, "material": [ "iflesh" ], diff --git a/data/mods/desert_region/desert_mammal.json b/data/mods/desert_region/desert_mammal.json index 79c66841a2eb1..0c47510d63e0b 100644 --- a/data/mods/desert_region/desert_mammal.json +++ b/data/mods/desert_region/desert_mammal.json @@ -9,7 +9,7 @@ "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "5896700 ml", - "weight": 5896700, + "weight": "5896700 g", "hp": 360, "speed": 200, "material": [ "flesh" ], diff --git a/data/mods/desert_region/desert_monsters.json b/data/mods/desert_region/desert_monsters.json index ff2700bc3daa7..bcb4fd55fbca5 100644 --- a/data/mods/desert_region/desert_monsters.json +++ b/data/mods/desert_region/desert_monsters.json @@ -8,7 +8,7 @@ "bodytype": "kangaroo", "species": [ "ZOMBIE" ], "volume": "90718 ml", - "weight": 90718, + "weight": "90718 g", "hp": 125, "speed": 130, "material": [ "flesh" ], diff --git a/data/mods/desert_region/desert_regional_map_settings.json b/data/mods/desert_region/desert_regional_map_settings.json index 9d1c6cc964bc3..f8cf777a16051 100644 --- a/data/mods/desert_region/desert_regional_map_settings.json +++ b/data/mods/desert_region/desert_regional_map_settings.json @@ -527,14 +527,7 @@ "extras": { "mx_military": 5, "mx_science": 12, "mx_collegekids": 15, "mx_portal": 7, "mx_portal_in": 1, "mx_anomaly": 3 } } }, - "num_forests": 250, - "forest_size_min": 15, - "forest_size_max": 40, - "swamp_maxsize": 4, - "swamp_river_influence": 5, - "swamp_spread_chance": 8500, "city": { - "type": "town", "shop_radius": 30, "shop_sigma": 50, "park_radius": 20, @@ -685,7 +678,9 @@ "s_thrift": 100, "s_petstore": 100, "megastore": 150, - "hotel": 75, + "hotel_1": 75, + "hotel_2": 75, + "hotel_3": 75, "hospital": 175, "public_works": 200, "office_tower_2": 150, diff --git a/data/mods/desert_region/desert_reptile_amphibian.json b/data/mods/desert_region/desert_reptile_amphibian.json index 3f27f70fa5aa4..f674711278236 100644 --- a/data/mods/desert_region/desert_reptile_amphibian.json +++ b/data/mods/desert_region/desert_reptile_amphibian.json @@ -8,7 +8,7 @@ "bodytype": "lizard", "species": [ "REPTILE" ], "volume": "4000 ml", - "weight": 1814, + "weight": "1814 g", "hp": 16, "speed": 85, "material": [ "iflesh" ], diff --git a/data/mods/desert_region/desert_terrain.json b/data/mods/desert_region/desert_terrain.json index 6fca2c3716784..6f7b3d6f6f062 100644 --- a/data/mods/desert_region/desert_terrain.json +++ b/data/mods/desert_region/desert_terrain.json @@ -96,7 +96,7 @@ "looks_like": "f_mutcactus_test", "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE_ASH", "THIN_OBSTACLE", "PLACE_ITEM", "SHARP" ], "examine_action": "harvest_ter_nectar", - "harvest_by_season": [ { "seasons": [ "spring" ], "entries": [ { "drop": "cholla_bud", "base_num": [ 2, 5 ], "scaled_num": [ 0, 0.5 ] } ] } ], + "harvest_by_season": [ { "seasons": [ "spring" ], "entries": [ { "drop": "cholla_bud", "base_num": [ 2, 5 ] } ] } ], "bash": { "str_min": 4, "str_max": 30, diff --git a/data/mods/mapspecials_demo/megastore/mega_1blc_01.json b/data/mods/mapspecials_demo/megastore/mega_1blc_01.json index 3d319ed2a41c3..d0ea75d34b2e9 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1blc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_1blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1blc", - "comment": "ground floor. bottom left corner", + "//": "ground floor. bottom left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1blc_02.json b/data/mods/mapspecials_demo/megastore/mega_1blc_02.json index 2ad1f6728f611..e17ec422a1439 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1blc_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_1blc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1blc", - "comment": "ground floor. bottom left corner", + "//": "ground floor. bottom left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1blc_03.json b/data/mods/mapspecials_demo/megastore/mega_1blc_03.json index 659f447dcdd8b..fa16a56ad6b48 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1blc_03.json +++ b/data/mods/mapspecials_demo/megastore/mega_1blc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1blc", - "comment": "ground floor. bottom left corner", + "//": "ground floor. bottom left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1blc_04.json b/data/mods/mapspecials_demo/megastore/mega_1blc_04.json index e6fbd7de2acf7..92f738dc22f8b 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1blc_04.json +++ b/data/mods/mapspecials_demo/megastore/mega_1blc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1blc", - "comment": "ground floor. bottom left corner", + "//": "ground floor. bottom left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1blc_05.json b/data/mods/mapspecials_demo/megastore/mega_1blc_05.json index 07e8b7d3af86f..23e1a7755d79f 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1blc_05.json +++ b/data/mods/mapspecials_demo/megastore/mega_1blc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1blc", - "comment": "ground floor. bottom left corner", + "//": "ground floor. bottom left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1brc_01.json b/data/mods/mapspecials_demo/megastore/mega_1brc_01.json index d0ce8730ad167..ddcdd7084800b 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1brc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_1brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1brc", - "comment": "ground floor. bottom right corner", + "//": "ground floor. bottom right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1brc_02.json b/data/mods/mapspecials_demo/megastore/mega_1brc_02.json index 2fd575e9b6003..5046ed2346f87 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1brc_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_1brc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1brc", - "comment": "ground floor. bottom right corner", + "//": "ground floor. bottom right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1brc_03.json b/data/mods/mapspecials_demo/megastore/mega_1brc_03.json index 2b2920e6c43ab..7f0835c07d216 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1brc_03.json +++ b/data/mods/mapspecials_demo/megastore/mega_1brc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1brc", - "comment": "ground floor. bottom right corner", + "//": "ground floor. bottom right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1brc_04.json b/data/mods/mapspecials_demo/megastore/mega_1brc_04.json index 6d6688a69ef3d..48da1c441a408 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1brc_04.json +++ b/data/mods/mapspecials_demo/megastore/mega_1brc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1brc", - "comment": "ground floor. bottom right corner", + "//": "ground floor. bottom right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1brc_05.json b/data/mods/mapspecials_demo/megastore/mega_1brc_05.json index aa2c52f459e68..a9c935ea098a3 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1brc_05.json +++ b/data/mods/mapspecials_demo/megastore/mega_1brc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1brc", - "comment": "ground floor. bottom right corner", + "//": "ground floor. bottom right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1le_01.json b/data/mods/mapspecials_demo/megastore/mega_1le_01.json index 29e826102bd97..50727875a28d7 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1le_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_1le_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1le", - "comment": "ground floor. left edge", + "//": "ground floor. left edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1le_02.json b/data/mods/mapspecials_demo/megastore/mega_1le_02.json index 9f18fc66f363b..68c9525f7ac0d 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1le_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_1le_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1le", - "comment": "ground floor. left edge", + "//": "ground floor. left edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1le_03.json b/data/mods/mapspecials_demo/megastore/mega_1le_03.json index 9863267e642b2..bf0e45fa668ce 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1le_03.json +++ b/data/mods/mapspecials_demo/megastore/mega_1le_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1le", - "comment": "ground floor. left edge", + "//": "ground floor. left edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1le_04.json b/data/mods/mapspecials_demo/megastore/mega_1le_04.json index 35171bf8684fe..df481f6bd8368 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1le_04.json +++ b/data/mods/mapspecials_demo/megastore/mega_1le_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1le", - "comment": "ground floor. left edge", + "//": "ground floor. left edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1le_05.json b/data/mods/mapspecials_demo/megastore/mega_1le_05.json index 5afb91d5a19aa..130c91b417bcd 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1le_05.json +++ b/data/mods/mapspecials_demo/megastore/mega_1le_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1le", - "comment": "ground floor. left edge", + "//": "ground floor. left edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1mid_01.json b/data/mods/mapspecials_demo/megastore/mega_1mid_01.json index ba572c81c19b9..01bbe0330928b 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1mid_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_1mid_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1mid", - "comment": "ground floor. middle area", + "//": "ground floor. middle area", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1mid_02.json b/data/mods/mapspecials_demo/megastore/mega_1mid_02.json index 9ff62aa8ca7a4..c0f8a5fed641f 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1mid_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_1mid_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1mid", - "comment": "ground floor. middle area", + "//": "ground floor. middle area", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1mid_03.json b/data/mods/mapspecials_demo/megastore/mega_1mid_03.json index 6a4a223d25da7..77b8ff5ea652a 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1mid_03.json +++ b/data/mods/mapspecials_demo/megastore/mega_1mid_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1mid", - "comment": "ground floor. middle area", + "//": "ground floor. middle area", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1mid_04.json b/data/mods/mapspecials_demo/megastore/mega_1mid_04.json index a91996726cc06..4b316b9d64348 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1mid_04.json +++ b/data/mods/mapspecials_demo/megastore/mega_1mid_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1mid", - "comment": "ground floor. middle area", + "//": "ground floor. middle area", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1mid_05.json b/data/mods/mapspecials_demo/megastore/mega_1mid_05.json index 4ed042a6cb9e5..a7fca85339e45 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1mid_05.json +++ b/data/mods/mapspecials_demo/megastore/mega_1mid_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1mid", - "comment": "ground floor. middle area", + "//": "ground floor. middle area", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1re_01.json b/data/mods/mapspecials_demo/megastore/mega_1re_01.json index cd997eb777d37..e85eef4c497da 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1re_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_1re_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1re", - "comment": "ground floor. right edge", + "//": "ground floor. right edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1re_02.json b/data/mods/mapspecials_demo/megastore/mega_1re_02.json index c464a3cde2316..23275a5183d66 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1re_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_1re_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1re", - "comment": "ground floor. right edge", + "//": "ground floor. right edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1re_03.json b/data/mods/mapspecials_demo/megastore/mega_1re_03.json index 194bed0f2569a..add03b41e47f0 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1re_03.json +++ b/data/mods/mapspecials_demo/megastore/mega_1re_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1re", - "comment": "ground floor. right edge", + "//": "ground floor. right edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1re_04.json b/data/mods/mapspecials_demo/megastore/mega_1re_04.json index bb34e0084df1c..e5c8f199d8118 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1re_04.json +++ b/data/mods/mapspecials_demo/megastore/mega_1re_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1re", - "comment": "ground floor. right edge", + "//": "ground floor. right edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1re_05.json b/data/mods/mapspecials_demo/megastore/mega_1re_05.json index 49a877f4f0561..257fb1bee576b 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1re_05.json +++ b/data/mods/mapspecials_demo/megastore/mega_1re_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1re", - "comment": "ground floor. right edge", + "//": "ground floor. right edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1te_01.json b/data/mods/mapspecials_demo/megastore/mega_1te_01.json index f784e6228dcda..54a8471bfbcbf 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1te_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_1te_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1te", - "comment": "ground floor. top edge", + "//": "ground floor. top edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1te_02.json b/data/mods/mapspecials_demo/megastore/mega_1te_02.json index c10aec4cf0d30..5f5ffb5939dbb 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1te_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_1te_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1te", - "comment": "ground floor. top edge", + "//": "ground floor. top edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1te_03.json b/data/mods/mapspecials_demo/megastore/mega_1te_03.json index ac7014614b00e..14ee9da2ce317 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1te_03.json +++ b/data/mods/mapspecials_demo/megastore/mega_1te_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1te", - "comment": "ground floor. top edge", + "//": "ground floor. top edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1te_04.json b/data/mods/mapspecials_demo/megastore/mega_1te_04.json index ee353e6464f64..84a72043a54eb 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1te_04.json +++ b/data/mods/mapspecials_demo/megastore/mega_1te_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1te", - "comment": "ground floor. top edge", + "//": "ground floor. top edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1te_05.json b/data/mods/mapspecials_demo/megastore/mega_1te_05.json index ed4f2f7289b0f..ae1374b925e6c 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1te_05.json +++ b/data/mods/mapspecials_demo/megastore/mega_1te_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1te", - "comment": "ground floor. top edge", + "//": "ground floor. top edge", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1tlc_01.json b/data/mods/mapspecials_demo/megastore/mega_1tlc_01.json index 27cea85ea942d..3a28cfc724506 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1tlc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_1tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1tlc", - "comment": "ground floor. top left corner", + "//": "ground floor. top left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1tlc_02.json b/data/mods/mapspecials_demo/megastore/mega_1tlc_02.json index 832737b15a404..c21fbddde5590 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1tlc_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_1tlc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1tlc", - "comment": "ground floor. top left corner", + "//": "ground floor. top left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1tlc_03.json b/data/mods/mapspecials_demo/megastore/mega_1tlc_03.json index 2e407d6beb09f..d663b699a0485 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1tlc_03.json +++ b/data/mods/mapspecials_demo/megastore/mega_1tlc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1tlc", - "comment": "ground floor. top left corner", + "//": "ground floor. top left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1tlc_04.json b/data/mods/mapspecials_demo/megastore/mega_1tlc_04.json index 730bc39ff0913..b39b46937745a 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1tlc_04.json +++ b/data/mods/mapspecials_demo/megastore/mega_1tlc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1tlc", - "comment": "ground floor. top left corner", + "//": "ground floor. top left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1tlc_05.json b/data/mods/mapspecials_demo/megastore/mega_1tlc_05.json index d92b7de573015..4b0baae4c07e7 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1tlc_05.json +++ b/data/mods/mapspecials_demo/megastore/mega_1tlc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1tlc", - "comment": "ground floor. top left corner", + "//": "ground floor. top left corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1trc_01.json b/data/mods/mapspecials_demo/megastore/mega_1trc_01.json index a2d52ab57d0d0..cfe8d43119e4f 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1trc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_1trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1trc", - "comment": "ground floor. top right corner", + "//": "ground floor. top right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1trc_02.json b/data/mods/mapspecials_demo/megastore/mega_1trc_02.json index 1c604ba3b0fad..c2daf929bc605 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1trc_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_1trc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1trc", - "comment": "ground floor. top right corner", + "//": "ground floor. top right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1trc_03.json b/data/mods/mapspecials_demo/megastore/mega_1trc_03.json index 7c1191337bdc3..d83261c75eb90 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1trc_03.json +++ b/data/mods/mapspecials_demo/megastore/mega_1trc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1trc", - "comment": "ground floor. top right corner", + "//": "ground floor. top right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1trc_04.json b/data/mods/mapspecials_demo/megastore/mega_1trc_04.json index a5b3f489b46c0..548dca6529a59 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1trc_04.json +++ b/data/mods/mapspecials_demo/megastore/mega_1trc_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1trc", - "comment": "ground floor. top right corner", + "//": "ground floor. top right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_1trc_05.json b/data/mods/mapspecials_demo/megastore/mega_1trc_05.json index 4d2dbbfd7df92..76c7130fce15a 100644 --- a/data/mods/mapspecials_demo/megastore/mega_1trc_05.json +++ b/data/mods/mapspecials_demo/megastore/mega_1trc_05.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_1trc", - "comment": "ground floor. top right corner", + "//": "ground floor. top right corner", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2be_01.json b/data/mods/mapspecials_demo/megastore/mega_2be_01.json index 44b6e9e2f1f6c..bfcd8a268fab9 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2be_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2be_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2be", - "comment": "second floor. bottom edge", + "//": "second floor. bottom edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2blc_01.json b/data/mods/mapspecials_demo/megastore/mega_2blc_01.json index 68b00e09bf7f4..2c1d1047d3e26 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2blc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2blc", - "comment": "second floor. bottom left corner", + "//": "second floor. bottom left corner", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2brc_01.json b/data/mods/mapspecials_demo/megastore/mega_2brc_01.json index f873071499a38..447ba1ee105af 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2brc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2brc", - "comment": "second floor bottom right corner", + "//": "second floor bottom right corner", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2le_01.json b/data/mods/mapspecials_demo/megastore/mega_2le_01.json index 7f51e3e58652a..efff4c3467131 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2le_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2le_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2le", - "comment": "second floor left edge", + "//": "second floor left edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2mid_01.json b/data/mods/mapspecials_demo/megastore/mega_2mid_01.json index c660d50247c40..13ebd09806f81 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2mid_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2mid_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2mid", - "comment": "second floor. middle area", + "//": "second floor. middle area", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2re_01.json b/data/mods/mapspecials_demo/megastore/mega_2re_01.json index 28585e04f1452..a01a1438dda40 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2re_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2re_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2re", - "comment": "second floor. right edge", + "//": "second floor. right edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2te_01.json b/data/mods/mapspecials_demo/megastore/mega_2te_01.json index a6c9cbac06a35..2fadc18175929 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2te_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2te_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2te", - "comment": "second floor. top edge", + "//": "second floor. top edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2tlc_01.json b/data/mods/mapspecials_demo/megastore/mega_2tlc_01.json index e065587249090..9b143c60c7a9b 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2tlc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2tlc", - "comment": "second floor. top left corner", + "//": "second floor. top left corner", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_2trc_01.json b/data/mods/mapspecials_demo/megastore/mega_2trc_01.json index f5ff242e27664..fbe8c46c0ff09 100644 --- a/data/mods/mapspecials_demo/megastore/mega_2trc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_2trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_2trc", - "comment": "second floor top right corner", + "//": "second floor top right corner", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3be_01.json b/data/mods/mapspecials_demo/megastore/mega_3be_01.json index f03acdb345fa2..a65a68d3311e0 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3be_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3be_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3be", - "comment": "roof. bottom edge", + "//": "roof. bottom edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3blc_01.json b/data/mods/mapspecials_demo/megastore/mega_3blc_01.json index c9545cba83a4a..8e334296c3b24 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3blc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3blc", - "comment": "third floor. bottom left corner", + "//": "third floor. bottom left corner", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3brc_01.json b/data/mods/mapspecials_demo/megastore/mega_3brc_01.json index ff4d4ac227911..48152ca6dd61a 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3brc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3brc", - "comment": "third floor bottom right corner", + "//": "third floor bottom right corner", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3le_01.json b/data/mods/mapspecials_demo/megastore/mega_3le_01.json index 4b9fb33d3e7a5..0c6e56e82072d 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3le_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3le_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3le", - "comment": "roof. left edge", + "//": "roof. left edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3mid_01.json b/data/mods/mapspecials_demo/megastore/mega_3mid_01.json index 392c9fe8aeb17..d1803a9e95032 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3mid_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3mid_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3mid", - "comment": "roof. middle area", + "//": "roof. middle area", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3re_01.json b/data/mods/mapspecials_demo/megastore/mega_3re_01.json index dfa9b064a8510..d3bf43a03c5dd 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3re_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3re_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3re", - "comment": "roof. right edge", + "//": "roof. right edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3te_01.json b/data/mods/mapspecials_demo/megastore/mega_3te_01.json index c5e8d9c276318..3e8a463d6c894 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3te_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3te_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3te", - "comment": "roof. top edge", + "//": "roof. top edge", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3tlc_01.json b/data/mods/mapspecials_demo/megastore/mega_3tlc_01.json index 21d1a3d043575..cc6f86a0080d2 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3tlc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3tlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3tlc", - "comment": "roof. top left corner.", + "//": "roof. top left corner.", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_3trc_01.json b/data/mods/mapspecials_demo/megastore/mega_3trc_01.json index d36b1257c3a03..60bfe274b9cf4 100644 --- a/data/mods/mapspecials_demo/megastore/mega_3trc_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_3trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_3trc", - "comment": "third floor. top right corner", + "//": "third floor. top right corner", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_entrance_01.json b/data/mods/mapspecials_demo/megastore/mega_entrance_01.json index b65d29c59deaa..fdbe064ed1c47 100644 --- a/data/mods/mapspecials_demo/megastore/mega_entrance_01.json +++ b/data/mods/mapspecials_demo/megastore/mega_entrance_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_entrance", - "comment": "ground floor. entrance", + "//": "ground floor. entrance", "weight": 10, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/megastore/mega_entrance_02.json b/data/mods/mapspecials_demo/megastore/mega_entrance_02.json index 7f184f2a79581..a5f7c8cce6405 100644 --- a/data/mods/mapspecials_demo/megastore/mega_entrance_02.json +++ b/data/mods/mapspecials_demo/megastore/mega_entrance_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": "mega_entrance", - "comment": "ground floor. entrance", + "//": "ground floor. entrance", "weight": 100, "method": "json", "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_blc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_blc_01.json index 8934b6320d18a..d717a1e3c978a 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_blc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_blc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_blc" ], - "comment": "bottom left corner", + "//": "bottom left corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_brc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_brc_01.json index 9a27d5d37eda0..e2dcb2769156a 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_brc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_brc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_brc" ], - "comment": "bottom right corner", + "//": "bottom right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_entrance_01.json b/data/mods/mapspecials_demo/missile_silo/silo_entrance_01.json index 25ba756f08de4..5644c10fe1990 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_entrance_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_entrance_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_entrance" ], - "comment": "silo entrance. top left corner", + "//": "silo entrance. top left corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_fblc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_fblc_01.json index aa05a49540552..452f44bbd5a94 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_fblc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_fblc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_fblc" ], - "comment": "finale. bottom left corner", + "//": "finale. bottom left corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_fbrc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_fbrc_01.json index 76fd90e3789b9..79368b895f564 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_fbrc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_fbrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_fbrc" ], - "comment": "finale. bottom right corner", + "//": "finale. bottom right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_ftlc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_ftlc_01.json index f3715ac4f2086..d294f5c784217 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_ftlc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_ftlc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_ftlc" ], - "comment": "finale. top left corner. A stairs", + "//": "finale. top left corner. A stairs", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_ftrc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_ftrc_01.json index f26e151f898e6..e2f6d8c79ae79 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_ftrc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_ftrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_ftrc" ], - "comment": "finale. top right corner", + "//": "finale. top right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_trc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_trc_01.json index ef67db13be726..ed5e5435a2ff9 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_trc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_trc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_trc" ], - "comment": "top right corner", + "//": "top right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_ublc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_ublc_01.json index 8d052d0a37582..081d98691ef35 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_ublc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_ublc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_ublc" ], - "comment": "underground. bottom left corner", + "//": "underground. bottom left corner", "method": "json", "weight": 20, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_ublc_02.json b/data/mods/mapspecials_demo/missile_silo/silo_ublc_02.json index 24703a80e3fa8..dc4f5d348253b 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_ublc_02.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_ublc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_ublc" ], - "comment": "underground. bottom left corner", + "//": "underground. bottom left corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_ublc_03.json b/data/mods/mapspecials_demo/missile_silo/silo_ublc_03.json index e8c98cc5b3e12..09bb70d1b24c9 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_ublc_03.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_ublc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_ublc" ], - "comment": "underground. bottom left corner", + "//": "underground. bottom left corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_ubrc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_ubrc_01.json index a4b16a7f46989..adf3486d5fa08 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_ubrc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_ubrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_ubrc" ], - "comment": "underground. bottom right corner", + "//": "underground. bottom right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_ubrc_02.json b/data/mods/mapspecials_demo/missile_silo/silo_ubrc_02.json index 99bb1191fa397..283bbe861c0b4 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_ubrc_02.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_ubrc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_ubrc" ], - "comment": "underground. bottom right corner", + "//": "underground. bottom right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_ubrc_03.json b/data/mods/mapspecials_demo/missile_silo/silo_ubrc_03.json index 610dc71f98cb5..28971949c9184 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_ubrc_03.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_ubrc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_ubrc" ], - "comment": "underground. bottom right corner", + "//": "underground. bottom right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlca_01.json b/data/mods/mapspecials_demo/missile_silo/silo_utlca_01.json index 7f420b891ddca..6fc9e88620bc1 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utlca_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utlca_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utlca" ], - "comment": "underground. top left corner. A stairs", + "//": "underground. top left corner. A stairs", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlca_02.json b/data/mods/mapspecials_demo/missile_silo/silo_utlca_02.json index 903d46a44459f..5728766b5f102 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utlca_02.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utlca_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utlca" ], - "comment": "underground. top left corner. A stairs", + "//": "underground. top left corner. A stairs", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlca_03.json b/data/mods/mapspecials_demo/missile_silo/silo_utlca_03.json index 8ccb4b8d2ca60..f4596d7585a25 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utlca_03.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utlca_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utlca" ], - "comment": "underground. top left corner. A stairs", + "//": "underground. top left corner. A stairs", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlcb_01.json b/data/mods/mapspecials_demo/missile_silo/silo_utlcb_01.json index db8c93dc1b75e..62e12150e18cf 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utlcb_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utlcb_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utlcb" ], - "comment": "underground. top left corner. alternate B stairs", + "//": "underground. top left corner. alternate B stairs", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlcb_02.json b/data/mods/mapspecials_demo/missile_silo/silo_utlcb_02.json index aa0ff968685db..528ab8e6d03fc 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utlcb_02.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utlcb_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utlcb" ], - "comment": "underground. top left corner. alternate B stairs", + "//": "underground. top left corner. alternate B stairs", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlcb_03.json b/data/mods/mapspecials_demo/missile_silo/silo_utlcb_03.json index f616597b6a0a6..435e2896ecba9 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utlcb_03.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utlcb_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utlcb" ], - "comment": "underground. top left corner. alternate B stairs", + "//": "underground. top left corner. alternate B stairs", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utlcb_04.json b/data/mods/mapspecials_demo/missile_silo/silo_utlcb_04.json index 87f2ec68194e2..fd61006017544 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utlcb_04.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utlcb_04.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utlcb" ], - "comment": "underground. top left corner. alternate B stairs", + "//": "underground. top left corner. alternate B stairs", "method": "json", "weight": 30, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utrc_01.json b/data/mods/mapspecials_demo/missile_silo/silo_utrc_01.json index 9899ac7da38f9..52265415b5591 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utrc_01.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utrc_01.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utrc" ], - "comment": "underground. top right corner", + "//": "underground. top right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utrc_02.json b/data/mods/mapspecials_demo/missile_silo/silo_utrc_02.json index 6f0958fb58140..4fae7c6d63d0d 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utrc_02.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utrc_02.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utrc" ], - "comment": "underground. top right corner", + "//": "underground. top right corner", "method": "json", "weight": 100, "object": { diff --git a/data/mods/mapspecials_demo/missile_silo/silo_utrc_03.json b/data/mods/mapspecials_demo/missile_silo/silo_utrc_03.json index 043d2223dd1d0..ec72d86cdf2fe 100644 --- a/data/mods/mapspecials_demo/missile_silo/silo_utrc_03.json +++ b/data/mods/mapspecials_demo/missile_silo/silo_utrc_03.json @@ -2,7 +2,7 @@ { "type": "mapgen", "om_terrain": [ "silo_utrc" ], - "comment": "underground. top right corner", + "//": "underground. top right corner", "method": "json", "weight": 100, "object": { @@ -39,7 +39,7 @@ "7": { "name": "Missile Control", "access_denied": "ERROR! Access denied! Unauthorized access will be met with lethal force!", - "options": [ { "name": "Launch Missile", "action": "miss_launch" }, { "name": "Disarm Missile", "action": "miss_disarm" } ], + "options": [ { "name": "Disarm Missile", "action": "miss_disarm" } ], "failures": [ { "action": "secubots" }, { "action": "damage" } ] } } diff --git a/data/mods/more_classes_scenarios/cs_classes.json b/data/mods/more_classes_scenarios/cs_classes.json index 48e334bdc9d5e..fff97420161d4 100644 --- a/data/mods/more_classes_scenarios/cs_classes.json +++ b/data/mods/more_classes_scenarios/cs_classes.json @@ -311,7 +311,7 @@ "type": "profession", "ident": "waken", "name": "Awakened", - "description": "You were awoken in the middle of the night by a noise. Armed only with a flashlight you went to investigate, now you face the Cataclysm.", + "description": "You were awoken in the middle of the night by a noise. Armed only with a flashlight you went to investigate, now you face the Cataclysm.", "points": 0, "items": { "both": { "items": [ "slippers" ], "entries": [ { "group": "charged_flashlight" } ] }, @@ -323,7 +323,7 @@ "type": "profession", "ident": "bio_cyclist", "name": "Bionic Cyclist", - "description": "Your training and augmentation for the Cyber-Olympics cycling competition gave you an edge on escaping the start of the Cataclysm. Can you keep on running from it forever?", + "description": "Your training and augmentation for the Cyber-Olympics cycling competition gave you an edge on escaping the start of the Cataclysm. Can you keep on running from it forever?", "points": 6, "CBMs": [ "bio_str_enhancer", "bio_adrenaline", "bio_hydraulics", "bio_metabolics", "bio_power_storage_mkII" ], "skills": [ { "level": 3, "name": "driving" }, { "level": 2, "name": "dodge" } ], @@ -347,7 +347,7 @@ "type": "profession", "ident": "welder", "name": "Welder", - "description": "You worked as a welder for an off shore company before the Cataclysm. You were on your way back home when it struck. At least you got the tools of your craft.", + "description": "You worked as a welder for an off shore company before the Cataclysm. You were on your way back home when it struck. At least you got the tools of your craft.", "points": 4, "skills": [ { "level": 1, "name": "mechanics" } ], "items": { @@ -366,7 +366,7 @@ "type": "profession", "ident": "pri-sur", "name": "Primitive Survivalist", - "description": "You knew the day would come, the day it all went to shit. You prepared yourself, not by gear but sheer skill; all those days in the woods paid off. If your ancestors survived with no tech, you'll be damned if you don't", + "description": "You knew the day would come, the day it all went to shit. You prepared yourself, not by gear but sheer skill; all those days in the woods paid off. If your ancestors survived with no tech, you'll be damned if you don't", "points": 6, "skills": [ { "level": 5, "name": "survival" }, diff --git a/data/mods/more_classes_scenarios/cs_scenarios.json b/data/mods/more_classes_scenarios/cs_scenarios.json index 40c76b4b43a6f..8a1ae2f604c80 100644 --- a/data/mods/more_classes_scenarios/cs_scenarios.json +++ b/data/mods/more_classes_scenarios/cs_scenarios.json @@ -4,7 +4,7 @@ "ident": "fema_help", "name": "Challenge-FEMA Death Camp", "points": -6, - "description": "You were one of the many law-enforcement and military personnel alike called in to keep order on one of the FEMA camps. It all went to shit fast...wounded, infected, surrounded by fire you lie on the ground...and they just keep coming...", + "description": "You were one of the many law-enforcement and military personnel alike called in to keep order on one of the FEMA camps. It all went to shit fast… wounded, infected, surrounded by fire you lie on the ground… and they just keep coming…", "allowed_locs": [ "fema_entrance_s", "fema_s" ], "professions": [ "cop", diff --git a/data/mods/necromancy/necronimicron.json b/data/mods/necromancy/necronimicron.json index 1ecfcf355e174..63e4145f1b35e 100644 --- a/data/mods/necromancy/necronimicron.json +++ b/data/mods/necromancy/necronimicron.json @@ -8,7 +8,7 @@ "description": "A small device, not bigger than a man's fist. It provides primitive organisms with electric stimulation, reviving them and forcing them to obey your commands. This version only works on blobs.", "price": 50000, "material": [ "aluminum", "plastic" ], - "weight": 100, + "weight": "100 g", "volume": 0, "category": "spare_parts" }, @@ -21,8 +21,8 @@ "description": "Several chunks of blob scraps, stuffed with a control chip and sewn back together. A light shock from the UPS started the chip, bringing the blob back to life. Use this item to wake up the blob.", "price": 70000, "material": "flesh", - "weight": 1000, - "volume": 1, + "weight": "1 kg", + "volume": "250 ml", "use_action": { "type": "place_monster", "monster_id": "mon_blob", @@ -45,8 +45,8 @@ "description": "Your very own undead servant. The blob controlling its body is in a state of coma, awaiting your orders. Use this item to wake up the minion.", "price": 250000, "material": "flesh", - "weight": 10000, - "volume": 800, + "weight": "10 kg", + "volume": "200 L", "category": "tools", "use_action": { "type": "place_monster", @@ -79,23 +79,23 @@ "color": "green", "description": "A potent drug, necessary when performing a revival operation on larger animals (including humans). It induces a violent allergic reactions in living organisms, so using it on yourself is a REALLY bad idea.", "price": 100000, - "weight": 1, - "volume": 1, + "weight": "1 g", + "volume": "250 ml", "tool": "syringe", "category": "drugs" }, { "type": "BOOK", "id": "abdul_necro", - "name": "Principles of Postmortem Mind Control", + "name": { "str": "Principles of Postmortem Mind Control", "str_pl": "copies of Principles of Postmortem Mind Control" }, "max_level": 5, "description": "A thick book containing research notes of a mad scientist. It describes various methods of reanimating and controlling the dead. There's a lot of gory details and technical language mixed in, so it's not easy to read.", - "weight": 2330, + "weight": "2330 g", "color": "dark_gray", "intelligence": 14, "symbol": "?", "material": [ "paper" ], - "volume": 5, + "volume": "1250 ml", "time": 120, "fun": -3, "skill": "firstaid", diff --git a/data/mods/novitamins/modinfo.json b/data/mods/novitamins/modinfo.json index 368d968bd79c6..b0ca0bfd09085 100644 --- a/data/mods/novitamins/modinfo.json +++ b/data/mods/novitamins/modinfo.json @@ -11,7 +11,6 @@ { "type": "EXTERNAL_OPTION", "name": "NO_VITAMINS", - "info": "Disables tracking vitamins in food items. If true, disables vitamin tracking and vitamin disorders.", "stype": "bool", "value": true }, diff --git a/data/mods/realguns/gun.json b/data/mods/realguns/gun.json index c620736b803df..e32c62a18430f 100644 --- a/data/mods/realguns/gun.json +++ b/data/mods/realguns/gun.json @@ -5,8 +5,8 @@ "reload_noise_volume": 10, "name": "M6 Aircrew Survival Weapon", "description": "A lightweight combination rifle, combining a .22 rimfire barrel with .410 shotgun barrel, and designed to fold for compact storage. Produced for military aircraft pilots who might be stranded after a crash, later produced commercially by various companies.", - "weight": 2140, - "volume": 7, + "weight": "2140 g", + "volume": "1750 ml", "price": 59500, "to_hit": -1, "bashing": 6, @@ -32,8 +32,8 @@ "type": "GUN", "name": ".410 pipe shotgun", "description": "A home-made shotgun, in .410 bore. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", - "weight": 2267, - "volume": 8, + "weight": "2267 g", + "volume": "2 L", "price": 10000, "to_hit": -1, "bashing": 10, diff --git a/data/mods/realguns/item_groups.json b/data/mods/realguns/item_groups.json index 3b0b4667fe50d..40076e65c9f2d 100644 --- a/data/mods/realguns/item_groups.json +++ b/data/mods/realguns/item_groups.json @@ -2,7 +2,7 @@ { "id": "spider", "type": "item_group", - "items": [ [ "410shot", 6 ], [ "m6_asw", 1 ] ] + "items": [ [ "410shot_000", 6 ], [ "m6_asw", 1 ] ] }, { "id": "helicopter", @@ -12,7 +12,7 @@ { "id": "guns_pistol_obscure", "type": "item_group", - "items": [ [ "m1991a1_38super", 150 ] ] + "items": [ [ "m1911a1_38super", 150 ] ] }, { "id": "guns_rifle_rare", @@ -38,6 +38,6 @@ { "id": "mags_obscure", "type": "item_group", - "items": [ [ "m1991_38smag", 10 ] ] + "items": [ [ "m1911mag_10rd_38super", 10 ] ] } ] diff --git a/data/mods/sees_player_hitbutton/modinfo.json b/data/mods/sees_player_hitbutton/modinfo.json index 36553f873cc38..89fa82455fcfc 100644 --- a/data/mods/sees_player_hitbutton/modinfo.json +++ b/data/mods/sees_player_hitbutton/modinfo.json @@ -4,7 +4,7 @@ "ident": "sees_player_hitbutton", "name": "sees-player icon, HitButton_iso", "authors": [ "esotericist", "AnthonBerg" ], - "description": "Adds indicator icon if a creature sees the player. Designed for the HitButton isometric tileset.", + "description": "Adds indicator icon if a creature sees the player. Designed for the HitButton isometric tileset.", "category": "graphical", "dependencies": [ "dda" ] } diff --git a/data/mods/sees_player_indicator/modinfo.json b/data/mods/sees_player_indicator/modinfo.json index f4ee66bfce702..2b7c01274f13c 100644 --- a/data/mods/sees_player_indicator/modinfo.json +++ b/data/mods/sees_player_indicator/modinfo.json @@ -4,7 +4,7 @@ "ident": "sees_player", "name": "sees-player icon, +attitude", "authors": [ "esotericist" ], - "description": "Adds attitude-tinted icon if a creature sees a player, and a tinted thought bubble otherwise. Designed for Live/Dead people tileset.", + "description": "Adds attitude-tinted icon if a creature sees a player, and a tinted thought bubble otherwise. Designed for Live/Dead people tileset.", "category": "graphical", "obsolete": true, "dependencies": [ "dda" ] diff --git a/data/mods/sees_player_less_attitude/modinfo.json b/data/mods/sees_player_less_attitude/modinfo.json index bd57081bb2333..9f8fc130f8f17 100644 --- a/data/mods/sees_player_less_attitude/modinfo.json +++ b/data/mods/sees_player_less_attitude/modinfo.json @@ -4,7 +4,7 @@ "ident": "sees_player_less_attitude", "name": "sees-player icon, -attitude", "authors": [ "esotericist" ], - "description": "Adds attitude-tinted icon if a creature sees a player, nothing when player is unseen. Designed for Live/Dead people tileset.", + "description": "Adds attitude-tinted icon if a creature sees a player, nothing when player is unseen. Designed for Live/Dead people tileset.", "category": "graphical", "obsolete": true, "dependencies": [ "dda" ] diff --git a/data/mods/sees_player_retro/modinfo.json b/data/mods/sees_player_retro/modinfo.json index b4e15e1149e91..b36b4dc94a40d 100644 --- a/data/mods/sees_player_retro/modinfo.json +++ b/data/mods/sees_player_retro/modinfo.json @@ -4,7 +4,7 @@ "ident": "sees_player_retro", "name": "sees-player icon, retrodays", "authors": [ "esotericist" ], - "description": "Adds indicator icon if a creature sees the player. Designed for the retrodays tileset.", + "description": "Adds indicator icon if a creature sees the player. Designed for the retrodays tileset.", "category": "graphical", "dependencies": [ "dda" ] } diff --git a/data/mods/speedydex/modinfo.json b/data/mods/speedydex/modinfo.json index 91b4de6910065..b329beb682d0e 100644 --- a/data/mods/speedydex/modinfo.json +++ b/data/mods/speedydex/modinfo.json @@ -12,14 +12,12 @@ { "type": "EXTERNAL_OPTION", "name": "SPEEDYDEX_MIN_DEX", - "info": "The minimum dex required for speedydex mod to add speed", "stype": "int", "value": 12 }, { "type": "EXTERNAL_OPTION", "name": "SPEEDYDEX_DEX_SPEED", - "info": "The amount of moves gained per dex above SPEEDYDEX_MIN_DEX", "stype": "int", "value": 2 } diff --git a/data/mods/stats_through_kills/modinfo.json b/data/mods/stats_through_kills/modinfo.json index 6cf323ddf4d67..fb5b7f3bc1f4a 100644 --- a/data/mods/stats_through_kills/modinfo.json +++ b/data/mods/stats_through_kills/modinfo.json @@ -12,7 +12,6 @@ { "type": "EXTERNAL_OPTION", "name": "STATS_THROUGH_KILLS", - "info": "Stats through Kills. A mod that allows your stats to increase by killing zombies.", "stype": "bool", "value": true } diff --git a/doc/DEVELOPER_TOOLING.md b/doc/DEVELOPER_TOOLING.md index 3c50ab19cf580..ae2f14f195809 100644 --- a/doc/DEVELOPER_TOOLING.md +++ b/doc/DEVELOPER_TOOLING.md @@ -263,7 +263,7 @@ to avoid compiler errors. python3 /clang-tools-extra/clang-tidy/tool/run-clang-tidy.py \ -clang-tidy-binary=build/tools/clang-tidy-plugin/CataAnalyzerPlugin.exe \ -p=build "\.cpp$" \ - -extra-arg=-target -extra-arg=x86_64-pc-windows-gnu -extra-arg=-pthread -extra-arg=-DSDL_DISABLE_ANALYZE_MACROS \ + -extra-arg=-target -extra-arg=x86_64-pc-windows-gnu -extra-arg=-pthread -extra-arg=-DSDL_DISABLE_ANALYZE_MACROS -extra-arg=-Wno-unknown-warning-option \ -extra-arg=-isystem -extra-arg=/clang/lib/Headers ``` diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md index 08903453d83c6..714af7fe74781 100644 --- a/doc/JSON_FLAGS.md +++ b/doc/JSON_FLAGS.md @@ -1,75 +1,76 @@ # JSON Flags -* [Notes](#notes) -* [Inheritance](#inheritance) -* [TODO](#todo) -* [Ammo](#ammo) - + [Ammo type](#ammo-type) - + [Effects](#effects) -* [Armor](#armor) - + [Covers](#covers) - + [Flags](#flags) -* [Bionics](#bionics) -* [Books](#books) - + [Use actions](#use-actions) -* [Comestibles](#comestibles) - + [Comestible type](#comestible-type) - + [Addiction type](#addiction-type) - + [Use action](#use-action) - + [Flags](#flags-1) -* [Furniture and Terrain](#furniture-and-terrain) - + [Flags](#flags-2) - + [Examine Actions](#examine-actions) - + [Fungal Conversions Only](#fungal-conversions-only) - + [Furniture Only](#furniture-only) -* [Generic](#generic) - + [Flags](#flags-3) -* [Guns](#guns) - + [Firing modes](#firing-modes) - + [Faults](#faults) +- [JSON Flags](#json-flags) + - [Notes](#notes) + - [Inheritance](#inheritance) + - [TODO](#todo) + - [Ammo](#ammo) + - [Ammo type](#ammo-type) + - [Effects](#effects) + - [Armor](#armor) + - [Covers](#covers) - [Flags](#flags) - - [Parameters](#parameters) -* [Magazines](#magazines) -* [MAP SPECIALS](#map-specials) -* [Material Phases](#material-phases) -* [Melee](#melee) - + [Flags](#flags-4) -* [Monster Groups](#monster-groups) - + [Conditions](#conditions) - - [Seasons](#seasons) - - [Time of day](#time-of-day) -* [Monsters](#monsters) - + [Anger, Fear and Placation Triggers](#anger--fear-and-placation-triggers) - + [Categories](#categories) - + [Death Functions](#death-functions) - + [Flags](#flags-5) - + [Monster Defense and Attacks](#monster-defense-and-attacks) - + [Sizes](#sizes) - + [Special attacks](#special-attacks) -* [Mutations](#mutations) - + [Categories](#categories-1) -* [Overmap](#overmap) - + [Overmap connections](#overmap-connections) + - [Bionics](#bionics) + - [Books](#books) + - [Use actions](#use-actions) + - [Comestibles](#comestibles) + - [Comestible type](#comestible-type) + - [Addiction type](#addiction-type) + - [Use action](#use-action) + - [Flags](#flags-1) + - [Furniture and Terrain](#furniture-and-terrain) + - [Flags](#flags-2) + - [Examine Actions](#examine-actions) + - [Fungal Conversions Only](#fungal-conversions-only) + - [Furniture Only](#furniture-only) + - [Generic](#generic) + - [Flags](#flags-3) + - [Guns](#guns) + - [Firing modes](#firing-modes) + - [Faults](#faults) + - [Flags](#flags-4) + - [Parameters](#parameters) + - [Magazines](#magazines) + - [MAP SPECIALS](#map-specials) + - [Material Phases](#material-phases) + - [Melee](#melee) + - [Flags](#flags-5) + - [Monster Groups](#monster-groups) + - [Conditions](#conditions) + - [Seasons](#seasons) + - [Time of day](#time-of-day) + - [Monsters](#monsters) + - [Anger, Fear and Placation Triggers](#anger-fear-and-placation-triggers) + - [Categories](#categories) + - [Death Functions](#death-functions) - [Flags](#flags-6) - + [Overmap specials](#overmap-specials) - - [Flags](#flags-7) - + [Overmap terrains](#overmap-terrains) - - [Flags](#flags-8) -* [Recipes](#recipes) - + [Categories](#categories-2) - + [Flags](#flags-9) -* [Scenarios](#scenarios) - + [Flags](#flags-10) - - [Season Flags](#season-flags) -* [Skills](#skills) - + [Tags](#tags) -* [Techniques](#techniques) -* [Tools](#tools) - + [Flags](#flags-11) - + [Flags that apply to items](#flags-that-apply-to-items) -* [Vehicle Parts](#vehicle-parts) - + [Flags](#flags-12) - + [Fuel types](#fuel-types) + - [Monster Defense and Attacks](#monster-defense-and-attacks) + - [Sizes](#sizes) + - [Special attacks](#special-attacks) + - [Mutations](#mutations) + - [Flags](#flags-7) + - [Categories](#categories-1) + - [Overmap](#overmap) + - [Overmap connections](#overmap-connections) + - [Overmap specials](#overmap-specials) + - [Flags](#flags-8) + - [Overmap terrains](#overmap-terrains) + - [Flags](#flags-9) + - [Recipes](#recipes) + - [Categories](#categories-2) + - [Flags](#flags-10) + - [Scenarios](#scenarios) + - [Flags](#flags-11) + - [Season Flags](#season-flags) + - [Skills](#skills) + - [Tags](#tags) + - [Techniques](#techniques) + - [Tools](#tools) + - [Flags](#flags-12) + - [Flags that apply to items](#flags-that-apply-to-items) + - [Vehicle Parts](#vehicle-parts) + - [Flags](#flags-13) + - [Fuel types](#fuel-types) ## Notes @@ -258,6 +259,7 @@ Some armor flags, such as `WATCH` and `ALARMCLOCK` are compatible with other ite - ```PARTIAL_DEAF``` Reduces the volume of sounds to a safe level. - ```PERSONAL``` This item goes in the personal aura layer, intended for metaphysical effects. - ```POCKETS``` Increases warmth for hands if the player's hands are cold and the player is wielding nothing. +- ```POWERARMOR_COMPATIBLE``` Makes item compatible with power armor despite other parameters causing failure. - ```PSYSHIELD_PARTIAL``` 25% chance to protect against fear_paralyze monster attack when worn. - ```RAD_PROOF``` This piece of clothing completely protects you from radiation. - ```RAD_RESIST``` This piece of clothing partially protects you from radiation. @@ -427,6 +429,7 @@ Some armor flags, such as `WATCH` and `ALARMCLOCK` are compatible with other ite - ```BANDAGE``` Stop bleeding. - ```BIRDFOOD``` Makes a small bird friendly. - ```BLECH``` Causes vomiting. +- ```BLECH_BECAUSE_UNCLEAN``` Causes warning. - ```CAFF``` Reduces fatigue. - ```CATFOOD``` Makes a cat friendly. - ```CATTLEFODDER``` Makes a large herbivore friendly. @@ -1004,7 +1007,7 @@ Also see `monster_attacks.json` for more special attacks, for example, impale an - ```BRANDISH``` Brandish a knife at the player. - ```BREATHE``` Spawns a `breather` - ```CALLBLOBS``` Calls 2/3 of nearby blobs to defend this monster, and sends 1/3 of nearby blobs after the player. -- ```CHICKENBOT``` Robot can attack with tazer, M4, or MGL depending on distance. +- ```CHICKENBOT``` LEGACY - Robot can attack with tazer, M4, or MGL depending on distance. - ```COPBOT``` Cop-bot alerts and then tazes the player. - ```DANCE``` Monster dances. - ```DARKMAN``` Can cause darkness and wraiths to spawn. @@ -1079,6 +1082,15 @@ Also see `monster_attacks.json` for more special attacks, for example, impale an ## Mutations +#### Flags + +- ```UNARMED_BONUS``` You get a bonus to unarmed bash and cut damage equal to unarmed_skill/2 up to 4. +- ```NEED_ACTIVE_TO_MELEE``` This mutation gives bonus to unarmed melee only if it's active. +- ```NO_DISEASE``` This mutation grants immunity to diseases. +- ```NO_THIRST``` Your thirst is not modified by food or drinks. +- ```NO_RADIATION``` This mutation grants immunity to radiations. + + ### Categories These branches are also the valid entries for the categories of `dreams` in `dreams.json` diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 4870c634a06d4..9c0e13b01c8ab 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -6,6 +6,7 @@ Use the `Home` key to return to the top. - [File descriptions](#file-descriptions) * [`data/json/`](#datajson) * [`data/json/items/`](#datajsonitems) + + [`data/json/items/comestibles`](#datajsonitemscomestibles) * [`data/json/requirements/`](#datajsonrequirements) * [`data/json/vehicles/`](#datajsonvehicles) - [Generic properties and formatting](#generic-properties-and-formatting) @@ -36,6 +37,7 @@ Use the `Home` key to return to the top. - [`flags`](#-flags-) - [`cbms`](#-cbms-) - [`traits`](#-traits-) + + [Profession item substitution](#profession_item_substitutions) + [Recipes](#recipes) + [Constructions](#constructions) + [Scent Types](#scent_types) @@ -155,12 +157,12 @@ Use the `Home` key to return to the top. - [MOD tileset](#mod-tileset) * [`compatibility`](#-compatibility-) * [`tiles-new`](#-tiles-new-) - + # Introduction This document describes the contents of the json files used in Cataclysm: Dark days ahead. You are probably reading this if you want to add or change content of Catacysm: Dark days ahead and need to learn more about what to find where and what each file and property does. # File descriptions -Here's a quick summary of what each of the JSON files contain, broken down by folder. +Here's a quick summary of what each of the JSON files contain, broken down by folder. This list is not comprehensive, but covers the broad strokes. ## `data/json/` @@ -259,6 +261,8 @@ See below for specifics on the various items | tools.json | tools and items that can be (a)ctivated | vehicle_parts.json | components of vehicles when they aren't on the vehicle +### `data/json/items/comestibles` + ## `data/json/requirements/` Standard components and tools for crafting @@ -300,10 +304,10 @@ A few properties are applicable to most if not all json files and do not need to | Identifier | Description |--- |--- | type | The type of object this json entry is describing. Setting this entry to 'armor' for example means the game will expect properties specific to armor in that entry. Also ties in with 'copy-from' (see below), if you want to inherit properties of another object, it must be of the same tipe. -| [copy-from](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc/JSON_INHERITANCE.md) | The identifier of the item you wish to copy properties from. This allows you to make an exact copy of an item __of the same type__ and only provide entries that should change from the item you copied from. +| [copy-from](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc/JSON_INHERITANCE.md) | The identifier of the item you wish to copy properties from. This allows you to make an exact copy of an item __of the same type__ and only provide entries that should change from the item you copied from. | [extends](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc/JSON_INHERITANCE.md) | Modders can add an "extends" field to their definition to append entries to a list instead of overriding the entire list. | [delete](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc/JSON_INHERITANCE.md) | Modders can also add a "delete" field that removes elements from lists instead of overriding the entire list. -| [abstract](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc/JSON_INHERITANCE.md) | Creates an abstract item (an item that does not end up in the game and solely exists in the json to be copied-from. Use this _instead of_ 'id'. +| [abstract](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc/JSON_INHERITANCE.md) | Creates an abstract item (an item that does not end up in the game and solely exists in the json to be copied-from. Use this _instead of_ 'id'. @@ -466,16 +470,17 @@ The syntax listed here is still valid. | Identifier | Description |--- |--- -| `ident` | Unique ID. Must be one continuous word, use underscores if necessary. +| `ident` | Unique ID. Lowercase snake_case. Must be one continuous word, use underscores if necessary. | `name` | In-game name displayed. | `bash_resist` | How well a material resists bashing damage. | `cut_resist` | How well a material resists cutting damage. -| `bash_dmg_verb` | Verb used when material takes bashing damage. -| `cut_dmg_verb` | Verb used when material takes cutting damage. -| `dmg_adj` | Description added to damaged item in ascending severity. | `acid_resist` | Ability of a material to resist acid. | `elec_resist` | Ability of a material to resist electricity. | `fire_resist` | Ability of a material to resist fire. +| `chip_resist` | Returns resistance to being damaged by attacks against the item itself. +| `bash_dmg_verb` | Verb used when material takes bashing damage. +| `cut_dmg_verb` | Verb used when material takes cutting damage. +| `dmg_adj` | Description added to damaged item in ascending severity. | `dmg_adj` | Adjectives used to describe damage states of a material. | `density` | Density of a material. | `vitamins` | Vitamins in a material. Usually overridden by item specific values. @@ -483,6 +488,12 @@ The syntax listed here is still valid. | `specific_heat_solid` | Specific heat of a material when frozen (J/(g K)). Default 2.108. | `latent_heat` | Latent heat of fusion for a material (J/g). Default 334. | `freeze_point` | Freezing point of this material (F). Default 32 F ( 0 C ). +| `edible` | Optional boolean. Default is false. +| `rotting` | Optional boolean. Default is false. +| `soft` | Optional boolean. Default is false. +| `reinforces` | Optional boolean. Default is false. + +There are six -resist parameters: acid, bash, chip, cut, elec, and fire. These are integer values; the default is 0 and they can be negative to take more damage. ```C++ { @@ -523,7 +534,7 @@ The syntax listed here is still valid. | `default` | Default monster, automatically fills in any remaining spawn chances. | `monsters` | To choose a monster for spawning, the game creates 1000 entries and picks one. Each monster will have a number of entries equal to it's "freq" and the default monster will fill in the remaining. See the table below for how to build the single monster definitions. | `is_safe` | (bool) Check to not trigger safe-mode warning. -| `is_animal` | (bool) Check if that group has only normal animals. +| `is_animal` | (bool) Check if that group has only normal animals. #### Monster definition @@ -581,6 +592,41 @@ See MONSTERS.md // NOTE: Please refrain from adding name PR's in order to maintain kickstarter exclusivity ``` +### Profession item substitution + +Defines item replacements that are applied to the starting items based upon the starting traits. This allows for example to replace wool items with non-wool items when the characters starts with the wool allergy trait. + +If the JSON objects contains a "item" member, it defines a replacement for the given item, like this: + +```C++ +{ + "type": "profession_item_substitutions", + "item": "sunglasses", + "sub": [ + { "present": [ "HYPEROPIC" ], "new": [ "fitover_sunglasses" ] }, + { "present": [ "MYOPIC" ], "new": [ { "fitover_sunglasses", "ratio": 2 } ] } + ] +} +``` +This defines each item of type "sunglasses" shall be replaced with: +- an item "fitover_sunglasses" if the character has the "HYPEROPIC" trait, +- two items "fitover_sunglasses" if the character has the "MYOPIC" trait. + +If the JSON objects contains a "trait" member, it defines a replacement for multiple items that applies when the character has the given trait: +```C++ +{ + "type": "profession_item_substitutions", + "trait": "WOOLALLERGY", + "sub": [ + { "item": "blazer", "new": [ "jacket_leather_red" ] }, + { "item": "hat_hunting", "new": [ { "item": "hat_cotton", "ratio": 2 } ] } + ] +} +```C++ +This defines characters with the WOOLALLERGY trait get some items replaced: +- "blazer" is converted into "jacket_leather_red", +- each "hat_hunting" is converted into *two* "hat_cotton" items. + ### Professions Professions are specified as JSON object with "type" member set to "profession": @@ -940,6 +986,10 @@ Note that even though most statistics yield an integer, you should still use "points": 2, // Point cost of the trait. Positive values cost points and negative values give points "visibility": 0, // Visibility of the trait for purposes of NPC interaction (default: 0) "ugliness": 0, // Ugliness of the trait for purposes of NPC interaction (default: 0) +"cut_dmg_bonus": 3, // Bonus to unarmed cut damage (default: 0) +"bash_dmg_bonus": 3, // Bonus to unarmed bash damage (default: 0) +"rand_cut_bonus": { "min": 2, "max": 3 }, // Random bonus to unarmed cut damage between min and max. +"rand_bash_bonus": { "min": 2, "max": 3 }, // Random bonus to unarmed bash damage between min and max. "bodytemp_modifiers" : [100, 150], // Range of additional bodytemp units (these units are described in 'weather.h'. First value is used if the person is already overheated, second one if it's not. "bodytemp_sleep" : 50, // Additional units of bodytemp which are applied when sleeping "initial_ma_styles": [ "style_crane" ], // (optional) A list of ids of martial art styles of which the player can choose one when starting a game. @@ -967,6 +1017,7 @@ Note that even though most statistics yield an integer, you should still use "good": 1 } ] // "neutral/good/ignored" // Good increases pos and cancels neg, neut cancels neg, ignored cancels both "vitamin_rates": [ [ "vitC", -1200 ] ], // How much extra vitamins do you consume per minute. Negative values mean production "vitamins_absorb_multi": [ [ "flesh", [ [ "vitA", 0 ], [ "vitB", 0 ], [ "vitC", 0 ], [ "calcium", 0 ], [ "iron", 0 ] ], [ "all", [ [ "vitA", 2 ], [ "vitB", 2 ], [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 2 ] ] ] ], // multiplier of vitamin absorption based on material. "all" is every material. supports multiple materials. +"craft_skill_bonus": [ [ "electronics", -2 ], [ "tailor", -2 ], [ "mechanics", -2 ] ], // Skill affected by the mutation and their bonuses. Bonuses can be negative, a bonus of 4 is worth 1 full skill level. "restricts_gear" : [ "TORSO" ], //list of bodyparts that get restricted by this mutation "allow_soft_gear" : true, //If there is a list of 'restricts_gear' this sets if the location still allows items made out of soft materials (Only one of the types need to be soft for it to be considered soft). (default: false) "destroys_gear" : true, //If true, destroys the gear in the 'restricts_gear' location when mutated into. (default: false) @@ -1073,7 +1124,7 @@ Vehicle components when installed on a vehicle. "exclusions": [ "souls" ] // Optional field, defaults to empty. A list of words. A new engine can't be installed on the vehicle if any engine on the vehicle shares a word from exclusions. "fuel_options": [ "soul", "black_soul" ] // Optional field, defaults to fuel_type. A list of words. An engine can be fueled by any fuel type in its fuel_options. If provided, it overrides fuel_type and should include the fuel in fuel_type. "comfort": 3, // Optional field, defaults to 0. How comfortable this terrain/furniture is. Impact ability to fall asleep on it. (uncomfortable = -999, neutral = 0, slightly_comfortable = 3, comfortable = 5, very_comfortable = 10) -"floor_bedding_warmth": 300, // Optional field, defaults to 0. Bonus warmth offered by this terrain/furniture when used to sleep. +"floor_bedding_warmth": 300, // Optional field, defaults to 0. Bonus warmth offered by this terrain/furniture when used to sleep. "bonus_fire_warmth_feet": 200,// Optional field, defaults to 300. Increase warmth received on feet from nearby fire. ``` @@ -1329,6 +1380,19 @@ Alternately, every item (tool, gun, even food) can be used as book if it has boo } ``` +Since many book names are proper names, it's often necessary to explicitly specify +the plural forms. The following is the game's convention on plural names of books: + +1. For non-periodical books (textbooks, manuals, spellbooks, etc.), + 1. If the book's singular name is a proper name, then the plural name is `copies of (singular name)`. For example, the plural name of `Lessons for the Novice Bowhunter` is `copies of Lessons for the Novice Bowhunter`. + 2. Otherwise, the plural name is the usual plural of the singular name. For example, the plural name of `tactical baton defense manual` is `tactical baton defense manuals` +2. For periodicals (magazines and journals), + 1. If the periodical's singular name is a proper name, and doesn't end with "Magazine", "Weekly", "Monthly", etc., the plural name is `issues of (singular name)`. For example, the plural name of `Archery for Kids` is `issues of Archery for Kids`. + 2. Otherwise, the periodical's plural name is the usual plural of the singular name. For example, the plural name of `Crafty Crafter's Quarterly` is `Crafty Crafter's Quarterlies`. +3. For board games (represented internally as book items), + 1. If the board game's singular name is a proper name, the plural is `sets of (singular name)`. For example, the plural name of `Picturesque` is `sets of Picturesque`. + 2. Otherwise the plural name is the usual plural. For example, the plural of `deck of cards` is `decks of cards`. + #### Conditional Naming The `conditional_names` field allows defining alternate names for items that will be displayed instead of (or in addition to) the default name, when specific conditions are met. Take the following (incomplete) definition for `sausage` as an example of the syntax: @@ -1533,7 +1597,7 @@ Alternately, every item (book, tool, armor, even food) can be used as a gunmod i "gunmod_data" : { "location": ..., "mod_targets": ..., - ... + ... } ``` @@ -1838,6 +1902,13 @@ The contents of use_action fields can either be a string indicating a built-in f "skill2": "unarmed", // Another id, just like the skill1. Both entries are optional. "moves": 60 // how many move points the action takes. }, +"use_action": { + "type": "place_npc", // place npc of specific class on the map + "npc_class_id": "true_foodperson", // npc class id, see npcs/classes.json + "summon_msg": "You summon a food hero!", // (optional) message when summoning the npc. + "place_randomly": true, // if true: places npc randomly around the player, if false: let the player decide where to put it (default: false) + "moves": 50 // how many move points the action takes. +}, "use_action": { "type": "ups_based_armor", // Armor that can be activated and uses power from an UPS, needs additional json code to work "activate_msg": "You activate your foo.", // Message when the player activates the item. @@ -2124,7 +2195,7 @@ Array of dictionaries defining possible items produced on butchering and their l For every `type` other then `bionic` and `bionic_group` following entries scale the results: `base_num` value should be an array with two elements in which the first defines the minimum number of the corresponding item produced and the second defines the maximum number. `scale_num` value should be an array with two elements, increasing the minimum and maximum drop numbers respectively by element value * survival skill. - `max` upper limit after `bas_num` and `scale_num` are calculated using + `max` upper limit after `bas_num` and `scale_num` are calculated using `mass_ratio` value is a multiplier of how much of the monster's weight comprises the associated item. to conserve mass, keep between 0 and 1 combined with all drops. This overrides `base_num`, `scale_num` and `max` @@ -2188,7 +2259,7 @@ Strength required to move the furniture around. Negative values indicate an unmo #### `plant_data` -(Optional) This is a plant. Must specify a plant transform, and a base depending on context. You can also add a harvest or growth multiplier if it has the `GROWTH_HARVEST` flag. +(Optional) This is a plant. Must specify a plant transform, and a base depending on context. You can also add a harvest or growth multiplier if it has the `GROWTH_HARVEST` flag. ### Terrain @@ -2311,7 +2382,7 @@ How comfortable this terrain/furniture is. Impact ability to fall asleep on it. #### `floor_bedding_warmth` -Bonus warmth offered by this terrain/furniture when used to sleep. +Bonus warmth offered by this terrain/furniture when used to sleep. #### `bonus_fire_warmth_feet` diff --git a/doc/MAPGEN.md b/doc/MAPGEN.md index 060904b68dbe1..7cbd1bf815133 100644 --- a/doc/MAPGEN.md +++ b/doc/MAPGEN.md @@ -586,7 +586,7 @@ Places a gas pump with gasoline (or sometimes diesel) in it. Values: ### 2.5.6 "items" Places items from an item group. Values: -- "item": (required, string) the item group to use. +- "item": (required, string or itemgroup object) the item group to use. - "chance": (optional, integer or min/max array) x in 100 chance that a loop will continue to spawn items from the group (which itself may spawn multiple items or not depending on its type, see `ITEM_SPAWN.md`), unless the chance is 100, in which case it will trigger the item group spawn exactly 1 time (see `map::place_items`). - "repeat": (optional, integer or min/max array) the number of times to repeat this placement, default is 1. diff --git a/doc/MONSTERS.md b/doc/MONSTERS.md index 58ad70d275c9a..57f5f0f316c71 100644 --- a/doc/MONSTERS.md +++ b/doc/MONSTERS.md @@ -11,6 +11,8 @@ Monster types are specified as JSON object with "type" member set to "MONSTER": The id member should be the unique id of the type. It can be any string, by convention it has the prefix "mon_". This id can be referred to in various places, like monster groups or in mapgen to spawn specific monsters. +For quantity strings (ie. volume, weight) use the largest unit you can keep full precision with. + Monster types support the following properties (mandatory, except if noted otherwise): ## "name" @@ -24,14 +26,22 @@ Monster types support the following properties (mandatory, except if noted other "name": { "ctxt": "fish", "str": "pike", "str_pl": "pikes" } ``` -Name displayed in-game, and optionally the plural name and a translation context. +Name displayed in-game, and optionally the plural name and a translation context (ctxt). + If the plural name is not specified, it defaults to singular name + "s". +Ctxt is used to help translators in case of homonyms (two different things with the same name). For example, pike the fish and pike the weapon. + ## "description" (string) In-game description for the monster. +## "categories" +(array of strings, optional) + +Monster categories. Can be NULL, CLASSIC (only mobs found in classic zombie movies) or WILDLIFE (natural animals). If they are not CLASSIC or WILDLIFE, they will not spawn in classic mode. One can add or remove entries in mods via "add:flags" and "remove:flags". + ## "species" (array of strings, optional) @@ -39,10 +49,21 @@ A list of species ids. One can add or remove entries in mods via "add:species" a In mainline game it can be HUMAN, ROBOT, ZOMBIE, MAMMAL, BIRD, FISH, REPTILE, WORM, MOLLUSK, AMPHIBIAN, INSECT, SPIDER, FUNGUS, PLANT, NETHER, MUTANT, BLOB, HORROR, ABERRATION, HALLUCINATION and UNKNOWN. -## "categories" -(array of strings, optional) +## "volume" +(string) -Monster categories. Can be NULL, CLASSIC (only mobs found in classic zombie movies) or WILDLIFE (natural animals). If they are not CLASSIC or WILDLIFE, they will not spawn in classic mode. One can add or remove entries in mods via "add:flags" and "remove:flags". +```JSON +"volume": "40 L" +``` +The numeric part of the string must be an integer. Accepts L, and ml as units. Note that l and mL are not currently accepted. + +## "weight" +(string) + +```JSON +"weight": "3 kg" +``` +The numeric part of the string must be an integer. Use the largest unit you can keep full precision with. For example: 3 kg, not 3000 g. Accepts g and kg as units. ## "scent_tracked" (array of strings, optional) diff --git a/doc/PLAYER_ACTIVITY.md b/doc/PLAYER_ACTIVITY.md index 535c738f8d970..bac9471ef0338 100644 --- a/doc/PLAYER_ACTIVITY.md +++ b/doc/PLAYER_ACTIVITY.md @@ -50,6 +50,9 @@ If the activity needs any information during its execution or when it's finished Those values are automatically saved and restored when loading a game. Other than that they are not changed/examined by any common code. Different types of activities can use them however they need to. +If you are adding an activity that may be possible for NPCs to perform, then please make the activity placement in absolute coords. +As the local coordinate system is based on the avatar position. + ### `activity_handlers::_do_turn` function To prevent an infinite loop, ensure that one of the following is satisfied: diff --git a/doc/TRANSLATING.md b/doc/TRANSLATING.md index 153a1ea1832b0..429aef1d60f51 100644 --- a/doc/TRANSLATING.md +++ b/doc/TRANSLATING.md @@ -1,5 +1,15 @@ # Translating Cataclysm: DDA +* [Translators](#translators) + * [Getting Started](#getting-Started) + * [Grammatical gender](#grammatical-gender) + * [Tips](#tips) +* [Developers](#developers) + * [Translation Functions](#translation-functions) + * [`translation`](#translation) + * [Recommendations](#recommendations) +* [Maintainers](#maintainers) + ## Translators The official location for translating Cataclysm: DDA is the diff --git a/doc/VITAMIN.md b/doc/VITAMIN.md index adc9224043311..2abcb854a2708 100644 --- a/doc/VITAMIN.md +++ b/doc/VITAMIN.md @@ -1,4 +1,6 @@ -## vitamin +# vitamin + +## definition ```JSON { @@ -11,6 +13,7 @@ "min": -12000, "max": 3600, "rate": "15 m", + "flags": [ "FOO" ], "disease": [ [ -4800, -5600 ], [ -5601, -6400 ], [ -6401, -12000 ] ], "disease_excess": [ [ 10, 19 ], [ 20, 29 ], [ 30, 40 ] ] }, @@ -55,6 +58,9 @@ The highest amount of this vitamin that the avatar can have. ### `rate` How long it takes to lose one unit of this vitamin. +### `flags` +An array of string flags, see the flags section below for valid ones + ### `disease` What the thresholds of deficiency of this vitamin are. Each pair in the list determines the start and end points of that tier of deficiency. @@ -64,3 +70,7 @@ Each tier of deficiency corresponds to the intensity level of the effect defined What the thresholds of excess of this vitamin are. Each pair in the list determines the start and end points of that tier of excess. Each tier of excess corresponds to the intensity level of the effect defined in `excess`. + +## flags + +- ```NO_DISPLAY``` - This vitamin will not be shown when examining a food diff --git a/gfx/RetroDays+Tileset/fallback.png b/gfx/RetroDays+Tileset/fallback.png new file mode 100644 index 0000000000000..355abadd5d132 Binary files /dev/null and b/gfx/RetroDays+Tileset/fallback.png differ diff --git a/gfx/RetroDays+Tileset/tile_config.json b/gfx/RetroDays+Tileset/tile_config.json new file mode 100644 index 0000000000000..4d6e9e315aa9f --- /dev/null +++ b/gfx/RetroDays+Tileset/tile_config.json @@ -0,0 +1,7889 @@ +{ + "tile_info": [ + { "height": 10, "width": 10, "pixelscale": 2 } + ], + "tiles-new": [ + { + "file": "tiles.png", + "tiles": [ + { "id": [ "nothing", "tr_ledge" ], "fg": 0 }, + { "id": [ "t_hole", "lighting_hidden" ], "fg": 1, "rotates": false }, + { "id": "lighting_lowlight_dark", "fg": 2, "rotates": false }, + { "id": "lighting_lowlight_light", "fg": 3, "rotates": false }, + { "id": "lighting_boomered_dark", "fg": 4, "rotates": false }, + { "id": "lighting_boomered_light", "fg": 5, "rotates": false }, + { "id": "animation_line", "fg": 6 }, + { "id": "animation_hit", "fg": 7 }, + { "id": "fd_dazzling", "fg": 8, "rotates": false }, + { "id": [ "fd_hot_air1", "fd_hot_air2", "fd_hot_air3", "fd_hot_air4" ], "fg": 9, "rotates": false }, + { "id": [ "t_open_air", "t_open_air_rooved" ], "fg": 10, "rotates": false }, + { "id": "fd_spotlight", "fg": 11, "rotates": false }, + { "id": [ "highlight", "line_target", "line_trail", "cursor" ], "fg": 12 }, + { "id": "highlight_item", "fg": 13, "rotates": false }, + { "id": "unknown", "fg": 14, "rotates": false }, + { "id": "footstep", "fg": 15, "rotates": false }, + { "id": "infrared_creature", "fg": 16, "rotates": false }, + { + "id": "explosion", + "fg": 17, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 17 }, + { "id": "corner", "fg": 18 }, + { "id": "edge", "fg": 17 }, + { "id": "end_piece", "fg": 17 }, + { "id": "t_connection", "fg": 17 }, + { "id": "unconnected", "fg": 17 } + ] + }, + { + "id": "explosion_medium", + "fg": 19, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 19 }, + { "id": "corner", "fg": 20 }, + { "id": "edge", "fg": 19 }, + { "id": "end_piece", "fg": 19 }, + { "id": "t_connection", "fg": 19 }, + { "id": "unconnected", "fg": 19 } + ] + }, + { + "id": "explosion_weak", + "fg": 21, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 21 }, + { "id": "corner", "fg": 22 }, + { "id": "edge", "fg": 21 }, + { "id": "end_piece", "fg": 21 }, + { "id": "t_connection", "fg": 21 }, + { "id": "unconnected", "fg": 21 } + ] + }, + { "id": "fd_laser", "fg": 23 }, + { "id": [ "animation_bullet_shrapnel", "animation_bullet_normal" ], "fg": 24 }, + { "id": "fd_plasma", "fg": 25 }, + { "id": "weather_rain_drop", "fg": 26 }, + { "id": "weather_acid_drop", "fg": 27 }, + { "id": "weather_snowflake", "fg": 28 }, + { "id": [ "t_water_moving_dp", "t_swater_dp", "t_water_dp" ], "fg": 29, "rotates": false }, + { "id": [ "t_water_moving_sh", "t_swater_sh", "t_water_pool", "t_water_sh" ], "fg": 30, "rotates": false }, + { "id": [ "t_slime", "t_sewage" ], "fg": 31, "rotates": false }, + { "id": [ "tr_lava", "t_lava" ], "fg": 32, "rotates": false }, + { "id": "t_sludge", "fg": 33, "rotates": false }, + { "id": "t_tar", "fg": 34, "rotates": false }, + { "id": [ "t_dirtfloor", "t_dirt" ], "fg": 35, "rotates": false }, + { "id": "t_dirt_season_winter", "fg": 36, "rotates": false }, + { "id": "t_searth_test", "fg": 37, "rotates": false }, + { "id": "t_sand", "fg": 38, "rotates": false }, + { "id": "t_clay", "fg": 39, "rotates": false }, + { "id": "t_woodchips", "fg": 40, "rotates": false }, + { "id": "f_ash", "fg": 41, "rotates": false }, + { "id": [ "fd_rubble", "f_rubble_rock" ], "fg": 42, "rotates": false }, + { "id": "f_rubble", "fg": 43, "rotates": false }, + { "id": [ "t_sidewalk_bg_dp", "t_sidewalk" ], "fg": 44, "rotates": false }, + { "id": [ "t_pavement_bg_dp", "t_pavement" ], "fg": 45, "rotates": false }, + { "id": [ "t_pavement_y_bg_dp", "t_pavement_y" ], "fg": 46, "rotates": false }, + { "id": "t_rock_floor", "fg": 47, "rotates": false }, + { + "id": [ "t_concrete_floor", "t_flat_roof", "t_strconc_floor", "t_thconc_floor", "t_railroad_rubble", "t_concrete" ], + "fg": 48, + "rotates": false + }, + { "id": "t_thconc_floor_olight", "fg": 49, "rotates": false }, + { "id": [ "t_scrap_floor", "t_junk_floor", "t_metal_floor" ], "fg": 50, "rotates": false }, + { "id": "f_wreckage", "fg": 51, "rotates": false }, + { "id": [ "t_linoleum_gray", "t_strconc_floor_halfway" ], "fg": 52, "rotates": false }, + { "id": [ "t_floor_red", "t_carpet_red" ], "fg": 53, "rotates": false }, + { "id": [ "t_carpet_yellow", "t_floor_waxed_y" ], "fg": 54, "rotates": false }, + { "id": "t_floor_waxed", "fg": 55, "rotates": false }, + { "id": [ "f_tatami", "f_skin_groundsheet" ], "fg": 56, "rotates": false }, + { "id": "t_floor_primitive", "fg": 57, "rotates": false }, + { + "id": [ "f_groundsheet", "f_fema_groundsheet", "f_large_groundsheet", "f_center_groundsheet" ], + "fg": 58, + "rotates": false + }, + { "id": [ "t_floor_green", "t_carpet_green" ], "fg": 59, "rotates": false }, + { "id": "t_floor_blue", "fg": 60, "rotates": false }, + { "id": "t_floor", "fg": 61, "rotates": false }, + { "id": "t_carpet_purple", "fg": 62, "rotates": false }, + { "id": "t_elevator", "fg": 63, "rotates": false }, + { "id": [ "t_skylight", "t_linoleum_white", "t_paper_floor", "f_canvas_floor" ], "fg": 64, "rotates": false }, + { "id": [ "t_claymound", "t_dirtmoundfloor", "t_dirtmound" ], "fg": 65, "rotates": false }, + { "id": "t_sandmound", "fg": 66, "rotates": false }, + { "id": [ "t_grass", "t_grass_season_spring" ], "fg": 67, "rotates": false }, + { "id": "t_grass_season_summer", "fg": 68, "rotates": false }, + { "id": "t_grass_season_autumn", "fg": 69, "rotates": false }, + { "id": "t_grass_season_winter", "fg": 70, "rotates": false }, + { "id": [ "t_fungus", "t_grass_white" ], "fg": 71, "rotates": false }, + { "id": [ "t_grass_long", "t_grass_long_season_spring" ], "fg": 72, "rotates": false }, + { "id": "t_grass_long_season_summer", "fg": 73, "rotates": false }, + { "id": "t_grass_long_season_autumn", "fg": 74, "rotates": false }, + { "id": "t_grass_long_season_winter", "fg": 75, "rotates": false }, + { "id": [ "t_grass_tall", "t_grass_tall_season_spring" ], "fg": 76, "rotates": false }, + { "id": "t_grass_tall_summer", "fg": 77, "rotates": false }, + { "id": "t_grass_tall_season_autumn", "fg": 78, "rotates": false }, + { "id": "t_grass_tall_season_winter", "fg": 79, "rotates": false }, + { "id": [ "t_underbrush_season_spring", "t_underbrush" ], "fg": 80, "rotates": false }, + { "id": "t_underbrush_season_summer", "fg": 81, "rotates": false }, + { "id": "t_underbrush_season_autumn", "fg": 82, "rotates": false }, + { "id": "t_underbrush_season_winter", "fg": 83, "rotates": false }, + { "id": "mon_minecraft", "fg": 84, "rotates": false }, + { "id": "mon_minecraft_charged", "fg": 85, "rotates": false }, + { "id": "mon_minecraft_season_winter", "fg": 86, "rotates": false }, + { "id": "mon_minecraft_charged_season_winter", "fg": 87, "rotates": false }, + { + "id": [ + "t_underbrush_harvested_spring", + "t_underbrush_harvested_spring_season_spring", + "t_underbrush_harvested_summer", + "t_underbrush_harvested_summer_season_spring", + "t_underbrush_harvested_autumn", + "t_underbrush_harvested_autumn_season_spring", + "t_underbrush_harvested_winter", + "t_underbrush_harvested_winter_season_spring" + ], + "fg": 88, + "rotates": false + }, + { + "id": [ + "t_underbrush_harvested_spring_season_summer", + "t_underbrush_harvested_summer_season_summer", + "t_underbrush_harvested_autumn_season_summer", + "t_underbrush_harvested_winter_season_summer" + ], + "fg": 89, + "rotates": false + }, + { + "id": [ + "t_underbrush_harvested_spring_season_autumn", + "t_underbrush_harvested_summer_season_autumn", + "t_underbrush_harvested_autumn_season_autumn", + "t_underbrush_harvested_winter_season_autumn" + ], + "fg": 90, + "rotates": false + }, + { + "id": [ + "t_underbrush_harvested_spring_season_winter", + "t_underbrush_harvested_summer_season_winter", + "t_underbrush_harvested_autumn_season_winter" + ], + "fg": 91, + "rotates": false + }, + { "id": "t_underbrush_harvested_winter_season_winter", "fg": 92, "rotates": false }, + { + "id": [ + "t_shrub", + "t_shrub_season_spring", + "t_shrub_peanut", + "t_shrub_peanut_season_spring", + "t_shrub_peanut_harvested", + "t_shrub_peanut_harvested_season_spring" + ], + "fg": 93, + "rotates": false + }, + { + "id": [ "t_shrub_peanut_season_summer", "t_shrub_peanut_harvested_season_summer", "t_shrub_season_summer" ], + "fg": 94, + "rotates": false + }, + { + "id": [ "t_shrub_season_autumn", "t_shrub_peanut_season_autumn", "t_shrub_peanut_harvested_season_autumn" ], + "fg": 95, + "rotates": false + }, + { + "id": [ + "t_shrub_peanut_season_winter", + "t_shrub_peanut_harvested_season_winter", + "t_shrub_blueberry_season_winter", + "t_shrub_strawberry_season_winter", + "t_shrub_season_winter" + ], + "fg": 96, + "rotates": false + }, + { + "id": [ "t_shrub_strawberry_harvested", "t_shrub_strawberry_season_spring", "t_shrub_strawberry_season_autumn" ], + "fg": 97, + "rotates": false + }, + { "id": "t_shrub_strawberry", "fg": 98, "rotates": false }, + { + "id": [ "t_shrub_blueberry_harvested", "t_shrub_blueberry_season_spring", "t_shrub_blueberry_season_autumn" ], + "fg": 99, + "rotates": false + }, + { "id": "t_shrub_blueberry", "fg": 100, "rotates": false }, + { "id": "t_shrub_fungal", "fg": 101, "rotates": false }, + { "id": [ "t_tree_young", "t_tree_young_season_spring" ], "fg": 102, "rotates": false }, + { "id": "t_tree_young_season_summer", "fg": 103, "rotates": false }, + { "id": "t_tree_young_season_autumn", "fg": 104, "rotates": false }, + { "id": "t_tree_fungal_young", "fg": 105, "rotates": false }, + { "id": "t_tree_young_season_winter", "fg": 106, "rotates": false }, + { "id": "t_tree_fungal", "fg": 107, "rotates": false }, + { "id": [ "t_tree_cherry", "t_tree_plum" ], "fg": 108, "rotates": false }, + { + "id": [ + "t_tree_season_autumn", + "t_tree_harvested_season_autumn", + "t_tree_cherry_season_autumn", + "t_tree_plum_season_autumn", + "t_tree_peach_season_autumn", + "t_tree_apricot_season_autumn" + ], + "fg": 109, + "rotates": false + }, + { "id": [ "t_tree_peach", "t_tree_apricot" ], "fg": 110, "rotates": false }, + { "id": [ "t_tree_peach_harvested", "t_tree_apricot_harvested" ], "fg": 111, "rotates": false }, + { + "id": [ "t_tree_harvested", "t_tree_season_summer", "t_tree_harvested_season_summer", "t_tree_harvested_season_spring" ], + "fg": 112, + "rotates": false + }, + { + "id": [ + "t_tree_season_spring", + "t_tree", + "t_tree_apple_season_summer", + "t_tree_pear_season_summer", + "t_tree_apple_harvested", + "t_tree_pear_harvested" + ], + "fg": 113, + "rotates": false + }, + { "id": [ "t_tree_apple", "t_tree_pear" ], "fg": 114, "rotates": false }, + { "id": "t_marloss_tree", "fg": 115, "rotates": false }, + { + "id": [ + "t_tree_cherry_season_spring", + "t_tree_plum_season_spring", + "t_tree_cherry_harvested", + "t_tree_plum_harvested", + "t_tree_apple_season_spring", + "t_tree_pear_season_spring", + "t_tree_peach_season_spring", + "t_tree_apricot_season_spring" + ], + "fg": 116, + "rotates": false + }, + { "id": "t_tree_maple_season_autumn", "fg": 117, "rotates": false }, + { + "id": [ + "t_tree_blackjack_season_autumn", + "t_tree_hickory_season_autumn", + "t_tree_hickory_harvested_season_autumn", + "t_tree_almond_season_autumn", + "t_tree_almond_harvested_season_autumn", + "t_tree_pecan_season_autumn", + "t_tree_pecan_harvested_season_autumn" + ], + "fg": 118, + "rotates": false + }, + { + "id": [ + "t_tree_blackjack_season_spring", + "t_tree_hickory_season_spring", + "t_tree_hickory", + "t_tree_hickory_harvested_season_spring", + "t_tree_hickory_harvested", + "t_tree_maple_season_spring", + "t_tree_maple", + "t_tree_almond_season_spring", + "t_tree_almond", + "t_tree_almond_harvested_season_spring", + "t_tree_almond_harvested", + "t_tree_pecan_season_spring", + "t_tree_pecan", + "t_tree_pecan_harvested_season_spring", + "t_tree_pecan_harvested" + ], + "fg": 119, + "rotates": false + }, + { + "id": [ + "t_tree_hickory_season_summer", + "t_tree_hickory_harvested_season_summer", + "t_tree_almond_season_summer", + "t_tree_almond_harvested_season_summer", + "t_tree_pecan_season_summer", + "t_tree_pecan_harvested_season_summer", + "t_tree_maple_season_summer", + "t_tree_blackjack" + ], + "fg": 120, + "rotates": false + }, + { "id": "t_tree_maple_tapped_season_autumn", "fg": 121, "rotates": false }, + { "id": "t_tree_maple_tapped_season_summer", "fg": 122, "rotates": false }, + { "id": [ "t_tree_maple_tapped", "t_tree_maple_tapped_season_spring" ], "fg": 123, "rotates": false }, + { "id": "mon_treent_green", "fg": 124, "rotates": false }, + { "id": "t_tree_birch_harvested_season_autumn", "fg": 125, "rotates": false }, + { "id": "t_tree_birch_season_autumn", "fg": 126, "rotates": false }, + { "id": "t_tree_birch_season_summer", "fg": 127, "rotates": false }, + { "id": "t_tree_birch_harvested_season_summer", "fg": 128, "rotates": false }, + { "id": [ "t_tree_birch_season_spring", "t_tree_birch" ], "fg": 129, "rotates": false }, + { "id": [ "t_tree_birch_harvested_season_spring", "t_tree_birch_harvested" ], "fg": 130, "rotates": false }, + { "id": "t_tree_willow_season_autumn", "fg": 131, "rotates": false }, + { "id": "t_tree_willow_harvested_season_autumn", "fg": 132, "rotates": false }, + { "id": "t_tree_willow_season_summer", "fg": 133, "rotates": false }, + { "id": [ "t_tree_willow_season_spring", "t_tree_willow" ], "fg": 134, "rotates": false }, + { "id": [ "t_tree_willow_harvested_season_spring", "t_tree_willow_harvested" ], "fg": 135, "rotates": false }, + { "id": "t_tree_willow_harvested_season_summer", "fg": 136, "rotates": false }, + { "id": "t_tree_pine", "fg": 137, "rotates": false }, + { "id": "t_tree_deadpine", "fg": 138, "rotates": false }, + { + "id": [ + "t_tree_hickory_dead", + "t_tree_blackjack_harvested_season_spring", + "t_tree_blackjack_harvested_season_summer", + "t_tree_blackjack_harvested_season_autumn", + "mon_treent" + ], + "fg": 139, + "rotates": false + }, + { "id": "t_tree_dead", "fg": 140, "rotates": false }, + { "id": "t_tree_deadpine_season_winter", "fg": 141, "rotates": false }, + { "id": "t_tree_pine_season_winter", "fg": 142, "rotates": false }, + { + "id": [ + "t_tree_blackjack_harvested_season_winter", + "mon_treent_season_winter", + "mon_treent_green_season_winter", + "t_tree_hickory_dead_season_winter" + ], + "fg": 143, + "rotates": false + }, + { + "id": [ + "t_tree_harvested_season_winter", + "t_tree_cherry_season_winter", + "t_tree_plum_season_winter", + "t_tree_apple_season_winter", + "t_tree_pear_season_winter", + "t_tree_peach_season_winter", + "t_tree_apricot_season_winter", + "t_tree_apple_harvested_season_winter", + "t_tree_apricot_harvested_season_winter", + "t_tree_cherry_harvested_season_winter", + "t_tree_peach_harvested_season_winter", + "t_tree_pear_harvested_season_winter", + "t_tree_plum_harvested_season_winter", + "t_tree_season_winter" + ], + "fg": 144, + "rotates": false + }, + { + "id": [ + "t_tree_birch_harvested_season_winter", + "t_tree_hickory_season_winter", + "t_tree_hickory_harvested_season_winter", + "t_tree_almond_season_winter", + "t_tree_almond_harvested_season_winter", + "t_tree_pecan_season_winter", + "t_tree_pecan_harvested_season_winter", + "t_tree_maple_season_winter", + "t_tree_willow_season_winter", + "t_tree_blackjack_season_winter" + ], + "fg": 145, + "rotates": false + }, + { "id": "t_tree_birch_season_winter", "fg": 146, "rotates": false }, + { "id": "t_tree_willow_harvested_season_winter", "fg": 147, "rotates": false }, + { "id": "t_tree_dead_season_winter", "fg": 148, "rotates": false }, + { "id": "t_tree_maple_tapped_season_winter", "fg": 149, "rotates": false }, + { "id": "t_trunk", "fg": 150, "rotates": false }, + { "id": "t_stump", "fg": 151, "rotates": false }, + { "id": "t_marloss", "fg": 152, "rotates": false }, + { "id": "t_fungus_mound", "fg": 153, "rotates": false }, + { "id": "t_fungus_floor_sup", "fg": 154, "rotates": false }, + { + "id": "vp_cargo_bag", + "fg": 154, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "t_fungus_floor_out", "fg": 156, "rotates": false }, + { "id": "t_fungus_floor_in", "fg": 157, "rotates": false }, + { "id": [ "t_fungus_wall_transformed", "t_fungus_wall" ], "fg": 158, "rotates": false }, + { + "id": "tr_goo", + "fg": 159, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 160 }, + { "id": "corner", "fg": 161 }, + { "id": "edge", "fg": 162 }, + { "id": "end_piece", "fg": 163 }, + { "id": "t_connection", "fg": 164 }, + { "id": "unconnected", "fg": 159 } + ] + }, + { "id": [ "t_pit_foxhole", "tr_sinkhole" ], "fg": 165, "rotates": false }, + { + "id": "t_pit_shallow", + "fg": 166, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 167 }, + { "id": "corner", "fg": 168 }, + { "id": "edge", "fg": 169 }, + { "id": "end_piece", "fg": 170 }, + { "id": "t_connection", "fg": 171 }, + { "id": "unconnected", "fg": 166 } + ] + }, + { + "id": [ "tr_pit", "t_pit" ], + "fg": 165, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 172 }, + { "id": "corner", "fg": 173 }, + { "id": "edge", "fg": 174 }, + { "id": "end_piece", "fg": 175 }, + { "id": "t_connection", "fg": 176 }, + { "id": "unconnected", "fg": 165 } + ] + }, + { + "id": [ "t_pit_spiked", "tr_spike_pit" ], + "fg": 177, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 178 }, + { "id": "corner", "fg": 179 }, + { "id": "edge", "fg": 180 }, + { "id": "end_piece", "fg": 181 }, + { "id": "t_connection", "fg": 182 }, + { "id": "unconnected", "fg": 177 } + ] + }, + { + "id": [ "tr_glass_pit", "t_pit_glass" ], + "fg": 183, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 184 }, + { "id": "corner", "fg": 185 }, + { "id": "edge", "fg": 186 }, + { "id": "end_piece", "fg": 187 }, + { "id": "t_connection", "fg": 188 }, + { "id": "unconnected", "fg": 183 } + ] + }, + { + "id": "t_pit_corpsed", + "fg": 189, + "bg": 194, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "bg": 194 }, + { "id": "corner", "fg": 190, "bg": 194 }, + { "id": "edge", "fg": 191, "bg": 194 }, + { "id": "end_piece", "fg": 192, "bg": 194 }, + { "id": "t_connection", "fg": 193, "bg": 194 }, + { "id": "unconnected", "fg": 189, "bg": 194 } + ] + }, + { + "id": "f_rubble_landfill", + "fg": 189, + "bg": 195, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "bg": 195 }, + { "id": "corner", "fg": 190, "bg": 195 }, + { "id": "edge", "fg": 191, "bg": 195 }, + { "id": "end_piece", "fg": 192, "bg": 195 }, + { "id": "t_connection", "fg": 193, "bg": 195 }, + { "id": "unconnected", "fg": 189, "bg": 195 } + ] + }, + { + "id": "f_rubble_landfill_season_winter", + "fg": 189, + "bg": 196, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "bg": 196 }, + { "id": "corner", "fg": 190, "bg": 196 }, + { "id": "edge", "fg": 191, "bg": 196 }, + { "id": "end_piece", "fg": 192, "bg": 196 }, + { "id": "t_connection", "fg": 193, "bg": 196 }, + { "id": "unconnected", "fg": 189, "bg": 196 } + ] + }, + { "id": [ "t_pit_glass_covered", "t_pit_spiked_covered", "t_pit_covered" ], "fg": 197, "rotates": false }, + { + "id": "t_sandbox", + "fg": 198, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 199 }, + { "id": "corner", "fg": 200 }, + { "id": "edge", "fg": 201 }, + { "id": "end_piece", "fg": 202 }, + { "id": "t_connection", "fg": 203 }, + { "id": "unconnected", "fg": 198 } + ] + }, + { "id": "t_wax", "fg": 204, "rotates": false }, + { "id": "t_floor_wax", "fg": 205, "rotates": false }, + { "id": "t_golf_hole", "fg": 206, "rotates": false }, + { "id": "t_rock_red", "fg": 207, "rotates": false }, + { "id": "t_rock_green", "fg": 208, "rotates": false }, + { "id": "t_rock_blue", "fg": 209, "rotates": false }, + { "id": "t_rock", "fg": 210, "rotates": false }, + { "id": "t_rock_smooth", "fg": 211, "rotates": false }, + { "id": "t_fault", "fg": 212, "rotates": false }, + { "id": "t_paper", "fg": 213, "rotates": false }, + { "id": "t_stairs_up", "fg": 214, "rotates": false }, + { "id": "t_stairs_down", "fg": 215, "rotates": false }, + { "id": "t_slope_up", "fg": 216, "rotates": false }, + { "id": "t_slope_down", "fg": 217, "rotates": false }, + { "id": "t_low_stairs_begin", "fg": 218, "rotates": false }, + { "id": "t_low_stairs_end", "fg": 219, "rotates": false }, + { "id": "t_manhole", "fg": 220, "rotates": false }, + { "id": [ "manhole_cover", "t_manhole_cover" ], "fg": 221, "rotates": false }, + { "id": "t_ladder_up", "fg": 222, "rotates": false }, + { "id": "t_ladder_down", "fg": 223, "rotates": false }, + { "id": "f_ladder", "fg": 224, "rotates": false }, + { + "id": "vp_travois", + "fg": 224, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { "id": "t_rope_up", "fg": 226, "rotates": false }, + { + "id": "t_root_wall", + "fg": 227, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 228 }, + { "id": "corner", "fg": 229 }, + { "id": "edge", "fg": 227 }, + { "id": "end_piece", "fg": 230 }, + { "id": "t_connection", "fg": 231 }, + { "id": "unconnected", "fg": 227 } + ] + }, + { + "id": "t_improvised_fence", + "fg": 232, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 233 }, + { "id": "corner", "fg": 234 }, + { "id": "edge", "fg": 232 }, + { "id": "end_piece", "fg": 235 }, + { "id": "t_connection", "fg": 236 }, + { "id": "unconnected", "fg": 232 } + ] + }, + { + "id": "t_fence_rope", + "fg": 227, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 233 }, + { "id": "corner", "fg": 234 }, + { "id": "edge", "fg": 227 }, + { "id": "end_piece", "fg": 235 }, + { "id": "t_connection", "fg": 236 }, + { "id": "unconnected", "fg": 227 } + ] + }, + { "id": "t_fence_post", "fg": 237, "rotates": false }, + { + "id": "vp_spike_wood", + "fg": 237, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "t_fence_h", "t_fence_v", "t_fence" ], + "fg": 238, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 239 }, + { "id": "corner", "fg": [ 240, 241, 242, 238 ] }, + { "id": "edge", "fg": [ 243, 244, 243, 244 ] }, + { "id": "end_piece", "fg": [ 243, 244, 245, 238 ] }, + { "id": "t_connection", "fg": [ 244, 241, 239, 242 ] }, + { "id": "unconnected", "fg": 238 } + ] + }, + { "id": "t_fencegate_c", "fg": [ 246, 247, 246, 247 ], "rotates": true }, + { "id": "t_fencegate_o", "fg": [ 248, 249, 248, 249 ], "rotates": true }, + { "id": "t_palisade", "fg": [ 250, 251, 250, 251 ], "rotates": true }, + { "id": "t_palisade_gate", "fg": [ 252, 253, 252, 253 ], "rotates": true }, + { "id": "t_palisade_gate_o", "fg": [ 254, 255, 254, 255 ], "rotates": true }, + { "id": "t_portcullis", "fg": 256, "rotates": false }, + { "id": [ "t_support_s", "t_chainfence_posts" ], "fg": 257, "rotates": false }, + { + "id": "t_iron_fence", + "fg": 258, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 259 }, + { "id": "corner", "fg": 260 }, + { "id": "edge", "fg": 258 }, + { "id": "end_piece", "fg": 261 }, + { "id": "t_connection", "fg": 262 }, + { "id": "unconnected", "fg": 258 } + ] + }, + { + "id": [ "t_chainfence_v", "t_chainfence", "t_chainfence_h", "t_fence_wire" ], + "fg": 263, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 259 }, + { "id": "corner", "fg": 260 }, + { "id": "edge", "fg": 263 }, + { "id": "end_piece", "fg": 261 }, + { "id": "t_connection", "fg": 262 }, + { "id": "unconnected", "fg": 263 } + ] + }, + { + "id": "t_fence_barbed", + "fg": 264, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 259 }, + { "id": "corner", "fg": 265 }, + { "id": "edge", "fg": 264 }, + { "id": "end_piece", "fg": 266 }, + { "id": "t_connection", "fg": 267 }, + { "id": "unconnected", "fg": 264 } + ] + }, + { "id": "t_iron_fence_posts", "fg": 268, "rotates": false }, + { "id": "t_chaingate_o", "fg": 269, "rotates": false }, + { "id": "t_chaingate_c", "fg": 270, "rotates": false }, + { "id": "t_chaingate_l", "fg": 271, "rotates": false }, + { + "id": [ "t_reb_cage", "t_bars" ], + "fg": 272, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 273 }, + { "id": "corner", "fg": 274 }, + { "id": "edge", "fg": 275 }, + { "id": "end_piece", "fg": 275 }, + { "id": "t_connection", "fg": 276 }, + { "id": "unconnected", "fg": 272 } + ] + }, + { + "id": "t_window_bars", + "fg": 275, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 273 }, + { "id": "corner", "fg": 274 }, + { "id": "edge", "fg": 275 }, + { "id": "end_piece", "fg": 275 }, + { "id": "t_connection", "fg": 276 }, + { "id": "unconnected", "fg": 275 } + ] + }, + { "id": [ "t_ov_reb_cage", "t_ov_smreb_cage", "t_metal" ], "fg": 277, "rotates": false }, + { + "id": "t_wall_wattle_half", + "fg": 278, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 279 }, + { "id": "corner", "fg": 280 }, + { "id": "edge", "fg": 281 }, + { "id": "end_piece", "fg": 282 }, + { "id": "t_connection", "fg": 283 }, + { "id": "unconnected", "fg": 278 } + ] + }, + { + "id": [ "t_wall_half", "t_wall_log_half" ], + "fg": 284, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 285 }, + { "id": "corner", "fg": 286 }, + { "id": "edge", "fg": 287 }, + { "id": "end_piece", "fg": 288 }, + { "id": "t_connection", "fg": 289 }, + { "id": "unconnected", "fg": 284 } + ] + }, + { + "id": [ "t_scrap_wall_halfway", "t_junk_palisade" ], + "fg": 290, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 291 }, + { "id": "corner", "fg": 292 }, + { "id": "edge", "fg": 293 }, + { "id": "end_piece", "fg": 294 }, + { "id": "t_connection", "fg": 295 }, + { "id": "unconnected", "fg": 290 } + ] + }, + { + "id": [ "t_brick_wall_halfway", "f_sandbag_half" ], + "fg": 296, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 297 }, + { "id": "corner", "fg": 298 }, + { "id": "edge", "fg": 299 }, + { "id": "end_piece", "fg": 300 }, + { "id": "t_connection", "fg": 301 }, + { "id": "unconnected", "fg": 296 } + ] + }, + { + "id": [ "t_rock_wall_half", "t_sconc_wall_halfway", "t_strconc_wall_halfway" ], + "fg": 302, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 303 }, + { "id": "corner", "fg": 304 }, + { "id": "edge", "fg": 305 }, + { "id": "end_piece", "fg": 306 }, + { "id": "t_connection", "fg": 307 }, + { "id": "unconnected", "fg": 302 } + ] + }, + { + "id": "t_concrete_wall", + "fg": 308, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 309 }, + { "id": "corner", "fg": 310 }, + { "id": "edge", "fg": 311 }, + { "id": "end_piece", "fg": 312 }, + { "id": "t_connection", "fg": 313 }, + { "id": "unconnected", "fg": 308 } + ] + }, + { "id": [ "t_sliding_concrete_wall_c", "t_secretdoor_concrete_wall_c" ], "fg": 311, "rotates": true }, + { "id": "t_secretdoor_concrete_wall_o", "fg": 314, "rotates": true }, + { + "id": [ "t_railing_h", "t_railing_v", "t_guardrail_bg_dp", "t_railing" ], + "fg": 315, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 315 }, + { "id": "corner", "fg": 316 }, + { "id": "edge", "fg": 317 }, + { "id": "end_piece", "fg": 318 }, + { "id": "t_connection", "fg": 319 }, + { "id": "unconnected", "fg": 320 } + ] + }, + { + "id": [ "t_glass_railing", "t_glass_railing_h", "t_glass_railing_v" ], + "fg": 321, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 321 }, + { "id": "corner", "fg": 322 }, + { "id": "edge", "fg": 323 }, + { "id": "end_piece", "fg": 324 }, + { "id": "t_connection", "fg": 325 }, + { "id": "unconnected", "fg": 326 } + ] + }, + { + "id": "t_metal_railing", + "fg": 327, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 327 }, + { "id": "corner", "fg": 328 }, + { "id": "edge", "fg": 329 }, + { "id": "end_piece", "fg": 330 }, + { "id": "t_connection", "fg": 331 }, + { "id": "unconnected", "fg": 332 } + ] + }, + { + "id": [ + "t_railroad_track", + "t_railroad_track_h", + "t_railroad_track_v", + "t_railroad_track_d", + "t_railroad_track_d1", + "t_railroad_track_d2" + ], + "fg": 333, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 333 }, + { "id": "corner", "fg": [ 334, 335, 336, 337 ] }, + { "id": "edge", "fg": 338 }, + { "id": "end_piece", "fg": 338 }, + { "id": "t_connection", "fg": 339 }, + { "id": "unconnected", "fg": 338 } + ] + }, + { "id": "t_railroad_track_on_tie", "fg": 340 }, + { + "id": [ "t_railroad_tie_h", "t_railroad_tie_v", "t_railroad_tie" ], + "fg": 341, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "edge", "fg": 342 } ] + }, + { + "id": [ "t_wall_log", "t_wall_wood" ], + "fg": 343, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 344 }, + { "id": "corner", "fg": 345 }, + { "id": "edge", "fg": 346 }, + { "id": "end_piece", "fg": 347 }, + { "id": "t_connection", "fg": 348 }, + { "id": "unconnected", "fg": 343 } + ] + }, + { + "id": [ "t_wall_wood_chipped", "t_wall_log_chipped" ], + "fg": 349, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 350 }, + { "id": "corner", "fg": 351 }, + { "id": "edge", "fg": 352 }, + { "id": "end_piece", "fg": 353 }, + { "id": "t_connection", "fg": 354 }, + { "id": "unconnected", "fg": 349 } + ] + }, + { + "id": [ "t_wall_wood_broken", "t_wall_log_broken" ], + "fg": 355, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 356 }, + { "id": "corner", "fg": 357 }, + { "id": "edge", "fg": 358 }, + { "id": "end_piece", "fg": 358 }, + { "id": "t_connection", "fg": 356 }, + { "id": "unconnected", "fg": 355 } + ] + }, + { + "id": [ "t_scrap_wall", "t_junk_wall", "t_wall_metal" ], + "fg": 359, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 360 }, + { "id": "corner", "fg": 361 }, + { "id": "edge", "fg": 362 }, + { "id": "end_piece", "fg": 363 }, + { "id": "t_connection", "fg": 364 }, + { "id": "unconnected", "fg": 359 } + ] + }, + { + "id": "t_wall_r", + "fg": 365, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 366 }, + { "id": "corner", "fg": 367 }, + { "id": "edge", "fg": 368 }, + { "id": "end_piece", "fg": 369 }, + { "id": "t_connection", "fg": 370 }, + { "id": "unconnected", "fg": 365 } + ] + }, + { + "id": "t_wall_y", + "fg": 371, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 372 }, + { "id": "corner", "fg": 373 }, + { "id": "edge", "fg": 374 }, + { "id": "end_piece", "fg": 375 }, + { "id": "t_connection", "fg": 376 }, + { "id": "unconnected", "fg": 371 } + ] + }, + { + "id": "t_brick_wall", + "fg": 377, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 378 }, + { "id": "corner", "fg": 379 }, + { "id": "edge", "fg": 380 }, + { "id": "end_piece", "fg": 381 }, + { "id": "t_connection", "fg": 382 }, + { "id": "unconnected", "fg": 377 } + ] + }, + { "id": [ "t_sliding_brick_wall_c", "t_secretdoor_brick_wall_c" ], "fg": 380, "rotates": true }, + { "id": "t_secretdoor_brick_wall_o", "fg": 383, "rotates": true }, + { + "id": "f_sandbag_wall", + "fg": 384, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 385 }, + { "id": "corner", "fg": 386 }, + { "id": "edge", "fg": 387 }, + { "id": "end_piece", "fg": 388 }, + { "id": "t_connection", "fg": 389 }, + { "id": "unconnected", "fg": 384 } + ] + }, + { + "id": "t_wall_wattle", + "fg": 390, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 391 }, + { "id": "corner", "fg": 392 }, + { "id": "edge", "fg": 393 }, + { "id": "end_piece", "fg": 394 }, + { "id": "t_connection", "fg": 395 }, + { "id": "unconnected", "fg": 390 } + ] + }, + { "id": "t_wall_wattle_broken", "fg": 396, "rotates": true }, + { + "id": "t_wall_g", + "fg": 397, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 398 }, + { "id": "corner", "fg": 399 }, + { "id": "edge", "fg": 400 }, + { "id": "end_piece", "fg": 401 }, + { "id": "t_connection", "fg": 402 }, + { "id": "unconnected", "fg": 397 } + ] + }, + { + "id": "t_wall_b", + "fg": 403, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 404 }, + { "id": "corner", "fg": 405 }, + { "id": "edge", "fg": 406 }, + { "id": "end_piece", "fg": 407 }, + { "id": "t_connection", "fg": 408 }, + { "id": "unconnected", "fg": 403 } + ] + }, + { + "id": "t_wall_p", + "fg": 409, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 410 }, + { "id": "corner", "fg": 411 }, + { "id": "edge", "fg": 412 }, + { "id": "end_piece", "fg": 413 }, + { "id": "t_connection", "fg": 414 }, + { "id": "unconnected", "fg": 409 } + ] + }, + { + "id": [ "t_wall", "t_wall_w" ], + "fg": 415, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 416 }, + { "id": "corner", "fg": 417 }, + { "id": "edge", "fg": 418 }, + { "id": "end_piece", "fg": 419 }, + { "id": "t_connection", "fg": 420 }, + { "id": "unconnected", "fg": 415 } + ] + }, + { "id": [ "t_secretdoor_wall_c", "t_sliding_wall_c", "t_secretdoor_onetime" ], "fg": 418, "rotates": true }, + { "id": [ "t_sliding_wall_o", "t_secretdoor_wall_o" ], "fg": 421, "rotates": true }, + { + "id": [ "t_rock_wall", "t_sconc_wall", "t_strconc_wall" ], + "fg": 422, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 423 }, + { "id": "corner", "fg": 424 }, + { "id": "edge", "fg": 425 }, + { "id": "end_piece", "fg": 426 }, + { "id": "t_connection", "fg": 427 }, + { "id": "unconnected", "fg": 422 } + ] + }, + { + "id": [ "t_gutter", "t_gutter_north", "t_gutter_east", "t_gutter_south", "t_gutter_west" ], + "fg": 428, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 429 }, + { "id": "corner", "fg": 430 }, + { "id": "edge", "fg": 431 }, + { "id": "end_piece", "fg": 432 }, + { "id": "t_connection", "fg": 433 }, + { "id": "unconnected", "fg": 428 } + ] + }, + { + "id": "t_gutter_drop", + "fg": 434, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 435 }, + { "id": "corner", "fg": 436 }, + { "id": "edge", "fg": 437 }, + { "id": "end_piece", "fg": 438 }, + { "id": "t_connection", "fg": 439 }, + { "id": "unconnected", "fg": 434 } + ] + }, + { "id": "t_gutter_downspout", "fg": 440, "rotates": true }, + { + "id": "t_window_bars_alarm", + "fg": 441, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 442 }, + { "id": "corner", "fg": 443 }, + { "id": "edge", "fg": 444 }, + { "id": "end_piece", "fg": 445 }, + { "id": "t_connection", "fg": 446 }, + { "id": "unconnected", "fg": 441 } + ] + }, + { + "id": "t_reinforced_glass_shutter", + "fg": 447, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 448 }, + { "id": "corner", "fg": 449 }, + { "id": "edge", "fg": 450 }, + { "id": "end_piece", "fg": 451 }, + { "id": "t_connection", "fg": 452 }, + { "id": "unconnected", "fg": 447 } + ] + }, + { + "id": "t_reinforced_glass_shutter_open", + "fg": 453, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 454 }, + { "id": "corner", "fg": 455 }, + { "id": "edge", "fg": 456 }, + { "id": "end_piece", "fg": 457 }, + { "id": "t_connection", "fg": 458 }, + { "id": "unconnected", "fg": 453 } + ] + }, + { + "id": "t_reinforced_glass", + "fg": 459, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 460 }, + { "id": "corner", "fg": 461 }, + { "id": "edge", "fg": 462 }, + { "id": "end_piece", "fg": 463 }, + { "id": "t_connection", "fg": 464 }, + { "id": "unconnected", "fg": 459 } + ] + }, + { + "id": [ "t_wall_glass_alarm", "t_window", "t_window_alarm", "t_wall_glass" ], + "fg": 465, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 466 }, + { "id": "corner", "fg": 467 }, + { "id": "edge", "fg": 468 }, + { "id": "end_piece", "fg": 469 }, + { "id": "t_connection", "fg": 470 }, + { "id": "unconnected", "fg": 465 } + ] + }, + { + "id": [ + "t_door_glass_frosted_c", + "t_door_glass_lab_c", + "t_door_glass_frosted_lab_c", + "t_door_glass_red_c", + "t_door_glass_green_c", + "t_door_glass_white_c", + "t_door_glass_gray_c", + "t_door_glass_c" + ], + "fg": 471, + "rotates": true + }, + { + "id": [ + "t_door_glass_frosted_o", + "t_door_glass_lab_o", + "t_door_glass_frosted_lab_o", + "t_door_glass_red_o", + "t_door_glass_green_o", + "t_door_glass_white_o", + "t_door_glass_gray_o", + "t_door_glass_o" + ], + "fg": 472, + "rotates": true + }, + { + "id": "t_window_stained_red", + "fg": 473, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "t_connection", "fg": 474 } ] + }, + { + "id": "t_window_stained_green", + "fg": 475, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "t_connection", "fg": 476 } ] + }, + { + "id": "t_window_domestic", + "fg": 477, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "t_connection", "fg": 478 } ] + }, + { + "id": "t_window_open", + "fg": 479, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "t_connection", "fg": 480 } ] + }, + { + "id": "t_window_stained_blue", + "fg": 481, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "t_connection", "fg": 482 } ] + }, + { + "id": "t_window_no_curtains", + "fg": 483, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "t_connection", "fg": 484 } ] + }, + { + "id": "t_window_no_curtains_open", + "fg": 485, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "t_connection", "fg": 486 } ] + }, + { "id": "t_window_no_curtains_taped", "fg": 487, "rotates": false }, + { "id": [ "t_window_taped", "t_window_domestic_taped", "t_window_alarm_taped" ], "fg": 488, "rotates": false }, + { "id": "t_window_reinforced", "fg": 489, "rotates": false }, + { "id": "t_window_boarded", "fg": 490, "rotates": false }, + { "id": "t_window_enhanced", "fg": 491, "rotates": false }, + { "id": "t_window_reinforced_noglass", "fg": 492, "rotates": false }, + { "id": "t_window_boarded_noglass", "fg": 493, "rotates": false }, + { "id": "t_window_enhanced_noglass", "fg": 494, "rotates": false }, + { "id": "t_window_frame", "fg": 495, "rotates": false }, + { "id": [ "t_m_frame", "t_window_empty" ], "fg": 496, "rotates": false }, + { "id": "t_curtains", "fg": 497, "rotates": false }, + { + "id": [ "vp_v_curtain", "vp_aisle_curtain" ], + "fg": 497, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": [ "f_curtain", "t_door_curtain_c" ], "fg": 498, "rotates": false }, + { "id": [ "f_curtain_open", "t_door_curtain_o" ], "fg": 499, "rotates": false }, + { "id": "t_glass_roof", "fg": 500, "rotates": false }, + { + "id": [ + "t_door_o", + "t_door_lab_o", + "t_door_o_peep", + "t_door_gray_o", + "t_door_red_o", + "t_door_green_o", + "t_door_white_o", + "t_door_frame", + "t_door_lab_frame", + "t_door_gray_frame", + "t_door_red_frame", + "t_door_green_frame", + "t_door_white_frame" + ], + "fg": 501, + "rotates": false + }, + { + "id": [ "t_door_c", "t_door_lab_c", "t_door_gray_c", "t_door_red_c", "t_door_green_c", "t_door_white_c" ], + "fg": 502, + "rotates": false + }, + { "id": [ "t_door_locked", "t_door_locked_alarm", "t_door_locked_interior" ], "fg": 503, "rotates": false }, + { "id": "t_door_locked_peep", "fg": 504, "rotates": false }, + { "id": "t_door_c_peep", "fg": 505, "rotates": false }, + { + "id": [ "t_door_b", "t_door_lab_b", "t_door_b_peep", "t_door_gray_b", "t_door_red_b", "t_door_green_b", "t_door_white_b" ], + "fg": 506, + "rotates": false + }, + { "id": [ "t_door_boarded_peep", "t_door_boarded" ], "fg": 507, "rotates": false }, + { "id": [ "t_door_boarded_damaged_peep", "t_door_boarded_damaged" ], "fg": 508, "rotates": false }, + { "id": "t_door_makeshift_o", "fg": 509, "rotates": false }, + { "id": "t_door_makeshift_c", "fg": 510, "rotates": false }, + { "id": "t_rdoor_o", "fg": 511, "rotates": false }, + { "id": "t_rdoor_c", "fg": 512, "rotates": false }, + { "id": "t_rdoor_b", "fg": 513, "rotates": false }, + { "id": "t_rdoor_boarded", "fg": 514, "rotates": false }, + { "id": "t_rdoor_boarded_damaged", "fg": 515, "rotates": false }, + { "id": [ "t_reinforced_door_glass_o", "t_reinforced_door_glass_lab_o" ], "fg": 516, "rotates": false }, + { "id": [ "t_reinforced_door_glass_lab_c", "t_reinforced_door_glass_c" ], "fg": 517, "rotates": false }, + { + "id": [ "t_door_metal_o", "t_door_metal_lab_o", "t_door_metal_o_peep", "t_mdoor_frame", "t_mdoor_lab_frame" ], + "fg": 518, + "rotates": false + }, + { "id": [ "t_door_metal_c", "t_door_metal_lab_c" ], "fg": 519, "rotates": false }, + { "id": [ "t_door_metal_locked", "t_door_metal_pickable" ], "fg": 520, "rotates": false }, + { "id": "t_door_metal_c_peep", "fg": 521, "rotates": false }, + { "id": "t_iron_gate_c", "fg": 522, "rotates": false }, + { "id": "t_iron_gate_l", "fg": 523, "rotates": false }, + { "id": [ "t_door_bar_o", "t_iron_gate_o" ], "fg": 524, "rotates": false }, + { "id": "t_door_bar_c", "fg": 525, "rotates": false }, + { "id": "t_door_bar_locked", "fg": 526, "rotates": false }, + { "id": "t_rootcellar", "fg": 527, "rotates": false }, + { "id": [ "t_dock", "t_sh_bridge" ], "fg": 528, "rotates": false }, + { "id": "t_grate", "fg": 529, "rotates": false }, + { "id": "t_bridge", "fg": 530, "rotates": false }, + { "id": [ "t_riverbridge_dp", "t_pontoon_dp" ], "fg": 531, "rotates": false }, + { + "id": "t_sewage_pipe", + "fg": 532, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 533 }, + { "id": "corner", "fg": 534 }, + { "id": "edge", "fg": 535 }, + { "id": "end_piece", "fg": 536 }, + { "id": "t_connection", "fg": 537 }, + { "id": "unconnected", "fg": 532 } + ] + }, + { + "id": "t_missile", + "fg": 538, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 538 }, + { "id": "corner", "fg": 539 }, + { "id": "edge", "fg": 538 }, + { "id": "end_piece", "fg": 538 }, + { "id": "t_connection", "fg": 540 }, + { "id": "unconnected", "fg": 538 } + ] + }, + { "id": "t_missile_exploded", "fg": 155, "rotates": false }, + { + "id": "t_slide", + "fg": 541, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "edge", "fg": 541 }, { "id": "end_piece", "fg": 542 } ] + }, + { + "id": "t_monkey_bars", + "fg": 543, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "center", "fg": 543 }, { "id": "corner", "fg": 544 }, { "id": "t_connection", "fg": 545 } ] + }, + { "id": "t_centrifuge", "fg": 546, "rotates": false }, + { + "id": "t_cvdbody", + "fg": 547, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 548 }, + { "id": "corner", "fg": 549 }, + { "id": "edge", "fg": 550 }, + { "id": "end_piece", "fg": 551 }, + { "id": "t_connection", "fg": 552 }, + { "id": "unconnected", "fg": 547 } + ] + }, + { + "id": "t_generator_broken", + "fg": 553, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "corner", "fg": 553 }, { "id": "t_connection", "fg": 554 } ] + }, + { + "id": "t_conveyor", + "fg": 555, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 555 }, + { "id": "corner", "fg": 556 }, + { "id": "edge", "fg": 555 }, + { "id": "end_piece", "fg": 555 }, + { "id": "t_connection", "fg": 557 }, + { "id": "unconnected", "fg": 555 } + ] + }, + { "id": [ "t_palisade_pulley", "t_barndoor" ], "fg": 558, "rotates": false }, + { + "id": [ + "t_gates_mech_control", + "t_gates_control_concrete", + "t_gates_control_brick", + "t_gates_mech_control_lab", + "t_gates_control_concrete_lab", + "t_gates_control_brick_lab" + ], + "fg": 559, + "rotates": false + }, + { + "id": [ "t_switch_even", "t_gates_control_metal", "t_gates_control_metal_lab" ], + "fg": 560, + "rotates": false + }, + { "id": "t_switch_gb", "fg": 561, "rotates": false }, + { "id": "t_switch_rb", "fg": 562, "rotates": false }, + { "id": "t_switch_rg", "fg": 563, "rotates": false }, + { "id": "t_machinery_light", "fg": 564, "rotates": false }, + { "id": "t_machinery_old", "fg": 565, "rotates": false }, + { "id": [ "t_machinery_heavy", "t_sewage_pump" ], "fg": 566, "rotates": false }, + { "id": "t_machinery_electronic", "fg": 567, "rotates": false }, + { "id": "f_autodoc", "fg": 568, "rotates": false }, + { "id": "f_robotic_arm", "fg": 569, "rotates": false }, + { "id": "t_ind_assembler", "fg": 570, "rotates": false }, + { "id": "t_ind_drill", "fg": 571, "rotates": false }, + { "id": "t_ind_furnace", "fg": 572, "rotates": false }, + { "id": "t_ind_lathe", "fg": 573, "rotates": false }, + { "id": "t_ind_mixer", "fg": 574, "rotates": false }, + { "id": "t_ind_pipe", "fg": 575, "rotates": false }, + { "id": "t_ind_press", "fg": 576, "rotates": false }, + { "id": "t_elevator_control", "fg": 577, "rotates": false }, + { "id": "t_elevator_control_off", "fg": 578, "rotates": false }, + { "id": "t_diesel_pump", "fg": 579, "rotates": false }, + { "id": "t_gas_pump_a", "fg": 580, "rotates": false }, + { "id": "t_gas_pump", "fg": 581, "rotates": false }, + { "id": "t_diesel_pump_smashed", "fg": 582, "rotates": false }, + { "id": "t_gas_pump_smashed", "fg": 583, "rotates": false }, + { "id": "t_slot_machine", "fg": 584, "rotates": false }, + { "id": "t_atm", "fg": 585, "rotates": false }, + { "id": [ "t_card_science", "t_card_military" ], "fg": 586, "rotates": false }, + { "id": "t_card_reader_broken", "fg": 587, "rotates": false }, + { + "id": [ "t_sliding_concrete_wall_control", "f_aut_gas_console_o", "electronics_controls", "t_console_broken" ], + "fg": 588, + "rotates": false + }, + { "id": "f_home_furnace", "fg": 589, "rotates": false }, + { "id": "t_cvdmachine", "fg": 590, "rotates": false }, + { + "id": [ + "t_radio_controls", + "t_containment_control", + "t_ins_bridge_control", + "t_jaildoor_control", + "t_outs_bridge_control", + "t_reinforced_glass_control" + ], + "fg": 591, + "rotates": false + }, + { "id": [ "f_aut_gas_console", "vp_controls_electronic", "t_console" ], "fg": 592, "rotates": false }, + { "id": "t_radio_tower", "fg": 593, "rotates": false }, + { "id": "t_utility_light", "fg": 594, "rotates": false }, + { "id": [ "t_support_l", "t_little_column", "t_column" ], "fg": 595, "rotates": false }, + { "id": "t_column_halfway", "fg": 596, "rotates": true }, + { "id": "f_bookcase", "fg": 597, "rotates": false }, + { + "id": [ + "t_secretdoor_bookcase_c", + "t_sliding_bookcase_c", + "t_sliding_bookcase_control", + "t_sliding_wall_control", + "t_decoy_bookcase" + ], + "fg": 598, + "rotates": false + }, + { "id": "t_secretdoor_bookcase_o", "fg": 599, "rotates": false }, + { "id": [ "f_locker", "t_switchgear_s" ], "fg": 600, "rotates": false }, + { "id": [ "f_fume_hood", "t_switchgear_l" ], "fg": 601, "rotates": false }, + { "id": [ "f_cupboard", "t_sai_box" ], "fg": 602, "rotates": false }, + { "id": [ "f_oven", "t_sai_box_damaged" ], "fg": 603, "rotates": false }, + { "id": "t_station_disc", "fg": 604, "rotates": false }, + { "id": "t_current_trans", "fg": 605, "rotates": false }, + { "id": "t_oil_circ_brkr_l", "fg": 606, "rotates": false }, + { "id": [ "t_potential_trans", "t_oil_circ_brkr_s" ], "fg": 607, "rotates": false }, + { "id": "t_milking_machine", "fg": 608, "rotates": false }, + { "id": "t_water_pump", "fg": 609, "rotates": false }, + { "id": "well_pump", "fg": 610, "rotates": false }, + { "id": "t_pedestal_wyrm", "fg": 611, "rotates": false }, + { "id": "tr_temple_flood", "fg": 612, "rotates": false }, + { "id": "t_pedestal_temple", "fg": 613, "rotates": false }, + { "id": "tr_temple_toggle", "fg": 614, "rotates": false }, + { "id": [ "t_backboard_in", "t_backboard" ], "fg": 615, "rotates": false }, + { "id": "t_vat", "fg": 616, "rotates": false }, + { "id": "t_plut_generator", "fg": 617, "rotates": false }, + { "id": "t_nuclear_reactor", "fg": 618, "rotates": false }, + { "id": [ "mon_hallu_mannequin", "f_mannequin" ], "fg": 619, "rotates": false }, + { "id": [ "f_statue", "t_sliding_brick_wall_control" ], "fg": 620, "rotates": false }, + { "id": "f_target", "fg": 621, "rotates": false }, + { "id": "t_bulk_tank", "fg": 622, "rotates": false }, + { "id": "t_covered_well", "fg": 623, "rotates": false }, + { "id": "vp_external_tank", "fg": 624, "rotates": true }, + { "id": "t_gas_tank", "fg": 625, "rotates": false }, + { "id": [ "55gal_drum", "30gal_drum", "keg", "keg_steel" ], "fg": 626, "rotates": false }, + { "id": [ "wooden_barrel", "f_wood_keg" ], "fg": 627, "rotates": false }, + { "id": "vp_tank_barrel", "fg": 627, "rotates": true }, + { "id": "30gal_barrel", "fg": 628, "rotates": false }, + { "id": "f_forge_rock", "fg": 629, "rotates": false }, + { "id": "f_clay_kiln", "fg": 630, "rotates": false }, + { "id": [ "broketent", "largebroketent" ], "fg": 631, "rotates": false }, + { "id": "damaged_shelter_kit", "fg": 632, "rotates": false }, + { "id": "t_improvised_shelter", "fg": 633, "rotates": false }, + { "id": "shelter_kit", "fg": 634, "rotates": false }, + { "id": [ "tent_kit", "large_tent_kit" ], "fg": 635, "rotates": false }, + { + "id": "f_skin_wall", + "fg": 634, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 636 }, + { "id": "corner", "fg": 637 }, + { "id": "edge", "fg": 638 }, + { "id": "end_piece", "fg": 639 }, + { "id": "t_connection", "fg": 640 }, + { "id": "unconnected", "fg": 634 } + ] + }, + { "id": "f_skin_door", "fg": 641, "rotates": false }, + { "id": "f_skin_door_o", "fg": 642, "rotates": false }, + { + "id": [ "f_large_canvas_wall", "f_canvas_wall" ], + "fg": 635, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 643 }, + { "id": "corner", "fg": 644 }, + { "id": "edge", "fg": 645 }, + { "id": "end_piece", "fg": 646 }, + { "id": "t_connection", "fg": 647 }, + { "id": "unconnected", "fg": 635 } + ] + }, + { "id": [ "f_large_canvas_door", "f_canvas_door" ], "fg": 648, "rotates": false }, + { "id": [ "f_large_canvas_door_o", "f_canvas_door_o" ], "fg": 649, "rotates": false }, + { "id": "t_leanto", "fg": 650, "rotates": false }, + { "id": "t_tarptent", "fg": 651, "rotates": false }, + { "id": "t_recycler", "fg": 652, "rotates": false }, + { + "id": [ "f_recycle_bin", "f_dumpster" ], + "fg": 653, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 654 }, + { "id": "corner", "fg": 655 }, + { "id": "edge", "fg": 656 }, + { "id": "end_piece", "fg": 657 }, + { "id": "t_connection", "fg": 658 }, + { "id": "unconnected", "fg": 653 } + ] + }, + { + "id": "f_pool_table", + "fg": 659, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "corner", "fg": 660 }, { "id": "t_connection", "fg": 659 } ] + }, + { "id": [ "tr_cot", "f_fiber_mat" ], "fg": 661, "rotates": false }, + { "id": [ "f_straw_bed", "tr_fur_rollmat" ], "fg": 662, "rotates": false }, + { "id": "tr_rollmat", "fg": 663, "rotates": false }, + { + "id": "vp_bed", + "fg": 663, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "f_makeshift_bed", "fg": 664, "rotates": false }, + { + "id": "f_bed", + "fg": 664, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 665 }, + { "id": "corner", "fg": 666 }, + { "id": "edge", "fg": 667 }, + { "id": "end_piece", "fg": 668 }, + { "id": "t_connection", "fg": 669 }, + { "id": "unconnected", "fg": 664 } + ] + }, + { + "id": "f_pillow_fort", + "fg": 670, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 671 }, + { "id": "corner", "fg": [ 672, 673, 674, 675 ] }, + { "id": "edge", "fg": [ 676, 670, 676, 670 ] }, + { "id": "end_piece", "fg": [ 677, 670, 678, 670 ] }, + { "id": "t_connection", "fg": [ 679, 680, 681, 682 ] }, + { "id": "unconnected", "fg": 670 } + ] + }, + { + "id": "f_counter", + "fg": 683, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 684 }, + { "id": "corner", "fg": 685 }, + { "id": "edge", "fg": 686 }, + { "id": "end_piece", "fg": 687 }, + { "id": "t_connection", "fg": 688 }, + { "id": "unconnected", "fg": 683 } + ] + }, + { + "id": "f_desk", + "fg": 689, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 690 }, + { "id": "corner", "fg": 691 }, + { "id": "edge", "fg": 692 }, + { "id": "end_piece", "fg": 693 }, + { "id": "t_connection", "fg": 694 }, + { "id": "unconnected", "fg": 689 } + ] + }, + { "id": [ "f_autodoc_couch", "f_sofa" ], "fg": 695, "rotates": false }, + { + "id": "f_table", + "fg": 696, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 697 }, + { "id": "corner", "fg": 698 }, + { "id": "edge", "fg": 699 }, + { "id": "end_piece", "fg": 700 }, + { "id": "t_connection", "fg": 701 }, + { "id": "unconnected", "fg": 696 } + ] + }, + { "id": "seat", "fg": 702, "rotates": false }, + { + "id": [ "vp_seat", "vp_folding_seat", "vp_reclining_seat" ], + "fg": 702, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_seat_wood", + "fg": 703, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { "id": "f_tourist_table", "fg": 704, "rotates": false }, + { "id": "tourist_table", "fg": 705, "rotates": false }, + { "id": "f_shackle", "fg": 706, "rotates": false }, + { "id": "f_shower", "fg": 707, "rotates": false }, + { "id": "f_toilet", "fg": 708, "rotates": false }, + { "id": "f_birdbath", "fg": 709, "rotates": false }, + { "id": "f_sink", "fg": 710, "rotates": false }, + { "id": "f_brazier", "fg": 711, "rotates": false }, + { "id": "brazier", "fg": 712, "rotates": false }, + { "id": "bowl_pewter", "fg": 713, "rotates": false }, + { "id": "ceramic_bowl", "fg": 714, "rotates": false }, + { "id": "bowl_clay", "fg": 715, "rotates": false }, + { "id": "glass_bowl", "fg": 716, "rotates": false }, + { "id": "bowl_plastic", "fg": 717, "rotates": false }, + { + "id": "f_bathtub", + "fg": 718, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 719 }, + { "id": "corner", "fg": 720 }, + { "id": "edge", "fg": 721 }, + { "id": "end_piece", "fg": 722 }, + { "id": "t_connection", "fg": 723 }, + { "id": "unconnected", "fg": 718 } + ] + }, + { + "id": "vp_blade_vertical", + "fg": 724, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { "id": "tr_blade", "fg": 724, "rotates": true }, + { "id": "f_blade", "fg": 726, "rotates": false }, + { "id": [ "f_cellphone_booster", "f_TV_antenna", "f_spike" ], "fg": 727, "rotates": false }, + { "id": "f_vent_pipe", "fg": 728, "rotates": false }, + { "id": "canister_empty", "fg": 729, "rotates": false }, + { "id": "f_roof_turbine_vent", "fg": 730, "rotates": false }, + { "id": [ "directional_antenna", "f_small_satelitte_dish" ], "fg": 731, "rotates": false }, + { "id": "f_chimney", "fg": 732, "rotates": false }, + { "id": [ "reinforced_solar_panel", "reinforced_solar_panel_v2" ], "fg": 733, "rotates": false }, + { "id": [ "solar_panel", "solar_panel_v2", "solar_panel_v3", "f_solar_unit" ], "fg": 734, "rotates": false }, + { + "id": [ "vp_reinforced_solar_panel", "vp_reinforced_solar_panel_v2" ], + "fg": 733, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 735 } ] + }, + { + "id": [ "vp_solar_panel", "vp_solar_panel_v2", "vp_solar_panel_v3" ], + "fg": 734, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 736 } ] + }, + { "id": "f_egg_sackws", "fg": 737, "rotates": false }, + { "id": "mon_trapdoor_queen", "fg": 738, "rotates": false }, + { "id": [ "f_egg_sackcs", "mon_trapdoor_egg", "f_egg_sackbw" ], "fg": 739, "rotates": false }, + { "id": "f_egg_sacke", "fg": 740, "rotates": false }, + { "id": "f_boulder_large", "fg": 741, "rotates": false }, + { "id": "f_boulder_medium", "fg": 742, "rotates": false }, + { "id": "f_boulder_small", "fg": 743, "rotates": false }, + { "id": "t_border_rock", "fg": 744, "rotates": false }, + { "id": "f_cattails", "fg": 745, "rotates": false }, + { "id": "f_lilypad", "fg": 746, "rotates": false }, + { "id": "f_flower_tulip", "fg": 747, "rotates": false }, + { "id": "f_dandelion", "fg": 748, "rotates": false }, + { "id": "f_datura", "fg": 749, "rotates": false }, + { "id": "f_bluebell", "fg": 750, "rotates": false }, + { "id": "f_dahlia", "fg": 751, "rotates": false }, + { "id": "f_lily", "fg": 752, "rotates": false }, + { "id": "f_flower_marloss", "fg": 753, "rotates": false }, + { "id": "f_flower_fungal", "fg": 754, "rotates": false }, + { "id": "f_mutpoppy", "fg": 755, "rotates": false }, + { "id": "f_flower_spurge", "fg": 756, "rotates": false }, + { "id": "f_black_eyed_susan", "fg": 757, "rotates": false }, + { "id": "f_sunflower", "fg": 758, "rotates": false }, + { "id": "f_lotus", "fg": 759, "rotates": false }, + { "id": "f_chamomile", "fg": 760, "rotates": false }, + { + "id": [ + "f_mutpoppy_season_winter", + "f_dandelion_season_winter", + "f_flower_spurge_season_winter", + "f_black_eyed_susan_season_winter", + "f_sunflower_season_winter", + "f_datura_season_winter", + "f_bluebell_season_winter", + "f_dahlia_season_winter", + "f_lily_season_winter", + "f_chamomile_season_winter", + "f_lotus_season_winter", + "f_flower_marloss_season_winter", + "f_flower_tulip_season_winter" + ], + "fg": 761, + "rotates": false + }, + { "id": "f_plant_seed", "fg": 762, "rotates": false }, + { "id": "f_plant_seedling", "fg": 763, "rotates": false }, + { "id": "f_plant_mature", "fg": 764, "rotates": false }, + { "id": "f_plant_harvest", "fg": 765, "rotates": false }, + { "id": "f_indoor_plant_y", "fg": 766, "rotates": false }, + { "id": "f_indoor_plant", "fg": 767, "rotates": false }, + { "id": "f_hay", "fg": 768, "rotates": false }, + { "id": "f_fungal_clump", "fg": 769, "rotates": false }, + { "id": "f_fungal_mass", "fg": 770, "rotates": false }, + { "id": "f_woodstove", "fg": 771, "rotates": false }, + { + "id": [ + "f_kiln_metal_empty", + "fuel_bunker", + "kiln", + "brick_kiln", + "kilnrig", + "char_kiln", + "vp_veh_kiln", + "vp_fuel_bunker", + "f_kiln_empty" + ], + "fg": 772, + "rotates": false + }, + { "id": [ "f_forge", "char_forge" ], "fg": 773, "rotates": false }, + { "id": [ "f_kiln_metal_full", "kiln_full", "f_kiln_full" ], "fg": 774, "rotates": false }, + { "id": "kiln_done", "fg": 775, "rotates": false }, + { "id": "kiln_lit", "fg": 776, "rotates": false }, + { "id": [ "anvil", "f_anvil" ], "fg": 777, "rotates": false }, + { "id": "f_fireplace", "fg": 778, "rotates": false }, + { "id": "f_firering", "fg": 779, "rotates": false }, + { "id": "metal_butcher_rack", "fg": 780, "rotates": false }, + { "id": "f_metal_butcher_rack", "fg": 781, "rotates": false }, + { "id": "f_butcher_rack", "fg": 782, "rotates": false }, + { "id": "f_smoking_rack", "fg": 783, "rotates": false }, + { "id": [ "f_utility_shelf", "f_rack" ], "fg": 784, "rotates": false }, + { "id": [ "f_filing_cabinet", "f_file_cabinet" ], "fg": 785, "rotates": false }, + { "id": "f_glass_cabinet", "fg": 786, "rotates": false }, + { "id": "f_piano", "fg": 787, "rotates": false }, + { "id": "f_wardrobe", "fg": 788, "rotates": false }, + { "id": "f_dresser", "fg": 789, "rotates": false }, + { "id": "f_rack_coat", "fg": 790, "rotates": false }, + { "id": [ "f_sign", "f_bulletin" ], "fg": 791, "rotates": false }, + { "id": "f_barricade_road", "fg": 792, "rotates": false }, + { "id": "f_lane", "fg": 793, "rotates": true }, + { "id": "f_crate_c", "fg": 794, "rotates": false }, + { "id": "f_crate_o", "fg": 795, "rotates": false }, + { + "id": "f_bench", + "fg": 796, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "t_connection", "fg": 797 } ] + }, + { "id": [ "f_stool", "f_chair" ], "fg": 798, "rotates": false }, + { "id": "f_armchair", "fg": 799, "rotates": false }, + { "id": "f_coffin_c", "fg": 800, "rotates": false }, + { "id": "f_coffin_o", "fg": 801, "rotates": false }, + { "id": "f_slab", "fg": 802, "rotates": false }, + { "id": "f_grave_head", "fg": 803, "rotates": false }, + { "id": "f_grave_monument", "fg": 804, "rotates": false }, + { "id": "f_grave_stone", "fg": 805, "rotates": false }, + { "id": "f_grave_stone_old", "fg": 806, "rotates": false }, + { "id": "f_mailbox", "fg": 807, "rotates": false }, + { "id": "f_air_conditioner", "fg": 808, "rotates": false }, + { "id": "f_water_heater", "fg": 809, "rotates": false }, + { "id": "f_chemical_mixer", "fg": 810, "rotates": false }, + { + "id": "vp_washing_machine", + "fg": 811, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { "id": "washing_machine", "fg": 811, "rotates": false }, + { "id": "f_washer", "fg": 813, "rotates": false }, + { "id": "f_dryer", "fg": 814, "rotates": false }, + { "id": "f_fridge", "fg": 815, "rotates": false }, + { "id": "f_glass_fridge", "fg": 816, "rotates": false }, + { "id": "f_bigmirror", "fg": 817, "rotates": false }, + { "id": "f_bigmirror_b", "fg": 818, "rotates": false }, + { "id": "f_arcade_machine", "fg": 819, "rotates": false }, + { "id": "f_pinball_machine", "fg": 820, "rotates": false }, + { "id": "f_ball_mach", "fg": 689, "rotates": false }, + { "id": "f_ergometer", "fg": 821, "rotates": false }, + { "id": "f_treadmill", "fg": 822, "rotates": false }, + { "id": "f_exercise", "fg": 823, "rotates": false }, + { "id": "f_floor_canvas", "fg": 824, "rotates": false }, + { "id": "f_vending_reinforced", "fg": 825, "rotates": false }, + { "id": "f_vending_c", "fg": 826, "rotates": false }, + { "id": "f_vending_o", "fg": 827, "rotates": false }, + { "id": "f_displaycase", "fg": 828, "rotates": false }, + { "id": "f_displaycase_b", "fg": 829, "rotates": false }, + { "id": [ "still", "f_still" ], "fg": 830, "rotates": false }, + { "id": [ "f_gun_safe_el", "f_gunsafe_ml", "f_safe_c" ], "fg": 831, "rotates": false }, + { "id": [ "f_safe_l", "f_gunsafe_mj" ], "fg": 832, "rotates": false }, + { "id": "f_safe_o", "fg": 833, "rotates": false }, + { "id": "f_trashcan", "fg": 834, "rotates": false }, + { "id": "f_fvat_empty", "fg": 835, "rotates": false }, + { "id": "f_fvat_full", "fg": 836, "rotates": false }, + { "id": "f_dive_block", "fg": 837, "rotates": false }, + { "id": "telepad", "fg": 838, "rotates": false }, + { "id": "tr_telepad", "fg": 839, "rotates": false }, + { "id": "tr_dissector", "fg": 840, "rotates": false }, + { "id": [ "tr_landmine_buried", "tr_beartrap_buried" ], "fg": 841, "rotates": false }, + { "id": "tr_landmine", "fg": 842, "rotates": false }, + { "id": "landmine", "fg": 843, "rotates": false }, + { "id": "tr_boobytrap", "fg": 844, "rotates": false }, + { "id": "boobytrap", "fg": 845, "rotates": false }, + { "id": "tr_bubblewrap", "fg": 846, "rotates": false }, + { "id": "bubblewrap", "fg": 847, "rotates": false }, + { + "id": [ "tr_snake", "tr_glow", "tr_hum", "tr_shadow", "fd_push_items", "tr_drain" ], + "fg": 848, + "rotates": false + }, + { "id": "tr_beartrap", "fg": 849, "rotates": false }, + { "id": "beartrap", "fg": 850, "rotates": false }, + { "id": [ "caltrops", "tr_caltrops" ], "fg": 851, "rotates": false }, + { "id": "blade_trap", "fg": 852, "rotates": false }, + { "id": [ "tr_light_snare", "tr_heavy_snare", "tr_snare" ], "fg": 853, "rotates": false }, + { "id": [ "heavy_snare_kit", "light_snare_kit" ], "fg": 854, "rotates": false }, + { "id": "snare_trigger", "fg": 855, "rotates": false }, + { "id": "tr_crossbow", "fg": 856, "rotates": false }, + { "id": "crossbow_trap", "fg": 857, "rotates": false }, + { "id": "tr_nailboard", "fg": 858, "rotates": false }, + { "id": "board_trap", "fg": 859, "rotates": false }, + { "id": [ "tr_shotgun_1", "tr_shotgun_2", "tr_shotgun_2_1" ], "fg": 860, "rotates": false }, + { "id": "shotgun_trap", "fg": 861, "rotates": false }, + { "id": "tr_tripwire", "fg": 862, "rotates": false }, + { "id": "tripwire", "fg": 863, "rotates": false }, + { + "id": [ + "mag_pistol", + "recipe_caseless", + "recipe_augs", + "recipe_mil_augs", + "textbook_anarch", + "decoy_anarch", + "recipe_elfa", + "decoy_elfa", + "mag_smg", + "novel_pulp", + "novel_satire", + "guidebook", + "holybook_bible2", + "holybook_quran", + "holybook_hadith", + "holybook_tanakh", + "holybook_bible3", + "scots_cookbook", + "holybook_kojiki", + "holybook_havamal" + ], + "fg": 864, + "rotates": false + }, + { + "id": [ + "novel_thriller", + "novel_sports", + "fairy_tales", + "holybook_talmud", + "holybook_tripitaka", + "holybook_pastafarian", + "holybook_slack", + "holybook_kallisti", + "manual_karate", + "manual_aikido", + "manual_judo", + "manual_tai_chi", + "manual_capoeira", + "manual_krav_maga", + "manual_muay_thai", + "manual_ninjutsu", + "manual_taekwondo", + "manual_zui_quan", + "manual_crane", + "manual_dragon", + "manual_leopard", + "manual_tiger", + "manual_snake", + "manual_centipede", + "manual_scorpion", + "manual_toad", + "manual_lizard", + "manual_venom_snake" + ], + "fg": 865, + "rotates": false + }, + { "id": "abdul_necro", "fg": 866, "rotates": false }, + { + "id": [ "mag_cutting", "mag_melee", "manual_melee", "mag_stabbing", "news_regional", "novel_crime2", "novel_war2" ], + "fg": 867, + "rotates": false + }, + { + "id": [ + "mag_mechanics", + "textbook_gaswarfare", + "recipe_mininuke_launch", + "recipe_lab_elec", + "phonebook", + "mag_unarmed", + "mag_launcher", + "textbook_speech", + "novel_buddy", + "essay_book", + "101_carpentry", + "radio_book", + "adv_chemistry", + "carpentry_book", + "manual_fabrication", + "textbook_weapwest", + "textbook_fireman", + "holybook_vedas", + "holybook_sutras", + "mag_animecon" + ], + "fg": 868, + "rotates": false + }, + { "id": "book_asgard", "fg": 869, "rotates": false }, + { + "id": [ + "photo_album", + "recipe_bullets", + "recipe_arrows", + "recipe_bows", + "modern_tanner", + "atomic_survival", + "trappers_companion", + "howto_computer", + "manual_launcher", + "manual_archery", + "novel_adventure", + "novel_war", + "novel_western", + "pocket_firstaid", + "pocket_firearms", + "tailor_portfolio", + "family_cookbook" + ], + "fg": 870, + "rotates": false + }, + { "id": "manual_pankration", "fg": 871, "rotates": false }, + { "id": "manual_swordsmanship", "fg": 872, "rotates": false }, + { + "id": [ + "recipe_alpha", + "recipe_chimera", + "recipe_serum", + "recipe_creepy", + "recipe_animal", + "recipe_maiar", + "recipe_labchem", + "recipe_raptor", + "holybook_bible1", + "cookbook_sushi", + "holybook_granth", + "holybook_scientology" + ], + "fg": 873, + "rotates": false + }, + { + "id": [ + "textbook_launcher", + "mag_computer", + "mag_survival", + "fun_survival", + "manual_bashing", + "manual_cutting", + "mag_rifle", + "manual_rifle", + "mag_shotgun", + "manual_shotgun", + "textbook_survival", + "survival_book", + "textbook_traps", + "manual_gun", + "book_archery", + "manual_throw", + "manual_swimming", + "novel_coa", + "novel_samurai", + "tall_tales", + "recipe_fauxfur", + "classic_literature", + "collector_book", + "manual_brawl", + "manual_knives", + "manual_stabbing", + "manual_mechanics", + "manual_survival", + "manual_speech", + "manual_business", + "manual_first_aid", + "pocket_survival", + "manual_computers", + "cookbook", + "cookbook_human", + "cookbook_italian", + "manual_electronics", + "manual_tailor", + "textbook_tailor", + "howto_traps", + "manual_traps", + "manual_carpentry", + "manual_driving", + "textbook_fabrication", + "manual_niten", + "manual_boxing", + "manual_eskrima", + "manual_fencing", + "manual_silat", + "manual_sojutsu" + ], + "fg": 874, + "rotates": false + }, + { + "id": [ + "jewelry_book", + "textbook_weapeast", + "recipe_melee", + "recipe_lab_cvd", + "glassblowing_book", + "commune_prospectus", + "necropolis_freq" + ], + "fg": 875, + "rotates": false + }, + { "id": "textbook_atomic", "fg": 876, "rotates": false }, + { + "id": [ + "advanced_electronics", + "mag_dude", + "textbook_computers", + "computer_science", + "repeater_mod_guide", + "textbook_business", + "textbook_mechanics", + "book_icef", + "textbook_chemistry", + "textbook_carpentry", + "SICP", + "textbook_robots", + "record_weather", + "record_patient", + "record_accounting", + "priest_diary", + "visions_solitude", + "textbook_armschina", + "textbook_biodiesel", + "textbook_armwest", + "holybook_mormon" + ], + "fg": 877, + "rotates": false + }, + { "id": "dnd_handbook", "fg": 878, "rotates": false }, + { + "id": [ + "manual_smg", + "novel_romance", + "novel_spy", + "novel_scifi", + "novel_drama", + "novel_swash", + "novel_fantasy", + "novel_mystery", + "novel_horror", + "novel_tragedy", + "ZSG", + "textbook_armeast", + "brewing_cookbook" + ], + "fg": 879, + "rotates": false + }, + { + "id": [ + "mag_porn", + "mag_traps", + "mag_electronics", + "mag_bashing", + "mag_tv", + "mag_news", + "mag_cars", + "mag_cooking", + "mag_glam", + "mag_beauty", + "mag_carpentry", + "mag_guns", + "mag_archery", + "mag_gaming", + "mag_comic", + "mag_firstaid", + "mag_dodge", + "mag_throwing", + "mag_swimming", + "novel_road", + "child_book", + "novel_erotic", + "poetry_book", + "plays_book", + "mag_tailor", + "mag_fabrication", + "mag_fieldrepair", + "manual_dodge_kid" + ], + "fg": 880, + "rotates": false + }, + { + "id": [ + "manual_pistol", + "textbook_computer", + "textbook_firstaid", + "booklet_firstaid", + "manual_dodge", + "novel_crime", + "novel_experimental", + "philosophy_book", + "story_book", + "textbook_electronics", + "emergency_book", + "welding_book", + "recipe_medicalmut", + "holybook_upanishads", + "novel_coa2", + "mag_barter" + ], + "fg": 881, + "rotates": false + }, + { + "id": [ + "recipe_atomic_battery", + "paper", + "sarcophagus_access_code", + "flyer", + "survnote", + "file", + "note", + "newest_newspaper", + "many_years_old_newspaper", + "years_old_newspaper", + "one_year_old_newspaper", + "months_old_newspaper", + "weeks_old_newspaper", + "necropolis_leaflet", + "black_box_transcript" + ], + "fg": 882, + "rotates": false + }, + { + "id": [ + "soup_fish", + "soup_chicken", + "soup_mushroom", + "soup_dumplings", + "protein_drink", + "hflesh_drink", + "spider_steak_soup", + "oxygen" + ], + "fg": 883, + "rotates": false + }, + { + "id": [ + "V8", + "wine_cabernet", + "wine_noir", + "bum_wine", + "drink_kalimotxo", + "blood", + "mutagen_jabberblood", + "curry_veggy", + "curry_meat", + "soup_tomato", + "brew_bum_wine", + "taint_tornado", + "mixed_alcohol_strong", + "oxyacetylene" + ], + "fg": 884, + "rotates": false + }, + { + "id": [ + "cooking_oil", + "cooking_oil2", + "protein_shake", + "hflesh_shake_fortified", + "hflesh_shake", + "mead", + "brew_mead", + "dandelion_wine", + "brew_dandelion_wine", + "dandelion_tea", + "drink_beeknees", + "drink_wsour", + "honey_gold", + "mugwort_oil", + "thyme_oil", + "protein_shake_fortified", + "lemonade", + "lamp_oil" + ], + "fg": 885, + "rotates": false + }, + { + "id": [ + "wine_chardonnay", + "creamsoda", + "lemonlime", + "bee_balm_tea", + "vinegar", + "brew_vinegar", + "gasoline", + "diesel", + "gas_fungicidal", + "wine_riesling" + ], + "fg": 886, + "rotates": false + }, + { + "id": [ "apple_cider", "energy_drink_atomic", "colamdew", "drink_wild_apple", "pine_tea" ], + "fg": 887, + "rotates": false + }, + { + "id": [ "drink_boozeberry", "maple_sap", "wash_rum", "wash_vodka", "cattail_jelly" ], + "fg": 888, + "rotates": false + }, + { + "id": [ "energy_drink", "poppysyrup", "iv_purifier", "purple_drink", "cranberry_juice", "pepto" ], + "fg": 889, + "rotates": false + }, + { + "id": [ "milk", "soup_cullenskink", "brew_milk_curdled", "milk_curdled", "eggnog", "eggnog_spiked" ], + "fg": 890, + "rotates": false + }, + { + "id": [ + "mutagen", + "mutagen_plant", + "mutagen_insect", + "mutagen_spider", + "mutagen_slime", + "mutagen_fish", + "mutagen_mouse", + "mutagen_rat", + "mutagen_beast", + "mutagen_cattle", + "mutagen_cephalopod", + "mutagen_bird", + "mutagen_lizard", + "mutagen_troglobite", + "mutagen_medical", + "mutagen_chimera", + "mutagen_alpha", + "mutagen_ursine", + "mutagen_feline", + "mutagen_lupine", + "mutagen_elfa", + "mutagen_raptor", + "pine_wine" + ], + "fg": 891, + "rotates": false + }, + { "id": [ "oj", "juice", "orangesoda", "triple_sec", "drink_screwdriver" ], "fg": 892, "rotates": false }, + { + "id": [ + "purifier", + "crispycran", + "drink_strawberry_surprise", + "fruit_wine", + "brew_fruit_wine", + "brandy", + "mixed_alcohol_weak", + "sports_drink", + "napalm" + ], + "fg": 893, + "rotates": false + }, + { + "id": [ + "sewage", + "water_sewage", + "cola", + "rootbeer", + "spezi", + "drink_hobo", + "broth", + "broth_bone", + "broth_human", + "chai_tea", + "hickory_nut_ambrosia", + "soup_meat", + "soup_woods", + "soup_human", + "whiskey", + "single_malt_whiskey", + "irish_coffee", + "drink_rumcola", + "drink_sewerbrew", + "rum", + "tequila", + "long_island", + "beer", + "european_pilsner", + "pale_ale", + "india_pale_ale", + "stout", + "belgian_ale", + "imperial_stout", + "syrup", + "coffee_syrup", + "brew_whiskey", + "hb_beer", + "brew_hb_beer", + "moonshine", + "brew_moonshine", + "molasses", + "tea", + "coffee", + "atomic_coffee", + "cola_meth", + "beet_syrup", + "soysauce", + "milk_coffee", + "milk_tea", + "tea_bark", + "hot_chocolate", + "mex_chocolate", + "wash_moonshine", + "wash_whiskey", + "choc_drink" + ], + "fg": 894, + "rotates": false + }, + { + "id": [ + "soup_veggy", + "herbal_tea", + "iv_mutagen", + "iv_mutagen_plant", + "iv_mutagen_insect", + "iv_mutagen_spider", + "iv_mutagen_slime", + "iv_mutagen_fish", + "iv_mutagen_mouse", + "iv_mutagen_rat", + "iv_mutagen_beast", + "iv_mutagen_ursine", + "iv_mutagen_feline", + "iv_mutagen_lupine", + "iv_mutagen_cattle", + "iv_mutagen_cephalopod", + "iv_mutagen_bird", + "iv_mutagen_lizard", + "iv_mutagen_troglobite", + "iv_mutagen_alpha", + "iv_mutagen_medical", + "iv_mutagen_chimera", + "iv_mutagen_elfa", + "iv_mutagen_raptor", + "brew_pine_wine", + "plut_slurry", + "plut_slurry_dense", + "gas_chloramine" + ], + "fg": 895, + "rotates": false + }, + { + "id": [ + "water", + "water_clean", + "water_mineral", + "saline", + "salt_water", + "sweet_water", + "chem_DMSO", + "chem_chloroform", + "chem_phenol", + "chem_glycerol", + "chem_hydrogen_peroxide", + "ether", + "vodka", + "gin", + "brew_rum", + "brew_vodka", + "bleach", + "ammonia", + "fertilizer_liquid", + "water_acid", + "water_acid_weak", + "acid", + "kompot", + "disinfectant", + "lye", + "water_smoke", + "chem_methanol", + "chem_ethanol", + "denat_alcohol", + "chem_acetic_acid", + "chem_acetone", + "chem_hydrogen_peroxide_conc", + "chem_nitric_acid", + "chem_sulphuric_acid", + "chem_formaldehyde" + ], + "fg": 896, + "rotates": false + }, + { "id": [ "mintpatties", "basketball", "coconut" ], "fg": 897, "rotates": false }, + { "id": [ "grapefruit", "irradiated_grapefruit", "honey_ant" ], "fg": 898, "rotates": false }, + { "id": [ "melon", "irradiated_melon", "cotton_boll", "egg_locust" ], "fg": 899, "rotates": false }, + { "id": [ "onion", "irradiated_onion" ], "fg": 900, "rotates": false }, + { "id": [ "orange", "irradiated_orange" ], "fg": 901, "rotates": false }, + { "id": [ "peach", "irradiated_peach" ], "fg": 902, "rotates": false }, + { "id": [ "razorclaw_roe", "egg_fish" ], "fg": 903, "rotates": false }, + { "id": [ "spider_egg", "cotton_ball" ], "fg": 904, "rotates": false }, + { "id": "pinecone", "fg": 905, "rotates": false }, + { "id": "marloss_seed", "fg": 906, "rotates": false }, + { "id": "garlic", "fg": 907, "rotates": false }, + { "id": [ "boiled_egg", "egg_reptile", "egg_wasp", "ant_egg" ], "fg": 908, "rotates": false }, + { "id": [ "lemon", "irradiated_lemon" ], "fg": 909, "rotates": false }, + { "id": "potato_baked", "fg": 910, "rotates": false }, + { + "id": [ "potato", "irradiated_potato", "kiwi", "irradiated_kiwi", "egg_bird" ], + "fg": 911, + "rotates": false + }, + { + "id": [ "watermelon", "irradiated_watermelon", "tool_rocket_candy", "tool_rocket_candy_act" ], + "fg": 912, + "rotates": false + }, + { "id": [ "irradiated_mango", "mango" ], "fg": 913, "rotates": false }, + { "id": [ "papaya", "irradiated_papaya" ], "fg": 914, "rotates": false }, + { "id": [ "irradiated_pomegranate", "pomegranate" ], "fg": 915, "rotates": false }, + { "id": [ "irradiated_tomato", "tomato" ], "fg": 916, "rotates": false }, + { "id": [ "irradiated_apple", "apple" ], "fg": 917, "rotates": false }, + { "id": "mycus_fruit", "fg": 918, "rotates": false }, + { "id": [ "irradiated_apricot", "apricot" ], "fg": 919, "rotates": false }, + { "id": "marloss_berry", "fg": 920, "rotates": false }, + { "id": [ "irradiated_pear", "pear" ], "fg": 921, "rotates": false }, + { "id": [ "irradiated_pumpkin", "pumpkin" ], "fg": 922, "rotates": false }, + { "id": [ "irradiated_cabbage", "cabbage" ], "fg": 923, "rotates": false }, + { "id": [ "lettuce", "irradiated_lettuce" ], "fg": 924, "rotates": false }, + { "id": [ "coal_lump", "coal" ], "fg": 925, "rotates": false }, + { + "id": [ "dandelion_fried", "sunflower", "spurge_flower", "black_eyed_susan_flower", "raw_dandelion" ], + "fg": 926, + "rotates": false + }, + { "id": [ "bee_balm", "lily_flower", "lotus_flower" ], "fg": 927, "rotates": false }, + { "id": [ "poppy_flower", "tulip_flower" ], "fg": 928, "rotates": false }, + { "id": "bluebell_flower", "fg": 929, "rotates": false }, + { "id": "dahlia_flower", "fg": 930, "rotates": false }, + { "id": [ "small_charcoal", "small_coal" ], "fg": 931, "rotates": false }, + { "id": "steel_chunk", "fg": 932, "rotates": false }, + { "id": "plant_sac", "fg": 933, "rotates": false }, + { "id": [ "seed_mushroom_morel", "fungal_seeds", "seed_mushroom" ], "fg": 934, "rotates": false }, + { + "id": [ "blueberries", "irradiated_blueberries", "blackberries", "irradiated_blackberries" ], + "fg": 935, + "rotates": false + }, + { "id": [ "kernels", "seed_corn" ], "fg": 936, "rotates": false }, + { + "id": [ + "seed_wheat", + "seed_barley", + "seed_sugar_beet", + "seed_cotton_boll", + "seed_tomato", + "dry_beans", + "beans_cooked", + "pelmeni", + "seed_carrot", + "seed_lettuce", + "oats", + "seed_celery", + "seed_oats", + "seed_cucumber", + "seed_zucchini", + "seed_potato_raw", + "seed_bee_balm", + "seed_blackberries", + "seed_buckwheat", + "seed_canola", + "seed_cranberries", + "seed_dogbane", + "seed_mugwort", + "seed_raspberries", + "seed_raw_dandelion", + "seed_thyme", + "seed_wild_herbs", + "seed_pumpkin", + "macaroni_cooked", + "ravioli", + "mre_ravioli", + "seed_weed", + "seed_chili_pepper" + ], + "fg": 937, + "rotates": false + }, + { "id": [ "veggy", "veggy_wild" ], "fg": 938, "rotates": false }, + { + "id": [ + "veggy_cooked", + "veggy_wild_cooked", + "choco_coffee_beans", + "maltballs", + "acorns", + "datura_seed", + "coffee_bean", + "roasted_coffee_bean", + "seed_broccoli", + "raw_beans", + "hickory_nut_roasted", + "hickory_nut_unshelled", + "seed_cabbage", + "seed_sunflower", + "macaroni_raw", + "seed_onion", + "mre_veggy", + "hickory_nut" + ], + "fg": 939, + "rotates": false + }, + { "id": "veggy_tainted", "fg": 940, "rotates": false }, + { + "id": [ "candy2", "candy3", "neccowafers", "gummy_vitamins", "maple_candy", "candy" ], + "fg": 941, + "rotates": false + }, + { "id": [ "irradiated_cranberries", "seed_strawberries", "cranberries" ], "fg": 942, "rotates": false }, + { + "id": [ "cherries", "irradiated_cherries", "raspberries", "irradiated_raspberries" ], + "fg": 943, + "rotates": false + }, + { "id": "ruined_chunks", "fg": 944, "rotates": false }, + { "id": [ "plums", "irradiated_plums" ], "fg": 945, "rotates": false }, + { "id": "seed_blueberries", "fg": 946, "rotates": false }, + { + "id": [ + "can_coconut", + "yoghurt", + "pudding", + "can_chicken", + "horseradish", + "con_milk", + "flour", + "sugar", + "salt", + "meal_bone", + "meal_bone_tainted", + "starch", + "mayonnaise" + ], + "fg": 947, + "rotates": false + }, + { "id": "sugar_fried", "fg": 948, "rotates": false }, + { "id": "fungicide", "fg": 949, "rotates": false }, + { "id": "meal_chitin_piece", "fg": 950, "rotates": false }, + { "id": [ "mustard", "honey_bottled", "marloss_gel" ], "fg": 951, "rotates": false }, + { "id": [ "sauce_pesto", "seasoning_italian", "tea_raw", "fertilizer" ], "fg": 952, "rotates": false }, + { + "id": [ "sauce_red", "ketchup", "strawberries_cooked", "fruit_cooked", "jam_fruit" ], + "fg": 953, + "rotates": false + }, + { "id": "slime_scrap", "fg": 954, "rotates": false }, + { "id": "blueberries_cooked", "fg": 955, "rotates": false }, + { "id": "fd_blood", "fg": 956, "rotates": false }, + { "id": "fd_blood_veggy", "fg": 957, "rotates": false }, + { "id": [ "fd_blood_invertebrate", "fd_gibs_invertebrate" ], "fg": 958, "rotates": false }, + { "id": [ "fd_blood_insect", "fd_gibs_insect" ], "fg": 959, "rotates": false }, + { "id": "fd_gibs_flesh", "fg": 960, "rotates": false }, + { "id": [ "feces_dog", "feces_cow", "feces_manure" ], "fg": 961, "rotates": false }, + { "id": "feces_bird", "fg": 962, "rotates": false }, + { + "id": [ + "pepper", + "can_sardine", + "can_herring", + "gunpowder", + "magnesium", + "oxy_powder", + "material_cement", + "chem_aluminium_powder", + "chem_black_powder", + "chem_carbide", + "chem_rocket_fuel", + "chem_thermite", + "chem_zinc_powder", + "incendiary", + "charcoal", + "material_sand", + "ash" + ], + "fg": 963, + "rotates": false + }, + { + "id": [ + "can_clams", + "can_chowder", + "rehydrated_fish", + "milk_powder", + "dry_rice", + "rice_cooked", + "beansnrice", + "yeast", + "bfipowder", + "morphine", + "sushi_rice", + "coke", + "meth", + "poppy_sleep", + "poppy_pain", + "lye_powder", + "detergent", + "chem_aluminium_sulphate", + "chem_ammonium_nitrate", + "chem_saltpetre", + "chem_rdx", + "material_quicklime", + "chem_hmtd" + ], + "fg": 964, + "rotates": false + }, + { + "id": [ + "can_beans", + "granola", + "macaroni_helper", + "hobo_helper", + "pork_beans", + "peanutbutter", + "mushroom_cooked", + "deluxe_beans", + "deluxe_veggy_beans", + "deluxe_beansnrice", + "deluxe_veggy_beansnrice", + "acorns_cooked", + "buckwheat", + "buckwheat_cooked", + "heroin", + "tobacco", + "coffee_raw", + "feces_roach", + "material_soil", + "dogfood", + "f_woodchips" + ], + "fg": 965, + "rotates": false + }, + { + "id": [ + "can_corn", + "can_pineapple", + "fertilizer_commercial", + "lemonade_powder", + "powder_eggs", + "cornmeal", + "deluxe_rice", + "deluxe_veggy_rice", + "can_cheese", + "chem_sulphur" + ], + "fg": 966, + "rotates": false + }, + { "id": [ "cooked_pumpkin", "dry_mushroom", "dry_mushroom_magic" ], "fg": 967, "rotates": false }, + { + "id": [ + "crack", + "dry_fish", + "oatmeal", + "quikclot", + "protein_powder", + "hflesh_powder", + "seasoning_salt", + "pine_nuts", + "cinnamon", + "fried_seeds", + "sauerkraut", + "sauerkraut_onions" + ], + "fg": 968, + "rotates": false + }, + { + "id": [ "chilly-p", "curry_powder", "can_tomato", "meat_salted", "hflesh_salted" ], + "fg": 969, + "rotates": false + }, + { "id": "dry_fruit", "fg": 970, "rotates": false }, + { "id": [ "dry_meat", "dry_hflesh" ], "fg": 971, "rotates": false }, + { "id": [ "dry_meat_tainted", "dry_veggy_tainted" ], "fg": 972, "rotates": false }, + { + "id": [ "rehydrated_fruit", "juice_pulp", "can_spam", "can_tuna", "can_salmon", "can_catfood", "chem_anfo", "catfood" ], + "fg": 973, + "rotates": false + }, + { + "id": [ "rehydrated_meat", "rehydrated_hflesh", "apple_canned", "apple_sugar", "meat_pickled", "human_pickled" ], + "fg": 974, + "rotates": false + }, + { "id": [ "rehydrated_veggy", "veggy_pickled" ], "fg": 975, "rotates": false }, + { + "id": [ + "chaw", + "dandelion_cooked", + "wild_herbs", + "veggy_salad", + "dried_salad", + "insta_salad", + "veggy_aspic", + "veggy_canned", + "veggy_salted", + "dry_veggy", + "homebrew_antiseptic", + "chem_chromium_oxide" + ], + "fg": 976, + "rotates": false + }, + { "id": [ "irradiated_strawberries", "strawberries" ], "fg": 977, "rotates": false }, + { "id": "meat_scrap_cooked", "fg": 978, "rotates": false }, + { "id": "fish_bait", "fg": 979, "rotates": false }, + { "id": "meat_scrap", "fg": 980, "rotates": false }, + { + "id": [ "brioche", "toastem", "toastem2", "toastem3", "toasterpastryfrozen", "wastebread", "bread" ], + "fg": 981, + "rotates": false + }, + { + "id": [ + "pemmican", + "hflesh_pemmican", + "toasterpastry", + "cloutie_dumpling", + "haggis", + "human_haggis", + "unfinished_charcoal", + "fish_smoked" + ], + "fg": 982, + "rotates": false + }, + { + "id": [ "fish", "lunchmeat", "fruit_leather", "fried_spam", "meat_aspic", "hflesh_aspic", "sashimi" ], + "fg": 983, + "rotates": false + }, + { "id": [ "fish_cooked", "fish_pickled", "salted_fish", "wool_staple" ], "fg": 984, "rotates": false }, + { "id": [ "fish_fried", "cornbread", "johnnycake", "noodles_fast" ], "fg": 985, "rotates": false }, + { "id": [ "fish_canned", "lutefisk" ], "fg": 986, "rotates": false }, + { "id": "sweetbread", "fg": 987, "rotates": false }, + { "id": [ "chips2", "chips3", "chips" ], "fg": 988, "rotates": false }, + { "id": [ "popcorn", "popcorn2", "popcorn3" ], "fg": 989, "rotates": false }, + { "id": [ "cereal", "cereal2", "cereal3", "can_peach" ], "fg": 990, "rotates": false }, + { "id": [ "bacon", "fetus" ], "fg": 991, "rotates": false }, + { "id": [ "frozen_dinner", "mre_chicken" ], "fg": 992, "rotates": false }, + { + "id": [ "jerky", "jerky_human", "cooked_dinner", "meat_smoked", "human_smoked", "mre_beef" ], + "fg": 993, + "rotates": false + }, + { "id": [ "human_flesh", "meat_canned", "human_canned", "meat" ], "fg": 994, "rotates": false }, + { "id": [ "meat_cooked", "human_cooked", "royal_beef", "spider_steak_cooked" ], "fg": 995, "rotates": false }, + { "id": "meat_tainted", "fg": 996, "rotates": false }, + { "id": "spider_steak", "fg": 997, "rotates": false }, + { "id": "spider_steak_fried", "fg": 998, "rotates": false }, + { "id": [ "stomach_large", "hstomach", "hstomach_large", "stomach" ], "fg": 999, "rotates": false }, + { + "id": [ "stomach_boiled", "hstomach_boiled", "small_stomach_boiled", "small_hstomach_boiled" ], + "fg": 1000, + "rotates": false + }, + { "id": "offal_cooked", "fg": 1001, "rotates": false }, + { "id": "offal", "fg": 1002, "rotates": false }, + { "id": "sausage_wasteland", "fg": 1003, "rotates": false }, + { "id": "spider_brain", "fg": 1004, "rotates": false }, + { "id": [ "helmet_bone_megabear", "megabear_skull_clean" ], "fg": 1005, "rotates": false }, + { "id": "megabear_skull_unclean", "fg": 1006, "rotates": false }, + { "id": "e_handcuffs", "fg": 1007, "rotates": false }, + { "id": "onion_rings", "fg": 1008, "rotates": false }, + { + "id": [ "deluxe_eggs", "nachos", "nachosc", "nachosm", "nachoshf", "nachosmc", "nachoshc", "chunk_sulfur", "scrambled_eggs" ], + "fg": 1009, + "rotates": false + }, + { "id": "fat_tainted", "fg": 1010, "rotates": false }, + { + "id": [ "onigiri", "seed_garlic", "fat", "material_limestone", "material_rocksalt", "marshmallow" ], + "fg": 1011, + "rotates": false + }, + { "id": [ "raw_tainted_fur", "raw_fur" ], "fg": 1012, "rotates": false }, + { "id": "cured_pelt", "fg": 1013, "rotates": false }, + { "id": "tanned_pelt", "fg": 1014, "rotates": false }, + { "id": [ "raw_hleather", "raw_tainted_leather", "raw_leather" ], "fg": 1015, "rotates": false }, + { "id": "cured_hide", "fg": 1016, "rotates": false }, + { "id": "tanned_hide", "fg": 1017, "rotates": false }, + { "id": "tanning_hide", "fg": 1018, "rotates": false }, + { "id": "tanning_pelt", "fg": 1019, "rotates": false }, + { "id": [ "fresh_fries", "fries", "cheese_fries", "fresh_fries_big" ], "fg": 1020, "rotates": false }, + { "id": "powder_candy", "fg": 1021, "rotates": false }, + { "id": [ "spaghetti_raw", "cracklins", "porkstick", "mre_hotdog" ], "fg": 1022, "rotates": false }, + { "id": "straw_pile", "fg": 1023, "rotates": false }, + { "id": "candycigarette", "fg": 1024, "rotates": false }, + { "id": "dogbane", "fg": 1025, "rotates": false }, + { "id": "seed_rhubarb", "fg": 1026, "rotates": false }, + { "id": "canola", "fg": 1027, "rotates": false }, + { "id": [ "irradiated_rhubarb", "rhubarb" ], "fg": 1028, "rotates": false }, + { "id": [ "thyme", "seed_veggy_wild" ], "fg": 1029, "rotates": false }, + { "id": [ "wheat", "barley" ], "fg": 1030, "rotates": false }, + { "id": [ "irradiated_broccoli", "cannabis", "broccoli" ], "fg": 1031, "rotates": false }, + { "id": [ "hops", "celery", "irradiated_celery" ], "fg": 1032, "rotates": false }, + { + "id": [ + "dahlia_root", + "dahlia_baked", + "cattail_rhizome", + "hickory_root", + "seed_hops", + "salsify_raw", + "salsify_baked", + "chicory_raw" + ], + "fg": 1033, + "rotates": false + }, + { "id": [ "mushroom_morel", "morel_cooked", "morel_fried", "mushroom" ], "fg": 1034, "rotates": false }, + { "id": [ "leg", "arm" ], "fg": 1035, "rotates": false }, + { "id": "fchicken", "fg": 1036, "rotates": false }, + { "id": "bone_tainted", "fg": 1037, "rotates": false }, + { "id": [ "bone_human", "bone" ], "fg": 1038, "rotates": false }, + { "id": [ "irradiated_banana", "banana" ], "fg": 1039, "rotates": false }, + { "id": [ "irradiated_carrot", "carrot" ], "fg": 1040, "rotates": false }, + { "id": "chili_pepper", "fg": 1041, "rotates": false }, + { "id": [ "irradiated_grapes", "grapes" ], "fg": 1042, "rotates": false }, + { "id": [ "irradiated_pineapple", "pineapple" ], "fg": 1043, "rotates": false }, + { "id": [ "mugwort", "pine_bough", "tobacco_raw", "weed" ], "fg": 1044, "rotates": false }, + { "id": "sugar_beet", "fg": 1045, "rotates": false }, + { "id": [ "corndogs_cooked", "corndogs_frozen" ], "fg": 1046, "rotates": false }, + { "id": [ "joint", "handrolled_cig" ], "fg": 1047, "rotates": false }, + { + "id": [ "mannwurstgravy", "sausagegravy", "cooked_cattail_stalk", "vibrator" ], + "fg": 1048, + "rotates": false + }, + { + "id": [ + "sausage", + "mre_maplesausage", + "hotdogs_frozen", + "hotdogs_cooked", + "hotdogs_campfire", + "chilidogs", + "chilidogs_human", + "mannwurst", + "currywurst", + "h_currywurst", + "sweet_sausage" + ], + "fg": 1049, + "rotates": false + }, + { + "id": [ "zucchini", "irradiated_zucchini", "cucumber", "irradiated_cucumber", "cattail_stalk", "stick_fiber", "pickle" ], + "fg": 1050, + "rotates": false + }, + { "id": [ "irradiated_corn", "corn" ], "fg": 1051, "rotates": false }, + { "id": [ "frozen_burrito", "cooked_burrito" ], "fg": 1052, "rotates": false }, + { "id": "cig", "fg": 1053, "rotates": false }, + { "id": "cig_lit", "fg": 1054, "rotates": false }, + { "id": "cig_butt", "fg": 1055, "rotates": false }, + { "id": "cigar", "fg": 1056, "rotates": false }, + { "id": "cigar_lit", "fg": 1057, "rotates": false }, + { "id": "cigar_butt", "fg": 1058, "rotates": false }, + { "id": [ "clay_lump", "clay_boiled", "clay_lump", "chocolate" ], "fg": 1059, "rotates": false }, + { "id": "gum", "fg": 1060, "rotates": false }, + { "id": "nic_gum", "fg": 1061, "rotates": false }, + { "id": [ "tallow", "lard", "caff_gum" ], "fg": 1062, "rotates": false }, + { "id": [ "tallow_tainted", "material_aluminium_ingot" ], "fg": 1063, "rotates": false }, + { "id": [ "hfleshbologna", "bologna" ], "fg": 1064, "rotates": false }, + { "id": "royal_jelly_sap", "fg": 1065, "rotates": false }, + { "id": "royal_jelly", "fg": 1066, "rotates": false }, + { "id": "honeycomb", "fg": 1067, "rotates": false }, + { "id": "wax", "fg": 1068, "rotates": false }, + { "id": [ "sushi_fishroll", "sushi_meatroll", "sushi_veggyroll" ], "fg": 1069, "rotates": false }, + { "id": [ "pie_meat", "pie_human", "pie_maple", "pie" ], "fg": 1070, "rotates": false }, + { "id": "pizza_cheese", "fg": 1071, "rotates": false }, + { "id": [ "pizza_meat", "pizza_human" ], "fg": 1072, "rotates": false }, + { "id": [ "pizza_veggy", "pie_veggy" ], "fg": 1073, "rotates": false }, + { "id": [ "waffles", "fruit_waffles" ], "fg": 1074, "rotates": false }, + { "id": "choc_waffles", "fg": 1075, "rotates": false }, + { "id": [ "biscuit", "flatbread", "tortilla_corn", "cookies" ], "fg": 1076, "rotates": false }, + { "id": [ "grahmcrackers", "hardtack", "frenchtoast", "crackers" ], "fg": 1077, "rotates": false }, + { + "id": [ "sandwich_pbh", "sandwich_cheese_grilled", "sandwich_cheese", "sandwich_honey", "sandwich_pbm", "fish_sandwich" ], + "fg": 1078, + "rotates": false + }, + { "id": [ "sandwich_cucumber", "sandwich_veggy" ], "fg": 1079, "rotates": false }, + { "id": [ "sandwich_pbj", "blt", "sandwich_jam" ], "fg": 1080, "rotates": false }, + { + "id": [ + "sandwich_t", + "sandwich_human", + "smores", + "sandwich_pb", + "cheeseburgerhuman", + "sandwich_deluxe", + "sandwich_dudeluxe", + "cheeseburger", + "hamburger", + "bobburger", + "sloppyjoe", + "manwich", + "sandwich_sauce", + "spider_steak_sandwich" + ], + "fg": 1081, + "rotates": false + }, + { "id": [ "tiotaco", "quesadilla_cheese", "taco" ], "fg": 1082, "rotates": false }, + { "id": [ "oatmeal_deluxe", "oatmeal_cooked" ], "fg": 1083, "rotates": false }, + { "id": [ "spaghetti_bolognese", "spaghetti_human", "chili", "chili_human" ], "fg": 1084, "rotates": false }, + { "id": "spaghetti_pesto", "fg": 1085, "rotates": false }, + { "id": [ "luigilasagne", "lasagne" ], "fg": 1086, "rotates": false }, + { "id": [ "folding_poncho", "lasagne_raw" ], "fg": 1087, "rotates": false }, + { "id": [ "cheese_hard", "cheese" ], "fg": 1088, "rotates": false }, + { "id": "glazed_tenderloin", "fg": 1089, "rotates": false }, + { "id": [ "fruit_pancakes", "choc_pancakes", "pancakes" ], "fg": 1090, "rotates": false }, + { "id": [ "brownie", "brownie_weed", "cake2" ], "fg": 1091, "rotates": false }, + { "id": [ "jihelucake", "cake3" ], "fg": 1092, "rotates": false }, + { "id": [ "chocpretzels", "pretzels" ], "fg": 1093, "rotates": false }, + { "id": "contacts", "fg": 1094, "rotates": false }, + { "id": "eyedrops", "fg": 1095, "rotates": false }, + { "id": [ "inhaler_stimgas", "inhaler", "inhaler_sewergas" ], "fg": 1096, "rotates": false }, + { "id": "bandages", "fg": 1097, "rotates": false }, + { "id": "medikit", "fg": 1098, "rotates": false }, + { "id": "duct_tape", "fg": 1099, "rotates": false }, + { "id": "medical_tape", "fg": 1100, "rotates": false }, + { "id": "resin_cord", "fg": 1101, "rotates": false }, + { "id": "medical_gauze", "fg": 1102, "rotates": false }, + { "id": "lsd", "fg": 1103, "rotates": false }, + { "id": [ "vitamins", "adderall" ], "fg": 1104, "rotates": false }, + { "id": "caffeine", "fg": 1105, "rotates": false }, + { "id": "thorazine", "fg": 1106, "rotates": false }, + { "id": "xanax", "fg": 1107, "rotates": false }, + { "id": [ "pills_sleep", "prussian_blue", "oxycodone" ], "fg": 1108, "rotates": false }, + { "id": "codeine", "fg": 1109, "rotates": false }, + { + "id": [ + "aspirin", + "antifungal", + "antiparasitic", + "pur_tablets", + "iodine", + "tramadol", + "diazepam", + "calcium_tablet", + "weak_antibiotic" + ], + "fg": 1110, + "rotates": false + }, + { "id": "prozac", "fg": 1111, "rotates": false }, + { "id": "antibiotics", "fg": 1112, "rotates": false }, + { "id": "nyquil", "fg": 1113, "rotates": false }, + { "id": "dayquil", "fg": 1114, "rotates": false }, + { "id": "panacea", "fg": 1115, "rotates": false }, + { "id": [ "advanced_ecig", "antenna" ], "fg": 1116, "rotates": false }, + { "id": [ "tie_skinny", "tie_necktie", "tie_clipon", "ecig" ], "fg": 1117, "rotates": false }, + { "id": "dr_stem_cell", "fg": 1118, "rotates": false }, + { "id": "permanent_marker", "fg": 1119, "rotates": false }, + { "id": [ "berserker_drug", "adrenaline_injector" ], "fg": 1120, "rotates": false }, + { "id": "berserker_drug_act", "fg": 1121, "rotates": false }, + { "id": [ "inj_vitb", "inj_iron" ], "fg": 1122, "rotates": false }, + { "id": [ "offal_canned", "r_paint", "pickles_ferment" ], "fg": 1123, "rotates": false }, + { + "id": [ "offal_pickled", "sauerkraut_ferment", "jar_spider_steak_pickled", "megabear_skull_picked" ], + "fg": 1124, + "rotates": false + }, + { "id": [ "y_paint", "honey_glassed" ], "fg": 1125, "rotates": false }, + { "id": "b_paint", "fg": 1126, "rotates": false }, + { "id": [ "g_paint", "jar_sauerkraut_pickled" ], "fg": 1127, "rotates": false }, + { "id": "p_paint", "fg": 1128, "rotates": false }, + { "id": "w_paint", "fg": 1129, "rotates": false }, + { "id": "jar_pickles_pickled", "fg": 1130, "rotates": false }, + { "id": "hazardous_waste_drum", "fg": 1131, "rotates": false }, + { "id": "can_food", "fg": 1132, "rotates": false }, + { "id": [ "popcan_stove", "can_drink" ], "fg": 1133, "rotates": false }, + { "id": "can_food_unsealed", "fg": 1134, "rotates": false }, + { "id": "can_drink_unsealed", "fg": 1135, "rotates": false }, + { "id": "jar_glass", "fg": 1136, "rotates": false }, + { "id": [ "jar_glass_sealed", "spider_steak_pickled" ], "fg": 1137, "rotates": false }, + { "id": "jar_3l_glass", "fg": 1138, "rotates": false }, + { "id": "jar_3l_glass_sealed", "fg": 1139, "rotates": false }, + { "id": [ "styrofoam_cup", "cup_plastic" ], "fg": 1140, "rotates": false }, + { "id": "cup_plastic_unsealed", "fg": 1141, "rotates": false }, + { "id": "glass", "fg": 1142, "rotates": false }, + { "id": "ceramic_cup", "fg": 1143, "rotates": false }, + { "id": [ "glass_tube_small", "test_tube" ], "fg": 1144, "rotates": false }, + { + "id": [ "rubber_slug", "canister_goo", "bot_fungal_boil", "bot_fungal_boil_egg" ], + "fg": 1145, + "rotates": false + }, + { "id": "clay_canister", "fg": 1146, "rotates": false }, + { "id": "bottle_folding", "fg": 1147, "rotates": false }, + { "id": "bottle_metal", "fg": 1148, "rotates": false }, + { "id": [ "bottle_twoliter", "bottle_plastic", "bottle_plastic_small" ], "fg": 1149, "rotates": false }, + { "id": "acidbomb_medium", "fg": 1150, "rotates": false }, + { "id": "nail_bomb", "fg": 1151, "rotates": false }, + { "id": "triffid_sap_grenade", "fg": 1152, "rotates": false }, + { "id": "bottle_glass", "fg": 1153, "rotates": false }, + { "id": "fertilizer_chelated", "fg": 1154, "rotates": false }, + { "id": [ "2lcanteen", "canteen_wood", "canteen" ], "fg": 1155, "rotates": false }, + { "id": "flask_hip", "fg": 1156, "rotates": false }, + { "id": "jug_plastic", "fg": 1157, "rotates": false }, + { "id": "jug_clay", "fg": 1158, "rotates": false }, + { "id": "clay_hydria", "fg": 1159, "rotates": false }, + { "id": [ "sac_treated", "sac_empty" ], "fg": 1160, "rotates": false }, + { "id": [ "sac_purse", "sac_purse_ankle", "sac_purse_arm", "sac_purse_leg" ], "fg": 1161, "rotates": false }, + { + "id": [ "waterskin2", "waterskin3", "large_stomach_sealed", "stomach_sealed", "waterskin" ], + "fg": 1162, + "rotates": false + }, + { "id": [ "milk_curdling", "milk_curdling2", "milk_curdling3" ], "fg": 1163, "rotates": false }, + { "id": [ "flask_yeast", "flask_glass" ], "fg": 1164, "rotates": false }, + { "id": [ "antidote_posion", "revival_serum", "antidote_badpoison" ], "fg": 1165, "rotates": false }, + { "id": "acidbomb", "fg": 1166, "rotates": false }, + { + "id": [ + "solarpack", + "q_solarpack", + "mbag", + "survivor_rucksack", + "survivor_duffel_bag", + "ammo_satchel", + "chestpouch", + "legpouch", + "legpouch_large", + "makeshift_knapsack", + "camelbak" + ], + "fg": 1167, + "rotates": false + }, + { "id": [ "backpack", "runner_bag", "slingpack" ], "fg": 1168, "rotates": false }, + { + "id": [ "backpack_leather", "survivor_pack", "survivor_runner_pack", "swag_bag" ], + "fg": 1169, + "rotates": false + }, + { "id": "duffelbag", "fg": 1170, "rotates": false }, + { "id": [ "fanny", "dive_bag" ], "fg": 1171, "rotates": false }, + { "id": "purse", "fg": 1172, "rotates": false }, + { "id": [ "plastic_shopping_bag", "plastic_bucket" ], "fg": 1173, "rotates": false }, + { "id": "straw_basket", "fg": 1174, "rotates": false }, + { "id": "bucket", "fg": 1175, "rotates": false }, + { "id": "plastic_bag_vac", "fg": 1176, "rotates": false }, + { + "id": [ + "bag_canvas", + "bag_canvas_small", + "mre_beef_box", + "mre_veggy_box", + "mre_chicken_box", + "mre_hotdog_box", + "mre_ravioli_box" + ], + "fg": 1177, + "rotates": false + }, + { "id": [ "bag_bundle_10", "bag_plastic" ], "fg": 1178, "rotates": false }, + { "id": [ "concrete", "mortar_build" ], "fg": 1179, "rotates": false }, + { "id": "box_cigarette", "fg": 1180, "rotates": false }, + { "id": "box_small", "fg": 1181, "rotates": false }, + { "id": "jerrycan_big", "fg": 1182, "rotates": false }, + { + "id": "vp_tank_medium", + "fg": 1182, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": [ "jerrypack", "jerrycan" ], "fg": 1184, "rotates": false }, + { + "id": "vp_tank_small", + "fg": 1184, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { + "id": [ "metal_tank_small", "metal_tank_little", "metal_tank_small", "metal_tank" ], + "fg": 1185, + "rotates": false + }, + { + "id": [ "vp_tank", "vp_tank_little" ], + "fg": 1185, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "stamina_vial", "fg": 1186, "rotates": false }, + { "id": [ "hose", "vine_30" ], "fg": 1187, "rotates": false }, + { "id": [ "leather_cat_tail", "fur_cat_tail", "string_6", "string_36" ], "fg": 1188, "rotates": false }, + { "id": [ "wire", "wire_barbed", "chain" ], "fg": 1189, "rotates": false }, + { "id": "spaghetti_cooked", "fg": 1190, "rotates": false }, + { "id": [ "flu_shot", "vaccine_shot" ], "fg": 1191, "rotates": false }, + { "id": "copper_knife", "fg": 1192, "rotates": false }, + { + "id": [ + "knife_steak", + "knife_butcher", + "knife_combat", + "diveknife", + "makeshift_knife", + "primitive_knife", + "knife_trench", + "switchblade", + "kris", + "knife_hunting", + "knife_rambo", + "knife_rm42", + "honey_scraper", + "bio_blade_weapon", + "kris_fake" + ], + "fg": 1193, + "rotates": false + }, + { "id": "glass_shiv", "fg": 1194, "rotates": false }, + { "id": "foil_alum", "fg": 1195, "rotates": false }, + { "id": [ "rolling_paper", "aluminum_foil", "wrapper" ], "fg": 1196, "rotates": false }, + { "id": "grenade_inc_act", "fg": 1197, "rotates": false }, + { "id": "scrambler_act", "fg": 1198, "rotates": false }, + { "id": "EMPbomb_act", "fg": 1199, "rotates": false }, + { "id": [ "flashbang_act", "t_lgtn_arrest" ], "fg": 1200, "rotates": false }, + { "id": "smokebomb_act", "fg": 1201, "rotates": false }, + { "id": "gasbomb_act", "fg": 1202, "rotates": false }, + { "id": "flashbang", "fg": 1203, "rotates": false }, + { "id": "grenade_inc", "fg": 1204, "rotates": false }, + { "id": "scrambler", "fg": 1205, "rotates": false }, + { "id": "EMPbomb", "fg": 1206, "rotates": false }, + { "id": "smokebomb", "fg": 1207, "rotates": false }, + { "id": "gasbomb", "fg": 1208, "rotates": false }, + { "id": "thermos", "fg": 1209, "rotates": false }, + { "id": "vacutainer", "fg": 1210, "rotates": false }, + { + "id": [ + "bio_null", + "bio_power_storage", + "bio_power_storage_mkII", + "bio_batteries", + "bio_metabolics", + "bio_solar", + "bio_torsionratchet", + "bio_furnace", + "bio_ethanol", + "bio_memory", + "bio_ears", + "bio_eye_enhancer", + "bio_dex_enhancer", + "bio_str_enhancer", + "bio_int_enhancer", + "bio_membrane", + "bio_targeting", + "bio_gills", + "bio_purifier", + "bio_climate", + "bio_storage", + "bio_recycler", + "bio_digestion", + "bio_tools", + "bio_shock", + "bio_heat_absorb", + "bio_carbon", + "bio_armor_head", + "bio_armor_torso", + "bio_armor_arms", + "bio_armor_legs", + "bio_flashlight", + "bio_night_vision", + "bio_infrared", + "bio_face_mask", + "bio_ads", + "bio_ods", + "bio_scent_mask", + "bio_scent_vision", + "bio_cloak", + "bio_painkiller", + "bio_nanobots", + "bio_heatsink", + "bio_resonator", + "bio_time_freeze", + "bio_teleport", + "bio_blood_anal", + "bio_blood_filter", + "bio_alarm", + "bio_evap", + "bio_lighter", + "bio_claws", + "bio_blaster", + "bio_laser", + "bio_emp", + "bio_hydraulics", + "bio_water_extractor", + "bio_magnet", + "bio_fingerhack", + "bio_lockpick", + "bio_ground_sonar", + "bio_power_armor_interface", + "bio_power_armor_interface_mkII", + "bio_flashbang", + "bio_railgun", + "bio_probability_travel", + "bio_shockwave", + "bio_chain_lightning", + "bio_night", + "bio_uncanny_dodge", + "bio_dis_shock", + "bio_dis_acid", + "bio_drain", + "bio_noise", + "bio_power_weakness", + "bio_sunglasses", + "bio_speed", + "bio_watch", + "bio_faraday", + "bio_armor_eyes", + "bio_leukocyte", + "bio_geiger", + "bio_radscrubber", + "bio_adrenaline", + "bio_razors", + "bio_blade", + "bio_itchy", + "bio_nostril", + "bio_thumbs", + "bio_spasm", + "bio_shakes", + "bio_leaky", + "bio_sleepy", + "bio_deformity", + "bio_voice", + "bio_pokedeye", + "bio_ankles", + "bio_trip", + "bio_cqb", + "bio_meteorologist", + "bio_ups", + "bio_remote", + "bio_advreactor", + "bio_plut_filter", + "bio_reactor", + "bio_reactor_upgrade", + "bio_stiff", + "bio_eye_optic", + "bio_chest_gun", + "bio_emp_armgun", + "bio_surgical_razor", + "bio_cable" + ], + "fg": 1211, + "rotates": false + }, + { "id": [ "control_chip", "burnt_out_bionic" ], "fg": 1212, "rotates": false }, + { + "id": [ "120mm_usable_heat", "120mm_usable_shot", "120mm_usable_slug", "120mm_usable_ap" ], + "fg": 1213, + "rotates": false + }, + { "id": "12mm", "fg": 1214, "rotates": false }, + { + "id": [ + "22_fmj", + "22_cb", + "22_ratshot", + "9mm", + "9mmP", + "9mmP2", + "9mmfmj", + "762_25", + "762_25hot", + "762_25typeP", + "reloaded_762_25", + "38_special", + "38_super", + "38_fmj", + "10mm", + "40sw", + "40fmj", + "44magnum", + "44fmj", + "45_acp", + "45_jhp", + "45_super", + "454_Casull", + "500_Magnum", + "57mm", + "46mm", + "762_m43", + "762_m87", + "223", + "556", + "556_incendiary", + "270", + "3006", + "3006fmj", + "3006_incendiary", + "308", + "762_51", + "762_51_incendiary", + "700nx", + "32_acp", + "300_winmag", + "762_54R", + "reloaded_9mm", + "reloaded_9mmP", + "reloaded_9mmP2", + "reloaded_9mmfmj", + "reloaded_38_special", + "reloaded_38_super", + "reloaded_38_fmj", + "reloaded_10mm", + "reloaded_40sw", + "reloaded_40fmj", + "reloaded_44magnum", + "reloaded_44fmj", + "reloaded_45_acp", + "reloaded_45_jhp", + "reloaded_45_super", + "reloaded_454_Casull", + "reloaded_500_Magnum", + "reloaded_57mm", + "reloaded_46mm", + "reloaded_762_m43", + "reloaded_762_m87", + "reloaded_223", + "reloaded_556", + "reloaded_556_incendiary", + "reloaded_270", + "reloaded_3006", + "reloaded_3006_incendiary", + "reloaded_308", + "reloaded_762_51", + "reloaded_762_51_incendiary", + "reloaded_50bmg", + "reloaded_50ss", + "reloaded_50_incendiary", + "reloaded_300_winmag", + "reloaded_32_acp", + "reloaded_700nx", + "reloaded_762_54R", + "reloaded_22_cb", + "reloaded_22_fmj", + "reloaded_22_lr", + "reloaded_22_ratshot", + "545", + "545_ap", + "9x18mm", + "9x18mmfmj", + "9x18mmP2", + "reloaded_545", + "reloaded_545_ap", + "reloaded_9x18mm", + "reloaded_9x18mmfmj", + "reloaded_9x18mmP2", + "reloaded_3006fmj", + "50bmg", + "50ss", + "50_incendiary", + "357sig_fmj", + "357sig_jhp", + "reloaded_357sig_fmj", + "reloaded_357sig_jhp", + "357", + "357_P", + "45_long_colt", + "reloaded_357", + "reloaded_357_P", + "reloaded_45_long_colt", + "22_lr" + ], + "fg": 1215, + "rotates": false + }, + { "id": [ "30mm_hei", "30mm_slug", "30mm_hedp" ], "fg": 1216, "rotates": false }, + { + "id": [ + "40mm_frag", + "40mm_incendiary", + "40mm_teargas", + "40mm_smoke", + "40mm_flare", + "40mm_flashbang", + "40mm_shot", + "40mm_flechette", + "reloaded_40mm_flechette", + "66mm_HEAT", + "120mm_HEAT", + "40mm_beanbag", + "84x246mm_he", + "84x246mm_hedp", + "84x246mm_smoke", + "m235tpa", + "40mm_concussive" + ], + "fg": 1217, + "rotates": false + }, + { "id": [ "reloaded_5x50dart", "5x50heavy", "5x50dart" ], "fg": 1218, "rotates": false }, + { + "id": [ + "shot_bird", + "shot_00", + "shot_slug", + "shot_he", + "shot_flechette", + "reloaded_shot_bird", + "reloaded_shot_00", + "reloaded_shot_slug", + "reloaded_shot_flechette", + "blun_flechette", + "blun_shot", + "blun_slug", + "reloaded_shot_beanbag", + "shot_scrap", + "shot_scrapbag", + "shot_beanbag", + "generic_no_ammo", + "signal_flare", + "410_birdshot", + "410_scrap", + "410_shot", + "410_slug", + "reloaded_410_birdshot", + "reloaded_410_shot", + "reloaded_410_slug", + "shot_410", + "shot_410_flechette", + "shot_410_flechette_reloaded", + "shot_410_hull", + "shot_410_inc", + "shot_410_inc_reloaded", + "shot_410_reloaded", + "shot_410_slug", + "shot_410_slug_reloaded" + ], + "fg": 1219, + "rotates": false + }, + { + "id": [ + "8mm_bootleg", + "8mm_fmj", + "8mm_jhp", + "8mm_inc", + "8mm_hvp", + "8mm_civilian", + "20x66_shot", + "20x66_flechette", + "20x66_slug", + "20x66_exp", + "20x66_frag", + "20x66_flare", + "20x66_inc", + "20x66_beanbag", + "20x66_bootleg_shot", + "20x66_bootleg_flechette", + "20x66_bootleg_slug", + "8mm_caseless" + ], + "fg": 1220, + "rotates": false + }, + { + "id": [ + "9mm_casing", + "22_casing", + "38_casing", + "40_casing", + "44_casing", + "45_casing", + "454_casing", + "500_casing", + "57mm_casing", + "46mm_casing", + "762_casing", + "223_casing", + "3006_casing", + "308_casing", + "40mm_casing", + "700nx_casing", + "300_casing", + "762R_casing", + "762_25_casing", + "32_casing", + "9x18mm_casing", + "545_casing", + "22_casing_new" + ], + "fg": 1221 + }, + { "id": [ "50_casing", "357sig_casing", "357_mag_casing", "45lc_casing" ], "fg": 1221, "rotates": false }, + { "id": "acidbomb_large", "fg": 1222, "rotates": false }, + { "id": "acidbomb_micro", "fg": 1223, "rotates": false }, + { "id": "acidbomb_small", "fg": 1224, "rotates": false }, + { "id": [ "stimpack_ammo", "ampoule" ], "fg": 1225, "rotates": false }, + { "id": [ "battery", "laser_capacitor" ], "fg": 1226, "rotates": false }, + { + "id": [ "laser_pack", "reloaded_laser_pack", "rechargeable_battery", "rechargeable_battery" ], + "fg": 1227, + "rotates": false + }, + { + "id": [ "plasma", "charge_shot", "rebreather_filter", "gasfilter_s", "gasfilter_m", "gasfilter_l" ], + "fg": 1228, + "rotates": false + }, + { "id": "plut_cell", "fg": 1229, "rotates": false }, + { "id": "battery_atomic", "fg": 1230, "rotates": false }, + { + "id": [ "155mm_frag", "155mm_heat", "155mm_shot", "155mm_slug", "atgm_heat" ], + "fg": 1231, + "rotates": false + }, + { "id": "bfg_shell", "fg": 1232, "rotates": false }, + { + "id": [ "bolt_wood", "arrow_fire_hardened_fletched", "arrow_heavy_fire_hardened_fletched" ], + "fg": 1233, + "rotates": false + }, + { "id": "arrow_plastic", "fg": 1234, "rotates": false }, + { + "id": [ + "bolt_metal", + "bolt_steel", + "bolt_steel_target", + "bolt_steel_bodkin", + "bolt_explosive", + "arrow_metal", + "arrow_metal_bodkin", + "arrow_metal_sharpened_fletched", + "arrow_metal_target", + "arrow_exploding", + "arrow_flamming" + ], + "fg": 1235, + "rotates": false + }, + { "id": "arrow_cf", "fg": 1236, "rotates": false }, + { "id": "bolt_bone", "fg": 1237, "rotates": false }, + { "id": "arrow_small_game_fletched", "fg": 1238, "rotates": false }, + { + "id": [ "arrow_wood_heavy", "arrow_field_point_fletched", "arrow_heavy_field_point_fletched", "flamable_arrow", "arrow_wood" ], + "fg": 1239, + "rotates": false + }, + { "id": [ "dart", "lawn_dart" ], "fg": 1240, "rotates": false }, + { "id": [ "bomblet_archdemon", "bomblet_explosive" ], "fg": 1241, "rotates": false }, + { "id": [ "bomblet_archvile", "bomblet_fire", "bomblet_vile" ], "fg": 1242, "rotates": false }, + { "id": "bomblet_casing", "fg": 1243, "rotates": false }, + { "id": "bomblet_chickenbot", "fg": 1244, "rotates": false }, + { "id": "bomblet_frag", "fg": 1245, "rotates": false }, + { "id": "bomblet_stun", "fg": 1246, "rotates": false }, + { "id": "bomblet_acid", "fg": 1247, "rotates": false }, + { "id": "cable", "fg": 1248, "rotates": false }, + { "id": "chain_link", "fg": 1249, "rotates": false }, + { "id": [ "chime_scrap_act", "chime_scrap" ], "fg": 1250, "rotates": false }, + { "id": [ "scrap_bronze", "scrap_copper", "copper" ], "fg": 1251, "rotates": false }, + { "id": "gold_small", "fg": 1252, "rotates": false }, + { + "id": [ "lead", "silver_small", "platinum_small", "bismuth", "tin", "scrap" ], + "fg": 1253, + "rotates": false + }, + { "id": [ "electric_primer_large", "electric_primer" ], "fg": 1254, "rotates": false }, + { "id": [ "spiked_rocket", "explosive_hm_rocket" ], "fg": 1255, "rotates": false }, + { "id": [ "incendiary_hm_rocket", "cyber_rocket" ], "fg": 1256, "rotates": false }, + { "id": "RPG-7_ammo", "fg": 1257, "rotates": false }, + { "id": [ "down_feather", "feather" ], "fg": 1258, "rotates": false }, + { "id": [ "throwing_knife", "survival_marker", "fighter_sting_juice" ], "fg": 1259, "rotates": false }, + { "id": "bee_sting", "fg": 1260, "rotates": false }, + { "id": "fighter_sting", "fg": 1261, "rotates": false }, + { "id": "wasp_sting", "fg": 1262, "rotates": false }, + { "id": "flaming_skull", "fg": 1263, "rotates": false }, + { "id": "bfg_shell_act", "fg": 1264, "rotates": false }, + { "id": "flaming_ball", "fg": 1265, "rotates": false }, + { "id": "fletching", "fg": 1266, "rotates": false }, + { "id": [ "36navy", "44army", "flintlock_shot", "flintlock_ammo" ], "fg": 1267, "rotates": false }, + { "id": [ "hell_laser_queen", "hell_laser" ], "fg": 1268, "rotates": true }, + { "id": "hell_napalm", "fg": 1269, "rotates": false }, + { "id": [ "hell_plasma_c", "hell_plasma_k", "hell_plasma_b" ], "fg": 1270, "rotates": false }, + { "id": [ "lance_charge_shot", "lance_charge" ], "fg": 1271, "rotates": false }, + { "id": "material_niter", "fg": 1272, "rotates": false }, + { "id": [ "mininuke", "mininuke_mod" ], "fg": 1273, "rotates": false }, + { "id": [ "chem_hexamine", "money" ], "fg": 1274, "rotates": false }, + { "id": [ "c_fishspear", "qiang", "m_fishspear" ], "fg": 1275, "rotates": false }, + { "id": [ "javelin", "javelin_copper", "javelin", "spear_wood" ], "fg": 1276, "rotates": false }, + { "id": [ "combatnail", "nail" ], "fg": 1277, "rotates": false }, + { "id": "nicotine_liquid", "fg": 1278, "rotates": false }, + { "id": [ "marble", "bearing", "bb", "bearing_lead", "pebble_clay", "pebble" ], "fg": 1279, "rotates": false }, + { + "id": [ "shotgun_primer", "smpistol_primer", "lgpistol_primer", "smrifle_primer", "lgrifle_primer" ], + "fg": 1280, + "rotates": false + }, + { "id": "sinew", "fg": 1281, "rotates": false }, + { "id": [ "thread", "yarn" ], "fg": 1282, "rotates": false }, + { "id": "plant_fibre", "fg": 1283, "rotates": false }, + { "id": [ "steel_rail", "rebar_rail" ], "fg": 1284, "rotates": false }, + { + "id": [ "blowgun", "skewer", "knitting_needles", "pointy_stick", "pool_cue", "digging_stick" ], + "fg": 1285, + "rotates": false + }, + { "id": [ "baton", "baton-extended" ], "fg": 1286, "rotates": false }, + { "id": "shrapnel", "fg": 1287, "rotates": false }, + { "id": "soap", "fg": 1288, "rotates": false }, + { "id": "solder_wire", "fg": 1289, "rotates": false }, + { "id": "throwing_axe", "fg": 1290, "rotates": false }, + { "id": "throwing_stick", "fg": 1291, "rotates": false }, + { "id": "triffid_sap", "fg": 1292, "rotates": false }, + { "id": "atomic_light", "fg": 1293, "rotates": false }, + { "id": [ "atomic_light_off", "baseball" ], "fg": 1294, "rotates": false }, + { "id": "lens", "fg": 1295, "rotates": false }, + { "id": [ "pool_ball", "bowling_ball", "pool_ball" ], "fg": 1296, "rotates": false }, + { + "id": "vp_atomic_light", + "fg": 1293, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": [ "rock", "rock" ], "fg": 1297, "rotates": false }, + { "id": "solar_cell", "fg": 1298, "rotates": false }, + { "id": "sheet_metal_small", "fg": 1299, "rotates": false }, + { "id": "steel_lump", "fg": 1300, "rotates": false }, + { "id": [ "rag", "chestwrap", "nomex", "neoprene", "tinder" ], "fg": 1301, "rotates": false }, + { "id": [ "chestwrap_wool", "felt_patch" ], "fg": 1302, "rotates": false }, + { "id": "rag_bloody", "fg": 1303, "rotates": false }, + { + "id": [ "javelin_iron", "javelin_stone", "spear_knife", "pike", "javelin_iron", "spear_stone", "fishspear" ], + "fg": 1304, + "rotates": false + }, + { "id": "spear_dory", "fg": 1305, "rotates": false }, + { "id": [ "8x40_100_mag", "8x40_500_mag", "360_200_mag", "hk_g80mag", "5x50_100_mag" ], "fg": 1306 }, + { "id": [ "8x40_50_mag", "20x66_40_mag", "lw223bigmag", "5x50_50_mag" ], "fg": 1307 }, + { + "id": [ + "20x66_10_mag", + "stanag10", + "falmag", + "falbigmag", + "g3mag", + "m14mag", + "m1918bigmag", + "m1918mag", + "saiga10mag", + "8x40_10_mag" + ], + "fg": 1308 + }, + { + "id": [ + "mp5bigmag", + "360_400_mag", + "thompson_drum", + "g3bigmag", + "scarhbigmag", + "glock_drum_100rd", + "glock_drum_50rd", + "ppshdrum", + "saiga30mag_410", + "8x40_250_mag" + ], + "fg": 1309 + }, + { + "id": [ + "20x66_20_mag", + "lw223mag", + "stanag30", + "scarhmag", + "akmmag", + "akmbigmag", + "saiga30mag", + "ppshmag", + "saiga10mag_410", + "8x40_25_mag" + ], + "fg": 1310 + }, + { "id": [ "ak74mag", "rpk74mag" ], "fg": 1311 }, + { "id": "a180mag", "fg": 1312 }, + { "id": "aux_pressurized_tank", "fg": 1313, "rotates": false }, + { "id": [ "belt308", "belt40mm", "belt50", "belt30mm", "belt223" ], "fg": 1314 }, + { "id": [ "calicomag", "fnp90mag" ], "fg": 1315 }, + { "id": "garandclip", "fg": 1316 }, + { + "id": [ + "glockmag", + "glock40mag", + "glock40bigmag", + "lw21mag", + "m9bigmag", + "m9mag", + "usp9mag", + "makarovmag", + "mosquitomag", + "sw22mag", + "ppkmag", + "sigp230mag", + "taurus38mag", + "deaglemag", + "lw12mag", + "m1911bigmag", + "m1911mag", + "usp45mag", + "fn57mag", + "sig40mag", + "tokarevmag", + "glock17_17", + "glock17_22", + "p226mag_15rd_357sig", + "af2011a1mag", + "m1991_38smag", + "glockbigmag" + ], + "fg": 1317 + }, + { "id": "hd_battery", "fg": 1318, "rotates": false }, + { "id": "m107a1mag", "fg": 1319 }, + { "id": [ "ruger1022bigmag", "mp5mag" ], "fg": 1320 }, + { + "id": [ "smg_22_mag", "smg_38_mag", "smg_40_mag", "smg_45_mag", "smg_9mm_mag", "brute_shot_mag", "nailmag" ], + "fg": 1321 + }, + { "id": "pressurized_tank", "fg": 1322, "rotates": false }, + { "id": "rm4502", "fg": 1323, "rotates": false }, + { "id": "rm4504", "fg": 1324, "rotates": false }, + { "id": [ "survivor223mag", "m14smallmag", "blrmag", "m2010mag", "ruger1022mag" ], "fg": 1325 }, + { + "id": [ "battery_motorbike", "battery_car", "medium_storage_battery", "storage_battery", "small_storage_battery" ], + "fg": 1326, + "rotates": false + }, + { + "id": [ + "vp_small_storage_battery", + "vp_medium_storage_battery", + "vp_storage_battery", + "vp_storage_battery_removable", + "vp_battery_motorbike", + "vp_battery_car" + ], + "fg": 1326, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "stanag50", "fg": 1327 }, + { + "id": [ + "stenmag", + "survivor9mm_mag", + "uzimag", + "skorpion82mag", + "skorpion61mag", + "mac10mag", + "tdi_mag", + "thompson_bigmag", + "thompson_mag", + "ump45mag", + "hk46mag", + "hk46bigmag", + "tec9mag" + ], + "fg": 1328 + }, + { "id": "tinyweldtank", "fg": 1329 }, + { "id": "weldtank", "fg": 1330 }, + { "id": [ "laser_cannon", "cerberus_laser", "unbio_blaster_gun" ], "fg": 1331, "rotates": false }, + { + "id": [ "flamethrower_simple", "flamethrower", "rm451_flamethrower", "hell_laser_napalm" ], + "fg": 1332, + "rotates": false + }, + { + "id": [ "m249", "30mm_autocannon", "rm614_lmg", "rm20", "rm298", "m240", "m60", "mgl" ], + "fg": 1333, + "rotates": false + }, + { "id": "fire_lance", "fg": 1334, "rotates": false }, + { + "id": [ + "fn_p90", + "rm802", + "bigun", + "heavy_rail_rifle", + "rm360_carbine", + "m134", + "tihar", + "helsing", + "watercannon", + "bomblet_launcher_double", + "bomblet_launcher_dualshot", + "bomblet_launcher_rotary", + "bomblet_launcher_single", + "bomblet_launcher_chickenbot" + ], + "fg": 1335, + "rotates": false + }, + { "id": "airspeargun", "fg": 1336, "rotates": false }, + { "id": [ "fn_fal", "ak74", "an94", "ak47" ], "fg": 1337, "rotates": false }, + { + "id": [ + "hk_g3", + "hk_g36", + "arx160", + "acr", + "ar15", + "m4a1", + "scar_l", + "scar_h", + "m107a1", + "h&k416a5", + "m27iar", + "rm51_assault_rifle" + ], + "fg": 1338, + "rotates": false + }, + { + "id": [ "tommygun", "ppsh", "smg_22", "smg_38", "smg_40", "smg_45", "smg_9mm", "american_180" ], + "fg": 1339, + "rotates": false + }, + { + "id": [ + "sig552", + "needlegun", + "uzi", + "tec9", + "calico", + "hk_mp5", + "mac_10", + "hk_ump45", + "sten", + "skorpion_61", + "skorpion_82", + "hk_mp7", + "rm2000_smg", + "paintballgun" + ], + "fg": 1340, + "rotates": false + }, + { "id": "atlatl", "fg": 1341, "rotates": false }, + { + "id": [ + "speargun", + "carbine_flintlock_double", + "rifle_flintlock", + "carbine_flintlock", + "rifle_308", + "surv_carbine_223", + "garand", + "m1903", + "rifle_22", + "marlin_9a", + "ruger_1022", + "survivor_special_700", + "rifle_3006", + "browning_blr", + "remington_700", + "sks", + "m1a", + "ruger_mini", + "savage_111f", + "win70", + "weatherby_5", + "mosin91_30", + "mosin44", + "l_long_45", + "bh_m89", + "henry_big_boy", + "colt_lightning", + "levergun_44", + "rifle_223", + "rifle_38", + "rifle_40", + "rifle_44", + "rifle_45", + "bbgun" + ], + "fg": 1342, + "rotates": false + }, + { "id": "nailrifle", "fg": 1343, "rotates": false }, + { + "id": [ + "rifle_9mm", + "m2010", + "m14ebr", + "rm11b_sniper_rifle", + "mosin44_ebr", + "mosin91_30_ebr", + "cx4", + "l_base_223", + "l_car_223", + "l_mbr_223", + "l_dsr_223", + "l_lmg_223", + "ksub2000", + "rm88_battle_rifle" + ], + "fg": 1344, + "rotates": false + }, + { "id": "BFG", "fg": 1345, "rotates": false }, + { "id": "bomblet_launcher_brute", "fg": 1346, "rotates": false }, + { "id": "chemical_thrower", "fg": 1347, "rotates": false }, + { "id": [ "compgreatbow", "compbow" ], "fg": 1348, "rotates": false }, + { "id": "ichaival_replica", "fg": 1349, "rotates": false }, + { "id": "compositebow", "fg": 1350, "rotates": false }, + { "id": [ "shockcannon", "shockcannon_plut", "shockcannon_ups", "emp_gun" ], "fg": 1351, "rotates": false }, + { + "id": [ + "revolver_shotgun", + "remington_870", + "mossberg_500", + "rm120c", + "m2browning", + "mark19", + "l_def_12", + "m1014", + "m2browning_sawn", + "abzats", + "ksg", + "shotgun_410" + ], + "fg": 1352, + "rotates": false + }, + { + "id": [ + "shotgun_s", + "pipe_shotgun", + "shotgun_d", + "pipe_double_shotgun", + "rebar_rifle", + "doublespeargun", + "blunderbuss", + "combination_gun", + "pipe_combination_gun", + "surv_levershotgun", + "410_pipe_shotgun", + "m6_asw" + ], + "fg": 1353, + "rotates": false + }, + { "id": "trex_gun", "fg": 1354, "rotates": false }, + { "id": "flamethrower_crude", "fg": 1355, "rotates": false }, + { "id": "minispeargun", "fg": 1356, "rotates": false }, + { + "id": [ "moss_brownie", "pistol_flintlock", "2_shot_special", "lemat_revolver", "colt_saa", "410_revolver" ], + "fg": 1357, + "rotates": false + }, + { + "id": [ + "cop_38", + "sig_mosquito", + "sw_22", + "glock_17", + "glock_19", + "glock_22", + "usp_9mm", + "sw_619", + "taurus_38", + "sig_40", + "sw_610", + "sw_500", + "raging_bull", + "ruger_redhawk", + "deagle_44", + "usp_45", + "m1911", + "fn57", + "hk_ucp", + "tokarev", + "walther_ppk", + "sig_p230", + "l_enforcer_45", + "l_sp_9mm", + "l_mp_9mm", + "l_sp_45", + "l_mp_45", + "l_bak_223", + "l_lookout_9mm", + "surv_hand_cannon", + "surv_six_shooter", + "sw629", + "colt_navy", + "rm99_pistol", + "rm103a_pistol", + "colt_army", + "m9", + "makarov", + "ruger_lcr_22", + "ruger_lcr_38", + "ashot", + "needlepistol", + "p226_357sig", + "af2011a1_38super", + "bond_410", + "m1991a1_38super", + "raging_judge" + ], + "fg": 1358, + "rotates": false + }, + { "id": "nailgun", "fg": 1359, "rotates": false }, + { "id": [ "v29", "v29_cheap" ], "fg": 1360, "rotates": false }, + { "id": [ "rx12_injector", "rx11_stimpack" ], "fg": 1361, "rotates": false }, + { "id": "wearable_rx12", "fg": 1362, "rotates": false }, + { "id": "flaregun", "fg": 1363, "rotates": false }, + { + "id": [ + "nx17", + "hk_g80", + "plasma_rifle", + "laser_rifle", + "hell_laser_gun", + "hell_laser_gun_queen", + "coilgun", + "laser_rifle_cheap", + "ftk93" + ], + "fg": 1364, + "rotates": false + }, + { "id": [ "saiga_12", "m1918", "saiga_410" ], "fg": 1365, "rotates": false }, + { + "id": [ "crossbow", "huge_crossbow", "rep_crossbow", "bullet_crossbow", "crossbow_makeshift", "hand_crossbow" ], + "fg": 1366, + "rotates": false + }, + { "id": [ "m320", "rm228", "triple_launcher_simple", "launcher_simple" ], "fg": 1367, "rotates": false }, + { "id": [ "m202_flash", "hell_launcher", "LAW" ], "fg": 1368, "rotates": false }, + { "id": "m3_carlgustav", "fg": 1369, "rotates": false }, + { "id": "mininuke_launcher", "fg": 1370, "rotates": false }, + { "id": "RPG", "fg": 1371, "rotates": false }, + { "id": "m79", "fg": 1372, "rotates": false }, + { + "id": [ "shortbow", "recurbow", "reflexbow", "longbow", "hybridbow", "reflexrecurvebow", "selfbow" ], + "fg": 1373, + "rotates": false + }, + { "id": [ "ithaca_doom", "ithaca_doom_dual", "410_lever" ], "fg": 1374, "rotates": false }, + { "id": [ "pipe__gun_44", "pipe_shotgunsawn" ], "fg": 1375, "rotates": false }, + { "id": "shotgun_sawn", "fg": 1376, "rotates": false }, + { "id": "sling", "fg": 1377, "rotates": false }, + { "id": "slingshot", "fg": 1378, "rotates": false }, + { "id": "steyr_aug", "fg": 1379, "rotates": false }, + { + "id": [ + "atgm_launcher", + "atgm_turret", + "howitzer_gun", + "tank_gun_auto", + "tank_gun_manual", + "tank_gun_rws", + "surv_rocket_launcher" + ], + "fg": 1380, + "rotates": false + }, + { "id": "TDI", "fg": 1381, "rotates": false }, + { + "id": [ + "retool_45", + "suppressor", + "grip", + "lwfeed", + "barrel_big", + "barrel_small", + "barrel_rifled", + "clip", + "clip2", + "spare_mag", + "brass_catcher", + "stabilizer", + "blowback", + "autofire", + "retool_9mm", + "retool_22", + "retool_57", + "retool_46", + "retool_308", + "retool_223", + "conversion_battle", + "conversion_sniper", + "m203", + "pipe_launcher40mm", + "u_shotgun", + "masterkey", + "gun_crossbow", + "laser_sight", + "improve_sights", + "red_dot_sight", + "holo_sight", + "rifle_scope", + "barrel_ported", + "pistol_grip", + "adjustable_stock", + "pistol_stock", + "crafted_suppressor", + "aux_flamer", + "pistol_bayonet", + "rm121aux", + "rail_laser_sight", + "pistol_scope", + "recoil_stock", + "waterproof_gunmod", + "tuned_mechanism", + "match_trigger", + "bipod", + "m320_mod", + "muzzle_brake", + "shot_suppressor", + "shoulder_strap", + "bow_sight", + "arrowrest", + "bow_stabilizer", + "folding_stock", + "light_grip", + "suppressor_compact", + "beltfeed", + "combination_gun_shotgun", + "combination_gun_shotgun_pipe", + "inter_bayonet", + "ksg_aux_shotgun", + "lemat_revolver_shotgun", + "offset_sights", + "riv_scope", + "riv_suppressor", + "acog_scope", + "autofire_654", + "beam_scatterer", + "electrolaser_conversion", + "high_density_capacitor", + "bomblet_undermod", + "M6_shotgun", + "retool_410", + "makeshift_pistol_bayonet", + "makeshift_sword_bayonet", + "sword_bayonet", + "ugl_buttstock", + "l_car_223_kit", + "l_mbr_223_kit", + "l_dsr_223_kit", + "l_lmg_223_kit", + "mn_classic_kit", + "mn_ebr_kit", + "makeshift_bayonet", + "briefcase_smg" + ], + "fg": 1382, + "rotates": false + }, + { + "id": [ "small_repairkit", "large_repairkit", "misc_repairkit", "weather_reader", "briefcase", "l_HFPack" ], + "fg": 1383, + "rotates": false + }, + { "id": [ "suitcase_l", "radio_car_box" ], "fg": 1384, "rotates": false }, + { "id": "suitcase_m", "fg": 1385, "rotates": false }, + { "id": [ "stethoscope", "wristrocket" ], "fg": 1386, "rotates": false }, + { "id": "hygrometer", "fg": 1387, "rotates": false }, + { "id": [ "barometer", "clock" ], "fg": 1388, "rotates": false }, + { + "id": "vp_vehicle_clock", + "fg": 1388, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "alarmclock", "fg": 1389, "rotates": false }, + { "id": [ "blade", "metal_smoother" ], "fg": 1390, "rotates": false }, + { "id": [ "bwirebat", "battletorch" ], "fg": 1391, "rotates": false }, + { "id": "coffeemaker", "fg": 1392, "rotates": false }, + { "id": [ "fan", "polisher" ], "fg": 1393, "rotates": false }, + { "id": [ "fishing_hook_basic", "fishing_hook_bone", "needle_curved" ], "fg": 1394, "rotates": false }, + { "id": "copper_ax", "fg": 1395, "rotates": false }, + { "id": [ "hatchet", "ax" ], "fg": 1396, "rotates": false }, + { "id": [ "mace", "paint_brush" ], "fg": 1397, "rotates": false }, + { "id": [ "pilot_light", "crude_firestarter" ], "fg": 1398, "rotates": false }, + { "id": "pocketwatch", "fg": 1399, "rotates": false }, + { + "id": [ "processor", "RAM", "amplifier", "transponder", "receiver", "radio_repeater_mod", "circuit", "radio_mod" ], + "fg": 1400, + "rotates": false + }, + { "id": [ "l-stick", "skewer_bone" ], "fg": 1401, "rotates": false }, + { "id": "l-stick_on", "fg": 1402, "rotates": false }, + { "id": "q_staff", "fg": 1403, "rotates": false }, + { "id": [ "rebar", "spear_rebar", "spear_steel", "spear_pipe", "flute" ], "fg": 1404, "rotates": false }, + { "id": "nailboard", "fg": 1405, "rotates": false }, + { "id": [ "jian_inferior", "sword_forged", "jian_fake", "jian" ], "fg": 1406, "rotates": false }, + { "id": [ "wood_smoother", "tonfa_wood" ], "fg": 1407, "rotates": false }, + { "id": "shocktonfa_on", "fg": 1408, "rotates": false }, + { "id": [ "tonfa", "PR24-retracted", "PR24-extended", "shocktonfa_off" ], "fg": 1409, "rotates": false }, + { "id": "golf_bag", "fg": 1410, "rotates": false }, + { "id": "LAW_Packed", "fg": 1411, "rotates": false }, + { "id": [ "multi_cooker", "mon_hallu_multicooker", "safe_box" ], "fg": 1412, "rotates": false }, + { "id": [ "UPS_off", "UPS_off" ], "fg": 1413, "rotates": false }, + { "id": [ "adv_UPS_off", "adv_UPS_off" ], "fg": 1414, "rotates": false }, + { "id": "airhorn", "fg": 1415, "rotates": false }, + { "id": "aperture_potato", "fg": 1416, "rotates": false }, + { "id": [ "ukulele", "violin", "acoustic_guitar", "banjo" ], "fg": 1417, "rotates": false }, + { "id": "violin_golden", "fg": 1418, "rotates": false }, + { "id": [ "battleaxe_inferior", "battleaxe_fake", "battleaxe" ], "fg": 1419, "rotates": false }, + { "id": "battletorch_lit", "fg": 1420, "rotates": false }, + { "id": "black_box", "fg": 1421, "rotates": false }, + { "id": "minion_dormant", "fg": 1422, "rotates": false }, + { "id": "blob_dormant", "fg": 1423, "rotates": false }, + { "id": "boltcutters", "fg": 1424, "rotates": false }, + { "id": [ "bomblet_vile_act", "bomblet_archvile_act" ], "fg": 1425, "rotates": false }, + { "id": "bomblet_chickenbot_act", "fg": 1426, "rotates": false }, + { "id": "bomblet_stun_act", "fg": 1427, "rotates": false }, + { "id": "bone_flute", "fg": 1428, "rotates": false }, + { "id": [ "zweifire_off", "broadfire_off" ], "fg": 1429, "rotates": false }, + { "id": "sword_crude", "fg": 1430, "rotates": false }, + { "id": [ "zweifire_on", "broadfire_on" ], "fg": 1431, "rotates": false }, + { + "id": [ + "broadsword_inferior", + "zweihander", + "zweihander_inferior", + "arming_sword", + "arming_sword_inferior", + "longsword", + "longsword_inferior", + "broadsword_fake", + "zweihander_fake", + "arming_sword_fake", + "longsword_fake", + "broadsword" + ], + "fg": 1432, + "rotates": false + }, + { "id": "sword_wood", "fg": 1433, "rotates": false }, + { "id": "c4", "fg": 1434, "rotates": false }, + { "id": "c4armed", "fg": 1435, "rotates": false }, + { "id": "camera", "fg": 1436, "rotates": false }, + { "id": "camera_pro", "fg": 1437, "rotates": false }, + { "id": [ "candle_smoke", "candle" ], "fg": 1438, "rotates": false }, + { "id": [ "candle_smoke_lit", "candle_lit" ], "fg": 1439, "rotates": false }, + { "id": [ "carver_on", "carver_off" ], "fg": 1440, "rotates": false }, + { "id": [ "gasdiscount_gold", "cash_card" ], "fg": 1441, "rotates": false }, + { "id": [ "gasdiscount_silver", "gasdiscount_platinum" ], "fg": 1442, "rotates": false }, + { "id": "id_military", "fg": 1443, "rotates": false }, + { "id": "id_science", "fg": 1444, "rotates": false }, + { "id": "cattlefodder", "fg": 1445, "rotates": false }, + { "id": "cell_phone", "fg": 1446, "rotates": false }, + { "id": "cell_phone_flashlight", "fg": 1447, "rotates": false }, + { + "id": [ "chainsaw_on", "elec_chainsaw_off", "elec_chainsaw_on", "chainsaw_off" ], + "fg": 1448, + "rotates": false + }, + { "id": [ "combatsaw_off", "combatsaw_on" ], "fg": 1449, "rotates": false }, + { "id": "char_purifier", "fg": 1450, "rotates": false }, + { "id": [ "chemistry_set_basic", "chemistry_set" ], "fg": 1451, "rotates": false }, + { "id": [ "chipper", "chisel" ], "fg": 1452, "rotates": false }, + { "id": "screwdriver", "fg": 1453, "rotates": false }, + { "id": "screwdriver_set", "fg": 1454, "rotates": false }, + { "id": "soldering_iron", "fg": 1455, "rotates": false }, + { "id": [ "circsaw_on", "circsaw_off" ], "fg": 1456, "rotates": false }, + { "id": "clarinet", "fg": 1457, "rotates": false }, + { "id": "laptop", "fg": 1458, "rotates": false }, + { "id": "control_laptop", "fg": 1459, "rotates": false }, + { "id": "con_mix", "fg": 1460, "rotates": false }, + { "id": "cordless_drill", "fg": 1461, "rotates": false }, + { "id": "cow_bell", "fg": 1462, "rotates": false }, + { "id": "crackpipe", "fg": 1463, "rotates": false }, + { "id": [ "makeshift_crowbar", "halligan", "crowbar" ], "fg": 1464, "rotates": false }, + { "id": "crucible", "fg": 1465, "rotates": false }, + { "id": "picklocks", "fg": 1466, "rotates": false }, + { "id": "crude_picklock", "fg": 1467, "rotates": false }, + { "id": [ "cs_lajatang_on", "cs_lajatang_off" ], "fg": 1468, "rotates": false }, + { "id": "dao", "fg": 1469, "rotates": false }, + { "id": "dehydrator", "fg": 1470, "rotates": false }, + { "id": [ "whistle", "dog_whistle" ], "fg": 1471, "rotates": false }, + { "id": "dusksword", "fg": 1472, "rotates": false }, + { "id": "dynamite", "fg": 1473, "rotates": false }, + { "id": "dynamite_act", "fg": 1474, "rotates": false }, + { "id": "eink_tablet_pc", "fg": 1475, "rotates": false }, + { "id": "electrohack", "fg": 1476, "rotates": false }, + { "id": "elec_hairtrimmer", "fg": 1477, "rotates": false }, + { "id": "etched_skull", "fg": 1478, "rotates": false }, + { "id": [ "sm_extinguisher", "extinguisher" ], "fg": 1479, "rotates": false }, + { "id": "throw_extinguisher", "fg": 1480, "rotates": false }, + { "id": [ "tool_black_powder_charge", "fertilizer_bomb" ], "fg": 1481, "rotates": false }, + { "id": [ "tool_black_powder_charge_act", "fertilizer_bomb_act" ], "fg": 1482, "rotates": false }, + { "id": "firecracker", "fg": 1483, "rotates": false }, + { "id": "firecracker_act", "fg": 1484, "rotates": false }, + { "id": "firecracker_pack", "fg": 1485, "rotates": false }, + { "id": "firecracker_pack_act", "fg": 1486, "rotates": false }, + { "id": "firekatana_off", "fg": 1487, "rotates": false }, + { "id": "firekatana_on", "fg": 1488, "rotates": false }, + { "id": [ "shishkebab_off", "firemachete_off" ], "fg": 1489, "rotates": false }, + { "id": [ "shishkebab_on", "firemachete_on" ], "fg": 1490, "rotates": false }, + { "id": "fire_ax", "fg": 1491, "rotates": false }, + { "id": [ "fire_drill_large", "fire_drill" ], "fg": 1492, "rotates": false }, + { "id": "fishing_rod_professional", "fg": 1493, "rotates": false }, + { "id": "fishing_rod_basic", "fg": 1494, "rotates": false }, + { "id": [ "heavy_flashlight", "reading_light", "flashlight" ], "fg": 1495, "rotates": false }, + { "id": [ "heavy_flashlight_on", "reading_light_on", "flashlight_on" ], "fg": 1496, "rotates": false }, + { "id": "flint_steel", "fg": 1497, "rotates": false }, + { + "id": [ + "v_planter_item", + "v_planter_item_advanced", + "v_plow_item", + "v_reaper_item", + "v_reaper_item_advanced", + "v_scoop_item", + "folding_bicycle" + ], + "fg": 1498, + "rotates": false + }, + { "id": "food_processor", "fg": 1499, "rotates": false }, + { "id": "char_smoker", "fg": 1500, "rotates": false }, + { "id": "forge", "fg": 1501, "rotates": false }, + { "id": "tr_metal_funnel", "fg": 1502, "rotates": false }, + { "id": "tr_funnel", "fg": 1503, "rotates": false }, + { "id": "tr_makeshift_funnel", "fg": 1504, "rotates": false }, + { "id": [ "tr_raincatcher", "t_raincatcher" ], "fg": 1505, "rotates": false }, + { "id": "tr_leather_funnel", "fg": 1506, "rotates": false }, + { + "id": "vp_funnel", + "fg": 1503, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_makeshift_funnel", + "fg": 1504, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_leather_funnel", + "fg": 1506, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_metal_funnel", + "fg": 1502, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "leather_funnel", "fg": 1507, "rotates": false }, + { "id": "makeshift_funnel", "fg": 1508, "rotates": false }, + { "id": "metal_funnel", "fg": 1509, "rotates": false }, + { "id": "funnel", "fg": 1510, "rotates": false }, + { "id": "teleporter", "fg": 1511, "rotates": false }, + { "id": "geiger_off", "fg": 1512, "rotates": false }, + { "id": "geiger_on", "fg": 1513, "rotates": false }, + { "id": "glowstick_dead", "fg": 1514, "rotates": false }, + { "id": "glowstick_lit", "fg": 1515, "rotates": false }, + { "id": "glowstick", "fg": 1516, "rotates": false }, + { "id": "granade", "fg": 1517, "rotates": false }, + { "id": "granade_act", "fg": 1518, "rotates": false }, + { "id": "grenade", "fg": 1519, "rotates": false }, + { "id": "grenade_act", "fg": 1520, "rotates": false }, + { "id": "saw", "fg": 1521, "rotates": false }, + { "id": "hacksaw", "fg": 1522, "rotates": false }, + { "id": "hammer", "fg": 1523, "rotates": false }, + { "id": "handflare", "fg": 1524, "rotates": false }, + { "id": "handflare_act", "fg": 1525, "rotates": false }, + { "id": "handflare_lit", "fg": 1526, "rotates": false }, + { "id": "hand_drill", "fg": 1527, "rotates": false }, + { "id": "hand_pump", "fg": 1528, "rotates": false }, + { "id": "heatpack_used", "fg": 1529, "rotates": false }, + { + "id": "vp_vehicle_scoop", + "fg": 1529, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_plow", + "fg": 1530, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1531 } ] + }, + { "id": "heatpack", "fg": 1532, "rotates": false }, + { "id": [ "hobo_stove", "esbit_stove" ], "fg": 1533, "rotates": false }, + { "id": "hoe", "fg": 1535, "rotates": false }, + { "id": [ "horn_car", "horn_big", "beeper", "chimes", "horn_bicycle" ], "fg": 1536, "rotates": false }, + { "id": [ "gasoline_cooker", "oil_cooker", "hotplate" ], "fg": 1537, "rotates": false }, + { "id": "inflatable_boat", "fg": 1538, "rotates": false }, + { "id": [ "jack_makeshift", "jack_small", "jack" ], "fg": 1539, "rotates": false }, + { "id": [ "elec_jackhammer", "jackhammer" ], "fg": 1540, "rotates": false }, + { "id": [ "jumper_cable_heavy", "jumper_cable" ], "fg": 1541, "rotates": false }, + { + "id": [ + "katana_inferior", + "tanto", + "wakizashi", + "wakizashi_inferior", + "kukri", + "cutlass", + "cutlass_inferior", + "nodachi", + "scimitar", + "scimitar_inferior", + "cavalry_sabre", + "katana_fake", + "wakizashi_fake", + "cutlass_fake", + "nodachi_fake", + "scimitar_fake", + "cavalry_sabre_fake", + "katana" + ], + "fg": 1542, + "rotates": false + }, + { "id": "bokken", "fg": 1543, "rotates": false }, + { "id": "kevlar_harness", "fg": 1544, "rotates": false }, + { "id": "ceramic_armor", "fg": 1545, "rotates": false }, + { "id": "kevlar_plate", "fg": 1546, "rotates": false }, + { "id": "khopesh", "fg": 1547, "rotates": false }, + { "id": [ "multitool", "knife_swissarmy" ], "fg": 1548, "rotates": false }, + { "id": "pockknife", "fg": 1549, "rotates": false }, + { "id": "laevateinn_replica", "fg": 1550, "rotates": false }, + { "id": "lighter", "fg": 1551, "rotates": false }, + { "id": "lightstrip", "fg": 1552, "rotates": false }, + { "id": "lightstrip_inactive", "fg": 1553, "rotates": false }, + { "id": "link_sheet", "fg": 1554, "rotates": false }, + { "id": "lobotomizer", "fg": 1555, "rotates": false }, + { "id": [ "survivor_machete", "machete" ], "fg": 1556, "rotates": false }, + { "id": [ "pan", "waffleiron" ], "fg": 1557, "rotates": false }, + { "id": "magnifying_glass", "fg": 1558, "rotates": false }, + { "id": "makeshift_axe", "fg": 1559, "rotates": false }, + { "id": "makeshift_machete", "fg": 1560, "rotates": false }, + { "id": "matchbomb", "fg": 1561, "rotates": false }, + { "id": "matchbomb_act", "fg": 1562, "rotates": false }, + { "id": "matches", "fg": 1563, "rotates": true }, + { "id": "mininuke_act", "fg": 1564, "rotates": false }, + { "id": "mold_plastic", "fg": 1565, "rotates": false }, + { "id": [ "molotov_micro", "molotov" ], "fg": 1566, "rotates": false }, + { "id": [ "molotov_micro_act", "molotov_lit" ], "fg": 1567, "rotates": false }, + { "id": "mop", "fg": 1568, "rotates": false }, + { "id": "mortar_pestle", "fg": 1569, "rotates": false }, + { "id": "mp3", "fg": 1570, "rotates": false }, + { "id": "mp3_on", "fg": 1571, "rotates": false }, + { "id": "needle_wood", "fg": 1572, "rotates": false }, + { "id": "needle_bone", "fg": 1573, "rotates": false }, + { "id": "radio", "fg": 1574, "rotates": false }, + { "id": "noise_emitter", "fg": 1575, "rotates": false }, + { "id": "radio_on", "fg": 1576, "rotates": false }, + { "id": "noise_emitter_on", "fg": 1577, "rotates": false }, + { + "id": [ "smart_lamp", "gasoline_lantern", "electric_lantern", "oxylamp", "atomic_lamp_off", "oil_lamp" ], + "fg": 1578, + "rotates": false + }, + { + "id": [ "smart_lamp_on", "gasoline_lantern_on", "electric_lantern_on", "oxylamp_on", "oil_lamp_on" ], + "fg": 1579, + "rotates": false + }, + { "id": "atomic_lamp", "fg": 1580, "rotates": false }, + { + "id": "vp_atomic_lamp", + "fg": 1580, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "smoxygen_tank", "scuba_tank", "scuba_tank_on", "small_scuba_tank", "small_scuba_tank_on", "oxygen_tank" ], + "fg": 1581, + "rotates": false + }, + { "id": "pet_carrier", "fg": 1582, "rotates": false }, + { "id": "pheromone", "fg": 1583, "rotates": false }, + { "id": [ "iceaxe", "pickaxe" ], "fg": 1584, "rotates": false }, + { "id": [ "tool_rdx_sand_bomb", "pipebomb" ], "fg": 1585, "rotates": false }, + { "id": [ "tool_rdx_sand_bomb_act", "pipebomb_act" ], "fg": 1586, "rotates": false }, + { "id": "pipe_glass", "fg": 1587, "rotates": false }, + { "id": "pipe_tobacco", "fg": 1588, "rotates": false }, + { "id": "plastic_chunk", "fg": 1589, "rotates": false }, + { "id": "pokeball", "fg": 1590, "rotates": false }, + { "id": "portable_game", "fg": 1591, "rotates": false }, + { "id": "portal", "fg": 1592, "rotates": false }, + { "id": "press", "fg": 1593, "rotates": false }, + { "id": [ "primitive_adze", "hand_axe", "primitive_axe" ], "fg": 1594, "rotates": false }, + { "id": [ "makeshift_hammer", "primitive_hammer" ], "fg": 1595, "rotates": false }, + { "id": [ "makeshift_shovel", "primitive_shovel" ], "fg": 1596, "rotates": false }, + { "id": "puller", "fg": 1597, "rotates": false }, + { "id": [ "remotevehcontrol", "radiocontrol" ], "fg": 1598, "rotates": false }, + { "id": "radio_car", "fg": 1599, "rotates": false }, + { "id": "radio_car_on", "fg": 1600, "rotates": false }, + { + "id": [ "rapier_fake", "fencing_foil", "fencing_epee", "fencing_sabre", "estoc", "estoc_fake", "rapier" ], + "fg": 1601, + "rotates": false + }, + { "id": "ref_lighter", "fg": 1602, "rotates": false }, + { "id": "ref_lighter_dare", "fg": 1603, "rotates": false }, + { "id": "ref_lighter_on", "fg": 1604, "rotates": false }, + { "id": "rocket_core", "fg": 1605, "rotates": false }, + { "id": "rocket_core_act", "fg": 1606, "rotates": false }, + { "id": "clay_quern", "fg": 1607, "rotates": false }, + { "id": "rock_quern", "fg": 1608, "rotates": false }, + { "id": "scalpel", "fg": 1609, "rotates": false }, + { "id": "scissors", "fg": 1610, "rotates": false }, + { "id": "scythe", "fg": 1611, "rotates": false }, + { "id": [ "tailors_kit", "sewing_kit" ], "fg": 1612, "rotates": false }, + { "id": [ "shavingkit", "survivor_shavingkit" ], "fg": 1613, "rotates": false }, + { "id": "i_staff", "fg": 1614, "rotates": false }, + { "id": "shock_staff", "fg": 1615, "rotates": false }, + { "id": [ "e_tool", "g_shovel", "e_tool_chinese", "shovel" ], "fg": 1616, "rotates": false }, + { "id": "sickle", "fg": 1617, "rotates": false }, + { "id": "smoke_machine", "fg": 1618, "rotates": false }, + { "id": "smoke_machine_act", "fg": 1619, "rotates": false }, + { "id": "smoke_machine_unpreped", "fg": 1620, "rotates": false }, + { "id": "spess_chunk", "fg": 1621 }, + { "id": "spray_can", "fg": 1622, "rotates": false }, + { "id": "stepladder", "fg": 1623, "rotates": false }, + { "id": "survivor_hairtrimmer", "fg": 1624, "rotates": false }, + { "id": "survivor_scope", "fg": 1625, "rotates": false }, + { "id": "swage", "fg": 1626, "rotates": false }, + { "id": "sword_xiphos", "fg": 1627, "rotates": false }, + { "id": "syringe", "fg": 1628, "rotates": false }, + { "id": [ "creepy_doll", "talking_doll" ], "fg": 1629, "rotates": false }, + { "id": "straw_doll", "fg": 1630, "rotates": false }, + { "id": "teddy", "fg": 1631, "rotates": false }, + { "id": "tazer", "fg": 1632, "rotates": false }, + { "id": "thermometer", "fg": 1633, "rotates": false }, + { "id": "tinderbox", "fg": 1634, "rotates": false }, + { "id": "tinderbox_on", "fg": 1635, "rotates": false }, + { "id": [ "pliers", "tongs" ], "fg": 1636, "rotates": false }, + { "id": "toolbox", "fg": 1637, "rotates": false }, + { "id": [ "tool_rdx_charge", "tool_anfo_charge" ], "fg": 1638, "rotates": false }, + { "id": [ "tool_rdx_charge_act", "tool_anfo_charge_act" ], "fg": 1639, "rotates": false }, + { "id": [ "gasbomb_makeshift", "tool_black_powder_bomb" ], "fg": 1640, "rotates": false }, + { "id": [ "gasbomb_makeshift_act", "tool_black_powder_bomb_act" ], "fg": 1641, "rotates": false }, + { "id": "torch", "fg": 1642, "rotates": false }, + { "id": "torch_lit", "fg": 1643, "rotates": false }, + { "id": "triffid_sap_grenade_act", "fg": 1644, "rotates": false }, + { "id": "triffid_sap_thrown", "fg": 1645, "rotates": false }, + { "id": [ "trimmer_on", "trimmer_off" ], "fg": 1646, "rotates": false }, + { "id": [ "tuba", "trumpet" ], "fg": 1647, "rotates": false }, + { "id": "two_way_radio", "fg": 1648, "rotates": false }, + { + "id": [ "makeshift_sealer", "battery_ups", "magazine_battery_mod", "stereo", "vac_sealer" ], + "fg": 1649, + "rotates": false + }, + { "id": "spiral_stone", "fg": 1650, "rotates": false }, + { "id": "vortex_stone", "fg": 1651, "rotates": false }, + { "id": "washboard", "fg": 1652, "rotates": false }, + { "id": [ "oxy_torch", "welder" ], "fg": 1653, "rotates": false }, + { "id": "welder_crude", "fg": 1654, "rotates": false }, + { "id": "whistle_multitool", "fg": 1655, "rotates": false }, + { + "id": [ "badge_deputy", "badge_marshal", "badge_detective", "badge_cybercop", "badge_swat" ], + "fg": 1656, + "rotates": false + }, + { "id": [ "rad_badge", "wrapped_rad_badge" ], "fg": 1657, "rotates": false }, + { "id": "wrench", "fg": 1658, "rotates": false }, + { "id": "xacto", "fg": 1659, "rotates": false }, + { "id": [ "fish_trap", "water_purifier" ], "fg": 1660, "rotates": false }, + { + "id": "vp_water_purifier", + "fg": 1660, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1661 } ] + }, + { + "id": "vp_minireactor", + "fg": 1662, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "minireactor", "fg": 1662, "rotates": false }, + { "id": [ "double_plutonium_core", "it_battery_mount", "battery_compartment" ], "fg": 1663, "rotates": false }, + { + "id": [ + "rm13_armor_on", + "armor_lightplate", + "cuirass_lightplate", + "armor_lorica", + "armor_plate", + "entry_suit", + "chainmail_suit", + "motorbike_armor", + "shark_suit", + "shark_suit_faraday", + "chainmail_hauberk", + "rm13_armor" + ], + "fg": 1664, + "rotates": false + }, + { "id": "armor_bone", "fg": 1665, "rotates": false }, + { "id": "armor_chitin", "fg": 1666, "rotates": false }, + { "id": [ "armor_larmor", "armor_blarmor", "touring_suit", "armor_lamellar" ], "fg": 1667, "rotates": false }, + { "id": "bookplate", "fg": 1668, "rotates": false }, + { "id": "football_armor", "fg": 1669, "rotates": false }, + { "id": "swat_armor", "fg": 1670, "rotates": false }, + { + "id": [ "mask_ski_loose", "thermal_mask", "thermal_mask_on", "balclava", "mask_ski" ], + "fg": 1671, + "rotates": false + }, + { "id": "f_leather_tarp", "fg": 1672, "rotates": false }, + { "id": "leather_tarp", "fg": 1673, "rotates": false }, + { "id": [ "emer_blanket", "generic_folded_vehicle" ], "fg": 1674, "rotates": false }, + { "id": "p_carpet", "fg": 1675, "rotates": false }, + { "id": "r_carpet", "fg": 1676, "rotates": false }, + { "id": "y_carpet", "fg": 1677, "rotates": false }, + { "id": "fiber_mat", "fg": 1678, "rotates": false }, + { "id": "g_carpet", "fg": 1679, "rotates": false }, + { "id": "fur_rollmat", "fg": 1680, "rotates": false }, + { "id": "rollmat", "fg": 1681, "rotates": false }, + { "id": "cot", "fg": 1682, "rotates": false }, + { "id": "electric_blanket", "fg": 1683, "rotates": false }, + { "id": "emer_blanket_on", "fg": 1684, "rotates": false }, + { "id": "towel", "fg": 1685, "rotates": false }, + { "id": "towel_soiled", "fg": 1686, "rotates": false }, + { "id": [ "blanket", "down_blanket", "towel_wet" ], "fg": 1687, "rotates": false }, + { "id": "sleeping_bag", "fg": 1688, "rotates": false }, + { "id": "snuggie", "fg": 1689, "rotates": false }, + { "id": [ "fur_blanket", "sleeping_bag_fur" ], "fg": 1690, "rotates": false }, + { "id": "electric_blanket_on", "fg": 1691, "rotates": false }, + { "id": "american_flag", "fg": 1692, "rotates": false }, + { + "id": [ "thermal_socks_on", "cleats", "tabi_dress", "wetsuit_booties", "nomex_socks", "boots_h20survivor", "thermal_socks" ], + "fg": 1693, + "rotates": false + }, + { "id": "clownshoes", "fg": 1694, "rotates": false }, + { "id": [ "socks", "tabi_gi", "socks_bowling", "sockmitts" ], "fg": 1695, "rotates": false }, + { "id": [ "socks_wool", "geta" ], "fg": 1696, "rotates": false }, + { "id": [ "blazer", "jacket_windbreaker" ], "fg": 1697, "rotates": false }, + { "id": [ "coat_rain", "bunker_coat", "folding_poncho_on" ], "fg": 1698, "rotates": false }, + { "id": [ "coat_winter", "jacket_leather_red" ], "fg": 1699, "rotates": false }, + { "id": [ "jacket_jean", "jacket_evac" ], "fg": 1700, "rotates": false }, + { "id": "jacket_leather", "fg": 1701, "rotates": false }, + { "id": [ "jacket_light", "cassock" ], "fg": 1702, "rotates": false }, + { + "id": [ + "keikogi", + "kariginu", + "kimono", + "kittel", + "thawb", + "coat_lab", + "jacket_chef", + "beekeeping_suit", + "fencing_jacket", + "winter_jacket_army" + ], + "fg": 1703, + "rotates": false + }, + { "id": [ "peacoat", "gambeson" ], "fg": 1704, "rotates": false }, + { "id": [ "cowboy_hat", "fedora" ], "fg": 1705, "rotates": false }, + { "id": [ "hairpin", "distaff_spindle" ], "fg": 1706, "rotates": false }, + { "id": "fc_hairpin", "fg": 1707, "rotates": false }, + { "id": [ "powered_earmuffs_on", "hat_noise_cancelling", "powered_earmuffs" ], "fg": 1708, "rotates": false }, + { "id": [ "helmet_riot_raised", "tac_fullhelmet", "helmet_riot" ], "fg": 1709, "rotates": false }, + { "id": [ "helmet_football", "headgear" ], "fg": 1710, "rotates": false }, + { "id": "keffiyeh", "fg": 1711, "rotates": false }, + { "id": [ "mask_filter", "mask_filter" ], "fg": 1712, "rotates": false }, + { + "id": [ + "mask_gas_xl", + "mask_survivor", + "mask_survivorxl", + "mask_hsurvivor", + "mask_lsurvivor", + "mask_bunker", + "mask_bunker_on", + "mask_wsurvivor", + "mask_wsurvivorxl", + "mask_fsurvivor", + "mask_fsurvivorxl", + "mask_h20survivor", + "mask_h20survivor_on", + "mask_h20survivorxl", + "mask_h20survivorxl_on", + "rebreather", + "rebreather_on", + "rebreather_xl", + "rebreather_xl_on", + "mask_gas" + ], + "fg": 1713, + "rotates": false + }, + { "id": [ "q_solarpack_on", "solarpack_on" ], "fg": 1714, "rotates": false }, + { "id": "copper_bracelet", "fg": 1715, "rotates": false }, + { "id": "gold_bracelet", "fg": 1716, "rotates": false }, + { "id": [ "silver_bracelet", "rad_monitor" ], "fg": 1717, "rotates": false }, + { "id": [ "bowhat", "porkpie" ], "fg": 1718, "rotates": false }, + { "id": [ "straw_hat", "hat_sombrero", "straw_fedora" ], "fg": 1719, "rotates": false }, + { "id": "tarp", "fg": 1720, "rotates": false }, + { + "id": [ "vest", "waistcoat", "sleeveless_trenchcoat", "chainmail_vest", "sleeveless_duster", "vest_leather_mod", "cloak" ], + "fg": 1721, + "rotates": false + }, + { "id": "cloak_fur", "fg": 1722, "rotates": false }, + { + "id": [ + "vest_leather", + "sleeveless_trenchcoat_leather", + "sleeveless_trenchcoat_fur", + "sleeveless_trenchcoat_survivor", + "sleeveless_duster_fur", + "sleeveless_duster_leather", + "sleeveless_duster_survivor", + "cloak_leather", + "jedi_cloak" + ], + "fg": 1723, + "rotates": false + }, + { "id": "optical_cloak", "fg": 1724, "rotates": false }, + { "id": "cloak_wool", "fg": 1725, "rotates": false }, + { "id": "holo_cloak", "fg": 1726, "rotates": false }, + { "id": "vest_leather_zuicide_short", "fg": 1727, "rotates": false }, + { "id": "vest_leather_zuicide_short_active", "fg": 1728, "rotates": false }, + { "id": "flotation_vest_ms", "fg": 1729, "rotates": false }, + { "id": "flotation_vest", "fg": 1730, "rotates": false }, + { "id": "tux", "fg": 1731, "rotates": false }, + { + "id": [ "thermal_suit_on", "thermal_outfit", "thermal_outfit_on", "wetsuit", "nomex_suit", "stillsuit", "thermal_suit" ], + "fg": 1732, + "rotates": false + }, + { "id": "armor_samurai", "fg": 1733, "rotates": false }, + { "id": "bondage_suit", "fg": 1734, "rotates": false }, + { "id": [ "clown_suit", "karate_gi", "judo_gi" ], "fg": 1735, "rotates": false }, + { "id": "dinosuit", "fg": 1736, "rotates": false }, + { "id": [ "hazmat_suit", "cleansuit", "subsuit_xl" ], "fg": 1737, "rotates": false }, + { "id": [ "jumpsuit", "jumpsuit_xl" ], "fg": 1738, "rotates": false }, + { "id": [ "union_suit", "wool_suit" ], "fg": 1739, "rotates": false }, + { "id": [ "wetsuit_spring", "halter_top", "tunic_rag" ], "fg": 1740, "rotates": false }, + { + "id": [ + "thermal_gloves_on", + "wetsuit_gloves", + "nomex_gloves", + "gloves_fsurvivor", + "gloves_h20survivor", + "gloves_hsurvivor", + "gloves_plate", + "megaarmor_gloves_1", + "thermal_gloves" + ], + "fg": 1741, + "rotates": false + }, + { "id": [ "fire_gauntlets", "gloves_survivor", "gloves_xlsurvivor" ], "fg": 1742, "rotates": false }, + { "id": [ "gauntlets_bone", "beekeeping_gloves" ], "fg": 1743, "rotates": false }, + { "id": [ "gloves_leather", "gauntlets_larmor", "gloves_work" ], "fg": 1744, "rotates": false }, + { + "id": [ "gloves_liner", "gloves_wraps", "winter_gloves_army", "long_glove_white", "gloves_golf" ], + "fg": 1745, + "rotates": false + }, + { "id": "gloves_lsurvivor", "fg": 1746, "rotates": false }, + { "id": "gloves_medical", "fg": 1747, "rotates": false }, + { "id": "gloves_rubber", "fg": 1748, "rotates": false }, + { "id": [ "gloves_winter", "gloves_wsurvivor" ], "fg": 1749, "rotates": false }, + { "id": "gloves_wool", "fg": 1750, "rotates": false }, + { + "id": [ "gloves_wraps_wool", "gloves_light", "gauntlets_chitin", "gloves_bag" ], + "fg": 1751, + "rotates": false + }, + { "id": [ "mittens", "boxing_gloves" ], "fg": 1752, "rotates": false }, + { "id": [ "survivor_light", "wearable_light" ], "fg": 1753, "rotates": false }, + { "id": [ "wearable_light_on", "survivor_light_on" ], "fg": 1754, "rotates": false }, + { "id": "megaarmor_torso_3_act", "fg": 1755, "rotates": false }, + { "id": "megaarmor_torso_3", "fg": 1756, "rotates": false }, + { "id": "bagpipes", "fg": 1757, "rotates": false }, + { "id": "binoculars", "fg": 1758, "rotates": false }, + { "id": "game_watch", "fg": 1759, "rotates": false }, + { "id": [ "goggles_nv_on", "goggles_ir", "goggles_ir_on", "goggles_nv" ], "fg": 1760, "rotates": false }, + { "id": "harmonica_holder", "fg": 1761, "rotates": false }, + { "id": "miner_hat", "fg": 1762, "rotates": false }, + { "id": "miner_hat_on", "fg": 1763, "rotates": false }, + { "id": "ref_lighter_string", "fg": 1764, "rotates": false }, + { + "id": [ "sac_purse_clean_water_ankle", "sac_purse_clean_water_arm", "sac_purse_clean_water_leg", "sac_purse_clean_water" ], + "fg": 1765, + "rotates": false + }, + { "id": "saxophone", "fg": 1766, "rotates": false }, + { + "id": [ + "scarf_long", + "knit_scarf", + "long_knit_scarf", + "knit_scarf_loose", + "long_knit_scarf_loose", + "long_patchwork_scarf", + "long_patchwork_scarf_loose", + "patchwork_scarf", + "patchwork_scarf_loose", + "scarf_long_loose", + "scarf_loose", + "scarf" + ], + "fg": 1767, + "rotates": false + }, + { + "id": [ "scarf_fur", "scarf_fur_long", "scarf_fur_long_loose", "scarf_fur_loose" ], + "fg": 1768, + "rotates": false + }, + { "id": "10gal_hat", "fg": 1769, "rotates": false }, + { "id": [ "anbc_suit", "aep_suit" ], "fg": 1770, "rotates": false }, + { "id": [ "hsurvivor_suit", "fsurvivor_suit", "h20survivor_suit" ], "fg": 1771, "rotates": false }, + { "id": "lsurvivor_suit", "fg": 1772, "rotates": false }, + { "id": [ "survivor_suit", "xlsurvivor_suit" ], "fg": 1773, "rotates": false }, + { "id": [ "wolfsuit", "armor_farmor" ], "fg": 1774, "rotates": false }, + { "id": "wsurvivor_suit", "fg": 1775, "rotates": false }, + { "id": "fishing_waders", "fg": 1776, "rotates": false }, + { "id": "apron_leather", "fg": 1777, "rotates": false }, + { "id": "armguard_chitin", "fg": 1778, "rotates": false }, + { + "id": [ "armguard_hard", "armguard_paper", "legguard_hard", "legguard_paper" ], + "fg": 1779, + "rotates": false + }, + { + "id": [ + "armguard_soft", + "chainmail_arms", + "armguard_metal", + "legguard_metal", + "chainmail_legs", + "armguard_lightplate", + "legguard_lightplate" + ], + "fg": 1780, + "rotates": false + }, + { + "id": [ + "arm_splint", + "leg_splint", + "2byarm_guard", + "2byshin_guard", + "vambrace_larmor", + "armguard_larmor", + "armguard_larmor_mod" + ], + "fg": 1781, + "rotates": false + }, + { + "id": [ "arm_warmers", "leg_warmers", "leg_warmers_f", "leg_warmers_xl", "leg_warmers_xlf" ], + "fg": 1782, + "rotates": false + }, + { "id": "megaarmor_armguards_1", "fg": 1783, "rotates": false }, + { "id": "armguard_bone", "fg": 1784, "rotates": false }, + { "id": "armor_cuirass", "fg": 1785, "rotates": false }, + { "id": [ "armor_plarmor", "jacket_leather_mod", "armor_scrapsuit" ], "fg": 1786, "rotates": false }, + { "id": "army_top", "fg": 1787, "rotates": false }, + { "id": "bandana", "fg": 1788, "rotates": false }, + { "id": [ "bandolier_rifle", "bandolier_shotgun", "bandolier_pistol" ], "fg": 1789, "rotates": false }, + { "id": "bandolier_wrist", "fg": 1790, "rotates": false }, + { "id": "brooch", "fg": 1791, "rotates": false }, + { "id": [ "tieclip", "collarpin" ], "fg": 1792, "rotates": false }, + { "id": "barrette", "fg": 1793, "rotates": false }, + { "id": [ "helmet_scavenger", "beekeeping_hood" ], "fg": 1794, "rotates": false }, + { "id": "helmet_chitin", "fg": 1795, "rotates": false }, + { "id": "helmet_plate", "fg": 1796, "rotates": false }, + { "id": [ "beret_wool", "beret" ], "fg": 1797, "rotates": false }, + { "id": [ "bra", "sports_bra", "bikini_top" ], "fg": 1798, "rotates": false }, + { "id": [ "bikini_top_fur", "fur_cat_ears" ], "fg": 1799, "rotates": false }, + { "id": "bikini_top_leather", "fg": 1800, "rotates": false }, + { "id": "bindle", "fg": 1801, "rotates": false }, + { "id": "bondage_mask", "fg": 1802, "rotates": false }, + { "id": [ "boots_larmor", "boots" ], "fg": 1803, "rotates": false }, + { "id": "boots_bone", "fg": 1804, "rotates": false }, + { "id": "boots_chitin", "fg": 1805, "rotates": false }, + { "id": [ "boots_combat", "boots_lsurvivor" ], "fg": 1806, "rotates": false }, + { "id": "boots_hiking", "fg": 1807, "rotates": false }, + { + "id": [ "boots_plate", "boots_fsurvivor", "boots_hsurvivor", "motorbike_boots", "megaarmor_boots_1" ], + "fg": 1808, + "rotates": false + }, + { "id": [ "boots_rubber", "boots_bunker" ], "fg": 1809, "rotates": false }, + { "id": [ "boots_winter", "boots_wsurvivor" ], "fg": 1810, "rotates": false }, + { "id": [ "sholster", "bootstrap" ], "fg": 1811, "rotates": false }, + { "id": "boots_fur", "fg": 1812, "rotates": false }, + { "id": [ "boots_survivor", "boots_xlsurvivor", "boots_steel" ], "fg": 1813, "rotates": false }, + { "id": "jeans", "fg": 1814, "rotates": false }, + { "id": "long_underpants", "fg": 1815, "rotates": false }, + { + "id": [ "pants", "tights", "technician_pants_gray", "motorbike_pants", "hakama_gi" ], + "fg": 1816, + "rotates": false + }, + { "id": [ "pants_cargo", "pants_survivor", "lsurvivor_pants" ], "fg": 1817, "rotates": false }, + { "id": [ "pants_leather", "breeches" ], "fg": 1818, "rotates": false }, + { "id": [ "pants_ski", "jeans_red" ], "fg": 1819, "rotates": false }, + { "id": [ "striped_pants", "zubon_gi", "fencing_pants", "winter_pants_army" ], "fg": 1820, "rotates": false }, + { "id": "bunker_pants", "fg": 1821, "rotates": false }, + { "id": "case_violin", "fg": 1822, "rotates": false }, + { "id": "chaps_leather", "fg": 1823, "rotates": false }, + { "id": [ "survivor_vest", "chestrig" ], "fg": 1824, "rotates": false }, + { "id": "chestwrap_fur", "fg": 1825, "rotates": false }, + { "id": "robe", "fg": 1826, "rotates": false }, + { "id": [ "coat_fur_sf", "coat_fur" ], "fg": 1827, "rotates": false }, + { "id": "gold_ear", "fg": 1828, "rotates": false }, + { "id": "silver_ear", "fg": 1829, "rotates": false }, + { "id": "copper_ear", "fg": 1830, "rotates": false }, + { "id": "corset", "fg": 1831, "rotates": false }, + { "id": "cowl_wool", "fg": 1832, "rotates": false }, + { "id": [ "crown_golden_survivor", "crown_golden" ], "fg": 1833, "rotates": false }, + { "id": [ "lsurvivor_armor", "dragonskin" ], "fg": 1834, "rotates": false }, + { "id": [ "kevlar", "makeshift_kevlar" ], "fg": 1835, "rotates": false }, + { + "id": [ "modularvest", "modularvestsuper", "modularveststeel", "modularvestceramic", "modularvestkevlar", "modularvesthard" ], + "fg": 1836, + "rotates": false + }, + { "id": [ "sundress", "sleeveless_tunic", "tunic", "gown", "dress" ], "fg": 1837, "rotates": false }, + { "id": [ "striped_shirt", "dress_shirt" ], "fg": 1838, "rotates": false }, + { "id": "long_undertop", "fg": 1839, "rotates": false }, + { "id": "postman_shirt", "fg": 1840, "rotates": false }, + { "id": [ "sheriffshirt", "longshirt" ], "fg": 1841, "rotates": false }, + { "id": "dress_wedding", "fg": 1842, "rotates": false }, + { "id": "dump_pouch", "fg": 1843, "rotates": false }, + { "id": "ear_plugs", "fg": 1844, "rotates": false }, + { "id": "glasses_bal", "fg": 1845, "rotates": false }, + { "id": "goggles_ski", "fg": 1846, "rotates": false }, + { "id": [ "goggles_welding", "survivor_goggles", "iggaak" ], "fg": 1847, "rotates": false }, + { "id": "eclipse_glasses", "fg": 1848, "rotates": false }, + { "id": [ "knee_pads", "elbow_pads" ], "fg": 1849, "rotates": false }, + { "id": "glasses_safety", "fg": 1850, "rotates": false }, + { "id": "fancy_sunglasses", "fg": 1851, "rotates": false }, + { "id": "flag_shirt", "fg": 1852, "rotates": false }, + { "id": "flintlock_pouch", "fg": 1853, "rotates": false }, + { + "id": [ "lowtops", "golf_shoes", "footrags", "footrags_wool", "socks_bag", "flip_flops" ], + "fg": 1854, + "rotates": false + }, + { + "id": [ + "mocassins", + "leathersandals", + "bastsandals", + "clogs", + "footrags_fur", + "footrags_leather", + "straw_sandals", + "slippers" + ], + "fg": 1855, + "rotates": false + }, + { "id": "shoes_bowling", "fg": 1856, "rotates": false }, + { "id": [ "sneakers", "dance_shoes", "shoes_birchbark", "dress_shoes" ], "fg": 1857, "rotates": false }, + { "id": [ "leather_collar", "locket_lucy", "fur_collar" ], "fg": 1858, "rotates": false }, + { "id": [ "glasses_eye", "fitover_sunglasses" ], "fg": 1859, "rotates": false }, + { "id": "glasses_reading", "fg": 1860, "rotates": false }, + { "id": "sunglasses", "fg": 1861, "rotates": false }, + { "id": "glasses_bifocal", "fg": 1862, "rotates": false }, + { "id": "glasses_monocle", "fg": 1863, "rotates": false }, + { + "id": [ "gloves_fingerless_mod", "gloves_wraps_fur", "gloves_wraps_leather", "gloves_fingerless" ], + "fg": 1864, + "rotates": false + }, + { "id": "gloves_fur", "fg": 1865, "rotates": false }, + { "id": "gloves_tactical", "fg": 1866, "rotates": false }, + { "id": "glove_jackson", "fg": 1867, "rotates": false }, + { "id": "goggles_swim", "fg": 1868, "rotates": false }, + { "id": [ "diamond_dental_grill", "gold_dental_grill" ], "fg": 1869, "rotates": false }, + { "id": [ "sf_watch", "gold_watch" ], "fg": 1870, "rotates": false }, + { "id": [ "wristwatch", "diving_watch" ], "fg": 1871, "rotates": false }, + { "id": [ "bandolier_bomblet", "grenade_pouch" ], "fg": 1872, "rotates": false }, + { "id": [ "helmet_netting", "hat_boonie" ], "fg": 1873, "rotates": false }, + { "id": [ "hat_hard", "firehelmet", "hat_hard_hooded" ], "fg": 1874, "rotates": false }, + { "id": [ "helmet_skid", "pot_helmet", "tinfoil_hat" ], "fg": 1875, "rotates": false }, + { "id": "hat_chef", "fg": 1876, "rotates": false }, + { "id": [ "tricorne", "eboshi", "hat_cotton" ], "fg": 1877, "rotates": false }, + { "id": "hat_knit", "fg": 1878, "rotates": false }, + { "id": "hat_fur", "fg": 1879, "rotates": false }, + { "id": "hat_hooded", "fg": 1880, "rotates": false }, + { "id": "hat_hunting", "fg": 1881, "rotates": false }, + { "id": [ "thigh_high_boots", "heels" ], "fg": 1882, "rotates": false }, + { "id": [ "helmet_bike", "maid_hat", "kufi" ], "fg": 1883, "rotates": false }, + { "id": [ "helmet_survivor", "helmet_xlsurvivor", "kippah" ], "fg": 1884, "rotates": false }, + { "id": [ "tac_helmet", "helmet_hsurvivor", "hat_newsboy" ], "fg": 1885, "rotates": false }, + { "id": "helmet_army", "fg": 1886, "rotates": false }, + { "id": "helmet_larmor", "fg": 1887, "rotates": false }, + { "id": [ "helmet_liner", "helmet_nomad", "veil_wedding" ], "fg": 1888, "rotates": false }, + { "id": "helmet_ball", "fg": 1889, "rotates": false }, + { "id": "helmet_barbute", "fg": 1890, "rotates": false }, + { "id": "hat_ball", "fg": 1891, "rotates": false }, + { "id": "postman_hat", "fg": 1892, "rotates": false }, + { "id": "hat_golf", "fg": 1893, "rotates": false }, + { "id": "helmet_bone", "fg": 1894, "rotates": false }, + { "id": "helmet_conical", "fg": 1895, "rotates": false }, + { "id": "helmet_corinthian", "fg": 1896, "rotates": false }, + { "id": "helmet_galea", "fg": 1897, "rotates": false }, + { "id": "helmet_kabuto", "fg": 1898, "rotates": false }, + { + "id": [ "nomex_hood", "wetsuit_hood", "hood_fsurvivor", "hood_h20survivor", "fencing_mask", "chainmail_hood", "helmet_motor" ], + "fg": 1899, + "rotates": false + }, + { "id": "helmet_nasal", "fg": 1900, "rotates": false }, + { "id": [ "back_holster", "XL_holster", "holster" ], "fg": 1901, "rotates": false }, + { "id": [ "wool_hoodie", "hoodie" ], "fg": 1902, "rotates": false }, + { "id": "hood_rain", "fg": 1903, "rotates": false }, + { "id": [ "hood_survivor", "hood_xlsurvivor" ], "fg": 1904, "rotates": false }, + { "id": "hood_wsurvivor", "fg": 1905, "rotates": false }, + { "id": "hood_lsurvivor", "fg": 1906, "rotates": false }, + { "id": "hot_pants_fur", "fg": 1907, "rotates": false }, + { "id": "hot_pants_leather", "fg": 1908, "rotates": false }, + { "id": [ "trunks", "boy_shorts", "boxer_shorts", "boxer_briefs" ], "fg": 1909, "rotates": false }, + { "id": "hot_pants", "fg": 1910, "rotates": false }, + { "id": [ "duster_fur", "trenchcoat_fur" ], "fg": 1911, "rotates": false }, + { "id": [ "trenchcoat", "duster", "greatcoat" ], "fg": 1912, "rotates": false }, + { + "id": [ "trenchcoat_leather", "trenchcoat_survivor", "duster_survivor", "armor_nomad", "duster_leather" ], + "fg": 1913, + "rotates": false + }, + { "id": "house_coat", "fg": 1914, "rotates": false }, + { "id": [ "armor_scavenger", "jacket_army" ], "fg": 1915, "rotates": false }, + { "id": "jacket_flannel", "fg": 1916, "rotates": false }, + { "id": "jersey", "fg": 1917, "rotates": false }, + { "id": "judo_belt_blue", "fg": 1918, "rotates": false }, + { "id": "judo_belt_brown", "fg": 1919, "rotates": false }, + { "id": "judo_belt_green", "fg": 1920, "rotates": false }, + { "id": "judo_belt_orange", "fg": 1921, "rotates": false }, + { "id": "judo_belt_white", "fg": 1922, "rotates": false }, + { "id": "judo_belt_yellow", "fg": 1923, "rotates": false }, + { "id": "judo_belt_black", "fg": 1924, "rotates": false }, + { "id": [ "boots_western", "knee_high_boots" ], "fg": 1925, "rotates": false }, + { + "id": [ "stockings", "stockings_tent_legs", "stockings_tent_arms", "leggings" ], + "fg": 1926, + "rotates": false + }, + { "id": [ "fireman_belt", "leather_belt" ], "fg": 1927, "rotates": false }, + { "id": "leather_cat_ears", "fg": 1928, "rotates": false }, + { "id": "ragpouch", "fg": 1929, "rotates": false }, + { "id": "leather_pouch", "fg": 1930, "rotates": false }, + { "id": "legguard_bronze", "fg": 1931, "rotates": false }, + { "id": "legrig", "fg": 1932, "rotates": false }, + { "id": "polo_shirt", "fg": 1933, "rotates": false }, + { "id": [ "tshirt", "undershirt", "tshirt_text", "technician_shirt_gray" ], "fg": 1934, "rotates": false }, + { "id": "linuxtshirt", "fg": 1935, "rotates": false }, + { + "id": [ "loincloth_wool", "briefs", "panties", "bikini_bottom", "loincloth" ], + "fg": 1936, + "rotates": false + }, + { "id": "loincloth_leather", "fg": 1937, "rotates": false }, + { "id": "loincloth_fur", "fg": 1938, "rotates": false }, + { "id": "maid_dress", "fg": 1939, "rotates": false }, + { "id": "makeshift_sling", "fg": 1940, "rotates": false }, + { "id": "mask_bal", "fg": 1941, "rotates": false }, + { "id": "mask_dust", "fg": 1942, "rotates": false }, + { "id": [ "mask_guy_fawkes", "mask_hockey" ], "fg": 1943, "rotates": false }, + { "id": "mask_rioter", "fg": 1944, "rotates": false }, + { "id": "megaarmor_head_1", "fg": 1945, "rotates": false }, + { "id": "megaarmor_leggings_1", "fg": 1946, "rotates": false }, + { "id": "megaarmor_torso_1", "fg": 1947, "rotates": false }, + { "id": "megaarmor_torso_2", "fg": 1948, "rotates": false }, + { "id": "mouthpiece", "fg": 1949, "rotates": false }, + { "id": "nanoskirt", "fg": 1950, "rotates": false }, + { "id": [ "locket", "holy_symbol_wood", "necklace" ], "fg": 1951, "rotates": false }, + { "id": "pearl_collar", "fg": 1952, "rotates": false }, + { "id": [ "small_relic", "holy_symbol" ], "fg": 1953, "rotates": false }, + { "id": [ "blindfold", "obi_gi" ], "fg": 1954, "rotates": false }, + { "id": "pants_checkered", "fg": 1955, "rotates": false }, + { "id": "pants_army", "fg": 1956, "rotates": false }, + { "id": "pants_fur", "fg": 1957, "rotates": false }, + { "id": [ "helmet_lobster", "pickelhaube" ], "fg": 1958, "rotates": false }, + { "id": "basket_laundry", "fg": 1959, "rotates": false }, + { "id": "poncho", "fg": 1960, "rotates": false }, + { "id": [ "shorts", "under_armor_shorts" ], "fg": 1961, "rotates": false }, + { "id": "shorts_cargo", "fg": 1962, "rotates": false }, + { "id": [ "shorts_denim", "b_shorts" ], "fg": 1963, "rotates": false }, + { "id": "postman_shorts", "fg": 1964, "rotates": false }, + { "id": [ "depowered_armor", "power_armor_basic" ], "fg": 1965, "rotates": false }, + { "id": "power_armor_frame", "fg": 1966, "rotates": false }, + { "id": "power_armor_heavy", "fg": 1967, "rotates": false }, + { "id": [ "depowered_helmet", "power_armor_helmet_basic" ], "fg": 1968, "rotates": false }, + { "id": "power_armor_helmet_heavy", "fg": 1969, "rotates": false }, + { "id": "power_armor_helmet_light", "fg": 1970, "rotates": false }, + { "id": "power_armor_light", "fg": 1971, "rotates": false }, + { "id": [ "quiver_birchbark", "sheath", "bootsheath", "quiver" ], "fg": 1972, "rotates": false }, + { + "id": [ "quiver_large_birchbark", "scabbard", "bscabbard", "baldric", "quiver_large" ], + "fg": 1973, + "rotates": false + }, + { "id": [ "diamond_ring", "ring" ], "fg": 1974, "rotates": false }, + { "id": [ "rollerskates", "roller_blades" ], "fg": 1975, "rotates": false }, + { "id": [ "molle_pack", "gobag", "rucksack" ], "fg": 1976, "rotates": false }, + { "id": [ "chestwrap_leather", "leather" ], "fg": 1977, "rotates": false }, + { "id": [ "v_curtain_item", "sheet" ], "fg": 1978, "rotates": false }, + { "id": [ "fur", "tanbark", "birchbark", "willowbark" ], "fg": 1979, "rotates": false }, + { "id": "shield_buckler", "fg": 1980, "rotates": false }, + { "id": "shield_heater", "fg": 1981, "rotates": false }, + { "id": "shield_hoplon", "fg": 1982, "rotates": false }, + { "id": "shield_kite", "fg": 1983, "rotates": false }, + { "id": "shield_round", "fg": 1984, "rotates": false }, + { "id": "shield_scutum", "fg": 1985, "rotates": false }, + { "id": "shield_wooden", "fg": 1986, "rotates": false }, + { "id": "shield_wooden_large", "fg": 1987, "rotates": false }, + { "id": [ "kilt", "skirt" ], "fg": 1988, "rotates": false }, + { "id": "skirt_leather", "fg": 1989, "rotates": false }, + { "id": "suit", "fg": 1990, "rotates": false }, + { "id": [ "swat_shield_act", "swat_shield" ], "fg": 1991, "rotates": false }, + { "id": "sweatshirt", "fg": 1992, "rotates": false }, + { "id": "sweater", "fg": 1993, "rotates": false }, + { "id": "swim_fins", "fg": 1994, "rotates": false }, + { "id": [ "camisole", "tank_top" ], "fg": 1995, "rotates": false }, + { "id": [ "under_armor", "kevlar_tee" ], "fg": 1996, "rotates": false }, + { "id": [ "survivor_belt", "survivor_belt_notools", "tool_belt" ], "fg": 1997, "rotates": false }, + { "id": "tophat", "fg": 1998, "rotates": false }, + { "id": "turban", "fg": 1999, "rotates": false }, + { "id": [ "puck", "ear_spool" ], "fg": 2000, "rotates": false }, + { "id": "120mm_casing", "fg": 2001, "rotates": false }, + { "id": "155mm_casing", "fg": 2002, "rotates": false }, + { "id": "30mm_casing", "fg": 2003, "rotates": false }, + { "id": "exploding_arrow_warhead", "fg": 2004, "rotates": false }, + { "id": [ "5x50_hull", "410_hull", "shot_hull" ], "fg": 2005 }, + { "id": "1st_aid", "fg": 2006, "rotates": false }, + { "id": "golf_tee", "fg": 2007, "rotates": false }, + { "id": "plastic_pot_flower", "fg": 2008, "rotates": false }, + { "id": "clay_pot_flower", "fg": 2009, "rotates": false }, + { "id": "2x4", "fg": 2010, "rotates": false }, + { "id": [ "chitin_plate", "alloy_plate", "alloy_sheet" ], "fg": 2011, "rotates": false }, + { "id": "hard_plate", "fg": 2012, "rotates": false }, + { "id": "mil_plate", "fg": 2013, "rotates": false }, + { "id": [ "steel_plate", "bone_plate" ], "fg": 2014, "rotates": false }, + { "id": "wood_plate", "fg": 2015, "rotates": false }, + { + "id": [ "ammolink30mm", "ammolink40mm", "ammolink50", "ammolink223", "ammolink308", "ammolink" ], + "fg": 2016 + }, + { "id": "arachnotron_guts", "fg": 2017, "rotates": false }, + { "id": "atomic_coffeepot", "fg": 2018, "rotates": false }, + { "id": "golf_ball", "fg": 2019, "rotates": false }, + { "id": "bat_metal", "fg": 2020, "rotates": false }, + { "id": "bat", "fg": 2021, "rotates": false }, + { "id": "battletorch_done", "fg": 2022, "rotates": false }, + { "id": "biollante_bud", "fg": 2023, "rotates": false }, + { "id": "bluebell_bud", "fg": 2024, "rotates": false }, + { "id": [ "dahlia_bud", "poppy_bud" ], "fg": 2025, "rotates": false }, + { "id": [ "knuckle_katar", "knuckle_nail", "bagh_nakha", "bio_claws_weapon" ], "fg": 2026, "rotates": false }, + { "id": [ "wasp_glue", "wasp_glue_super", "bone_glue" ], "fg": 2027, "rotates": false }, + { "id": "superglue", "fg": 2028, "rotates": false }, + { "id": "bowling_axe", "fg": 2029, "rotates": false }, + { "id": "bowling_pin", "fg": 2030, "rotates": false }, + { "id": "brick", "fg": 2031, "rotates": false }, + { "id": [ "carding_paddles", "broom" ], "fg": 2032, "rotates": false }, + { "id": "bullwhip", "fg": 2033, "rotates": false }, + { "id": "candlestick", "fg": 2034, "rotates": false }, + { "id": "cane", "fg": 2035, "rotates": false }, + { "id": [ "cantilever_small", "cantilever_medium" ], "fg": 2036, "rotates": false }, + { + "id": [ "vp_crane_medium", "vp_crane_small" ], + "fg": 2036, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "cargo_lock", "fg": 2037, "rotates": false }, + { "id": "glass_plate", "fg": 2038, "rotates": false }, + { "id": "tin_plate", "fg": 2039, "rotates": false }, + { "id": "ceramic_plate", "fg": 2040, "rotates": false }, + { "id": [ "material_shrd_limestone", "ceramic_shard" ], "fg": 2041, "rotates": false }, + { "id": "knuckle_brass", "fg": 2042, "rotates": false }, + { "id": "knuckle_steel", "fg": 2043, "rotates": false }, + { "id": "cestus", "fg": 2044, "rotates": false }, + { "id": "chitin_piece", "fg": 2045, "rotates": false }, + { "id": "teapot", "fg": 2046, "rotates": false }, + { "id": "clay_teapot", "fg": 2047, "rotates": false }, + { "id": [ "circsaw_blade", "clockworks" ], "fg": 2048, "rotates": false }, + { "id": "mon_blood_sacrifice", "fg": 2049, "rotates": false }, + { "id": "corpse", "fg": 2050, "rotates": false }, + { "id": "cudgel", "fg": 2051, "rotates": false }, + { "id": "pipe", "fg": 2052, "rotates": false }, + { "id": "cu_pipe", "fg": 2053, "rotates": false }, + { "id": "diamond", "fg": 2054, "rotates": false }, + { "id": [ "drivebelt_makeshift", "drivebelt" ], "fg": 2055, "rotates": false }, + { "id": "element", "fg": 2056, "rotates": false }, + { "id": [ "filter_air_makeshift", "filter_air" ], "fg": 2057, "rotates": false }, + { "id": [ "filter_liquid_makeshift", "filter_liquid" ], "fg": 2058 }, + { "id": "fish_bowl", "fg": 2059, "rotates": false }, + { "id": "frame", "fg": 2060, "rotates": false }, + { "id": [ "frame_wood", "frame_wood_light", "foldwoodframe" ], "fg": 2061, "rotates": false }, + { "id": "hdframe", "fg": 2062, "rotates": false }, + { "id": [ "xlframe", "foldframe" ], "fg": 2063, "rotates": false }, + { "id": "folding_basket", "fg": 2064, "rotates": false }, + { "id": "football", "fg": 2065, "rotates": false }, + { "id": [ "spork", "foon", "fork" ], "fg": 2066, "rotates": false }, + { "id": "glass_macuahuitl", "fg": 2067, "rotates": false }, + { "id": "glass_shard", "fg": 2068, "rotates": false }, + { "id": [ "reinforced_glass_sheet", "reinforced_glass_pane" ], "fg": 2069, "rotates": false }, + { "id": "glass_sheet", "fg": 2070, "rotates": false }, + { "id": "glass_tinted", "fg": 2071, "rotates": false }, + { "id": "glowplug", "fg": 2072, "rotates": false }, + { "id": "golf_club", "fg": 2073, "rotates": false }, + { "id": "grapnel", "fg": 2074, "rotates": false }, + { "id": "gungnir_replica", "fg": 2075, "rotates": false }, + { "id": "hammer_sledge", "fg": 2076, "rotates": false }, + { "id": "handflare_dead", "fg": 2077, "rotates": false }, + { "id": "hand_paddles", "fg": 2078, "rotates": false }, + { "id": "hockey_stick", "fg": 2079, "rotates": false }, + { "id": "ji", "fg": 2080, "rotates": false }, + { "id": "joint_lit", "fg": 2081, "rotates": false }, + { "id": "joint_roach", "fg": 2082, "rotates": false }, + { "id": "knife_butter", "fg": 2083, "rotates": false }, + { "id": "lajatang", "fg": 2084, "rotates": false }, + { "id": "lawnmower", "fg": 2085, "rotates": false }, + { "id": "light_bulb", "fg": 2086, "rotates": false }, + { "id": "log", "fg": 2087, "rotates": false }, + { + "id": [ "glaive", "halberd", "halberd_fake", "naginata", "makeshift_halberd" ], + "fg": 2088, + "rotates": false + }, + { "id": "mess_tin", "fg": 2089, "rotates": false }, + { "id": "television", "fg": 2090, "rotates": false }, + { "id": "microwave", "fg": 2091, "rotates": false }, + { "id": "mjolnir_replica", "fg": 2092, "rotates": false }, + { + "id": [ "mobile_memory_card_used", "mobile_memory_card_encrypted", "mobile_memory_card_science", "mobile_memory_card" ], + "fg": 2093, + "rotates": false + }, + { "id": "money_bundle", "fg": 2094, "rotates": false }, + { "id": [ "mjolnir", "morningstar" ], "fg": 2095, "rotates": false }, + { "id": [ "homewrecker", "nailbat" ], "fg": 2096, "rotates": false }, + { "id": "nuclear_waste", "fg": 2097, "rotates": false }, + { "id": "nuclear_fuel", "fg": 2098, "rotates": false }, + { "id": "pallet_lifter", "fg": 2099, "rotates": false }, + { "id": [ "can_sealer", "pastaextruder" ], "fg": 2100, "rotates": false }, + { "id": "peephole", "fg": 2101, "rotates": false }, + { "id": "petrified_eye", "fg": 2102, "rotates": false }, + { "id": [ "down_pillow", "pillow" ], "fg": 2103, "rotates": false }, + { "id": "bodypillow", "fg": 2104, "rotates": false }, + { "id": "pipe_solid", "fg": 2105, "rotates": false }, + { "id": "pipe_solid_spear", "fg": 2106, "rotates": false }, + { "id": [ "spear_forked", "pitchfork" ], "fg": 2107, "rotates": false }, + { "id": [ "clay_watercont", "survivor_mess_kit", "crucible_clay", "clay_pot" ], "fg": 2108, "rotates": false }, + { + "id": [ "charcoal_cooker", "rock_pot", "pot_makeshift", "pot_canning", "pressure_cooker", "f_standing_tank" ], + "fg": 2109, + "rotates": false + }, + { "id": [ "mess_kit", "mil_mess_kit" ], "fg": 2110, "rotates": false }, + { "id": "pot_makeshift_copper", "fg": 2111, "rotates": false }, + { "id": "pot_copper", "fg": 2112, "rotates": false }, + { "id": "pot", "fg": 2113, "rotates": false }, + { "id": [ "pot_xlhelmet", "pot_helmet" ], "fg": 2114, "rotates": false }, + { "id": [ "e_scrap", "power_supply" ], "fg": 2115, "rotates": false }, + { "id": "pump_complex", "fg": 2116, "rotates": false }, + { "id": "punch_dagger", "fg": 2117, "rotates": false }, + { "id": "razor_blade", "fg": 2118, "rotates": false }, + { + "id": [ "survivormap", "militarymap", "restaurantmap", "touristmap", "trailmap", "roadmap" ], + "fg": 2119, + "rotates": false + }, + { "id": "rock_sock", "fg": 2120, "rotates": false }, + { "id": [ "rope_6", "rope_makeshift_30", "rope_makeshift_6", "rope_30" ], "fg": 2121, "rotates": false }, + { "id": "sharp_rock", "fg": 2122, "rotates": false }, + { "id": "sharp_toothbrush", "fg": 2123, "rotates": false }, + { "id": [ "lead_plate", "sheet_metal" ], "fg": 2124, "rotates": false }, + { "id": "sheet_metal_lit", "fg": 2125, "rotates": false }, + { "id": "small_lcd_screen", "fg": 2126, "rotates": false }, + { "id": "spear_survivor", "fg": 2127, "rotates": false }, + { "id": "spear_copper", "fg": 2128, "rotates": false }, + { "id": "spike", "fg": 2129, "rotates": false }, + { "id": "spiked_plate", "fg": 2130, "rotates": false }, + { "id": "splinter", "fg": 2131, "rotates": false }, + { "id": "spoon", "fg": 2132, "rotates": false }, + { "id": "spring", "fg": 2133, "rotates": false }, + { + "id": "vp_muffler", + "fg": 2134, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_seatbelt", + "fg": 2134, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2135 } ] + }, + { "id": "stick_long", "fg": 2136, "rotates": false }, + { "id": "stick", "fg": 2137, "rotates": false }, + { "id": "sword_nail", "fg": 2138, "rotates": false }, + { "id": "toaster", "fg": 2139, "rotates": false }, + { "id": "torch_done", "fg": 2140, "rotates": false }, + { "id": "tree_spile", "fg": 2141, "rotates": false }, + { "id": [ "teleumbrella", "umbrella" ], "fg": 2142, "rotates": false }, + { "id": "usb_drive", "fg": 2143, "rotates": false }, + { "id": "warhammer", "fg": 2144, "rotates": false }, + { "id": "water_faucet", "fg": 2145, "rotates": false }, + { "id": "withered", "fg": 2146, "rotates": false }, + { "id": [ "mon_generator", "generator_7500w" ], "fg": 2147, "rotates": false }, + { "id": "mirror", "fg": 2148, "rotates": false }, + { "id": "bundle_wool", "fg": 2149, "rotates": false }, + { "id": "bundle_leather", "fg": 2150, "rotates": false }, + { "id": "bundle_rag", "fg": 2151, "rotates": false }, + { "id": "scythe_war", "fg": 2152, "rotates": false }, + { "id": "fd_bees", "fg": 2153, "rotates": false }, + { + "id": "tr_portal", + "fg": 2154, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2155 }, + { "id": "corner", "fg": 2156 }, + { "id": "edge", "fg": 2157 }, + { "id": "end_piece", "fg": 2158 }, + { "id": "t_connection", "fg": 2159 }, + { "id": "unconnected", "fg": 2154 } + ] + }, + { + "id": "fd_web", + "fg": 2160, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2161 }, + { "id": "corner", "fg": 2162 }, + { "id": "edge", "fg": 2163 }, + { "id": "end_piece", "fg": 2164 }, + { "id": "t_connection", "fg": 2165 }, + { "id": "unconnected", "fg": 2160 } + ] + }, + { + "id": "fd_slime", + "fg": 2166, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2167 }, + { "id": "corner", "fg": 2168 }, + { "id": "edge", "fg": 2169 }, + { "id": "end_piece", "fg": 2170 }, + { "id": "t_connection", "fg": 2171 }, + { "id": "unconnected", "fg": 2166 } + ] + }, + { + "id": "fd_sludge", + "fg": 2172, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2173 }, + { "id": "corner", "fg": 2174 }, + { "id": "edge", "fg": 2175 }, + { "id": "end_piece", "fg": 2176 }, + { "id": "t_connection", "fg": 2177 }, + { "id": "unconnected", "fg": 2172 } + ] + }, + { "id": "fd_acid_vent", "fg": 2178, "rotates": false }, + { + "id": "fd_acid", + "fg": 2179, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2180 }, + { "id": "corner", "fg": 2181 }, + { "id": "edge", "fg": 2182 }, + { "id": "end_piece", "fg": 2183 }, + { "id": "t_connection", "fg": 2184 }, + { "id": "unconnected", "fg": 2179 } + ] + }, + { + "id": [ "fd_bile", "fd_gibs_veggy", "fd_sap" ], + "fg": 2185, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2186 }, + { "id": "corner", "fg": 2187 }, + { "id": "edge", "fg": 2188 }, + { "id": "end_piece", "fg": 2189 }, + { "id": "t_connection", "fg": 2190 }, + { "id": "unconnected", "fg": 2185 } + ] + }, + { "id": "fd_shock_vent", "fg": 2191, "rotates": false }, + { + "id": "fd_electricity", + "fg": 2192, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2193 }, + { "id": "corner", "fg": 2194 }, + { "id": "edge", "fg": 2195 }, + { "id": "end_piece", "fg": 2196 }, + { "id": "t_connection", "fg": 2197 }, + { "id": "unconnected", "fg": 2192 } + ] + }, + { "id": "fd_fire_vent", "fg": 2198, "rotates": false }, + { "id": "animation_bullet_flame", "fg": 2199 }, + { + "id": "fd_incendiary", + "fg": 2199, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2200 }, + { "id": "corner", "fg": 2201 }, + { "id": "edge", "fg": 2202 }, + { "id": "end_piece", "fg": 2203 }, + { "id": "t_connection", "fg": 2204 }, + { "id": "unconnected", "fg": 2199 } + ] + }, + { + "id": [ "fd_flame_burst", "fd_fire" ], + "fg": 2205, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2200 }, + { "id": "corner", "fg": 2201 }, + { "id": "edge", "fg": 2202 }, + { "id": "end_piece", "fg": 2203 }, + { "id": "t_connection", "fg": 2204 }, + { "id": "unconnected", "fg": 2205 } + ] + }, + { + "id": "fd_fungicidal_gas", + "fg": 2206, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2207 }, + { "id": "corner", "fg": 2208 }, + { "id": "edge", "fg": 2209 }, + { "id": "end_piece", "fg": 2210 }, + { "id": "t_connection", "fg": 2211 }, + { "id": "unconnected", "fg": 2206 } + ] + }, + { "id": "fd_gas_vent", "fg": 2212, "rotates": false }, + { + "id": [ "fd_toxic_gas", "fd_nuke_gas" ], + "fg": 2213, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2214 }, + { "id": "corner", "fg": 2215 }, + { "id": "edge", "fg": 2216 }, + { "id": "end_piece", "fg": 2217 }, + { "id": "t_connection", "fg": 2218 }, + { "id": "unconnected", "fg": 2213 } + ] + }, + { + "id": "fd_fungal_haze", + "fg": 2219, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2220 }, + { "id": "corner", "fg": 2221 }, + { "id": "edge", "fg": 2222 }, + { "id": "end_piece", "fg": 2223 }, + { "id": "t_connection", "fg": 2224 }, + { "id": "unconnected", "fg": 2219 } + ] + }, + { + "id": [ "fd_fatigue", "fd_relax_gas" ], + "fg": 2225, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2226 }, + { "id": "corner", "fg": 2227 }, + { "id": "edge", "fg": 2228 }, + { "id": "end_piece", "fg": 2229 }, + { "id": "t_connection", "fg": 2230 }, + { "id": "unconnected", "fg": 2225 } + ] + }, + { + "id": [ "fd_cigsmoke", "fd_weedsmoke", "fd_methsmoke", "fd_cracksmoke" ], + "fg": 2231, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2232 }, + { "id": "corner", "fg": 2233 }, + { "id": "edge", "fg": 2234 }, + { "id": "end_piece", "fg": 2235 }, + { "id": "t_connection", "fg": 2236 }, + { "id": "unconnected", "fg": 2231 } + ] + }, + { "id": "f_smoking_rack_active", "fg": 2237, "rotates": false }, + { + "id": [ "fd_smoke", "fd_tear_gas" ], + "fg": 2237, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2238 }, + { "id": "corner", "fg": 2239 }, + { "id": "edge", "fg": 2240 }, + { "id": "end_piece", "fg": 2241 }, + { "id": "t_connection", "fg": 2242 }, + { "id": "unconnected", "fg": 2237 } + ] + }, + { + "id": "vp_xlframe_cover", + "fg": 2243, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_xlframe_vertical", + "fg": 275, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_xlframe_vertical_2", + "fg": 2244, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": [ "vp_folding_frame", "vp_xlframe_horizontal" ], + "fg": 2245, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_xlframe_horizontal_2", + "fg": 2246, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_xlframe_cross", + "fg": 273, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_xlframe_nw", + "fg": 274, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_xlframe_sw", + "fg": 2247, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_xlframe_se", + "fg": 2248, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_xlframe_ne", + "fg": 2249, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": [ "vp_halfboard_cover", "vp_frame_cover" ], + "fg": 2250, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "vp_frame_handle", "fg": 2250, "rotates": true }, + { + "id": "vp_frame_vertical", + "fg": 2251, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_frame_vertical_2", + "fg": 2252, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_frame_horizontal", + "fg": 2253, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_frame_horizontal_2", + "fg": 2254, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_frame_cross", + "fg": 2255, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_frame_nw", + "fg": 2256, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_frame_sw", + "fg": 2257, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_frame_se", + "fg": 2258, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_frame_ne", + "fg": 2259, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "vp_frame_wood_cover", "vp_frame_wood_handle", "vp_frame_wood_light_cover", "vp_frame_wood_light_handle" ], + "fg": 2260, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": "vp_folding_wooden_frame", + "fg": 2261, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_vertical", "vp_frame_wood_vertical" ], + "fg": 2262, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_vertical_2", "vp_frame_wood_vertical_2" ], + "fg": 2263, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_horizontal", "vp_frame_wood_horizontal" ], + "fg": 2264, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_horizontal_2", "vp_frame_wood_horizontal_2" ], + "fg": 2265, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_cross", "vp_frame_wood_cross" ], + "fg": 2266, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_nw", "vp_frame_wood_nw" ], + "fg": 2267, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_sw", "vp_frame_wood_sw" ], + "fg": 2268, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_se", "vp_frame_wood_se" ], + "fg": 2269, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_frame_wood_light_ne", "vp_frame_wood_ne" ], + "fg": 2270, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": "vp_hdframe_cover", + "fg": 2271, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_vertical", + "fg": 2273, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_vertical_2", + "fg": 2274, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_horizontal", + "fg": 2275, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_horizontal_2", + "fg": 2276, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_cross", + "fg": 2277, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_nw", + "fg": 2278, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_sw", + "fg": 2279, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_se", + "fg": 2280, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdframe_ne", + "fg": 2281, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": [ "vp_door_opaque", "vp_door_internal", "vp_door" ], + "fg": 2282, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2283 }, { "id": "open", "fg": 2284 } ] + }, + { "id": "vp_fdoor", "fg": 2282, "rotates": false }, + { + "id": [ "vp_door_trunk", "vp_hatch", "vp_door_shutter", "vp_door_sliding" ], + "fg": 2285, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2286 }, { "id": "open", "fg": 2287 } ] + }, + { + "id": "vp_hatch_opaque", + "fg": 2285, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "open", "fg": 2287 } ] + }, + { + "id": [ "vp_door_wood", "vp_door_wood_opaque" ], + "fg": 2288, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2289 }, { "id": "open", "fg": 2290 } ] + }, + { + "id": [ "vp_hdhatch", "vp_hdhatch_opaque" ], + "fg": 2291, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2292 }, { "id": "open", "fg": 2293 } ] + }, + { "id": "boat_board", "fg": 2294, "rotates": false }, + { + "id": "vp_boat_board", + "fg": 2295, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "broken", "fg": 225 }, + { "id": "center", "fg": 2296 }, + { "id": "corner", "fg": 2297 }, + { "id": "edge", "fg": 2298 }, + { "id": "end_piece", "fg": 2298 }, + { "id": "t_connection", "fg": 2299 }, + { "id": "unconnected", "fg": 2295 } + ] + }, + { "id": "hd_steel_drum", "fg": 2300, "rotates": true }, + { + "id": "vp_roller_drum", + "fg": 2301, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": [ "wheel_metal", "wheel" ], "fg": 2302, "rotates": false }, + { "id": "wheel_wood", "fg": 2303, "rotates": false }, + { + "id": [ "vp_wheel_bicycle_steerable", "vp_wheel_bicycle" ], + "fg": 2304, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2305 } ] + }, + { + "id": "vp_wheel_wheelchair", + "fg": 2306, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2305 } ] + }, + { + "id": "vp_wheel_caster", + "fg": 2307, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2305 } ] + }, + { + "id": "vp_wheel_wood", + "fg": 2303, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_wheel", "vp_wheel_steerable", "vp_metal_wheel" ], + "fg": 2302, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2305 } ] + }, + { "id": [ "wheel_wide", "wheel_wide_or" ], "fg": 2308, "rotates": false }, + { + "id": [ "vp_wheel_armor", "vp_wheel_armor_steerable" ], + "fg": 2309, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2305 } ] + }, + { + "id": [ "vp_wheel_wide", "vp_wheel_wide_steerable" ], + "fg": 2308, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2305 } ] + }, + { "id": "wheel_armor", "fg": 2309, "rotates": false }, + { + "id": [ "wheel_bicycle_or", "wheel_motorbike", "wheel_motorbike_or", "wheel_slick", "wheel_bicycle" ], + "fg": 2310, + "rotates": false + }, + { + "id": [ "vp_wheel_unicycle", "vp_wheel_motorbike", "vp_wheel_motorbike_steerable" ], + "fg": 2310, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2305 } ] + }, + { "id": [ "wheel_barrow", "wheel_small" ], "fg": 2311, "rotates": true }, + { + "id": [ "vp_wheel_small", "vp_wheel_small_steerable", "vp_wheel_barrow" ], + "fg": 2311, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2305 } ] + }, + { + "id": "vp_wheel_wood_b", + "fg": 2312, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { "id": "wheel_wood_b", "fg": 2312, "rotates": false }, + { "id": "wheel_caster", "fg": 2313, "rotates": false }, + { "id": "wheel_wheelchair", "fg": 2314, "rotates": false }, + { + "id": "vp_hand_rims", + "fg": 2315, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "hand_rims", "fg": 2315, "rotates": false }, + { + "id": "vp_hand_paddles", + "fg": 2316, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { "id": "foot_crank", "fg": 2317, "rotates": false }, + { + "id": [ "vp_engine_motor", "vp_foot_pedals" ], + "fg": 2250, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { + "id": [ + "v12_diesel", + "1cyl_combustion", + "1cyl_combustion_small", + "v2_combustion", + "i4_combustion", + "v6_combustion", + "v8_combustion", + "v12_combustion", + "i6_diesel", + "v6_diesel", + "v8_diesel" + ], + "fg": 2318, + "rotates": false + }, + { + "id": [ + "vp_engine_1cyl", + "vp_engine_1cyl_small", + "vp_engine_vtwin", + "vp_engine_inline4", + "vp_engine_v6", + "vp_engine_v8", + "vp_engine_v12", + "vp_diesel_engine_v12", + "vp_engine_electric", + "vp_engine_electric_large", + "vp_engine_electric_small", + "vp_engine_electric_enhanced", + "vp_diesel_engine_i6", + "vp_diesel_engine_v6", + "vp_diesel_engine_v8" + ], + "fg": 2318, + "rotates": true + }, + { + "id": "vp_door_motor", + "fg": 2319, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "tr_engine", "fg": 2320, "rotates": false }, + { + "id": [ + "motor_large", + "motor_small", + "motor_enhanced", + "alternator_bicycle", + "alternator_motorbike", + "alternator_car", + "alternator_truck", + "motor" + ], + "fg": 2321, + "rotates": false + }, + { + "id": [ "vp_alternator_bicycle", "vp_alternator_motorbike", "vp_alternator_car", "vp_alternator_truck" ], + "fg": 2321, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { + "id": [ "vp_veh_table", "vp_veh_table_wood" ], + "fg": 2322, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { "id": "v_table", "fg": 2322, "rotates": false }, + { "id": "inflatable_airbag", "fg": 2323, "rotates": false }, + { "id": "inflatable_section", "fg": 2324, "rotates": false }, + { "id": "vehicle_dashboard", "fg": 2325, "rotates": false }, + { "id": "basket", "fg": 2326, "rotates": false }, + { + "id": [ "vp_box", "vp_folding wood box", "vp_wood box", "vp_basketsm", "vp_basketsm_external" ], + "fg": 2327, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_basketlg", "vp_basketlg_folding", "vp_basketlg_external" ], + "fg": 2326, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "bike_basket", "fg": 2327, "rotates": false }, + { + "id": [ "vp_cargo_space", "vp_cargo_space_external" ], + "fg": 2328, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_trunk", + "fg": 2329, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { "id": "cargo_rack", "fg": 2328, "rotates": false }, + { "id": "drive_by_wire_controls", "fg": 2330, "rotates": false }, + { "id": "robot_controls", "fg": 2331, "rotates": false }, + { + "id": "vp_robot_controls", + "fg": 2331, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_controls", + "fg": 2332, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_drive_by_wire_controls", + "fg": 2330, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "vehicle_controls", "fg": 2332, "rotates": false }, + { "id": [ "vp_fridge_cargo", "fridge_cargo" ], "fg": 2333, "rotates": false }, + { + "id": "vp_veh_forge", + "fg": 2334, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { + "id": "vp_water_faucet", + "fg": 2335, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { "id": "forgerig", "fg": 2334, "rotates": false }, + { "id": "muffler", "fg": 2336, "rotates": false }, + { + "id": "vp_chemlab", + "fg": 2337, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { "id": "chemlab", "fg": 2337, "rotates": false }, + { + "id": [ "car_headlight", "wide_headlight_reinforced", "car_wide_headlight", "headlight_reinforced" ], + "fg": 2338, + "rotates": true + }, + { "id": "floodlight", "fg": 2338, "rotates": false }, + { + "id": "vp_headlight_reinforced", + "fg": 2339, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "vp_horn_car", "vp_horn_big", "vp_beeper", "vp_chimes" ], + "fg": 2340, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "vp_head_light", "vp_headlight", "vp_floodlight" ], + "fg": 2338, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_kitchen_unit", + "fg": 2341, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { "id": "kitchen_unit", "fg": 2341, "rotates": false }, + { "id": "light_emergency_red", "fg": 2342, "rotates": false }, + { "id": "omnicamera", "fg": 2343, "rotates": false }, + { + "id": "vp_light_blue", + "fg": 2344, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_light_red", + "fg": 2342, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { + "id": "vp_omnicam", + "fg": 2343, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "light_emergency_blue", "fg": 2344, "rotates": false }, + { "id": "minifreezer", "fg": 2345, "rotates": false }, + { + "id": "vp_minifridge", + "fg": 2346, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { + "id": "vp_minifreezer", + "fg": 2345, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { "id": "minifridge", "fg": 2346, "rotates": false }, + { + "id": "vp_recharge_station", + "fg": 2347, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { "id": "recharge_station", "fg": 2347, "rotates": false }, + { + "id": "vp_tracker", + "fg": 2348, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_vehicle_alarm", + "fg": 2348, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "veh_tracker", "fg": 2348, "rotates": false }, + { "id": "craftrig", "fg": 2349, "rotates": true }, + { + "id": "vp_welding_rig", + "fg": 2350, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { + "id": "vp_craft_rig", + "fg": 2349, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { "id": "weldrig", "fg": 2350, "rotates": false }, + { + "id": "vp_saddle", + "fg": 2351, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": "saddle", "fg": 2351, "rotates": false }, + { + "id": "vp_cam_control", + "fg": 2352, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "camera_control", "fg": 2352, "rotates": false }, + { "id": "w_table", "fg": 2353, "rotates": false }, + { + "id": [ "vp_inboard_mirror", "vp_wing_mirror" ], + "fg": 2354, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_horn_bicycle", + "fg": 2355, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_inflatable_airbag", + "fg": 2356, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "broken", "fg": 2272 }, + { "id": "center", "fg": 2357 }, + { "id": "corner", "fg": 2358 }, + { "id": "edge", "fg": 2359 }, + { "id": "end_piece", "fg": 2359 }, + { "id": "t_connection", "fg": 2360 }, + { "id": "unconnected", "fg": 2356 } + ] + }, + { + "id": "vp_inflatable_section", + "fg": 2361, + "rotates": true, + "multitile": true, + "additional_tiles": [ + { "id": "broken", "fg": 2272 }, + { "id": "center", "fg": 2362 }, + { "id": "corner", "fg": 2363 }, + { "id": "edge", "fg": 2364 }, + { "id": "end_piece", "fg": 2364 }, + { "id": "t_connection", "fg": 2365 }, + { "id": "unconnected", "fg": 2361 } + ] + }, + { + "id": [ + "vp_fxlhalfboard_vertical", + "vp_board_vertical", + "vp_clothboard_vertical", + "vp_cloth_halfboard_vertical", + "vp_xlhalfboard_vertical", + "vp_halfboard_vertical" + ], + "fg": 2366, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ + "vp_fxlhalfboard_vertical_2", + "vp_xlhalfboard_vertical_2", + "vp_halfboard_vertical_2", + "vp_cloth_halfboard_vertical_2" + ], + "fg": 2367, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ + "vp_fxlhalfboard_horizontal", + "vp_clothboard_horizontal", + "vp_cloth_halfboard_horizontal", + "vp_xlhalfboard_horizontal", + "vp_halfboard_horizontal", + "vp_board_horizontal" + ], + "fg": 2368, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ + "vp_fxlhalfboard_horizontal_2", + "vp_xlhalfboard_horizontal_2", + "vp_halfboard_horizontal_2", + "vp_cloth_halfboard_horizontal_2" + ], + "fg": 2369, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_halfboard_cross", + "fg": 2370, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ + "vp_fxlhalfboard_nw", + "vp_clothboard_nw", + "vp_cloth_halfboard_nw", + "vp_xlhalfboard_nw", + "vp_halfboard_nw", + "vp_board_nw" + ], + "fg": 2371, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ + "vp_fxlhalfboard_sw", + "vp_clothboard_sw", + "vp_cloth_halfboard_sw", + "vp_xlhalfboard_sw", + "vp_halfboard_sw", + "vp_board_sw" + ], + "fg": 2372, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ + "vp_fxlhalfboard_se", + "vp_clothboard_se", + "vp_cloth_halfboard_se", + "vp_xlhalfboard_se", + "vp_halfboard_se", + "vp_board_se" + ], + "fg": 2373, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ + "vp_fxlhalfboard_ne", + "vp_clothboard_ne", + "vp_cloth_halfboard_ne", + "vp_xlhalfboard_ne", + "vp_halfboard_ne", + "vp_board_ne" + ], + "fg": 2374, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "vp_hdboard_vertical", "vp_hdhalfboard_vertical" ], + "fg": 2375, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdhalfboard_vertical_2", + "fg": 2376, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": [ "vp_hdboard_horizontal", "vp_hdhalfboard_horizontal" ], + "fg": 2377, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdhalfboard_horizontal_2", + "fg": 2378, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": [ "vp_hdboard_nw", "vp_hdhalfboard_nw" ], + "fg": 2379, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": [ "vp_hdboard_sw", "vp_hdhalfboard_sw" ], + "fg": 2380, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": [ "vp_hdboard_se", "vp_hdhalfboard_se" ], + "fg": 2381, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": [ "vp_hdboard_ne", "vp_hdhalfboard_ne" ], + "fg": 2382, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": [ "vp_woodboard_vertical", "vp_woodhalfboard_vertical" ], + "fg": 2383, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": "vp_woodhalfboard_vertical_2", + "fg": 2384, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_woodboard_horizontal", "vp_woodhalfboard_horizontal" ], + "fg": 2385, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": "vp_woodhalfboard_horizontal_2", + "fg": 2386, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_woodboard_nw", "vp_woodhalfboard_nw" ], + "fg": 2387, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_woodboard_sw", "vp_woodhalfboard_sw" ], + "fg": 2388, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_woodboard_se", "vp_woodhalfboard_se" ], + "fg": 2389, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_woodboard_ne", "vp_woodhalfboard_ne" ], + "fg": 2390, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": "vp_stowboard_vertical", + "fg": 2391, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_stowboard_horizontal", + "fg": 2392, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_stowboard_nw", + "fg": 2393, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_stowboard_sw", + "fg": 2394, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_stowboard_se", + "fg": 2395, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_stowboard_ne", + "fg": 2396, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_hdstowboard_vertical", + "fg": 2397, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdstowboard_horizontal", + "fg": 2398, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdstowboard_nw", + "fg": 2399, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdstowboard_sw", + "fg": 2400, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdstowboard_se", + "fg": 2401, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_hdstowboard_ne", + "fg": 2402, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": "vp_aisle_vertical", + "fg": 2403, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_aisle_horizontal", + "fg": 2404, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_wooden_aisle_vertical", + "fg": 2405, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": "vp_wooden_aisle_horizontal", + "fg": 2406, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 225 } ] + }, + { + "id": [ "vp_aisle_lights", "vp_lit_aisle_vertical" ], + "fg": 2407, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_lit_aisle_horizontal", + "fg": 2408, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_trunk_floor", + "fg": 2409, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "vp_roof_cloth", "vp_roof_wood", "vp_roof" ], + "fg": 2410, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": "vp_hdroof", + "fg": 2411, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "vp_jumper_cable_heavy", "vp_jumper_cable" ], + "fg": 2412, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "vp_mounted_m1918", "vp_flamethrower" ], + "fg": 2413, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { + "id": [ "vp_mounted_rm298", "vp_mounted_rm614" ], + "fg": 2414, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 155 } ] + }, + { "id": [ "vp_tow_launcher", "vp_tow_turret" ], "fg": 2413, "rotates": true }, + { + "id": [ "vp_fusion_gun", "vp_laser_rifle" ], + "fg": 2415, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2416 } ] + }, + { + "id": [ "vp_mounted_browning", "vp_mounted_mk19", "vp_mounted_abzats" ], + "fg": 2417, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2272 } ] + }, + { + "id": [ "vp_m249", "vp_mounted_m240", "vp_mounted_m60", "vp_mounted_m134" ], + "fg": 2418, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1661 } ] + }, + { + "id": [ "vp_plasmagun", "vp_plasma_gun" ], + "fg": 2419, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1661 } ] + }, + { + "id": [ "vp_mounted_howitzer", "vp_mounted_tank_auto", "vp_mounted_tank_manual", "vp_mounted_tank_rws", "vp_m240", "vp_m60" ], + "fg": 2417, + "rotates": true + }, + { "id": "vp_mounted_30mm_autocannon", "fg": 2414, "rotates": true }, + { + "id": [ "vp_watercannon", "vp_shockcannon_mounted" ], + "fg": 2419, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1531 } ] + }, + { "id": "vp_bfg_mounted", "fg": 2420, "rotates": true }, + { + "id": "vp_blade_horizontal", + "fg": 2421, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { "id": "vp_cargo_lock", "fg": 2422, "rotates": false }, + { "id": "vp_crane_tiny", "fg": 2423, "rotates": true }, + { + "id": "vp_storage_battery_mount", + "fg": 2424, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { + "id": "vp_generator_7500w", + "fg": 2425, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1183 } ] + }, + { "id": "vp_external_tank_small", "fg": 2426, "rotates": true }, + { "id": "vp_forklift_fork", "fg": 2427, "rotates": true }, + { + "id": "vp_stereo", + "fg": 2428, + "rotates": false, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 812 } ] + }, + { + "id": [ "vp_reaper_advanced", "vp_reaper" ], + "fg": 2429, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1661 } ] + }, + { "id": "vp_plating_hard", "fg": 2430, "rotates": true }, + { "id": "vp_plating_military", "fg": 2431, "rotates": true }, + { "id": [ "vp_plating_steel", "vp_plating_chitin" ], "fg": 2432, "rotates": true }, + { "id": "vp_plating_superalloy", "fg": 2433, "rotates": true }, + { "id": "vp_plating_wood", "fg": 2434, "rotates": true }, + { "id": "vp_plating_bone", "fg": 2435, "rotates": true }, + { "id": "vp_plating_spiked", "fg": 2436, "rotates": true }, + { + "id": "vp_reinforced_windshield", + "fg": 2437, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2438 } ] + }, + { + "id": "vp_seatbelt_heavyduty", + "fg": 2439, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2135 } ] + }, + { + "id": [ "vp_seed_drill_advanced", "vp_seed_drill" ], + "fg": 2440, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 1531 } ] + }, + { + "id": "vp_spike", + "fg": 2441, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 725 } ] + }, + { + "id": "vp_windshield", + "fg": 2442, + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": 2438 } ] + }, + { "id": "mon_flashbang_hack", "fg": 2443, "rotates": false }, + { "id": "bot_flashbang_hack", "fg": 2444, "rotates": false }, + { "id": "broken_flashbang_hack", "fg": 2445, "rotates": false }, + { "id": "mon_gasbomb_hack", "fg": 2446, "rotates": false }, + { "id": "bot_gasbomb_hack", "fg": 2447, "rotates": false }, + { "id": "broken_gasbomb_hack", "fg": 2448, "rotates": false }, + { "id": "mon_EMP_hack", "fg": 2449, "rotates": false }, + { "id": "bot_EMP_hack", "fg": 2450, "rotates": false }, + { "id": "broken_EMP_hack", "fg": 2451, "rotates": false }, + { "id": "mon_grenade_hack", "fg": 2452, "rotates": false }, + { "id": "bot_grenade_hack", "fg": 2453, "rotates": false }, + { "id": "broken_grenade_hack", "fg": 2454, "rotates": false }, + { "id": "mon_c4_hack", "fg": 2455, "rotates": false }, + { "id": "bot_c4_hack", "fg": 2456, "rotates": false }, + { "id": "broken_c4_hack", "fg": 2457, "rotates": false }, + { "id": "mon_manhack", "fg": 2458, "rotates": false }, + { "id": "bot_manhack", "fg": 2459, "rotates": false }, + { "id": "broken_manhack", "fg": 2460, "rotates": false }, + { "id": "mon_manhack_fire", "fg": 2461, "rotates": false }, + { "id": "bot_manhack_fire", "fg": 2462, "rotates": false }, + { "id": "broken_manhack_fire", "fg": 2463, "rotates": false }, + { "id": "mon_manhack_missile", "fg": 2464, "rotates": false }, + { "id": "bot_manhack_missile", "fg": 2465, "rotates": false }, + { "id": "manhack_firebomb", "fg": 2466, "rotates": false }, + { "id": "manhack_firebomb_act", "fg": 2467, "rotates": false }, + { "id": "mon_mininuke_hack", "fg": 2468, "rotates": false }, + { "id": "bot_mininuke_hack", "fg": 2469, "rotates": false }, + { "id": "broken_mininuke_hack", "fg": 2470, "rotates": false }, + { "id": "mon_broken_cyborg", "fg": 2471, "rotates": false }, + { "id": "mon_prototype_cyborg", "fg": 2472, "rotates": false }, + { "id": "mon_chickenbot", "fg": 2473, "rotates": false }, + { "id": "mon_copbot", "fg": 2474, "rotates": false }, + { "id": "broken_copbot", "fg": 2475, "rotates": false }, + { "id": "mon_cyborg_cop", "fg": 2476, "rotates": false }, + { "id": "mon_cyborg_guard", "fg": 2477, "rotates": false }, + { "id": "mon_eyebot", "fg": 2478, "rotates": false }, + { "id": "broken_eyebot", "fg": 2479, "rotates": false }, + { "id": "mon_hazmatbot", "fg": 2480, "rotates": false }, + { "id": "mon_turret", "fg": 2481, "rotates": false }, + { "id": "bot_turret", "fg": 2482, "rotates": false }, + { "id": "mon_turret_rifle", "fg": 2483, "rotates": false }, + { "id": "bot_rifleturret", "fg": 2484, "rotates": false }, + { "id": "mon_turret_shockcannon", "fg": 2485, "rotates": false }, + { "id": "bot_turret_shockcannon", "fg": 2486, "rotates": false }, + { "id": "mon_laserturret", "fg": 2487, "rotates": false }, + { "id": "bot_laserturret", "fg": 2488, "rotates": false }, + { "id": "mon_turret_bmg", "fg": 2489, "rotates": false }, + { "id": "mon_turret_searchlight", "fg": 2490, "rotates": false }, + { "id": "mon_science_bot", "fg": 2491, "rotates": false }, + { "id": "bot_science_bot", "fg": 2492, "rotates": false }, + { "id": "broken_science_bot", "fg": 2493, "rotates": false }, + { "id": "mon_molebot", "fg": 2494, "rotates": false }, + { "id": "broken_molebot", "fg": 2495, "rotates": false }, + { "id": "mon_riotbot", "fg": 2496, "rotates": false }, + { "id": "broken_riotbot", "fg": 2497, "rotates": false }, + { "id": "mon_dispatch", "fg": 2498, "rotates": false }, + { "id": "bot_dispatch", "fg": 2499, "rotates": false }, + { "id": "broken_dispatch", "fg": 2500, "rotates": false }, + { "id": "mon_dispatch_military", "fg": 2501, "rotates": false }, + { "id": "bot_dispatch_military", "fg": 2502, "rotates": false }, + { "id": "broken_dispatch_military", "fg": 2503, "rotates": false }, + { "id": "mon_robot_drone", "fg": 2504, "rotates": false }, + { "id": "bot_robot_drone", "fg": 2505, "rotates": false }, + { "id": "broken_robot_drone", "fg": 2506, "rotates": false }, + { "id": "mon_secubot", "fg": 2507, "rotates": false }, + { "id": "bot_antimateriel", "fg": 2508, "rotates": false }, + { "id": "mon_skitterbot", "fg": 2509, "rotates": false }, + { "id": "bot_skitterbot", "fg": 2510, "rotates": false }, + { "id": "broken_skitterbot", "fg": 2511, "rotates": false }, + { "id": "mon_tankbot", "fg": 2512, "rotates": false }, + { "id": "broken_tankbot", "fg": 2513, "rotates": false }, + { "id": "mon_w11b20b4", "fg": 2514, "rotates": false }, + { "id": "mon_w11h10", "fg": 2515, "rotates": false }, + { "id": "mon_w12b10", "fg": 2516, "rotates": false }, + { "id": "mon_w12n10", "fg": 2517, "rotates": false }, + { "id": "mon_w11b10", "fg": 2518, "rotates": false }, + { "id": "mon_generator_SCINET", "fg": 2519, "rotates": false }, + { + "id": [ + "bot_cyberdemon", + "bot_hell_baron", + "bot_hell_knight", + "bot_imp", + "bot_imp_black", + "bot_lostsoul", + "bot_mancubus", + "bot_mechaspider", + "bot_rat", + "bot_revenant", + "bot_spider_trapdoor_giant", + "bot_spider_trapdoor_giant_guardian", + "bot_spider_web_omega", + "bot_spider_web_s", + "bot_trapdoor_s", + "bot_pinky", + "bot_acidic_pk", + "bot_blind", + "bot_cacodemon_revive", + "bot_cherub", + "bot_cherub_fly", + "bot_churl_revive", + "bot_grabber", + "bot_hell_knight_revive", + "bot_hollow", + "bot_imp_revive", + "bot_pinky_revive", + "bot_shady", + "bot_thing_head", + "bot_thing_spider", + "bot_tripod", + "bot_cacodemon" + ], + "fg": 2520, + "rotates": false + }, + { "id": "mon_doom_archdemon", "fg": 2521, "rotates": false }, + { + "id": [ "mon_doom_archvile_2", "mon_doom_archvile_3", "mon_doom_archvile_4", "mon_doom_archvile_5", "mon_doom_archvile" ], + "fg": 2522, + "rotates": false + }, + { "id": "mon_doom_archvile_queen", "fg": 2523, "rotates": false }, + { "id": [ "mon_hell_knight_revive", "mon_hell_knight" ], "fg": 2524, "rotates": false }, + { "id": "mon_hell_baron", "fg": 2525, "rotates": false }, + { "id": "mon_cyberdemon", "fg": 2526, "rotates": false }, + { "id": "mon_mechaspider_queen", "fg": 2527, "rotates": false }, + { "id": "mon_mechaspider", "fg": 2528, "rotates": false }, + { "id": "broken_mechaspider", "fg": 2529, "rotates": false }, + { "id": [ "mon_cacodemon_revive", "mon_cacodemon" ], "fg": 2530, "rotates": false }, + { "id": "mon_mancubus", "fg": 2531, "rotates": false }, + { "id": "mon_revenant", "fg": 2532, "rotates": false }, + { "id": "mon_tripod", "fg": 2533, "rotates": false }, + { "id": "broken_tripod", "fg": 2534, "rotates": false }, + { "id": [ "mon_imp_revive", "mon_imp" ], "fg": 2535, "rotates": false }, + { "id": "mon_imp_black", "fg": 2536, "rotates": false }, + { "id": [ "mon_pinky_revive", "mon_pinky" ], "fg": 2537, "rotates": false }, + { "id": "mon_lostsoul", "fg": 2538, "rotates": false }, + { "id": "mon_lostsoul_mount", "fg": 2539, "rotates": false }, + { "id": [ "mon_cherub_fly", "mon_cherub" ], "fg": 2540, "rotates": false }, + { "id": [ "mon_doom_churl", "mon_doom_churl_revive" ], "fg": 2541, "rotates": false }, + { "id": "mon_doom_slave", "fg": 2542, "rotates": false }, + { "id": "mon_doom_cur", "fg": 2543, "rotates": false }, + { "id": "mon_doom_sacrifice", "fg": 2544, "rotates": false }, + { "id": "mon_soulcube", "fg": 2545, "rotates": false }, + { "id": [ "broken_soulcube", "soulcube" ], "fg": 2546, "rotates": false }, + { "id": "soulcube_on", "fg": 2547, "rotates": false }, + { "id": "soulcube_charging", "fg": 2548, "rotates": false }, + { "id": "mon_shoggoth", "fg": 2549, "rotates": false }, + { "id": "mon_flying_polyp", "fg": 2550, "rotates": false }, + { "id": "mon_legion", "fg": 2551, "rotates": false }, + { "id": "mon_mi_go_fly", "fg": 2552, "rotates": false }, + { "id": "mon_mi_go_terminal", "fg": 2553, "rotates": false }, + { "id": "mon_mi_go", "fg": 2554, "rotates": false }, + { "id": "mon_thing", "fg": 2555, "rotates": false }, + { "id": "mon_thing_head", "fg": 2556, "rotates": false }, + { "id": "mon_thing_spider", "fg": 2557, "rotates": false }, + { "id": "mon_thing_swamp", "fg": 2558, "rotates": false }, + { "id": "mon_gozu", "fg": 2559, "rotates": false }, + { "id": "mon_headless_dog_thing", "fg": 2560, "rotates": false }, + { "id": "mon_darkman", "fg": 2561, "rotates": false }, + { "id": "mon_shadow", "fg": 2562, "rotates": false }, + { "id": "mon_blank", "fg": 2563, "rotates": false }, + { "id": "mon_nuculais", "fg": 2564, "rotates": false }, + { "id": "mon_horror_dusk_queen", "fg": 2565, "rotates": false }, + { "id": "mon_horror_dusk", "fg": 2566, "rotates": false }, + { "id": "mon_hunting_horror", "fg": 2567, "rotates": false }, + { "id": "mon_flaming_eye", "fg": 2568, "rotates": false }, + { "id": "mon_stemcell_nether", "fg": 2569, "rotates": false }, + { "id": "mon_amigara_horror", "fg": 2570, "rotates": false }, + { "id": "mon_vortex", "fg": 2571, "rotates": false }, + { "id": "mon_twisted_body", "fg": 2572, "rotates": false }, + { "id": "mon_flesh_angel", "fg": 2573, "rotates": false }, + { "id": "mon_charred_nightmare", "fg": 2574, "rotates": false }, + { "id": "mon_crawler", "fg": 2575, "rotates": false }, + { "id": "debug_mon", "fg": 2576, "rotates": false }, + { "id": [ "mon_jabberwock_pk", "mon_jabberwock" ], "fg": 2577, "rotates": false }, + { "id": "mon_human_snail", "fg": 2578, "rotates": false }, + { + "id": [ "mon_irradiated_wanderer_2", "mon_irradiated_wanderer_3", "mon_irradiated_wanderer_4", "mon_irradiated_wanderer_1" ], + "fg": 2579, + "rotates": false + }, + { "id": "mon_marloss_man", "fg": 2580, "rotates": false }, + { "id": "mon_furvivor", "fg": 2581, "rotates": false }, + { + "id": [ "mon_furvivor_glock", "mon_furvivor_pk", "mon_furvivor_shotgun", "mon_furvivor_smg", "mon_furvivor_deagle" ], + "fg": 2582, + "rotates": false + }, + { "id": "mon_cult_slave", "fg": 2583, "rotates": false }, + { "id": "mon_hologram", "fg": 2584, "rotates": false }, + { "id": [ "mon_shia", "mon_zombie_jackson" ], "fg": 2585, "rotates": false }, + { "id": "mon_chud", "fg": 2586, "rotates": false }, + { "id": "mon_dementia", "fg": 2587, "rotates": false }, + { "id": "mon_hallu_mom", "fg": 2588, "rotates": false }, + { "id": "mon_one_eye", "fg": 2589, "rotates": false }, + { "id": "mon_ratman_ninja", "fg": 2590, "rotates": false }, + { "id": "mon_rat_king", "fg": 2591, "rotates": false }, + { "id": "mon_leonardo", "fg": 2592, "rotates": false }, + { "id": "mon_michelangelo", "fg": 2593, "rotates": false }, + { "id": "mon_raphael", "fg": 2594, "rotates": false }, + { "id": "mon_donatello", "fg": 2595, "rotates": false }, + { "id": "mon_cult_churl", "fg": 2596, "rotates": false }, + { "id": "mon_bear_mega_mating", "fg": 2597, "rotates": false }, + { "id": "mon_bear_mega", "fg": 2598, "rotates": false }, + { "id": "mon_zombie_bear_mega", "fg": 2599, "rotates": false }, + { "id": "mon_bear_mega_kid", "fg": 2600, "rotates": false }, + { "id": "mon_bear_mega_baby", "fg": 2601, "rotates": false }, + { "id": [ "mon_bear_pk", "mon_bear_weak", "mon_bear" ], "fg": 2602, "rotates": false }, + { "id": [ "mon_bear_smoky", "mon_bear_smoky_pk" ], "fg": 2603, "rotates": false }, + { "id": "mon_zombear", "fg": 2604, "rotates": false }, + { "id": "mon_bobcat", "fg": 2605, "rotates": false }, + { "id": [ "mon_cougar_pk", "mon_cougar_weak", "mon_cougar" ], "fg": 2606, "rotates": false }, + { "id": "mon_fougar", "fg": 2607, "rotates": false }, + { "id": "mon_zougar", "fg": 2608, "rotates": false }, + { "id": "mon_cat", "fg": 2609, "rotates": false }, + { "id": "mon_wolf", "fg": 2610, "rotates": false }, + { "id": "mon_folf", "fg": 2611, "rotates": false }, + { "id": "mon_zolf", "fg": 2612, "rotates": false }, + { "id": "mon_zolf_shady", "fg": 2613, "rotates": false }, + { "id": "mon_zolf_scorched", "fg": 2614, "rotates": false }, + { + "id": [ + "mon_dog_bcollie", + "mon_dog_boxer", + "mon_dog_gshepherd", + "mon_dog_gpyrenees", + "mon_dog_rottweiler", + "mon_dog_auscattle", + "mon_dog_thing", + "mon_dog_large", + "mon_dog" + ], + "fg": 2615, + "rotates": false + }, + { + "id": [ + "mon_dog_bull", + "mon_dog_bull_pup", + "mon_dog_pitbullmix", + "mon_dog_pitbullmix_pup", + "mon_dog_beagle", + "mon_dog_beagle_pup", + "mon_dog_bcollie_pup", + "mon_dog_boxer_pup", + "mon_dog_chihuahua", + "mon_dog_chihuahua_pup", + "mon_dog_dachshund", + "mon_dog_dachshund_pup", + "mon_dog_gshepherd_pup", + "mon_dog_gpyrenees_pup", + "mon_dog_rottweiler_pup", + "mon_dog_auscattle_pup", + "mon_dog_pup" + ], + "fg": 2616, + "rotates": false + }, + { "id": [ "mon_coyote_wolf", "mon_coyote_small", "mon_coyote" ], "fg": 2617, "rotates": false }, + { "id": "mon_coyote_wolf_zerg", "fg": 2618, "rotates": false }, + { "id": "mon_fox_red", "fg": 2619, "rotates": false }, + { "id": "mon_fox_gray", "fg": 2620, "rotates": false }, + { "id": "mon_pig_saber", "fg": 2621, "rotates": false }, + { "id": "mon_pig", "fg": 2622, "rotates": false }, + { "id": "mon_fungus_pig", "fg": 2623, "rotates": false }, + { "id": "mon_zombie_pig", "fg": 2624, "rotates": false }, + { "id": [ "mon_moose_pk", "mon_moose_weak", "mon_moose" ], "fg": 2625, "rotates": false }, + { "id": "mon_foose", "fg": 2626, "rotates": false }, + { "id": "mon_zoose", "fg": 2627, "rotates": false }, + { "id": "mon_horse", "fg": 2628, "rotates": false }, + { "id": "mon_horse_zombie", "fg": 2629, "rotates": false }, + { "id": "mon_horse_zombie_scorched", "fg": 2630, "rotates": false }, + { "id": "mon_deer_rutting", "fg": 2631, "rotates": false }, + { "id": "mon_deer", "fg": 2632, "rotates": false }, + { "id": "mon_deer_small", "fg": 2633, "rotates": false }, + { "id": "mon_feer", "fg": 2634, "rotates": false }, + { "id": "mon_goat", "fg": 2635, "rotates": false }, + { "id": "mon_sheep", "fg": 2636, "rotates": false }, + { "id": "mon_cow", "fg": 2637, "rotates": false }, + { "id": "mon_nakedmolerat_giant", "fg": 2638, "rotates": false }, + { "id": [ "mon_beaver", "mon_muskrat", "mon_chipmunk" ], "fg": 2639, "rotates": false }, + { "id": "mon_mole_large", "fg": 2640, "rotates": false }, + { "id": [ "mon_squirrel_red", "mon_groundhog" ], "fg": 2641, "rotates": false }, + { "id": "mon_squirrel", "fg": 2642, "rotates": false }, + { "id": [ "mon_shrew", "mon_deer_mouse" ], "fg": 2643, "rotates": false }, + { "id": "mon_lemming", "fg": 2644, "rotates": false }, + { "id": "mon_rabbit", "fg": 2645, "rotates": false }, + { "id": "mon_hare", "fg": 2646, "rotates": false }, + { "id": "mon_skunk", "fg": 2647, "rotates": false }, + { "id": [ "mon_opossum", "mon_raccoon", "mon_black_rat" ], "fg": 2648, "rotates": false }, + { "id": "mon_otter", "fg": 2649, "rotates": false }, + { "id": [ "mon_sewer_rat", "mon_weasel", "mon_mink" ], "fg": 2650, "rotates": false }, + { "id": "mon_bat_vampire", "fg": 2651, "rotates": false }, + { "id": "mon_bat", "fg": 2652, "rotates": false }, + { "id": "mon_albino_penguin", "fg": 2653, "rotates": false }, + { "id": "mon_robin", "fg": 2654, "rotates": false }, + { "id": "mon_bjay", "fg": 2655, "rotates": false }, + { "id": "mon_turkey", "fg": 2656, "rotates": false }, + { "id": "mon_chicken", "fg": 2657, "rotates": false }, + { "id": "mon_duck", "fg": 2658, "rotates": false }, + { "id": "mon_crow", "fg": 2659, "rotates": false }, + { "id": "mon_gull", "fg": 2660, "rotates": false }, + { "id": "mon_pidgeon", "fg": 2661, "rotates": false }, + { "id": [ "mon_duck_chick", "mon_chicken_chick" ], "fg": 2662, "rotates": false }, + { + "id": [ "mon_grouse_chick", "mon_crow_chick", "mon_turkey_chick", "mon_pheasant_chick" ], + "fg": 2663, + "rotates": false + }, + { "id": "mon_cockatrice_chick", "fg": 2664, "rotates": false }, + { "id": "mon_dimorphodon", "fg": 2665, "rotates": false }, + { "id": "mon_parasaurolophus", "fg": 2666, "rotates": false }, + { "id": "mon_spinosaurus", "fg": 2667, "rotates": false }, + { "id": "mon_stegosaurus", "fg": 2668, "rotates": false }, + { "id": "mon_titanis", "fg": 2669, "rotates": false }, + { "id": "mon_allosaurus", "fg": 2670, "rotates": false }, + { "id": "mon_ankylosaurus", "fg": 2671, "rotates": false }, + { "id": "mon_eoraptor", "fg": 2672, "rotates": false }, + { "id": "mon_gallimimus", "fg": 2673, "rotates": false }, + { "id": "mon_utahraptor", "fg": 2674, "rotates": false }, + { "id": "mon_compsognathus", "fg": 2675, "rotates": false }, + { "id": "mon_deinonychus", "fg": 2676, "rotates": false }, + { "id": "mon_velociraptor", "fg": 2677, "rotates": false }, + { "id": "mon_dilophosaurus", "fg": 2678, "rotates": false }, + { "id": "mon_rattlesnake_giant", "fg": 2679, "rotates": false }, + { "id": "mon_rattlesnake", "fg": 2680, "rotates": false }, + { "id": "mon_shadow_snake", "fg": 2681, "rotates": false }, + { "id": "mon_sewer_snake", "fg": 2682, "rotates": false }, + { "id": "mon_gator", "fg": 2683, "rotates": false }, + { "id": "mon_frog_giant", "fg": 2684, "rotates": false }, + { "id": "mon_fish_blinky", "fg": 2685, "rotates": false }, + { + "id": [ "mon_fish_trout", "mon_fish_perch", "mon_fish_salmon", "mon_fish_sunfish", "mon_fish_bowfin" ], + "fg": 2686, + "rotates": false + }, + { "id": "mon_fish_carp", "fg": 2687, "rotates": false }, + { "id": [ "mon_fish_bullhead", "mon_fish_sbass", "mon_fish_lbass" ], "fg": 2688, "rotates": false }, + { "id": [ "mon_fish_pike", "mon_fish_bluegill" ], "fg": 2689, "rotates": false }, + { "id": "mon_sewer_fish", "fg": 2690, "rotates": false }, + { "id": [ "mon_zhark", "mon_mutant_carp", "mon_mutant_salmon" ], "fg": 2691, "rotates": false }, + { "id": [ "mon_fish_whitefish", "mon_fish_pickerel", "mon_fish_pbass" ], "fg": 2692, "rotates": false }, + { "id": "mon_fish_flying", "fg": 2693, "rotates": false }, + { "id": "mon_fish_eel_large", "fg": 2694, "rotates": false }, + { "id": "mon_fish_eel", "fg": 2695, "rotates": false }, + { "id": "mon_alpha_razorclaw", "fg": 2696, "rotates": false }, + { "id": "mon_razorclaw", "fg": 2697, "rotates": false }, + { "id": [ "mon_giant_crayfish", "mon_fish_lobster_giant" ], "fg": 2698, "rotates": false }, + { "id": [ "mon_fish_lobster", "mon_fish_crayfish" ], "fg": 2699, "rotates": false }, + { "id": "mon_spider_jumping_giant_acid", "fg": 2700, "rotates": false }, + { "id": "mon_spider_jumping_giant", "fg": 2701, "rotates": false }, + { "id": "mon_spider_jumping", "fg": 2702, "rotates": false }, + { "id": "mon_spider_trapdoor_giant_guardian", "fg": 2703, "rotates": false }, + { "id": [ "mon_spider_trapdoor_giant", "mon_spider_trapdoor_giant_pk" ], "fg": 2704, "rotates": false }, + { "id": [ "mon_spider_trapdoor", "mon_spider_trapdoor_giant_s" ], "fg": 2705, "rotates": false }, + { "id": "mon_spider_web_queen", "fg": 2706, "rotates": false }, + { "id": "mon_spider_web_alpha", "fg": 2707, "rotates": false }, + { "id": [ "mon_spider_web_omega", "mon_spider_web_mu" ], "fg": 2708, "rotates": false }, + { "id": "mon_spider_web", "fg": 2709, "rotates": false }, + { "id": "mon_spider_web_s", "fg": 2710, "rotates": false }, + { "id": [ "mon_spider_wolf_giant", "mon_spider_wolf_giant_pk" ], "fg": 2711, "rotates": false }, + { "id": "mon_spider_wolf", "fg": 2712, "rotates": false }, + { "id": "mon_spider_cellar_giant", "fg": 2713, "rotates": false }, + { "id": "mon_spider_cellar_giant_s", "fg": 2714, "rotates": false }, + { "id": "mon_spider_widow_giant", "fg": 2715, "rotates": false }, + { "id": [ "mon_spider_widow_giant_s", "mon_spider_widow" ], "fg": 2716, "rotates": false }, + { "id": "mon_dermatik", "fg": 2717, "rotates": false }, + { "id": "mon_dermatik_larva", "fg": 2718, "rotates": false }, + { "id": "mon_wasp_queen", "fg": 2719, "rotates": false }, + { "id": "mon_wasp", "fg": 2720, "rotates": false }, + { "id": "mon_bee_queen", "fg": 2721, "rotates": false }, + { "id": "mon_bee_king", "fg": 2722, "rotates": false }, + { "id": [ "mon_bee_scout", "mon_bee_soldier", "mon_bee" ], "fg": 2723, "rotates": false }, + { "id": "mon_butterfly", "fg": 2724, "rotates": false }, + { "id": "mon_caterpillar", "fg": 2725, "rotates": false }, + { "id": "mon_moth", "fg": 2726, "rotates": false }, + { "id": "mon_dragonfly_giant", "fg": 2727, "rotates": false }, + { "id": [ "mon_frog", "mon_dragonfly" ], "fg": 2728, "rotates": false }, + { "id": "mon_mosquito_giant", "fg": 2729, "rotates": false }, + { "id": "mon_locust", "fg": 2730, "rotates": false }, + { "id": "mon_locust_nymph", "fg": 2731, "rotates": false }, + { "id": "mon_fly", "fg": 2732, "rotates": false }, + { "id": "mon_centipede_giant", "fg": 2733, "rotates": false }, + { "id": "mon_plague_vector", "fg": 2734, "rotates": false }, + { "id": "mon_skittering_plague", "fg": 2735, "rotates": false }, + { "id": "mon_plague_nymph", "fg": 2736, "rotates": false }, + { "id": [ "mon_pregnant_giant_cockroach", "mon_giant_cockroach" ], "fg": 2737, "rotates": false }, + { "id": "mon_giant_cockroach_nymph", "fg": 2738, "rotates": false }, + { "id": [ "mon_centipede", "mon_slug", "mon_mosquito" ], "fg": 2739, "rotates": false }, + { "id": "mon_wasp_small", "fg": 2740, "rotates": false }, + { "id": [ "mon_pupae_pk", "mon_pupae" ], "fg": 2741, "rotates": false }, + { "id": "mon_ant_acid_kwama", "fg": 2742, "rotates": false }, + { "id": "mon_ant_queen_firebug", "fg": 2743, "rotates": false }, + { "id": "mon_ant_acid_queen", "fg": 2744, "rotates": false }, + { "id": "mon_ant_acid_soldier", "fg": 2745, "rotates": false }, + { "id": "mon_ant_soldier_terminal", "fg": 2746, "rotates": false }, + { "id": "mon_ant_terminal", "fg": 2747, "rotates": false }, + { "id": [ "mon_ant_queen", "mon_ant_queen_young" ], "fg": 2748, "rotates": false }, + { "id": "mon_ant_soldier", "fg": 2749, "rotates": false }, + { "id": [ "mon_ant_soldier_pk", "mon_ant_soldier_pk_weak" ], "fg": 2750, "rotates": false }, + { "id": "mon_ant_acid", "fg": 2751, "rotates": false }, + { "id": "mon_ant_male", "fg": 2752, "rotates": false }, + { "id": "mon_ant", "fg": 2753, "rotates": false }, + { "id": "mon_fant", "fg": 2754, "rotates": false }, + { "id": "mon_ant_fungus", "fg": 2755, "rotates": false }, + { "id": "mon_ant_scrib", "fg": 2756, "rotates": false }, + { "id": [ "mon_ant_larva", "mon_bee_larvae", "mon_maggot", "mon_wasp_larvae" ], "fg": 2757, "rotates": false }, + { "id": "mon_ant_acid_larva", "fg": 2758, "rotates": false }, + { "id": "mon_slug_giant", "fg": 2759, "rotates": false }, + { "id": "mon_sludge_crawler_queen", "fg": 2760, "rotates": false }, + { "id": "mon_sludge_crawler", "fg": 2761, "rotates": false }, + { "id": "mon_dark_wyrm", "fg": 2762, "rotates": false }, + { "id": "mon_graboid", "fg": 2763, "rotates": false }, + { "id": "mon_yugg", "fg": 2764, "rotates": false }, + { "id": "mon_worm", "fg": 2765, "rotates": false }, + { "id": "mon_halfworm", "fg": 2766, "rotates": false }, + { "id": "mon_tardigrade", "fg": 2767, "rotates": false }, + { "id": "mon_fardigrade", "fg": 2768, "rotates": false }, + { "id": [ "mon_biollante", "mon_biollante_pk" ], "fg": 2769, "rotates": false }, + { "id": "mon_vinebeast_terminal", "fg": 2770, "rotates": false }, + { "id": [ "mon_vinebeast", "mon_vinebeast_pk" ], "fg": 2771, "rotates": false }, + { + "id": [ "mon_creeper_vine_terminal", "mon_creeper_vine_terminal_pk" ], + "fg": 2772, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2773 }, + { "id": "corner", "fg": 2774 }, + { "id": "edge", "fg": 2775 }, + { "id": "end_piece", "fg": 2776 }, + { "id": "t_connection", "fg": 2777 }, + { "id": "unconnected", "fg": 2772 } + ] + }, + { "id": "mon_finebeast", "fg": 2778, "rotates": false }, + { + "id": [ "mon_creeper_vine_pk", "mon_creeper_vine" ], + "fg": 2779, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2780 }, + { "id": "corner", "fg": 2781 }, + { "id": "edge", "fg": 2782 }, + { "id": "end_piece", "fg": 2783 }, + { "id": "t_connection", "fg": 2784 }, + { "id": "unconnected", "fg": 2779 } + ] + }, + { "id": "mon_creeper_root", "fg": 2785, "rotates": false }, + { "id": "mon_creeper_hub", "fg": 2786, "rotates": false }, + { "id": "mon_finecraft", "fg": 2787, "rotates": false }, + { "id": "mon_dionaea", "fg": 2788, "rotates": false }, + { "id": "mon_fionaea", "fg": 2789, "rotates": false }, + { "id": "mon_dionaea_sprout", "fg": 2790, "rotates": false }, + { "id": "mon_triffid_heart", "fg": 2791, "rotates": false }, + { "id": "mon_triffid_queen", "fg": 2792, "rotates": false }, + { "id": [ "mon_triffid_pk", "mon_triffid" ], "fg": 2793, "rotates": false }, + { "id": "mon_triffid_young", "fg": 2794, "rotates": false }, + { "id": "mon_triffid_sprig", "fg": 2795, "rotates": false }, + { "id": "mon_fungal_fighter", "fg": 2796, "rotates": false }, + { "id": [ "mon_fungaloid_dormant", "mon_fungaloid_pk", "mon_fungaloid" ], "fg": 2797, "rotates": false }, + { "id": "mon_fungaloid_young", "fg": 2798, "rotates": false }, + { "id": "mon_fungal_blossom", "fg": 2799, "rotates": false }, + { "id": "mon_fungal_tendril", "fg": 2800, "rotates": false }, + { "id": "mon_fungal_wall", "fg": 2801, "rotates": false }, + { "id": "mon_fungal_hedgerow", "fg": 2802, "rotates": false }, + { "id": [ "mon_fungus_boil", "mon_spore" ], "fg": 2803, "rotates": false }, + { "id": "mon_zombie_thorny", "fg": 2804 }, + { "id": "mon_zombie_fiend_shocker", "fg": 2805, "rotates": false }, + { "id": [ "mon_zombie_fiend_pk", "mon_zombie_fiend" ], "fg": 2806, "rotates": false }, + { "id": "mon_zombie_nullfield", "fg": 2807, "rotates": false }, + { "id": "mon_zombie_electric_fungal", "fg": 2808, "rotates": false }, + { "id": [ "mon_zombie_electric_pk", "mon_zombie_electric" ], "fg": 2809, "rotates": false }, + { "id": "mon_zombie_scorched_shocker", "fg": 2810, "rotates": false }, + { "id": "mon_zombie_lord", "fg": 2811, "rotates": false }, + { "id": [ "mon_zombie_master_pk", "mon_zombie_master" ], "fg": 2812, "rotates": false }, + { "id": "mon_zombie_scorched_master", "fg": 2813, "rotates": false }, + { "id": [ "mon_zombie_necro_pk", "mon_zombie_necro" ], "fg": 2814, "rotates": false }, + { "id": "mon_zombie_scorched_necro", "fg": 2815, "rotates": false }, + { "id": "mon_zombie_predator", "fg": 2816, "rotates": false }, + { "id": [ "mon_zombie_runner_pk", "mon_zombie_runner" ], "fg": 2817, "rotates": false }, + { "id": "mon_zombie_soldier_blackops_2", "fg": 2818, "rotates": false }, + { "id": "mon_zombie_soldier_blackops_1", "fg": 2819, "rotates": false }, + { "id": "mon_zombie_military_pilot", "fg": 2820, "rotates": false }, + { "id": "mon_zombie_flamer", "fg": 2821, "rotates": false }, + { "id": "mon_zombie_soldier_acid_1", "fg": 2822, "rotates": false }, + { "id": "mon_zombie_armored", "fg": 2823, "rotates": false }, + { "id": "mon_zombie_grenadier", "fg": 2824, "rotates": false }, + { "id": "mon_zombie_grenadier_elite", "fg": 2825, "rotates": false }, + { "id": "mon_zombie_soldier", "fg": 2826, "rotates": false }, + { "id": "mon_zombie_soldier_acid_2", "fg": 2827, "rotates": false }, + { "id": "mon_zombie_bio_op", "fg": 2828, "rotates": false }, + { "id": "mon_zombie_fireman", "fg": 2829, "rotates": false }, + { "id": "mon_zombie_hazmat", "fg": 2830, "rotates": false }, + { "id": "mon_zombie_survivor", "fg": 2831, "rotates": false }, + { "id": "mon_zombie_cop", "fg": 2832, "rotates": false }, + { "id": "mon_zombie_scientist", "fg": 2833, "rotates": false }, + { "id": "mon_zombie_technician", "fg": 2834, "rotates": false }, + { "id": "mon_zombie_labsecurity", "fg": 2835, "rotates": false }, + { "id": "mon_gas_zombie", "fg": 2837, "rotates": false }, + { "id": "mon_zombie_corrosive", "fg": 2838, "rotates": false }, + { "id": "mon_homunculus", "fg": 2836, "rotates": false }, + { "id": "mon_zombie_kevlar_1", "fg": 2839, "rotates": false }, + { "id": "mon_zombie_brute_ninja", "fg": 2840, "rotates": false }, + { "id": "mon_zombie_brute_shocker", "fg": 2841, "rotates": false }, + { "id": "mon_zombie_brute", "fg": 2842, "rotates": false }, + { "id": "mon_zombie_brute_grappler", "fg": 2843, "rotates": false }, + { "id": "mon_zombie_grappler", "fg": 2844, "rotates": false }, + { "id": "mon_zombie_grabber", "fg": 2845, "rotates": false }, + { "id": "mon_zombie_mancroc", "fg": 2846, "rotates": false }, + { "id": "mon_zombie_biter", "fg": 2847, "rotates": false }, + { "id": "mon_zombie_anklebiter", "fg": 2848, "rotates": false }, + { "id": [ "mon_beekeeper", "mon_beekeeper_pk" ], "fg": 2849, "rotates": false }, + { "id": "mon_zombie_radbag", "fg": 2850, "rotates": false }, + { "id": [ "mon_boomer_huge_pk", "mon_boomer_huge" ], "fg": 2853, "rotates": false }, + { "id": "mon_boomer", "fg": 2854, "rotates": false }, + { "id": "mon_boomer_fungus", "fg": 2855, "rotates": false }, + { "id": [ "mon_zombie_gasbag", "mon_zombie_gasbag_pk" ], "fg": 2856, "rotates": false }, + { "id": [ "mon_zombie_fat", "mon_zombie_fat_2", "mon_zombie_fat_3" ], "fg": 2857, "rotates": false }, + { "id": [ "mon_zombie_smoker_pk", "mon_zombie_smoker" ], "fg": 2851, "rotates": false }, + { "id": "mon_zombie_spitter", "fg": 2852, "rotates": false }, + { "id": "mon_skeleton_brute", "fg": 2858, "rotates": false }, + { "id": "mon_skeleton", "fg": 2859, "rotates": false }, + { "id": "mon_skeleton_scorched", "fg": 2860, "rotates": false }, + { "id": "mon_zombie_waif", "fg": 2861, "rotates": false }, + { "id": "mon_zombie_creepy", "fg": 2862, "rotates": false }, + { "id": "mon_zombie_sproglodyte", "fg": 2863, "rotates": false }, + { "id": "mon_zombie_snotgobbler", "fg": 2864, "rotates": false }, + { "id": "mon_zombie_screecher", "fg": 2865, "rotates": false }, + { "id": "mon_zombie_shrieker", "fg": 2866, "rotates": false }, + { "id": "mon_zombie_shriekling", "fg": 2867, "rotates": false }, + { "id": [ "mon_zombie_child_scorched_2", "mon_zombie_child_scorched" ], "fg": 2868, "rotates": false }, + { "id": [ "mon_zombie_child_reaver", "mon_kreck" ], "fg": 2869, "rotates": false }, + { + "id": [ "mon_zombie_child_2", "mon_zombie_child_3", "mon_zombie_child_pk", "mon_zombie_child" ], + "fg": 2870, + "rotates": false + }, + { "id": "mon_zombie_child_fungus", "fg": 2871, "rotates": false }, + { "id": [ "mon_dog_zombie_cop", "mon_dog_zombie_cop_pk" ], "fg": 2872, "rotates": false }, + { + "id": [ "mon_dog_zombie_rot", "mon_dog_zombie_rot_pain", "mon_dog_zombie_rot_worms" ], + "fg": 2873, + "rotates": false + }, + { "id": [ "mon_dog_skeleton", "mon_dog_skeleton_pk" ], "fg": 2874, "rotates": false }, + { "id": [ "mon_zombie_dog", "mon_zombie_dog_pk", "mon_zombie_fast" ], "fg": 2875, "rotates": false }, + { "id": "mon_zombie_hunter", "fg": 2876, "rotates": false }, + { + "id": [ "mon_zombie_crawler_pk", "mon_zombie_crawler_pk_weak", "mon_zombie_crawler" ], + "fg": 2877, + "rotates": false + }, + { "id": "mon_zombie_crawler_scorched", "fg": 2878, "rotates": false }, + { "id": "mon_zombie_cripple", "fg": 2879, "rotates": false }, + { "id": [ "mon_zombie_blind_pk", "mon_zombie_blind" ], "fg": 2880, "rotates": false }, + { "id": "mon_zombie_skull", "fg": 2881, "rotates": false }, + { "id": "mon_gracke", "fg": 2882, "rotates": false }, + { "id": [ "mon_zombie_hollow", "mon_zombie_hollow_pk" ], "fg": 2883, "rotates": false }, + { "id": "mon_zombie_ears", "fg": 2884, "rotates": false }, + { "id": "mon_zombie_brainless", "fg": 2885, "rotates": false }, + { + "id": [ + "mon_zombie_rot_flu", + "mon_zombie_rot_pain", + "mon_zombie_rot_worms", + "mon_zombie_rot_pk", + "mon_zombie_rot_pk_flu", + "mon_zombie_rot_pk_pain", + "mon_zombie_rot_pk_worms", + "mon_zombie_rot" + ], + "fg": 2886, + "rotates": false + }, + { "id": "mon_zombie_shady_ghost", "fg": 2887, "rotates": false }, + { "id": [ "mon_zombie_shady_pk", "mon_zombie_shady" ], "fg": 2888, "rotates": false }, + { "id": "mon_zombie_fungus", "fg": 2889, "rotates": false }, + { "id": [ "mon_zombie_acidic", "mon_zombie_acidic_pk" ], "fg": 2890, "rotates": false }, + { "id": [ "mon_zombie_tough", "mon_zombie_tough_2", "mon_zombie_tough_3" ], "fg": 2891, "rotates": false }, + { "id": "mon_zombie_scales", "fg": 2892, "rotates": false }, + { "id": [ "mon_zombie_swimmer", "mon_zombie_swimmer_pk" ], "fg": 2893, "rotates": false }, + { "id": "mon_zombie_dancer", "fg": 2894, "rotates": false }, + { "id": [ "mon_zombie_scorched_pk", "mon_zombie_scorched" ], "fg": 2895, "rotates": false }, + { "id": [ "mon_zombie_pk", "mon_zombie_2", "mon_zombie_3", "mon_zombie" ], "fg": 2896, "rotates": false }, + { "id": "mon_zanimal_scorched", "fg": 2897, "rotates": false }, + { "id": "mon_zanimal_skeleton", "fg": 2898, "rotates": false }, + { "id": "mon_zanimal_skeleton_dead", "fg": 2899, "rotates": false }, + { "id": "mon_blob_brain", "fg": 2900, "rotates": false }, + { "id": "mon_breather_hub", "fg": 2901, "rotates": false }, + { "id": [ "mon_gelatin", "mon_blob_large" ], "fg": 2902, "rotates": false }, + { "id": "mon_player_blob", "fg": 2903, "rotates": false }, + { "id": "mon_blob", "fg": 2904, "rotates": false }, + { "id": "mon_blob_small", "fg": 2905, "rotates": false }, + { "id": "mon_breather", "fg": 2906, "rotates": false }, + { "id": "player_female", "fg": 2907, "rotates": false }, + { "id": "player_male", "fg": 2908, "rotates": false }, + { "id": "npc_female", "fg": 2909, "rotates": false }, + { "id": "npc_male", "fg": 2910, "rotates": false }, + { "id": "overlay_mutation_bio_armor_legs", "fg": 2911 }, + { "id": "overlay_male_mutation_bio_armor_legs", "fg": 2912 }, + { "id": "overlay_mutation_bio_armor_torso", "fg": 2913 }, + { "id": "overlay_male_mutation_bio_armor_torso", "fg": 2914 }, + { "id": "overlay_mutation_bio_armor_arms", "fg": 2915 }, + { "id": "overlay_male_mutation_bio_armor_arms", "fg": 2916 }, + { "id": "overlay_mutation_bio_armor_head", "fg": 2917 }, + { "id": "overlay_male_mutation_bio_armor_head", "fg": 2918 }, + { "id": "overlay_mutation_bio_blaster", "fg": 2919 }, + { "id": "overlay_male_mutation_bio_blaster", "fg": 2920 }, + { "id": "overlay_mutation_bio_deformity", "fg": 2921 }, + { "id": "overlay_male_mutation_bio_deformity", "fg": 2922 }, + { "id": [ "overlay_mutation_active_bio_scent_vision", "overlay_mutation_active_bio_blindfold" ], "fg": 2923 }, + { + "id": [ "overlay_male_mutation_active_bio_scent_vision", "overlay_male_mutation_active_bio_blindfold" ], + "fg": 2924 + }, + { "id": "overlay_mutation_active_bio_night_vision", "fg": 2925 }, + { "id": "overlay_male_mutation_active_bio_night_vision", "fg": 2926 }, + { "id": "overlay_mutation_active_bio_infrared", "fg": 2927 }, + { "id": "overlay_male_mutation_active_bio_infrared", "fg": 2928 }, + { "id": "overlay_mutation_THRESH_MARLOSS", "fg": 2929 }, + { "id": "overlay_male_mutation_THRESH_MARLOSS", "fg": 2930 }, + { "id": "overlay_mutation_THRESH_ALPHA", "fg": 2931 }, + { "id": "overlay_male_mutation_THRESH_ALPHA", "fg": 2932 }, + { "id": "overlay_mutation_THRESH_ELFA", "fg": 2933 }, + { "id": "overlay_male_mutation_THRESH_ELFA", "fg": 2934 }, + { "id": "overlay_mutation_THRESH_CHIMERA", "fg": 2935 }, + { "id": "overlay_mutation_THRESH_BEAST", "fg": 2936 }, + { "id": "overlay_male_mutation_THRESH_BEAST", "fg": 2937 }, + { "id": "overlay_mutation_THRESH_FELINE", "fg": 2938 }, + { "id": "overlay_mutation_THRESH_LUPINE", "fg": 2939 }, + { "id": "overlay_mutation_THRESH_RAT", "fg": 2940 }, + { "id": "overlay_mutation_THRESH_MOUSE", "fg": 2941 }, + { "id": "overlay_mutation_THRESH_TROGLOBITE", "fg": 2942 }, + { "id": "overlay_male_mutation_THRESH_TROGLOBITE", "fg": 2943 }, + { "id": "overlay_mutation_THRESH_BIRD", "fg": 2944 }, + { "id": "overlay_mutation_THRESH_RAPTOR", "fg": 2945 }, + { "id": "overlay_mutation_THRESH_FISH", "fg": 2946 }, + { "id": "overlay_mutation_THRESH_CEPHALOPOD", "fg": 2947 }, + { "id": "overlay_male_mutation_THRESH_CEPHALOPOD", "fg": 2948 }, + { "id": "overlay_mutation_INT_UP_4", "fg": 2949 }, + { "id": "overlay_male_mutation_INT_UP_4", "fg": 2950 }, + { "id": "overlay_mutation_THRESH_SPIDER", "fg": 2951 }, + { "id": "overlay_male_mutation_THRESH_SPIDER", "fg": 2952 }, + { "id": "overlay_mutation_THRESH_INSECT", "fg": 2953 }, + { "id": "overlay_mutation_THRESH_PLANT", "fg": 2954 }, + { "id": "overlay_male_mutation_THRESH_PLANT", "fg": 2955 }, + { "id": [ "overlay_mutation_FLOWERS", "overlay_mutation_ROSEBUDS" ], "fg": 2956 }, + { "id": [ "overlay_male_mutation_FLOWERS", "overlay_male_mutation_ROSEBUDS" ], "fg": 2957 }, + { "id": "overlay_mutation_THRESH_MYCUS", "fg": 2958 }, + { "id": "overlay_mutation_THRESH_SLIME", "fg": 2959 }, + { "id": "overlay_male_mutation_THRESH_SLIME", "fg": 2960 }, + { "id": [ "overlay_mutation_BENDY2", "overlay_mutation_BENDY3", "overlay_mutation_BENDY1" ], "fg": 2961 }, + { + "id": [ "overlay_male_mutation_BENDY2", "overlay_male_mutation_BENDY3", "overlay_male_mutation_BENDY1" ], + "fg": 2962 + }, + { "id": "overlay_mutation_AMORPHOUS", "fg": 2963 }, + { "id": "overlay_male_mutation_AMORPHOUS", "fg": 2964 }, + { "id": "overlay_mutation_PER_SLIME", "fg": 2965 }, + { "id": "overlay_male_mutation_PER_SLIME", "fg": 2966 }, + { "id": "overlay_mutation_PER_SLIME_OK", "fg": 2967 }, + { "id": "f_planter", "fg": 2968, "rotates": false }, + { "id": "f_planter_seed", "fg": 2969, "rotates": false }, + { "id": "f_planter_seedling", "fg": 2970, "rotates": false }, + { "id": "f_planter_mature", "fg": 2971, "rotates": false }, + { "id": "f_planter_harvest", "fg": 2972, "rotates": false }, + { "id": "vp_autoclave", "fg": 2973, "rotates": false }, + { "id": [ "f_autoclave", "f_autoclave_full" ], "fg": 2974, "rotates": false }, + { "id": "vp_dishwasher", "fg": 2975, "rotates": false }, + { "id": "t_door_gray_o", "fg": 2976, "rotates": false }, + { "id": "t_door_gray_c", "fg": 2977, "rotates": false }, + { "id": "t_door_gray_b", "fg": 2978, "rotates": false }, + { "id": "t_door_red_o", "fg": 2979, "rotates": false }, + { "id": "t_door_red_c", "fg": 2980, "rotates": false }, + { "id": "t_door_red_b", "fg": 2981, "rotates": false }, + { "id": "t_door_green_o", "fg": 2982, "rotates": false }, + { "id": "t_door_green_c", "fg": 2983, "rotates": false }, + { "id": "t_door_green_b", "fg": 2984, "rotates": false }, + { "id": "t_door_white_o", "fg": 2985, "rotates": false }, + { "id": "t_door_white_c", "fg": 2986, "rotates": false }, + { "id": "t_door_white_b", "fg": 2987, "rotates": false }, + { "id": "sponge", "fg": 2988, "rotates": false }, + { "id": "wash_kit", "fg": 2989, "rotates": false }, + { "id": "pouch_autoclave", "fg": 2990, "rotates": false }, + { "id": "f_alien_tendril", "fg": 2991, "rotates": false }, + { + "id": "t_wall_resin", + "fg": 227, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 2993 }, + { "id": "corner", "fg": 2994 }, + { "id": "edge", "fg": 2995 }, + { "id": "end_piece", "fg": 2996 }, + { "id": "t_connection", "fg": 2997 }, + { "id": "unconnected", "fg": 2992 } + ] + }, + { "id": "t_resin_hole_c", "fg": 2998, "rotates": false }, + { "id": "t_resin_hole_o", "fg": 2999, "rotates": false }, + { "id": "t_resin_hole", "fg": 3000, "rotates": false }, + { "id": "t_floor_resin", "fg": 3001, "rotates": false }, + { + "id": "t_wall_resin_cage", + "fg": 227, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 3003 }, + { "id": "corner", "fg": 3004 }, + { "id": "edge", "fg": 3005 }, + { "id": "end_piece", "fg": 3006 }, + { "id": "t_connection", "fg": 3007 }, + { "id": "unconnected", "fg": 3003 } + ] + }, + { "id": "f_alien_pod_organ", "fg": 3008, "rotates": false }, + { "id": "f_alien_pod", "fg": 3009, "rotates": false }, + { "id": "f_alien_pod_resin", "fg": 3010, "rotates": false }, + { "id": "f_alien_anemone", "fg": 3011, "rotates": false }, + { "id": "f_alien_scar", "fg": 3012, "rotates": false }, + { "id": "f_alien_gasper", "fg": 3013, "rotates": false }, + { "id": "f_alien_zapper", "fg": 3014, "rotates": false }, + { + "id": "f_alien_table", + "fg": 227, + "rotates": false, + "multitile": true, + "additional_tiles": [ + { "id": "center", "fg": 3016 }, + { "id": "corner", "fg": 3017 }, + { "id": "edge", "fg": 3018 }, + { "id": "end_piece", "fg": 3019 }, + { "id": "t_connection", "fg": 3020 }, + { "id": "unconnected", "fg": 3015 } + ] + }, + { "id": "tie_bow", "fg": 3021, "rotates": false }, + { "id": "backpack_hiking", "fg": 3022, "rotates": false }, + { "id": "backpack_tactical_large", "fg": 3023, "rotates": false }, + { "id": "backpack_giant", "fg": 3024, "rotates": false }, + { "id": "petpack", "fg": 3025, "rotates": false }, + { "id": "bigback", "fg": 3026, "rotates": false }, + { "id": "travelpack", "fg": 3027, "rotates": false }, + { "id": "guitar_electric", "fg": 3028, "rotates": false }, + { "id": "fp_loyalty_card", "fg": 3029, "rotates": false }, + { + "id": [ "wheel_mount_heavy", "vp_wheel_mount_heavy", "vp_wheel_mount_heavy_steerable" ], + "fg": 3030, + "rotates": false + }, + { + "id": [ "wheel_mount_medium", "vp_wheel_mount_medium", "vp_wheel_mount_medium_steerable" ], + "fg": 3031, + "rotates": false + }, + { + "id": [ "wheel_mount_light", "vp_wheel_mount_light", "vp_wheel_mount_light_steerable" ], + "fg": 3032, + "rotates": false + }, + { "id": "t_tree_juniper", "fg": 3033, "rotates": false }, + { "id": "t_tree_juniper_season_winter", "fg": 3034, "rotates": false }, + { "id": "t_tree_juniper_harvested", "fg": 3035, "rotates": false }, + { "id": "hinge", "fg": 3036, "rotates": false }, + { "id": "wood_sheet", "fg": 3037, "rotates": false }, + { "id": "wood_panel", "fg": 3038, "rotates": false }, + { "id": "condom", "fg": 3039, "rotates": false }, + { "id": "zombie_revival_indicator", "fg": 3040 } + ] + }, + { + "file": "tiles_20x20.png", + "sprite_width": 20, + "sprite_height": 20, + "sprite_offset_x": -5, + "sprite_offset_y": -10, + "tiles": [ + { "id": "mon_dragon_dummy", "fg": 3056, "rotates": false }, + { "id": "mon_tyrannosaurus", "fg": 3057, "rotates": false }, + { "id": "mon_triceratops", "fg": 3058, "rotates": false }, + { "id": "mon_fungaloid_queen", "fg": 3059 }, + { "id": "mon_fungaloid_seeder", "fg": 3060 }, + { "id": "mon_fungaloid_tower", "fg": 3061 }, + { "id": "mon_skeleton_hulk", "fg": 3062, "rotates": false }, + { "id": "mon_zombie_kevlar_2", "fg": 3063, "rotates": false }, + { "id": "mon_zombie_hulk_pk", "fg": 3064, "rotates": false }, + { "id": "mon_zombie_hulk", "fg": 3064, "rotates": false }, + { "id": "overlay_mutation_THRESH_URSINE", "fg": 3065 }, + { "id": "overlay_mutation_THRESH_CATTLE", "fg": 3066 }, + { "id": "overlay_male_mutation_THRESH_CATTLE", "fg": 3067 }, + { "id": "overlay_mutation_THRESH_LIZARD", "fg": 3068 } + ] + }, + { + "file": "fallback.png", + "tiles": [ ], + "ascii": [ + { "offset": 0, "bold": false, "color": "BLACK" }, + { "offset": 256, "bold": true, "color": "WHITE" }, + { "offset": 512, "bold": false, "color": "WHITE" }, + { "offset": 768, "bold": true, "color": "BLACK" }, + { "offset": 1024, "bold": false, "color": "RED" }, + { "offset": 1280, "bold": false, "color": "GREEN" }, + { "offset": 1536, "bold": false, "color": "BLUE" }, + { "offset": 1792, "bold": false, "color": "CYAN" }, + { "offset": 2048, "bold": false, "color": "MAGENTA" }, + { "offset": 2304, "bold": false, "color": "YELLOW" }, + { "offset": 2560, "bold": true, "color": "RED" }, + { "offset": 2816, "bold": true, "color": "GREEN" }, + { "offset": 3072, "bold": true, "color": "BLUE" }, + { "offset": 3328, "bold": true, "color": "CYAN" }, + { "offset": 3584, "bold": true, "color": "MAGENTA" }, + { "offset": 3840, "bold": true, "color": "YELLOW" } + ] + } + ], + "overlay_ordering": [ + { "id": "THRESH_MARLOSS", "order": 400 }, + { "id": [ "bio_armor_legs", "bio_armor_torso", "bio_armor_arms" ], "order": 500 }, + { "id": "bio_armor_head", "order": 505 }, + { "id": "bio_blaster", "order": 510 }, + { "id": "bio_deformity", "order": 515 }, + { "id": [ "active_bio_blindfold", "active_bio_scent_vision" ], "order": 520 }, + { "id": "active_bio_night_vision", "order": 521 }, + { "id": "active_bio_infrared", "order": 522 }, + { + "id": [ + "THRESH_ALPHA", + "THRESH_CHIMERA", + "THRESH_BEAST", + "THRESH_URSINE", + "THRESH_FELINE", + "THRESH_LUPINE", + "THRESH_CATTLE", + "THRESH_RAT", + "THRESH_MOUSE", + "THRESH_TROGLOBITE", + "THRESH_BIRD", + "THRESH_RAPTOR", + "THRESH_LIZARD", + "THRESH_FISH", + "THRESH_CEPHALOPOD", + "THRESH_SPIDER", + "THRESH_INSECT", + "THRESH_PLANT", + "THRESH_MYCUS", + "THRESH_SLIME" + ], + "order": 5000 + }, + { "id": [ "BENDY1", "BENDY2", "BENDY3" ], "order": 5100 }, + { "id": [ "AMORPHOUS", "INT_UP_4", "FLOWERS", "ROSEBUDS" ], "order": 5200 }, + { "id": [ "PER_SLIME", "THRESH_ELFA" ], "order": 5300 }, + { "id": "PER_SLIME_OK", "order": 5400 } + ] +} diff --git a/gfx/RetroDays+Tileset/tiles.png b/gfx/RetroDays+Tileset/tiles.png new file mode 100644 index 0000000000000..729766ab9dd38 Binary files /dev/null and b/gfx/RetroDays+Tileset/tiles.png differ diff --git a/gfx/RetroDays+Tileset/tiles_20x20.png b/gfx/RetroDays+Tileset/tiles_20x20.png new file mode 100644 index 0000000000000..20d4596f967ae Binary files /dev/null and b/gfx/RetroDays+Tileset/tiles_20x20.png differ diff --git a/gfx/RetroDays+Tileset/tileset.txt b/gfx/RetroDays+Tileset/tileset.txt new file mode 100644 index 0000000000000..c1270c625ca8f --- /dev/null +++ b/gfx/RetroDays+Tileset/tileset.txt @@ -0,0 +1,9 @@ +#RETRO DAYS+ TILESET +#Name of the tileset +NAME: retrodays+ +#Viewing (Option) name of the tileset +VIEW: RetroDays+ +#JSON Path - Default of gfx/tile_config.json +JSON: tile_config.json +#Tileset Path - Default of gfx/tinytile.png +TILESET: tiles.png diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index d5dbaa1a2297e..2c7c51f6f2b6e 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -1,88 +1,88 @@ -MESSAGE(STATUS "Process LINGUAS variable --\n") +MESSAGE(STATUS "Process LANGUAGES variable --\n") FIND_PACKAGE(Gettext) IF (NOT GETTEXT_FOUND) - MESSAGE(FATAL_ERROR - "Gettext not found. Install gettext package or diable - localization with: -DLOCALIZE=OFF \nSee INSTALL file for details and more info\n" - ) + MESSAGE(FATAL_ERROR + "Gettext not found. Install gettext package or disable + localization with: -DLOCALIZE=OFF \nSee INSTALL file for details and more info\n" + ) ENDIF (NOT GETTEXT_FOUND) foreach (LANG ${LANGUAGES}) - MESSAGE(STATUS "Add translation for ${LANG}: ${LANG}.po") + MESSAGE(STATUS "Add translation for ${LANG}: ${LANG}.po") endforeach () MESSAGE("\n") # Extract json strings add_custom_target ( - extract_string - COMMAND python lang/extract_json_strings.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + extract_string + COMMAND python lang/extract_json_strings.py + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) # Generate cataclysm-dda.pot add_custom_target ( - translations - COMMAND xgettext --default-domain="cataclysm-dda" - --sort-by-file - --add-comments="~" - --output="${CMAKE_SOURCE_DIR}/lang/po/cataclysm-dda.pot" - --keyword="_" - --keyword="pgettext:1c,2" - --keyword="ngettext:1,2" - --from-code="UTF-8" - ${CMAKE_SOURCE_DIR}/src/*.cpp - ${CMAKE_SOURCE_DIR}/src/*.h - ${CMAKE_SOURCE_DIR}/lang/json/*.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - DEPENDS extract_string + translations + COMMAND xgettext --default-domain="cataclysm-dda" + --sort-by-file + --add-comments="~" + --output="${CMAKE_SOURCE_DIR}/lang/po/cataclysm-dda.pot" + --keyword="_" + --keyword="pgettext:1c,2" + --keyword="ngettext:1,2" + --from-code="UTF-8" + ${CMAKE_SOURCE_DIR}/src/*.cpp + ${CMAKE_SOURCE_DIR}/src/*.h + ${CMAKE_SOURCE_DIR}/lang/json/*.py + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + DEPENDS extract_string ) add_custom_target ( - translations_prepare - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + translations_prepare + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) # Auto-Compile translation on release builds only IF (RELEASE) - add_custom_target ( - translations_compile - ALL - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - DEPENDS translations_prepare - ) + add_custom_target ( + translations_compile + ALL + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + DEPENDS translations_prepare + ) ELSE (RELEASE) - add_custom_target ( - translations_compile - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - DEPENDS translations_prepare - ) + add_custom_target ( + translations_compile + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + DEPENDS translations_prepare + ) ENDIF (RELEASE) foreach (LANG ${LANGUAGES}) - add_custom_command ( - TARGET translations_prepare - PRE_BUILD - COMMAND ${CMAKE_COMMAND} - -E make_directory ${CMAKE_SOURCE_DIR}/lang/mo/${LANG}/LC_MESSAGES - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - add_custom_command ( - TARGET translations_compile - PRE_BUILD - COMMAND - ${GETTEXT_MSGFMT_EXECUTABLE} -f ${CMAKE_SOURCE_DIR}/lang/po/${LANG}.po - -o ${CMAKE_SOURCE_DIR}/lang/mo/${LANG}/LC_MESSAGES/cataclysm-dda.mo - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - IF(RELEASE) - IF (${CMAKE_SYSTEM_NAME} MATCHES Windows) - #install(DIRECTORY ${CMAKE_SOURCE_DIR}/lang/mo/${LANG} DESTINATION ${DATA_PREFIX}) - ELSE (${CMAKE_SYSTEM_NAME} MATCHES Windows) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/lang/mo/${LANG} DESTINATION ${LOCALE_DIR}) - ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Windows) - ENDIF(RELEASE) + add_custom_command ( + TARGET translations_prepare + PRE_BUILD + COMMAND ${CMAKE_COMMAND} + -E make_directory ${CMAKE_SOURCE_DIR}/lang/mo/${LANG}/LC_MESSAGES + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + add_custom_command ( + TARGET translations_compile + PRE_BUILD + COMMAND + ${GETTEXT_MSGFMT_EXECUTABLE} -f ${CMAKE_SOURCE_DIR}/lang/po/${LANG}.po + -o ${CMAKE_SOURCE_DIR}/lang/mo/${LANG}/LC_MESSAGES/cataclysm-dda.mo + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + IF(RELEASE) + IF (${CMAKE_SYSTEM_NAME} MATCHES Windows) + #install(DIRECTORY ${CMAKE_SOURCE_DIR}/lang/mo/${LANG} DESTINATION ${DATA_PREFIX}) + ELSE (${CMAKE_SYSTEM_NAME} MATCHES Windows) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/lang/mo/${LANG} DESTINATION ${LOCALE_DIR}) + ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Windows) + ENDIF(RELEASE) endforeach() diff --git a/lang/extract_json_strings.py b/lang/extract_json_strings.py index 63bc4e9c82fc4..97b86632a1184 100755 --- a/lang/extract_json_strings.py +++ b/lang/extract_json_strings.py @@ -167,13 +167,17 @@ def warning_supressed(filename): "BIONIC_ITEM", "BOOK", "CONTAINER", + "ENGINE", "GENERIC", "GUN", "GUNMOD", + "MAGAZINE", "MONSTER", + "PET_ARMOR", "TOOL", "TOOLMOD", "TOOL_ARMOR", + "WHEEL", } # these objects can be automatically converted, but use format strings diff --git a/lang/po/cataclysm-dda.pot b/lang/po/cataclysm-dda.pot index 13451403f4c52..b77d863a65cd3 100644 --- a/lang/po/cataclysm-dda.pot +++ b/lang/po/cataclysm-dda.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-13 22:54+0800\n" +"POT-Creation-Date: 2019-12-23 00:36+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1913,6 +1913,60 @@ msgid "" "manually." msgstr "" +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of flame." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "" @@ -2681,125 +2735,132 @@ msgid ".40 S&W JHP, reloaded" msgstr "" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" +msgid "40x46mm grenade" msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" +msgid "40x46mm M1006" msgstr "" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm concussive" +msgid "40x46mm M433" msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" +msgid "40x46mm M576" msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" +msgid "40x46mm M651" msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." +"A low velocity 40mm tear gas canister. It is effective for riot control and " +"driving infantry from entrenched positions" msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flechette" +msgid "40x46mm buckshot" msgstr "" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm frag" +msgid "40x46mm slug" msgstr "" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "" -msgstr[1] "" +msgid "40x46mm flechette" +msgstr "" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of flame." +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" +msgid "40x53mm M1001" msgstr "" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M430A1" +msgstr "" + +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" +msgid "40x53mm buckshot" msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "" -msgstr[1] "" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm slug" +msgid "40x53mm flechette" msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." msgstr "" #: lang/json/AMMO_from_json.py @@ -4978,13 +5039,6 @@ msgstr "" msgid "plutonium cell" msgstr "" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "" - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5051,7 +5105,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" @@ -5526,18 +5580,6 @@ msgid "" "Hefty round projectiles cast from lead, useful as ammunition for slings." msgstr "" -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "" - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -5976,7 +6018,7 @@ msgstr[1] "" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py @@ -6566,17 +6608,6 @@ msgstr[1] "" msgid "A plastic basket meant for storing and hauling clothing." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of beekeeping gloves" -msgid_plural "pairs of beekeeping gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of beekeeping gloves -#: lang/json/ARMOR_from_json.py -msgid "A pair of white beekeeping gloves made out of smooth leather." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "beekeeping hood" msgid_plural "beekeeping hoods" @@ -6893,19 +6924,6 @@ msgid "" "Men's boxer shorts. More fashionable than briefs and just as comfortable." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of boxing gloves" -msgid_plural "pairs of boxing gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of boxing gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of big, red, 8 oz. boxing gloves. They make dexterous tasks near " -"impossible, but provide ample protection." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "boy shorts" msgid_plural "boy shorts" @@ -7136,32 +7154,6 @@ msgid "" "small straps designed to better distribute the weight." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of chainmail chausses" -msgid_plural "pairs of chainmail chausses" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of chainmail chausses -#: lang/json/ARMOR_from_json.py -msgid "" -"Customized chainmail chausses that cover the feet, like booties made of " -"chainmail." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of chainmail gloves" -msgid_plural "pairs of chainmail gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of chainmail gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"Customized chainmail gloves. They fully enclose the fingers and provide " -"excellent protection, but are somewhat cumbersome." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "faraday chainmail suit" msgid_plural "faraday chainmail suits" @@ -7850,46 +7842,6 @@ msgstr[1] "" msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "fencing gauntlet" -msgid_plural "fencing gauntlets" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for fencing gauntlet -#: lang/json/ARMOR_from_json.py -msgid "" -"A single suede glove with sturdy cotton wrists, padded backs and well-" -"fitting fingers." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "fencing gauntlet (left)" -msgid_plural "fencing gauntlet (left)s" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for fencing gauntlet (left) -#: lang/json/ARMOR_from_json.py -msgid "" -"A single suede glove with sturdy cotton wrists, padded backs and well-" -"fitting fingers. This one is left-handed." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of fire gauntlets" -msgid_plural "pairs of fire gauntlets" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of fire gauntlets -#: lang/json/ARMOR_from_json.py -msgid "" -"A heavy pair of gloves, used by firefighters and metalworkers for heat " -"protection. Highly resistant to heat and flame, they provide excellent " -"protection from injury." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "firefighter helmet" msgid_plural "firefighter helmets" @@ -8039,42 +7991,6 @@ msgid "" "other armor. Or worn on its own, if you can't afford proper armor." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of chitinous gauntlets" -msgid_plural "pairs of chitinous gauntlets" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of chitinous gauntlets -#: lang/json/ARMOR_from_json.py -msgid "" -"Gauntlets made from the exoskeletons of insects. Very light and durable." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of biosilicified chitin gauntlets" -msgid_plural "pairs of biosilicified chitin gauntlets" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of biosilicified chitin gauntlets -#: lang/json/ARMOR_from_json.py -msgid "" -"Gauntlets crafted from the carefully cleaned and pruned biosilicified " -"exoskeletons of acidic ants. Acid-resistant and very durable." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of leather armor gauntlets" -msgid_plural "pairs of leather armor gauntlets" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of leather armor gauntlets -#: lang/json/ARMOR_from_json.py -msgid "Heavy fingerless leather gloves. Very flexible and comfortable." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "pair of ballistic glasses" msgid_plural "pairs of ballistic glasses" @@ -8168,341 +8084,6 @@ msgid "" "many other places. Provides great protection from damage." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "white glove" -msgid_plural "white gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for white glove -#: lang/json/ARMOR_from_json.py -msgid "A single white glove covered with hundreds of rhinestones." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of bag gloves" -msgid_plural "pairs of bag gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of bag gloves -#: lang/json/ARMOR_from_json.py -msgid "A pair of disposable plastic bags, adapted to be used as gloves." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of fingerless gloves" -msgid_plural "pairs of fingerless gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of fingerless gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of leather gloves with no fingers, allowing greater manual dexterity." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of armored fingerless gloves" -msgid_plural "pairs of armored fingerless gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of armored fingerless gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of leather gloves with no fingers, allowing greater manual " -"dexterity. These have been crudely reinforced with steel guards across the " -"back." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of survivor firegloves" -msgid_plural "pairs of survivor firegloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of survivor firegloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of customized, Kevlar armored Nomex gloves, modified to be easy to " -"wear while providing maximum protection under extreme conditions." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of fur gloves" -msgid_plural "pairs of fur gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of fur gloves -#: lang/json/ARMOR_from_json.py -msgid "A pair of warm fur gloves. They are somewhat cumbersome." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of heavy survivor gloves" -msgid_plural "pairs of heavy survivor gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of heavy survivor gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of heavily customized, steel-backed armored Kevlar gloves, modified " -"to be easy to wear while providing maximum protection under extreme " -"conditions." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of leather gloves" -msgid_plural "pairs of leather gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of leather gloves -#: lang/json/ARMOR_from_json.py -msgid "A thin pair of black leather gloves." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of light gloves" -msgid_plural "pairs of light gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of light gloves -#: lang/json/ARMOR_from_json.py -msgid "A pair of cotton gloves." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of glove liners" -msgid_plural "pairs of glove liners" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of glove liners -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of thin cotton gloves. Often used as a liner beneath other gloves." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of light survivor gloves" -msgid_plural "pairs of light survivor gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of light survivor gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of customized, Kevlar armored cloth gloves, modified to be easy to " -"wear while providing maximum protection under extreme conditions." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of fingerless survivor gloves" -msgid_plural "pairs of fingerless survivor gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of fingerless survivor gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of customized, Kevlar armored cloth gloves with no fingers, modified " -"to be easy to wear while providing maximum protection under extreme " -"conditions." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of medical gloves" -msgid_plural "pairs of medical gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of medical gloves -#: lang/json/ARMOR_from_json.py -msgid "A pair of thin latex gloves, designed to limit the spread of disease." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of armored gauntlets" -msgid_plural "pairs of armored gauntlets" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of armored gauntlets -#: lang/json/ARMOR_from_json.py -msgid "An extremely heavy set of armor-plated leather gloves." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of rubber gloves" -msgid_plural "pairs of rubber gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of rubber gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of rubber gloves, often used while cleaning with caustic materials." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of survivor gloves" -msgid_plural "pairs of survivor gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of survivor gloves -#. ~ Description for pair of black dragonhide gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of customized, Kevlar armored leather gloves, modified to be easy to " -"wear while providing maximum protection under extreme conditions." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of tactical gloves" -msgid_plural "pairs of tactical gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of tactical gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of reinforced Kevlar tactical gloves. Commonly used by police and " -"military units." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of winter gloves" -msgid_plural "pairs of winter gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of winter gloves -#: lang/json/ARMOR_from_json.py -msgid "A pair of padded gloves. Cumbersome, but warm." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of wool gloves" -msgid_plural "pairs of wool gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of wool gloves -#: lang/json/ARMOR_from_json.py -msgid "A thick pair of wool gloves. Cumbersome, but warm." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of work gloves" -msgid_plural "pairs of work gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of work gloves -#: lang/json/ARMOR_from_json.py -msgid "A tough pair of gloves, for tough everyday work." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of cut resistant gloves" -msgid_plural "pairs of cut resistant gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of cut resistant gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of cut resistant gloves, useful when rapidly breaking down carcasses." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of hand wraps" -msgid_plural "pairs of hand wraps" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of hand wraps -#: lang/json/ARMOR_from_json.py -msgid "" -"Long pieces of cloth that are meant to be wrapped around your hands. " -"Provide small amounts of protection while punching and performing other " -"general mischief." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of fur hand wraps" -msgid_plural "pairs of fur hand wraps" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of fur hand wraps -#: lang/json/ARMOR_from_json.py -msgid "" -"Pieces of animal pelt that are meant to be wrapped around your hands. " -"Provide small amounts of protection while punching and performing other " -"general mischief." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of leather hand wraps" -msgid_plural "pairs of leather hand wraps" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of leather hand wraps -#: lang/json/ARMOR_from_json.py -msgid "" -"Pieces of leather that are meant to be wrapped around your hands. Provide " -"small amounts of protection while punching and performing other general " -"mischief." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of wool hand wraps" -msgid_plural "pairs of wool hand wraps" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of wool hand wraps -#: lang/json/ARMOR_from_json.py -msgid "" -"Long pieces of wool that are meant to be wrapped around your hands. Provide " -"small amounts of protection while punching and performing other general " -"mischief." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of winter survivor gloves" -msgid_plural "pairs of winter survivor gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of winter survivor gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of customized, Kevlar armored fur gloves, modified to be easy to wear " -"while providing maximum protection under extreme conditions." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of XL survivor gloves" -msgid_plural "pairs of XL survivor gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of XL survivor gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A massive pair of customized, Kevlar armored leather gloves, modified to be " -"easy to wear while providing maximum protection under extreme conditions." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "go bag" msgid_plural "go bags" @@ -9874,17 +9455,6 @@ msgstr[1] "" msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of fetlock furs" -msgid_plural "pairs of fetlock furs" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of fetlock furs -#: lang/json/ARMOR_from_json.py -msgid "Snug fur sleeves to keep your fetlocks warm." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "leggings" msgid_plural "leggings" @@ -10098,17 +9668,6 @@ msgid "" "your modesty, but not much else." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of extra long white gloves" -msgid_plural "pairs of extra long white gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of extra long white gloves -#: lang/json/ARMOR_from_json.py -msgid "Long white costume gloves." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "long underwear bottom" msgid_plural "long underwear bottoms" @@ -10278,17 +9837,6 @@ msgid "" "rioters to hide their identity." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of mittens" -msgid_plural "pairs of mittens" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of mittens -#: lang/json/ARMOR_from_json.py -msgid "A pair of warm mittens. They are extremely cumbersome." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "motorcycle armor" msgid_plural "motorcycle armors" @@ -10335,20 +9883,6 @@ msgstr[1] "" msgid "Apparently the microskirt wasn't short enough." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of flame-resistant gloves" -msgid_plural "pairs of flame-resistant gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of flame-resistant gloves -#: lang/json/ARMOR_from_json.py -msgid "" -"A snug fitting pair of gloves made from thin and lightweight Nomex fire-" -"resistant fabric. Tough yet breathable, they are light and comfortable to " -"wear under clothing." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "flame-resistant hood" msgid_plural "flame-resistant hoods" @@ -10363,20 +9897,6 @@ msgid "" "and comfortable to wear under clothing." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of flame-resistant socks" -msgid_plural "pairs of flame-resistant socks" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of flame-resistant socks -#: lang/json/ARMOR_from_json.py -msgid "" -"A snug fitting pair of stockings made from thin and lightweight Nomex fire-" -"resistant fabric. Tough yet breathable, they are light and comfortable to " -"wear under clothing." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "flame-resistant suit" msgid_plural "flame-resistant suits" @@ -10509,7 +10029,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" +msgid_plural "faux fur pants" msgstr[0] "" msgstr[1] "" @@ -11172,64 +10692,6 @@ msgstr[1] "" msgid "Perfect for reading all those books you scavenged." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of sock mitts" -msgid_plural "pairs of sock mitts" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of sock mitts -#: lang/json/ARMOR_from_json.py -msgid "" -"A pair of improvised gloves made from socks with holes poked through them." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of socks" -msgid_plural "pairs of socks" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of socks -#: lang/json/ARMOR_from_json.py -msgid "Socks. Put 'em on your feet." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of bag socks" -msgid_plural "pairs of bag socks" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of bag socks -#: lang/json/ARMOR_from_json.py -msgid "A pair of disposable plastic bags, adapted to be used as socks." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of disposable bowling socks" -msgid_plural "pairs of disposable bowling socks" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of disposable bowling socks -#: lang/json/ARMOR_from_json.py -msgid "" -"Cheap one time socks. Can keep your feet clean, but too thin to give any " -"protection." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of wool socks" -msgid_plural "pairs of wool socks" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of wool socks -#: lang/json/ARMOR_from_json.py -msgid "Warm socks made of wool." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "sports bra" msgid_plural "sports bras" @@ -11259,44 +10721,6 @@ msgid "" "Because of this your walking speed is impaired while wearing it." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of stockings" -msgid_plural "pairs of stockings" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of stockings -#: lang/json/ARMOR_from_json.py -msgid "" -"Long cotton socks that reach above the knees to help protect from the cold." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of tentacle sleeves" -msgid_plural "pairs of tentacle sleeves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of tentacle sleeves -#: lang/json/ARMOR_from_json.py -msgid "" -"Long cotton tubes sized to fit over tentacles and help protect them from the " -"cold." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of tentacle stockings" -msgid_plural "pairs of tentacle stockings" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of tentacle stockings -#: lang/json/ARMOR_from_json.py -msgid "" -"Six long cotton tubes sized to fit over tentacles and help protect them from " -"the cold." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "straw basket" msgid_plural "straw baskets" @@ -11513,28 +10937,6 @@ msgstr[1] "" msgid "A thick cotton shirt. Provides warmth and a bit of padding." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of tabi" -msgid_plural "pairs of tabi" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of tabi -#: lang/json/ARMOR_from_json.py -msgid "A pair of black tabi, as worn with traditional Japanese clothes." -msgstr "" - -#: lang/json/ARMOR_from_json.py -msgid "pair of gi tabi" -msgid_plural "pairs of gi tabi" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of gi tabi -#: lang/json/ARMOR_from_json.py -msgid "A pair of white tabi, as used by martial arts practitioners." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "tactical full helmet" msgid_plural "tactical full helmets" @@ -12054,17 +11456,6 @@ msgid "" "would be too casual and a suit would be just overdoing it." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of army winter gloves" -msgid_plural "pairs of army winter gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of army winter gloves -#: lang/json/ARMOR_from_json.py -msgid "A pair of padded gloves. Favored by the military." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "army winter jacket" msgid_plural "army winter jackets" @@ -12185,7 +11576,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" +msgid_plural "violin cases" msgstr[0] "" msgstr[1] "" @@ -12255,17 +11646,6 @@ msgid "" "mask for full protection." msgstr "" -#: lang/json/ARMOR_from_json.py -msgid "pair of golfing gloves" -msgid_plural "pairs of golfing gloves" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of golfing gloves -#: lang/json/ARMOR_from_json.py -msgid "A thin pair of black leather golfing gloves." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "golf cap" msgid_plural "golf caps" @@ -13875,6 +13255,668 @@ msgstr "" msgid "A pair of sneakers with wheels, currently the wheels are out." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "pair of chainmail chausses" +msgid_plural "pairs of chainmail chausses" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of chainmail chausses +#: lang/json/ARMOR_from_json.py +msgid "" +"Customized chainmail chausses that cover the feet, like booties made of " +"chainmail." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of fetlock furs" +msgid_plural "pairs of fetlock furs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of fetlock furs +#: lang/json/ARMOR_from_json.py +msgid "Snug fur sleeves to keep your fetlocks warm." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of flame-resistant socks" +msgid_plural "pairs of flame-resistant socks" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of flame-resistant socks +#: lang/json/ARMOR_from_json.py +msgid "" +"A snug fitting pair of stockings made from thin and lightweight Nomex fire-" +"resistant fabric. Tough yet breathable, they are light and comfortable to " +"wear under clothing." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of socks" +msgid_plural "pairs of socks" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of socks +#: lang/json/ARMOR_from_json.py +msgid "Socks. Put 'em on your feet." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of bag socks" +msgid_plural "pairs of bag socks" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of bag socks +#: lang/json/ARMOR_from_json.py +msgid "A pair of disposable plastic bags, adapted to be used as socks." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of disposable bowling socks" +msgid_plural "pairs of disposable bowling socks" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of disposable bowling socks +#: lang/json/ARMOR_from_json.py +msgid "" +"Cheap one time socks. Can keep your feet clean, but too thin to give any " +"protection." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of wool socks" +msgid_plural "pairs of wool socks" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of wool socks +#: lang/json/ARMOR_from_json.py +msgid "Warm socks made of wool." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of stockings" +msgid_plural "pairs of stockings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of stockings +#: lang/json/ARMOR_from_json.py +msgid "" +"Long cotton socks that reach above the knees to help protect from the cold." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tentacle stockings" +msgid_plural "pairs of tentacle stockings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tentacle stockings +#: lang/json/ARMOR_from_json.py +msgid "" +"Six long cotton tubes sized to fit over tentacles and help protect them from " +"the cold." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tabi" +msgid_plural "pairs of tabi" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tabi +#: lang/json/ARMOR_from_json.py +msgid "A pair of black tabi, as worn with traditional Japanese clothes." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of gi tabi" +msgid_plural "pairs of gi tabi" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of gi tabi +#: lang/json/ARMOR_from_json.py +msgid "A pair of white tabi, as used by martial arts practitioners." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of beekeeping gloves" +msgid_plural "pairs of beekeeping gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of beekeeping gloves +#: lang/json/ARMOR_from_json.py +msgid "A pair of white beekeeping gloves made out of smooth leather." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of boxing gloves" +msgid_plural "pairs of boxing gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of boxing gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of big, red, 8 oz. boxing gloves. They make dexterous tasks near " +"impossible, but provide ample protection." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of chainmail gloves" +msgid_plural "pairs of chainmail gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of chainmail gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"Customized chainmail gloves. They fully enclose the fingers and provide " +"excellent protection, but are somewhat cumbersome." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of fire gauntlets" +msgid_plural "pairs of fire gauntlets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of fire gauntlets +#: lang/json/ARMOR_from_json.py +msgid "" +"A heavy pair of gloves, used by firefighters and metalworkers for heat " +"protection. Highly resistant to heat and flame, they provide excellent " +"protection from injury." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of chitinous gauntlets" +msgid_plural "pairs of chitinous gauntlets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of chitinous gauntlets +#: lang/json/ARMOR_from_json.py +msgid "" +"Gauntlets made from the exoskeletons of insects. Very light and durable." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of biosilicified chitin gauntlets" +msgid_plural "pairs of biosilicified chitin gauntlets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of biosilicified chitin gauntlets +#: lang/json/ARMOR_from_json.py +msgid "" +"Gauntlets crafted from the carefully cleaned and pruned biosilicified " +"exoskeletons of acidic ants. Acid-resistant and very durable." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "fencing gauntlet" +msgid_plural "fencing gauntlets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for fencing gauntlet +#: lang/json/ARMOR_from_json.py +msgid "" +"A single suede glove with sturdy cotton wrists, padded backs and well-" +"fitting fingers." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "fencing gauntlet (left)" +msgid_plural "fencing gauntlet (left)s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for fencing gauntlet (left) +#: lang/json/ARMOR_from_json.py +msgid "" +"A single suede glove with sturdy cotton wrists, padded backs and well-" +"fitting fingers. This one is left-handed." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of leather armor gauntlets" +msgid_plural "pairs of leather armor gauntlets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of leather armor gauntlets +#: lang/json/ARMOR_from_json.py +msgid "Heavy fingerless leather gloves. Very flexible and comfortable." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of bag gloves" +msgid_plural "pairs of bag gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of bag gloves +#: lang/json/ARMOR_from_json.py +msgid "A pair of disposable plastic bags, adapted to be used as gloves." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of fingerless gloves" +msgid_plural "pairs of fingerless gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of fingerless gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of leather gloves with no fingers, allowing greater manual dexterity." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of armored fingerless gloves" +msgid_plural "pairs of armored fingerless gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of armored fingerless gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of leather gloves with no fingers, allowing greater manual " +"dexterity. These have been crudely reinforced with steel guards across the " +"back." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of survivor firegloves" +msgid_plural "pairs of survivor firegloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of survivor firegloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of customized, Kevlar armored Nomex gloves, modified to be easy to " +"wear while providing maximum protection under extreme conditions." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of fur gloves" +msgid_plural "pairs of fur gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of fur gloves +#: lang/json/ARMOR_from_json.py +msgid "A pair of warm fur gloves. They are somewhat cumbersome." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of heavy survivor gloves" +msgid_plural "pairs of heavy survivor gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of heavy survivor gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of heavily customized, steel-backed armored Kevlar gloves, modified " +"to be easy to wear while providing maximum protection under extreme " +"conditions." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "white glove" +msgid_plural "white gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for white glove +#: lang/json/ARMOR_from_json.py +msgid "A single white glove covered with hundreds of rhinestones." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of leather gloves" +msgid_plural "pairs of leather gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of leather gloves +#: lang/json/ARMOR_from_json.py +msgid "A thin pair of black leather gloves." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of light gloves" +msgid_plural "pairs of light gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of light gloves +#: lang/json/ARMOR_from_json.py +msgid "A pair of cotton gloves." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of glove liners" +msgid_plural "pairs of glove liners" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of glove liners +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of thin cotton gloves. Often used as a liner beneath other gloves." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of light survivor gloves" +msgid_plural "pairs of light survivor gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of light survivor gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of customized, Kevlar armored cloth gloves, modified to be easy to " +"wear while providing maximum protection under extreme conditions." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of fingerless survivor gloves" +msgid_plural "pairs of fingerless survivor gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of fingerless survivor gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of customized, Kevlar armored cloth gloves with no fingers, modified " +"to be easy to wear while providing maximum protection under extreme " +"conditions." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of medical gloves" +msgid_plural "pairs of medical gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of medical gloves +#: lang/json/ARMOR_from_json.py +msgid "A pair of thin latex gloves, designed to limit the spread of disease." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of armored gauntlets" +msgid_plural "pairs of armored gauntlets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of armored gauntlets +#: lang/json/ARMOR_from_json.py +msgid "An extremely heavy set of armor-plated leather gloves." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of rubber gloves" +msgid_plural "pairs of rubber gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of rubber gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of rubber gloves, often used while cleaning with caustic materials." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of survivor gloves" +msgid_plural "pairs of survivor gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of survivor gloves +#. ~ Description for pair of black dragonhide gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of customized, Kevlar armored leather gloves, modified to be easy to " +"wear while providing maximum protection under extreme conditions." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tactical gloves" +msgid_plural "pairs of tactical gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tactical gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of reinforced Kevlar tactical gloves. Commonly used by police and " +"military units." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of winter gloves" +msgid_plural "pairs of winter gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of winter gloves +#: lang/json/ARMOR_from_json.py +msgid "A pair of padded gloves. Cumbersome, but warm." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of wool gloves" +msgid_plural "pairs of wool gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of wool gloves +#: lang/json/ARMOR_from_json.py +msgid "A thick pair of wool gloves. Cumbersome, but warm." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of work gloves" +msgid_plural "pairs of work gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of work gloves +#: lang/json/ARMOR_from_json.py +msgid "A tough pair of gloves, for tough everyday work." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of cut resistant gloves" +msgid_plural "pairs of cut resistant gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of cut resistant gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of cut resistant gloves, useful when rapidly breaking down carcasses." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of hand wraps" +msgid_plural "pairs of hand wraps" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of hand wraps +#: lang/json/ARMOR_from_json.py +msgid "" +"Long pieces of cloth that are meant to be wrapped around your hands. " +"Provide small amounts of protection while punching and performing other " +"general mischief." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of fur hand wraps" +msgid_plural "pairs of fur hand wraps" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of fur hand wraps +#: lang/json/ARMOR_from_json.py +msgid "" +"Pieces of animal pelt that are meant to be wrapped around your hands. " +"Provide small amounts of protection while punching and performing other " +"general mischief." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of leather hand wraps" +msgid_plural "pairs of leather hand wraps" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of leather hand wraps +#: lang/json/ARMOR_from_json.py +msgid "" +"Pieces of leather that are meant to be wrapped around your hands. Provide " +"small amounts of protection while punching and performing other general " +"mischief." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of wool hand wraps" +msgid_plural "pairs of wool hand wraps" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of wool hand wraps +#: lang/json/ARMOR_from_json.py +msgid "" +"Long pieces of wool that are meant to be wrapped around your hands. Provide " +"small amounts of protection while punching and performing other general " +"mischief." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of winter survivor gloves" +msgid_plural "pairs of winter survivor gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of winter survivor gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of customized, Kevlar armored fur gloves, modified to be easy to wear " +"while providing maximum protection under extreme conditions." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of XL survivor gloves" +msgid_plural "pairs of XL survivor gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of XL survivor gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A massive pair of customized, Kevlar armored leather gloves, modified to be " +"easy to wear while providing maximum protection under extreme conditions." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of extra long white gloves" +msgid_plural "pairs of extra long white gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of extra long white gloves +#: lang/json/ARMOR_from_json.py +msgid "Long white costume gloves." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of mittens" +msgid_plural "pairs of mittens" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of mittens +#: lang/json/ARMOR_from_json.py +msgid "A pair of warm mittens. They are extremely cumbersome." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of flame-resistant gloves" +msgid_plural "pairs of flame-resistant gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of flame-resistant gloves +#: lang/json/ARMOR_from_json.py +msgid "" +"A snug fitting pair of gloves made from thin and lightweight Nomex fire-" +"resistant fabric. Tough yet breathable, they are light and comfortable to " +"wear under clothing." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sock mitts" +msgid_plural "pairs of sock mitts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sock mitts +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of improvised gloves made from socks with holes poked through them." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tentacle sleeves" +msgid_plural "pairs of tentacle sleeves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tentacle sleeves +#: lang/json/ARMOR_from_json.py +msgid "" +"Long cotton tubes sized to fit over tentacles and help protect them from the " +"cold." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of army winter gloves" +msgid_plural "pairs of army winter gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of army winter gloves +#: lang/json/ARMOR_from_json.py +msgid "A pair of padded gloves. Favored by the military." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of golfing gloves" +msgid_plural "pairs of golfing gloves" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of golfing gloves +#: lang/json/ARMOR_from_json.py +msgid "A thin pair of black leather golfing gloves." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "back holster" msgid_plural "back holsters" @@ -14057,7 +14099,7 @@ msgid_plural "diamond dental grills" msgstr[0] "" msgstr[1] "" -#. ~ Description for diamond dental grill +#. ~ Description for {'str': 'diamond dental grill'} #: lang/json/ARMOR_from_json.py msgid "" "Fake teeth inlaid with diamonds, worn over the teeth. Fits horribly, but " @@ -14065,12 +14107,146 @@ msgid "" msgstr "" #: lang/json/ARMOR_from_json.py -msgid "diamond ring" -msgid_plural "diamond rings" +msgid "garnet dental grill" +msgid_plural "garnet dental grills" msgstr[0] "" msgstr[1] "" -#. ~ Description for diamond ring +#. ~ Description for {'str': 'garnet dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'amethyst dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'aquamarine dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'emerald dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'alexandrite dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'ruby dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'peridot dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'sapphire dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'tourmaline dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'citrine dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue topaz dental grill" +msgid_plural "blue topaz dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'blue topaz dental grill'} +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "diamond and gold ring" +msgid_plural "diamond and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'diamond and gold ring'} #: lang/json/ARMOR_from_json.py msgid "" "A gold ring with a sparkling diamond mounted on top of it. Back in the old " @@ -14927,6 +15103,1631 @@ msgid "" "behind you when you walk." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of diamond and gold earrings', 'str_pl': 'pairs of diamond and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of garnet and gold earrings', 'str_pl': 'pairs of garnet and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of amethyst and gold earrings', 'str_pl': 'pairs of amethyst and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of aquamarine and gold earrings', 'str_pl': 'pairs of aquamarine and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of emerald and gold earrings', 'str_pl': 'pairs of emerald and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of alexandrite and gold earrings', 'str_pl': 'pairs of alexandrite and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of ruby and gold earrings', 'str_pl': 'pairs of ruby and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it " +"won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of peridot and gold earrings', 'str_pl': 'pairs of peridot and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of sapphire and gold earrings', 'str_pl': 'pairs of sapphire and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of tourmaline and gold earrings', 'str_pl': 'pairs of tourmaline and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of citrine and gold earrings', 'str_pl': 'pairs of citrine and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of blue topaz and gold earrings', 'str_pl': 'pairs of blue topaz and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of opal and gold earrings', 'str_pl': 'pairs of opal and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it " +"won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of pearl and gold earrings', 'str_pl': 'pairs of pearl and gold earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of diamond and silver earrings', 'str_pl': 'pairs of diamond and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of garnet and silver earrings', 'str_pl': 'pairs of garnet and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of amethyst and silver earrings', 'str_pl': 'pairs of amethyst and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of aquamarine and silver earrings', 'str_pl': 'pairs of aquamarine and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of emerald and silver earrings', 'str_pl': 'pairs of emerald and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of alexandrite and silver earrings', 'str_pl': 'pairs of alexandrite and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of ruby and silver earrings', 'str_pl': 'pairs of ruby and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of peridot and silver earrings', 'str_pl': 'pairs of peridot and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of sapphire and silver earrings', 'str_pl': 'pairs of sapphire and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of tourmaline and silver earrings', 'str_pl': 'pairs of tourmaline and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of citrine and silver earrings', 'str_pl': 'pairs of citrine and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of blue topaz and silver earrings', 'str_pl': 'pairs of blue topaz and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of opal and silver earrings', 'str_pl': 'pairs of opal and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of pearl and silver earrings', 'str_pl': 'pairs of pearl and silver earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of diamond and platinum earrings', 'str_pl': 'pairs of diamond and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of garnet and platinum earrings', 'str_pl': 'pairs of garnet and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of amethyst and platinum earrings', 'str_pl': 'pairs of amethyst and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of aquamarine and platinum earrings', 'str_pl': 'pairs of aquamarine and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of emerald and platinum earrings', 'str_pl': 'pairs of emerald and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of alexandrite and platinum earrings', 'str_pl': 'pairs of alexandrite and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of ruby and platinum earrings', 'str_pl': 'pairs of ruby and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of peridot and platinum earrings', 'str_pl': 'pairs of peridot and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of sapphire and platinum earrings', 'str_pl': 'pairs of sapphire and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of tourmaline and platinum earrings', 'str_pl': 'pairs of tourmaline and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of citrine and platinum earrings', 'str_pl': 'pairs of citrine and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of blue topaz and platinum earrings', 'str_pl': 'pairs of blue topaz and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of opal and platinum earrings', 'str_pl': 'pairs of opal and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pair of pearl and platinum earrings', 'str_pl': 'pairs of pearl and platinum earrings'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "garnet and gold ring" +msgid_plural "garnet and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'garnet and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a garnet mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst and gold ring" +msgid_plural "amethyst and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'amethyst and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a amethyst mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine and gold ring" +msgid_plural "aquamarine and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'aquamarine and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a aquamarine mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald and gold ring" +msgid_plural "emerald and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'emerald and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a emerald mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite and gold ring" +msgid_plural "alexandrite and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'alexandrite and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a alexandrite mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby and gold ring" +msgid_plural "ruby and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'ruby and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a ruby mounted on top of it. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot and gold ring" +msgid_plural "peridot and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'peridot and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a peridot mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire and gold ring" +msgid_plural "sapphire and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'sapphire and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a sapphire mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline and gold ring" +msgid_plural "tourmaline and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'tourmaline and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a tourmaline mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine and gold ring" +msgid_plural "citrine and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'citrine and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a citrine mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue topaz and gold ring" +msgid_plural "blue topaz and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'blue topaz and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a blue topaz mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "opal and gold ring" +msgid_plural "opal and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'opal and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a opal mounted on top of it. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pearl and gold ring" +msgid_plural "pearl and gold rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pearl and gold ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold ring with a pearl mounted on top of it. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "diamond and silver ring" +msgid_plural "diamond and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'diamond and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a diamond mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "garnet and silver ring" +msgid_plural "garnet and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'garnet and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a garnet mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst and silver ring" +msgid_plural "amethyst and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'amethyst and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a amethyst mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine and silver ring" +msgid_plural "aquamarine and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'aquamarine and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a aquamarine mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald and silver ring" +msgid_plural "emerald and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'emerald and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a emerald mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite and silver ring" +msgid_plural "alexandrite and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'alexandrite and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a alexandrite mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby and silver ring" +msgid_plural "ruby and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'ruby and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a ruby mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot and silver ring" +msgid_plural "peridot and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'peridot and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a peridot mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire and silver ring" +msgid_plural "sapphire and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'sapphire and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a sapphire mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline and silver ring" +msgid_plural "tourmaline and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'tourmaline and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a tourmaline mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine and silver ring" +msgid_plural "citrine and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'citrine and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a citrine mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue topaz and silver ring" +msgid_plural "blue topaz and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'blue topaz and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a blue topaz mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "opal and silver ring" +msgid_plural "opal and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'opal and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a opal mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pearl and silver ring" +msgid_plural "pearl and silver rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pearl and silver ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver ring with a pearl mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "diamond and platinum ring" +msgid_plural "diamond and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'diamond and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a diamond mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "garnet and platinum ring" +msgid_plural "garnet and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'garnet and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a garnet mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst and platinum ring" +msgid_plural "amethyst and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'amethyst and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a amethyst mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine and platinum ring" +msgid_plural "aquamarine and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'aquamarine and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a aquamarine mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald and platinum ring" +msgid_plural "emerald and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'emerald and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a emerald mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite and platinum ring" +msgid_plural "alexandrite and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'alexandrite and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a alexandrite mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby and platinum ring" +msgid_plural "ruby and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'ruby and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a ruby mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot and platinum ring" +msgid_plural "peridot and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'peridot and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a peridot mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire and platinum ring" +msgid_plural "sapphire and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'sapphire and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a sapphire mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline and platinum ring" +msgid_plural "tourmaline and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'tourmaline and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a tourmaline mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine and platinum ring" +msgid_plural "citrine and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'citrine and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a citrine mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue topaz and platinum ring" +msgid_plural "blue topaz and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'blue topaz and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a blue topaz mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "opal and platinum ring" +msgid_plural "opal and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'opal and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a opal mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pearl and platinum ring" +msgid_plural "pearl and platinum rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pearl and platinum ring'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum ring with a pearl mounted on top of it. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "diamond and gold bracelet" +msgid_plural "diamond and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'diamond and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling diamonds. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "garnet and gold bracelet" +msgid_plural "garnet and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'garnet and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling garnets. You can wear it if you like, but it " +"won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst and gold bracelet" +msgid_plural "amethyst and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'amethyst and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling amethysts. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine and gold bracelet" +msgid_plural "aquamarine and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'aquamarine and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling aquamarines. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald and gold bracelet" +msgid_plural "emerald and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'emerald and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling emeralds. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite and gold bracelet" +msgid_plural "alexandrite and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'alexandrite and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling alexandrites. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby and gold bracelet" +msgid_plural "ruby and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'ruby and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling rubies. You can wear it if you like, but it " +"won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot and gold bracelet" +msgid_plural "peridot and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'peridot and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling peridots. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire and gold bracelet" +msgid_plural "sapphire and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'sapphire and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling sapphires. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline and gold bracelet" +msgid_plural "tourmaline and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'tourmaline and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling tourmalines. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine and gold bracelet" +msgid_plural "citrine and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'citrine and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling citrines. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue topaz and gold bracelet" +msgid_plural "blue topaz and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'blue topaz and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with sparkling blue topaz. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "opal and gold bracelet" +msgid_plural "opal and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'opal and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with opals. You can wear it if you like, but it won't " +"provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pearl and gold bracelet" +msgid_plural "pearl and gold bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pearl and gold bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A gold bracelet with pearls. You can wear it if you like, but it won't " +"provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "diamond and silver bracelet" +msgid_plural "diamond and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'diamond and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling diamonds. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "garnet and silver bracelet" +msgid_plural "garnet and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'garnet and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling garnets. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst and silver bracelet" +msgid_plural "amethyst and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'amethyst and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling amethysts. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine and silver bracelet" +msgid_plural "aquamarine and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'aquamarine and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling aquamarines. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald and silver bracelet" +msgid_plural "emerald and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'emerald and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling emeralds. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite and silver bracelet" +msgid_plural "alexandrite and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'alexandrite and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling alexandrites. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby and silver bracelet" +msgid_plural "ruby and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'ruby and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling rubies. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot and silver bracelet" +msgid_plural "peridot and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'peridot and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling peridots. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire and silver bracelet" +msgid_plural "sapphire and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'sapphire and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling sapphires. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline and silver bracelet" +msgid_plural "tourmaline and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'tourmaline and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling tourmalines. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine and silver bracelet" +msgid_plural "citrine and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'citrine and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling citrines. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue topaz and silver bracelet" +msgid_plural "blue topaz and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'blue topaz and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with sparkling blue topaz. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "opal and silver bracelet" +msgid_plural "opal and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'opal and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with opals. You can wear it if you like, but it won't " +"provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pearl and silver bracelet" +msgid_plural "pearl and silver bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pearl and silver bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A silver bracelet with pearls. You can wear it if you like, but it won't " +"provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "diamond and platinum bracelet" +msgid_plural "diamond and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'diamond and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling diamonds. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "garnet and platinum bracelet" +msgid_plural "garnet and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'garnet and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling garnets. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst and platinum bracelet" +msgid_plural "amethyst and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'amethyst and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling amethysts. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine and platinum bracelet" +msgid_plural "aquamarine and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'aquamarine and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling aquamarines. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald and platinum bracelet" +msgid_plural "emerald and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'emerald and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling emeralds. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite and platinum bracelet" +msgid_plural "alexandrite and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'alexandrite and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling alexandrites. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby and platinum bracelet" +msgid_plural "ruby and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'ruby and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling rubies. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot and platinum bracelet" +msgid_plural "peridot and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'peridot and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling peridots. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire and platinum bracelet" +msgid_plural "sapphire and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'sapphire and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling sapphires. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline and platinum bracelet" +msgid_plural "tourmaline and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'tourmaline and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling tourmalines. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine and platinum bracelet" +msgid_plural "citrine and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'citrine and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling citrines. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue topaz and platinum bracelet" +msgid_plural "blue topaz and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'blue topaz and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with sparkling blue topaz. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "opal and platinum bracelet" +msgid_plural "opal and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'opal and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with opals. You can wear it if you like, but it won't " +"provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pearl and platinum bracelet" +msgid_plural "pearl and platinum bracelets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'pearl and platinum bracelet'} +#: lang/json/ARMOR_from_json.py +msgid "" +"A platinum bracelet with pearls. You can wear it if you like, but it won't " +"provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -15418,8 +17219,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not " -"intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15431,10 +17232,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" #: lang/json/ARMOR_from_json.py @@ -15446,8 +17247,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most " "of the old features of the standard issue boots but trade in protection for " "easier movement." msgstr "" @@ -15461,9 +17262,9 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with gene-" -"modding and/or mutations while still allowing greater manipulation of items " -"and moderate protection." +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"gene-modding and/or mutations while still allowing greater manipulation of " +"items and moderate protection." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15475,9 +17276,9 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for " -"warmth and fingertip-less for those with gene-modding and/or mutations while " -"still allowing greater manipulation of items and moderate protection." +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " +"while still allowing greater manipulation of items and moderate protection." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15489,7 +17290,7 @@ msgstr[1] "" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -15517,7 +17318,7 @@ msgstr[1] "" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows " "for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" @@ -15532,7 +17333,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " +"insulated with rubber. They are sturdy and will block attacks, but they are " "ridiculously heavy." msgstr "" @@ -15545,8 +17346,8 @@ msgstr[1] "" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your " -"hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15558,9 +17359,9 @@ msgstr[1] "" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15573,7 +17374,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented " -"plates of armor. A complex system digitizes items in an individual pocket " +"plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -15587,10 +17388,10 @@ msgstr[1] "" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined " -"with a cleansuit core and strategically placed segmented kevlar plates keep " -"the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -15616,11 +17417,11 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " +"body-armor which usually goes over other armor. Overlapping steel plates on " "top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " +"it can deflect attacks. Built with the idea that comfort is less important " "than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" @@ -15633,9 +17434,9 @@ msgstr[1] "" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of " -"harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +"harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -15649,10 +17450,10 @@ msgstr[1] "" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the " -"suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15665,8 +17466,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure " "you can actually walk with it on though." msgstr "" @@ -15679,30 +17480,30 @@ msgstr[1] "" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows " -"for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather " +"while a sleek design keeps it from being too flashy. A zipper at the back " +"and front allows for quick donning and doffing." msgstr "" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" +msgid_plural "C.R.I.T trousers" msgstr[0] "" msgstr[1] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" @@ -15714,7 +17515,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15725,20 +17526,20 @@ msgstr[1] "" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "" msgstr[1] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " +"made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -15750,7 +17551,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" @@ -15763,7 +17564,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -15778,8 +17579,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the " -"same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15876,10 +17677,11 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15888,13 +17690,6 @@ msgid_plural "silver infusion bracelets" msgstr[0] "" msgstr[1] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -16198,7 +17993,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" +msgid_plural "flesh pouches" msgstr[0] "" msgstr[1] "" @@ -16210,6 +18005,19 @@ msgid "" "minimize encumbrance." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -18092,7 +19900,7 @@ msgstr[1] "" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" @@ -19873,6 +21681,136 @@ msgid "" "goblins, and trolls." msgstr "" +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three Bears" +"\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title " +"page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the " +"dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the " +"Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the 1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -22521,9 +24459,10 @@ msgid "" "3) Learn how to make caramel ointment, it's the only way to fix your body if " "you get hurt.\n" " There are many more things I'd like to tell you but I must leave before " -"it's too late. I've made you a friend to keep you company, be kind to it. \n" +"it's too late. I've made you a friend to keep you company, be kind to " +"it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" #: lang/json/BOOK_from_json.py @@ -22549,7 +24488,7 @@ msgstr[1] "" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" @@ -23457,14 +25396,14 @@ msgid "Only the finest whiskey straight from the bung." msgstr "" #: lang/json/COMESTIBLE_from_json.py -msgid "single pot still irish whiskey" -msgid_plural "single pot still irish whiskey" +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" msgstr[0] "" msgstr[1] "" -#. ~ Description for single pot still irish whiskey +#. ~ Description for single pot still Irish whiskey #: lang/json/COMESTIBLE_from_json.py -msgid "A bottle of fine Irish whiskey." +msgid "A whiskey made from a mixed mash of malted and unmalted barley." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -23475,18 +25414,18 @@ msgstr[1] "" #. ~ Description for cheap whiskey #: lang/json/COMESTIBLE_from_json.py -msgid "A bottle of cheap whiskey." +msgid "Really cheap blended whiskey." msgstr "" #: lang/json/COMESTIBLE_from_json.py -msgid "canadian whiskey" -msgid_plural "canadian whiskey" +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" msgstr[0] "" msgstr[1] "" -#. ~ Description for canadian whiskey +#. ~ Description for Canadian whiskey #: lang/json/COMESTIBLE_from_json.py -msgid "A bottle of fine Canadian whiskey." +msgid "A multi-grain liquor made from a mash of corn and rye." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -23502,24 +25441,25 @@ msgid "" msgstr "" #: lang/json/COMESTIBLE_from_json.py -msgid "bristol sherry" -msgid_plural "sherry_bristol" +msgid "Bristol Cream" +msgid_plural "Bristol Cream" msgstr[0] "" msgstr[1] "" -#. ~ Description for bristol sherry +#. ~ Description for Bristol Cream #: lang/json/COMESTIBLE_from_json.py msgid "" -"Finest sherry straight from Bristol. Adorned with a Royal Purveyor's mark." +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." msgstr "" #: lang/json/COMESTIBLE_from_json.py -msgid "madera" -msgid_plural "madeira" +msgid "Madeira wine" +msgid_plural "Madeira wine" msgstr[0] "" msgstr[1] "" -#. ~ Description for madera +#. ~ Description for Madeira wine #: lang/json/COMESTIBLE_from_json.py msgid "Fortified wine from Madeira. A true Royal Navy drink." msgstr "" @@ -24673,6 +26613,18 @@ msgid "" "for storage and tanning." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "raw human pelt" +msgstr "" + +#. ~ Description for raw human pelt +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A carefully folded raw skin harvested from a fur-bearing mutant human. It " +"still has the fur attached. You can cure it for storage and tanning, or eat " +"it if you're desperate enough." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "seeping heart" msgstr "" @@ -33866,17 +35818,6 @@ msgid "" "resembles spoiled milk." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "" @@ -33925,6 +35866,17 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "" @@ -33943,7 +35895,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really " +"you of a starry-night sky. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -33959,7 +35911,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -34205,17 +36157,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair " -"items made of wood, paper, bone, or chitin." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -34223,7 +36164,7 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " +"The corpse of a necco, now it really looks like a giant necco wafer. Surely " "a bite wouldn't hurt, right?" msgstr "" @@ -34248,7 +36189,7 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34261,7 +36202,7 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34274,7 +36215,7 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34286,8 +36227,8 @@ msgstr[1] "" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34406,7 +36347,7 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34429,15 +36370,15 @@ msgstr "" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "" #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it " +"certainly is not wheat flour! It is useful for baking though." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34447,8 +36388,8 @@ msgstr "" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and " +"nutritious gluten free fried bread treat. " msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34486,9 +36427,9 @@ msgstr[1] "" #. ~ Description for gluten free lactose free fruit pancake #: lang/json/COMESTIBLE_from_json.py msgid "" -"Fluffy and delicious pancakes made out of the only things you can still eat. " -"But at least it has real maple syrup, made sweeter and healthier with the " -"addition of wholesome fruit." +"Fluffy and delicious pancakes made out of the only things you can still " +"eat. But at least it has real maple syrup, made sweeter and healthier with " +"the addition of wholesome fruit." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34526,8 +36467,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a " -"post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34744,7 +36685,7 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just " -"the bread... especially if it is the wrong type of bread!" +"the bread… especially if it is the wrong type of bread!" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34753,7 +36694,7 @@ msgstr "" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34762,13 +36703,13 @@ msgstr "" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." msgstr "" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "" @@ -34814,7 +36755,7 @@ msgstr[1] "" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "" @@ -34827,7 +36768,7 @@ msgstr[1] "" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "" @@ -35697,11 +37638,11 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "survival kit box" -msgid_plural "survival kit boxs" +msgid_plural "survival kit boxes" msgstr[0] "" msgstr[1] "" -#. ~ Description for survival kit box +#. ~ Description for {'str': 'survival kit box', 'str_pl': 'survival kit boxes'} #: lang/json/CONTAINER_from_json.py msgid "" "An aluminum box that used to contain a small survival kit. Can hold 1 liter " @@ -37523,6 +39464,20 @@ msgid "" "parts." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "broken chickenbot" +msgid_plural "broken chickenbots" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for broken chickenbot +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken chicken walker. Still looks intimidating despite being permanently " +"inoperative, possibly due to the sheer size and mass. Could be gutted for " +"parts." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "broken recon mech" msgid_plural "broken recon mechs" @@ -38356,6 +40311,149 @@ msgstr[1] "" msgid "A sparkling diamond." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -40138,17 +42236,16 @@ msgid "" msgstr "" #: lang/json/GENERIC_from_json.py -#: lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" +msgid "turret interior chassis" +msgid_plural "turret interior chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" #: lang/json/GENERIC_from_json.py @@ -42102,6 +44199,284 @@ msgid_plural ".50 ammo belt linkages" msgstr[0] "" msgstr[1] "" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py +#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water " +"away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap, " +"blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow, " +"black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -42241,16 +44616,44 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" msgstr[0] "" msgstr[1] "" -#. ~ Description for 40mm canister +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." +msgid "A large canister from a spent 40mm cartridge." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" +msgstr[1] "" + #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" msgid_plural ".44 Magnum casings" @@ -42611,17 +45014,6 @@ msgid_plural "generic silverwares" msgstr[0] "" msgstr[1] "" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py -#: lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -45316,6 +47708,28 @@ msgid "" "ties, duct tape, and other random stuff has been used to compensate." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -46952,7 +49366,7 @@ msgstr[1] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the Cataclysm happened first. These are physical coins with " +"US tax base but the Cataclysm happened first. These are physical coins with " "random numbers sequences embossed on them." msgstr "" @@ -47087,9 +49501,9 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." msgstr "" #: lang/json/GENERIC_from_json.py @@ -47129,7 +49543,7 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "This lump of flesh has various lobes protruding from it that at intervals " -"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " "bioparts the openings on this piece closed up after it was cut free and it " "seems to have gone into a form of hibernation with the pulses occurring " "slower and slower as it conserves energy." @@ -49295,7 +51709,20 @@ msgstr[1] "" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" #: lang/json/GENERIC_from_json.py @@ -50485,6 +52912,17 @@ msgstr[1] "" msgid "A small book, containing spells created by a novice magician." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -51039,7 +53477,7 @@ msgstr[1] "" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" @@ -51065,7 +53503,7 @@ msgstr[1] "" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" @@ -51101,7 +53539,7 @@ msgstr[1] "" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" @@ -51644,7 +54082,7 @@ msgstr[1] "" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "" #: lang/json/GENERIC_from_json.py @@ -51674,8 +54112,8 @@ msgstr[1] "" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with " -"an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -51687,43 +54125,43 @@ msgstr[1] "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -51735,8 +54173,8 @@ msgstr[1] "" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -51750,8 +54188,10 @@ msgstr[1] "" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "" #: lang/json/GENERIC_from_json.py @@ -51762,7 +54202,7 @@ msgstr[1] "" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "" #: lang/json/GENERIC_from_json.py @@ -51786,7 +54226,7 @@ msgstr[1] "" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" @@ -51799,29 +54239,29 @@ msgstr[1] "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter. " -"Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector. " -"Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -51847,7 +54287,7 @@ msgstr[1] "" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " "recrafted." msgstr "" @@ -51869,12 +54309,6 @@ msgid_plural "broken fist kings" msgstr[0] "" msgstr[1] "" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -51999,7 +54433,7 @@ msgid "" "attached to, whether blob-based or otherwise, through extended pseudopods. " "You think you might be able to manipulate it, and through it, all its " "attached parts. Though to do so you'll have to position yourself to be in " -"contact with it; and it appears unnervingly willing to accommodate you..." +"contact with it; and it appears unnervingly willing to accommodate you…" msgstr "" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py @@ -52047,6 +54481,12 @@ msgid "" "However, this comes at the cost of being prohibitively heavy and obstructive." msgstr "" +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -52094,7 +54534,7 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " +"reality, a phrase from a time forever gone echoes in your mind. \"There are " "two things that are infinite: the universe and human kleptomania.\"" msgstr "" @@ -54953,7 +57393,7 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -55220,7 +57660,7 @@ msgstr "" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "" @@ -55242,10 +57682,37 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" +#: lang/json/MOD_INFO_from_json.py +msgid "Graphical Overmap Fujistruct" +msgstr "" + +#. ~ Description for Graphical Overmap Fujistruct +#: lang/json/MOD_INFO_from_json.py +msgid "Fuji Structures mod support for Graphical Overmap." +msgstr "" + +#: lang/json/MOD_INFO_from_json.py +msgid "Graphical Overmap More Locations" +msgstr "" + +#. ~ Description for Graphical Overmap More Locations +#: lang/json/MOD_INFO_from_json.py +msgid "More Locations mod support for Graphical Overmap." +msgstr "" + +#: lang/json/MOD_INFO_from_json.py +msgid "Graphical Overmap Urban Development" +msgstr "" + +#. ~ Description for Graphical Overmap Urban Development +#: lang/json/MOD_INFO_from_json.py +msgid "Urban Development mod support for Graphical Overmap." +msgstr "" + #: lang/json/MOD_INFO_from_json.py msgid "Garden Pots" msgstr "" @@ -55274,7 +57741,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" @@ -55367,7 +57834,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -55377,9 +57844,8 @@ msgstr "" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -55683,7 +58149,7 @@ msgstr "" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "" @@ -55721,7 +58187,7 @@ msgstr "" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" @@ -55864,7 +58330,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -55876,7 +58342,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -55887,7 +58353,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -55897,7 +58363,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -59828,6 +62294,19 @@ msgid "" "able to see." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever " +"seen. Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -61295,7 +63774,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -61309,7 +63788,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61679,9 +64158,9 @@ msgstr[1] "" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst " -"through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61693,10 +64172,10 @@ msgstr[1] "" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted " -"through its hand to deal with prey and the haunting visage of a jawless maw " -"and a gaping wound in its forehead sends chills down your spine. The awkward " -"steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your " +"spine. The awkward steps it takes slows it down greatly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61709,7 +64188,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -61723,9 +64202,9 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen " -"as it leaps forward with immense arm strength. With elongated fangs that are " -"can easily mutilate your flesh, the grotesque face roars incessantly. The " -"lower body has fused together into one giant tail with a barbed spike." +"as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " +"The lower body has fused together into one giant tail with a barbed spike." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61738,7 +64217,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a C.R.I." "T S-I G.E.A.R operator." msgstr "" @@ -61752,10 +64231,10 @@ msgstr[1] "" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " "A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61767,9 +64246,9 @@ msgstr[1] "" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -61783,8 +64262,8 @@ msgstr[1] "" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout " -"out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61796,16 +64275,16 @@ msgstr[1] "" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" @@ -61819,8 +64298,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end " -"of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61844,7 +64323,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" #: lang/json/MONSTER_from_json.py @@ -62713,7 +65192,7 @@ msgstr[1] "" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" @@ -62726,7 +65205,7 @@ msgstr[1] "" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" @@ -62739,7 +65218,7 @@ msgstr[1] "" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated " "40mm beanbag launcher." msgstr "" @@ -63079,7 +65558,7 @@ msgstr[1] "" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will " "suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or " +"reserves. A useful helper for keeping your front lawn clean of debris… or " "corpses." msgstr "" @@ -63134,8 +65613,8 @@ msgstr[1] "" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" #: lang/json/MONSTER_from_json.py @@ -64592,6 +67071,17 @@ msgstr "" msgid "Ethereal Grasp" msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "" @@ -67155,9 +69645,9 @@ msgstr[1] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your " -"spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -67168,7 +69658,7 @@ msgstr[1] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -67181,8 +69671,8 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " +"one's head where it should be. Various filters and other high tech wizardry " +"allow for enhanced oxygen intake and safety even under bombardment. It has " "an integrated HUD and the option to turn it on for more features." msgstr "" @@ -67200,7 +69690,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -67213,12 +69703,12 @@ msgstr[1] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." +msgid "Power levels too low for safe bootup…" msgstr "" #. ~ Description for CRIT EM vest (off) @@ -67226,8 +69716,8 @@ msgstr "" msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " +"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " "protection and movement." msgstr "" @@ -67244,7 +69734,7 @@ msgstr "" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "" #. ~ Description for CRIT EM vest (on) @@ -67253,7 +69743,7 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid " "that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " "currently in suit form and draining your UPS power at high rates." msgstr "" @@ -67272,7 +69762,7 @@ msgstr "" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -67291,9 +69781,9 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing " "power." msgstr "" @@ -67549,6 +70039,32 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows " +"you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -70980,7 +73496,7 @@ msgstr[1] "" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "" @@ -71958,19 +74474,6 @@ msgid "" "blade allows for precision strikes in the hands of the skilled." msgstr "" -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "" - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -74103,6 +76606,30 @@ msgid "" "all enemies with a built-in firearm and grenade launcher." msgstr "" +#. ~ Use action friendly_msg for inactive chicken walker. +#: lang/json/TOOL_from_json.py +msgid "The chicken bot rolls out and begins acquiring targets." +msgstr "" + +#. ~ Use action hostile_msg for inactive chicken walker. +#: lang/json/TOOL_from_json.py +msgid "" +"The chicken bot swivels its turret and aims directly at you. Don your brown " +"pants!" +msgstr "" + +#. ~ Description for inactive chicken walker +#: lang/json/TOOL_from_json.py +msgid "" +"This is an inactive chicken walker. Using this item involves placing it on " +"the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm " +"cartridge grenades in your inventory (if you wish to divide your ammunition, " +"set aside whatever ammunition you do NOT want to give the robot) and turning " +"it on. If reprogrammed and rewired successfully the tank drone will then " +"identify you as a friendly, roam around or follow you, and attack all " +"enemies with a built-in firearm and grenade launcher." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "inactive tripod" msgid_plural "inactive tripods" @@ -74204,6 +76731,17 @@ msgid "" "however, it will be nonaggressive, and serves only as a distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -76210,6 +78748,19 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -76583,12 +79134,12 @@ msgstr[1] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of " -"the normal military mess kit, but made to be telescopic, the parts are made " -"from a thin sheet of a stainless superalloy composite and are insulated with " -"ceramic. Sadly, this compact reimagining loses much of its battery life but " -"does have a rather small (useless) solar panel installed. Also comes with an " -"absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated " +"with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -76600,10 +79151,10 @@ msgstr[1] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " +"pry bar at the bottom for opening simple things and bashing in heads. Matte " "black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"allows for light-armor penetration. Blade length allows for decent reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -76615,7 +79166,7 @@ msgstr[1] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -76628,7 +79179,7 @@ msgstr[1] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -76642,10 +79193,10 @@ msgstr[1] "" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely " +"brushing your fingers over the weapon brings a feeling of invincibility. It " +"looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -76658,7 +79209,7 @@ msgstr[1] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -76672,7 +79223,7 @@ msgstr[1] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -77184,7 +79735,7 @@ msgstr[1] "" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" @@ -77197,7 +79748,7 @@ msgstr[1] "" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" @@ -77210,7 +79761,7 @@ msgstr[1] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" @@ -77223,7 +79774,7 @@ msgstr[1] "" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" @@ -77236,8 +79787,8 @@ msgstr[1] "" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary " -"for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -77249,7 +79800,7 @@ msgstr[1] "" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " +"This magical pebble has an insignia of lightning and storm clouds on it. It " "is necessary for Stormshapers to channel magic into their crafts." msgstr "" @@ -77262,7 +79813,7 @@ msgstr[1] "" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" @@ -77275,7 +79826,7 @@ msgstr[1] "" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " +"This magical pebble has an insignia of summoners on it. It is necessary for " "Animists to channel magic into their crafts." msgstr "" @@ -77288,7 +79839,7 @@ msgstr[1] "" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -77377,7 +79928,7 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." @@ -77387,7 +79938,7 @@ msgstr "" #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." +msgid "Error. No weapon systems found." msgstr "" #. ~ Description for disarmed defense turret @@ -77553,7 +80104,7 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" @@ -77611,8 +80162,8 @@ msgstr[1] "" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" @@ -77626,7 +80177,7 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" @@ -77640,7 +80191,7 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" @@ -77950,7 +80501,7 @@ msgstr[1] "" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" @@ -77964,7 +80515,7 @@ msgstr[1] "" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." @@ -78028,10 +80579,10 @@ msgstr[1] "" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will " -"suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" #: lang/json/TOOL_from_json.py @@ -78065,7 +80616,7 @@ msgstr[1] "" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item " "to deploy the robot." msgstr "" @@ -78106,7 +80657,7 @@ msgstr[1] "" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets " "with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" @@ -78153,7 +80704,7 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" @@ -78201,7 +80752,7 @@ msgstr[1] "" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to " -"load and deploy the robot... preferably far from anything flammable" +"load and deploy the robot… preferably far from anything flammable" msgstr "" #: lang/json/TOOL_from_json.py @@ -78527,7 +81078,7 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool " "of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" #: lang/json/TOOL_from_json.py @@ -78733,9 +81284,9 @@ msgstr "" #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" #: lang/json/TOOL_from_json.py @@ -78746,8 +81297,7 @@ msgstr[1] "" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py -msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +msgid "Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "" #. ~ Description for diamond matrix @@ -78766,10 +81316,10 @@ msgstr[1] "" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " +"A tornado in a box, so to speak. Inside this innocuous tank contains either " "the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" @@ -78782,10 +81332,10 @@ msgstr[1] "" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " +"A tornado in a box, so to speak. Inside this innocuous tank contains either " "the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" @@ -81934,6 +84484,10 @@ msgstr "" msgid "Build Stone Wall" msgstr "" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "" @@ -84660,9 +87214,7 @@ msgstr "" msgid "Your %s feels warm." msgstr "" -#. ~ Speed name of effect(s) 'Warm, Hot, Scorching'. -#: lang/json/effects_from_json.py -#: lang/json/morale_type_from_json.py +#: lang/json/effects_from_json.py lang/json/morale_type_from_json.py msgid "Hot" msgstr "" @@ -84682,6 +87234,38 @@ msgstr "" msgid "Your %s is sweating profusely!" msgstr "" +#: lang/json/effects_from_json.py +msgid "Slowdown" +msgstr "" + +#. ~ Description of effect 'Slowdown'. +#: lang/json/effects_from_json.py +msgid "The heat slows you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Hampered" +msgstr "" + +#. ~ Description of effect 'Hampered'. +#: lang/json/effects_from_json.py +msgid "You struggle to move in this heat." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Crushed" +msgstr "" + +#. ~ Description of effect 'Crushed'. +#: lang/json/effects_from_json.py +msgid "The heat is crushing you." +msgstr "" + +#. ~ Speed name of effect(s) 'Slowdown, Hampered, Crushed'. +#: lang/json/effects_from_json.py +msgid "Heat slowdown" +msgstr "" + #: lang/json/effects_from_json.py msgid "Frostnip" msgstr "" @@ -86176,7 +88760,7 @@ msgstr "" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "" @@ -88047,11 +90631,13 @@ msgid "A big, blocky metal device for refrigerating large areas." msgstr "" #: lang/json/furniture_from_json.py +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py #: lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "" #: lang/json/furniture_from_json.py +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py #: lang/json/terrain_from_json.py msgid "clang!" msgstr "" @@ -89888,6 +92474,15 @@ msgid "" "for awhile. Doesn't look like it's coming again anytime soon." msgstr "" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "" @@ -90796,8 +93391,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready " -"to add raw milk and salt. It will churn till the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -90830,7 +93425,7 @@ msgstr "" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -90841,7 +93436,7 @@ msgstr "" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -90852,7 +93447,7 @@ msgstr "" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -90863,7 +93458,7 @@ msgstr "" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -93176,19 +95771,6 @@ msgid "" "sees use with many units worldwide." msgstr "" -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the Cataclysm, and if you can " -"find some 40mm grenades, maybe even beyond." -msgstr "" - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -93232,6 +95814,19 @@ msgstr "" msgid "multi" msgstr "" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can " +"find some 40mm grenades, maybe even beyond." +msgstr "" + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -95322,7 +97917,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "You ripped this from a mi-go abomination. You have no clue how or if it can " -"be reloaded. " +"be reloaded. " msgstr "" #: lang/json/gun_from_json.py @@ -95374,7 +97969,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -95387,7 +97982,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -95401,7 +97996,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -95413,7 +98008,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " "new breakthrough in hybrid weaponry." msgstr "" @@ -95425,11 +98020,11 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " +"A simple combination gun. This military-grade semi-auto carbine couples the " +"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " "further compliment the CQB aspect, the stock is built to amplify the user's " "force and the rugged construction with tonfa-like grip can handle bashing in " -"enemy heads. An integrated magazine makes it a pain to reload, but keeps " +"enemy heads. An integrated magazine makes it a pain to reload, but keeps " "your clip from ejecting accidently." msgstr "" @@ -95455,9 +98050,9 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " +"A surprisingly powerful airgun that can reliably hunt small game. The small " "lead or alloy pellets that can be chambered provide it decent power in every " -"shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " +"shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " "but the break action charging system requires some arm strength to load a " "pellet." msgstr "" @@ -95470,7 +98065,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -95482,7 +98077,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes " "a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." @@ -95496,7 +98091,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -95508,8 +98103,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -95521,7 +98116,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -95545,8 +98140,9 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the " -"zombies in your path, all the hulks, the spiders, and those damned mole rats." +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " +"rats." msgstr "" #: lang/json/gun_from_json.py @@ -95663,8 +98259,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." msgstr "" #: lang/json/gun_from_json.py @@ -95746,8 +98342,8 @@ msgid "" msgstr "" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" msgstr[0] "" msgstr[1] "" @@ -96306,7 +98902,8 @@ msgstr[0] "" msgstr[1] "" #: lang/json/gun_from_json.py -msgid "This is a pseudo item for monster attacks. If you see this, it's a bug." +msgid "" +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "" #: lang/json/gun_from_json.py @@ -96495,7 +99092,7 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py @@ -96510,7 +99107,7 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled " "out at significant velocity towards any nearby threats. The amorphous mass " "can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py @@ -98854,7 +101451,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -98878,9 +101475,9 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -98892,7 +101489,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -100753,10 +103350,6 @@ msgstr "" msgid "Heat up food (with it)" msgstr "" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "" @@ -100842,7 +103435,7 @@ msgid "Inject" msgstr "" #: lang/json/item_action_from_json.py -#: lang/json/item_action_from_json.py src/handle_action.cpp +#: src/handle_action.cpp msgid "Drink" msgstr "" @@ -101575,6 +104168,11 @@ msgid "" "This can feel good." msgstr "" +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -102699,8 +105297,8 @@ msgstr "" msgid "Disassemble items" msgstr "" -#: lang/json/keybinding_from_json.py src/defense.cpp -#: src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "" @@ -103520,7 +106118,8 @@ msgstr "" msgid "Wasp nest is here." msgstr "" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "" @@ -103579,6 +106178,33 @@ msgstr "" msgid "Small pond is here." msgstr "" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "" @@ -104422,6 +107048,16 @@ msgstr "" msgid "NO Diving!" msgstr "" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -106220,7 +108856,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade-work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -106242,7 +108878,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -106252,7 +108888,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -106261,7 +108897,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -106272,7 +108908,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed " -"adds a plethora of combat bonuses. 25 percent bash damage." +"adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -106282,7 +108918,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -106293,7 +108929,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight " -"piercing capability. 50 Percent Bash Damage." +"piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -106472,6 +109108,10 @@ msgstr "" msgid "Diamond" msgstr "" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "" @@ -106689,8 +109329,8 @@ msgid "Mushroom" msgstr "" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "" @@ -108120,11 +110760,11 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "" #: lang/json/mission_def_from_json.py @@ -108165,6 +110805,10 @@ msgstr "" msgid "What good does this do me?" msgstr "" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "" @@ -108205,7 +110849,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "" #: lang/json/mission_def_from_json.py @@ -108243,12 +110887,12 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "" #: lang/json/mission_def_from_json.py @@ -108317,7 +110961,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "" #: lang/json/mission_def_from_json.py @@ -108335,7 +110979,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" @@ -108356,7 +111000,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" #: lang/json/mission_def_from_json.py @@ -108364,7 +111008,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "" #: lang/json/mission_def_from_json.py @@ -111086,7 +113730,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -111112,10 +113756,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "" - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -111140,7 +113780,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -111180,8 +113820,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice " +"and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -111202,7 +113842,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -111229,7 +113869,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -111244,7 +113884,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -119100,7 +121740,7 @@ msgstr "" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -119164,18 +121804,10 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you " -"with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "" @@ -119810,7 +122442,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -119843,7 +122475,7 @@ msgid "I'm just trying to stay alive." msgstr "" #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." msgstr "" #: lang/json/npc_class_from_json.py @@ -119852,7 +122484,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore, " +"I'm looking for lizard mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119862,8 +122494,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -119872,8 +122504,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -119882,8 +122514,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -119892,7 +122524,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119902,7 +122534,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore, " +"I'm looking for ursine mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119912,7 +122544,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore, " +"I'm looking for feline mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119922,7 +122554,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore, " +"I'm looking for lupine mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119932,7 +122564,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore, " +"I'm looking for cattle mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119942,7 +122574,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore, " +"I'm looking for insect mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119952,7 +122584,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119962,7 +122594,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -119972,7 +122604,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" @@ -119982,7 +122614,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" @@ -119992,7 +122624,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore, " +"I'm looking for spider mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -120002,8 +122634,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -120012,7 +122644,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -120022,7 +122654,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -120032,8 +122664,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -120042,8 +122674,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -120052,7 +122684,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore, " +"I'm looking for raptor mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -127545,7 +130177,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your " "optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -127562,7 +130194,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your " "optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -127813,10 +130445,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and " -"short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the " +"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " +"out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -127829,10 +130461,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and " -"short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the " +"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " +"out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -127844,11 +130476,11 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some " -"sneak-peeks on some pretty cool stuff. After all non-essential personel were " -"purged you found yourself stuck with nothing but the uniform they gave you " -"and your job's sign-bonus equipment." +"*Sigh* Your life has been a wreck. Hopping place to place you finally found " +"a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some " +"sneak-peeks on some pretty cool stuff. After all non-essential personel " +"were purged you found yourself stuck with nothing but the uniform they gave " +"you and your job's sign-bonus equipment." msgstr "" #: lang/json/professions_from_json.py @@ -127860,11 +130492,11 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some " -"sneak-peeks on some pretty cool stuff. After all non-essential personel were " -"purged you found yourself stuck with nothing but the uniform they gave you " -"and your job's sign-bonus equipment." +"*Sigh* Your life has been a wreck. Hopping place to place you finally found " +"a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some " +"sneak-peeks on some pretty cool stuff. After all non-essential personel " +"were purged you found yourself stuck with nothing but the uniform they gave " +"you and your job's sign-bonus equipment." msgstr "" #: lang/json/professions_from_json.py @@ -127876,7 +130508,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time " "again until it all fell apart." msgstr "" @@ -127890,7 +130522,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time " "again until it all fell apart." msgstr "" @@ -127905,9 +130537,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper " +"when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -127922,9 +130554,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper " +"when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -127938,12 +130570,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " +"distraction. Forced to flee, will you have what it takes to survive or will " "you join the horde to haunt them for their cardinal sin?" msgstr "" @@ -127956,12 +130588,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " +"distraction. Forced to flee, will you have what it takes to survive or will " "you join the horde to haunt them for their cardinal sin?" msgstr "" @@ -127975,8 +130607,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't " +"keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -127991,8 +130623,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't " +"keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -128007,9 +130639,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up " -"the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -128022,9 +130654,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up " -"the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -128036,13 +130668,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and " -"deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look " -"like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your " +"skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -128054,13 +130686,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and " -"deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look " -"like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your " +"skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -128072,10 +130704,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority " +"of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -128087,10 +130719,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority " +"of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -128102,12 +130734,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe Response/" -"Research & Investigation Team. A looming spectre which responded to secular " +"STR 10 recommended. You were an elite member of the Catastrophe Response/" +"Research & Investigation Team. A looming spectre which responded to secular " "threats which allowed your faction to leap decades in front of other world " -"powers. Your squad was the first to be deployed into the New England region, " -"ground zero, to contain the impending outbreak and gain information to relay " -"back to command. Good luck soldier." +"powers. Your squad was the first to be deployed into the New England " +"region, ground zero, to contain the impending outbreak and gain information " +"to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -128119,12 +130751,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe Response/" -"Research & Investigation Team. A looming spectre which responded to secular " +"STR 10 recommended. You were an elite member of the Catastrophe Response/" +"Research & Investigation Team. A looming spectre which responded to secular " "threats which allowed your faction to leap decades in front of other world " -"powers. Your squad was the first to be deployed into the New England region, " -"ground zero, to contain the impending outbreak and gain information to relay " -"back to command. Good luck soldier." +"powers. Your squad was the first to be deployed into the New England " +"region, ground zero, to contain the impending outbreak and gain information " +"to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -128136,17 +130768,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist " -"after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped " -"of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking " +"them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick " +"your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -128158,17 +130790,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist " -"after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped " -"of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking " +"them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick " +"your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -128181,10 +130813,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " -"Cataclysm broke out and your instructor never showed up for the next lesson. " -"Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn " -"a thing or two about survival though!" +"Cataclysm broke out and your instructor never showed up for the next " +"lesson. Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -128197,10 +130829,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " -"Cataclysm broke out and your instructor never showed up for the next lesson. " -"Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn " -"a thing or two about survival though!" +"Cataclysm broke out and your instructor never showed up for the next " +"lesson. Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -128214,9 +130846,9 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's admin-" "offices to escape from bitter memories and past traumas after valiantly " -"protecting your comrades for years. After you completed the readjustment " +"protecting your comrades for years. After you completed the readjustment " "program, your skills may have rusted considerably since your last deployment " -"to battle, but the drilled muscle memories have not worn away. As your " +"to battle, but the drilled muscle memories have not worn away. As your " "comrades' screams once again ring in your ears and repressed memories of " "abhorrent nature resurface, can you find it within yourself to overcome the " "looming terror which paralyzes you?" @@ -128233,9 +130865,9 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's admin-" "offices to escape from bitter memories and past traumas after valiantly " -"protecting your comrades for years. After you completed the readjustment " +"protecting your comrades for years. After you completed the readjustment " "program, your skills may have rusted considerably since your last deployment " -"to battle, but the drilled muscle memories have not worn away. As your " +"to battle, but the drilled muscle memories have not worn away. As your " "comrades' screams once again ring in your ears and repressed memories of " "abhorrent nature resurface, can you find it within yourself to overcome the " "looming terror which paralyzes you?" @@ -128251,9 +130883,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -128266,9 +130898,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -128280,11 +130912,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion " -"was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With " +"the new flesh that is now your own, bare your fangs and fight until the next " +"dawn." msgstr "" #: lang/json/professions_from_json.py @@ -128296,11 +130929,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion " -"was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With " +"the new flesh that is now your own, bare your fangs and fight until the next " +"dawn." msgstr "" #: lang/json/professions_from_json.py @@ -128452,7 +131086,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -128465,7 +131099,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -128502,7 +131136,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -128515,7 +131149,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -128528,7 +131162,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -128541,7 +131175,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -128601,7 +131235,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -128612,7 +131246,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -128809,7 +131443,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -128824,7 +131458,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -129820,7 +132454,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " +"You were awoken in the middle of the night by a noise. Armed only with a " "flashlight you went to investigate, now you face the Cataclysm." msgstr "" @@ -129833,7 +132467,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " +"You were awoken in the middle of the night by a noise. Armed only with a " "flashlight you went to investigate, now you face the Cataclysm." msgstr "" @@ -129847,7 +132481,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the Cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" @@ -129861,7 +132495,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the Cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" @@ -129874,8 +132508,8 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the Cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" @@ -129888,8 +132522,8 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the Cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" @@ -129902,9 +132536,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " -"yourself, not by gear but sheer skill; all those days in the woods paid off. " -"If your ancestors survived with no tech, you'll be damned if you don't" +"You knew the day would come, the day it all went to shit. You prepared " +"yourself, not by gear but sheer skill; all those days in the woods paid " +"off. If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" #: lang/json/professions_from_json.py @@ -129916,9 +132550,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " -"yourself, not by gear but sheer skill; all those days in the woods paid off. " -"If your ancestors survived with no tech, you'll be damned if you don't" +"You knew the day would come, the day it all went to shit. You prepared " +"yourself, not by gear but sheer skill; all those days in the woods paid " +"off. If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" #. ~ Crafting recipes category name @@ -134769,7 +137403,7 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have " -"begun to make you doubt it. Wandering in your temple, you just found books " +"begun to make you doubt it. Wandering in your temple, you just found books " "that may restore your faith or shatter it completely." msgstr "" @@ -134778,7 +137412,7 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have " -"begun to make you doubt it. Wandering in your temple, you just found books " +"begun to make you doubt it. Wandering in your temple, you just found books " "that may restore your faith or shatter it completely." msgstr "" @@ -134808,7 +137442,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to " -"survive on your own. At least he left his notebook..." +"survive on your own. At least he left his notebook…" msgstr "" #. ~ Description for scenario 'The Wizard's Apprentice' for a female character. @@ -134819,7 +137453,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to " -"survive on your own. At least he left his notebook..." +"survive on your own. At least he left his notebook…" msgstr "" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -134951,9 +137585,9 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called " -"in to keep order on one of the FEMA camps. It all went to shit fast..." -"wounded, infected, surrounded by fire you lie on the ground...and they just " -"keep coming..." +"in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female character. @@ -134961,9 +137595,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called " -"in to keep order on one of the FEMA camps. It all went to shit fast..." -"wounded, infected, surrounded by fire you lie on the ground...and they just " -"keep coming..." +"in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -135860,6 +138494,11 @@ msgid "" "you'll probably be left with no meat! Use a BB gun or maybe a .22 rifle." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -136360,6 +138999,12 @@ msgid "" "be deadly." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -136422,6 +139067,11 @@ msgid "" "bad!" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -136518,13 +139168,27 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "" +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -136656,6 +139320,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all " @@ -136771,15 +139441,20 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"Everything seems to mutate nowadays. Even survivors. If my eyeballs " -"starting shooting lasers do you think I could still see good? How can you " -"see anything past the lasers always shooting out your eyeballs?" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" msgstr "" #: lang/json/snippet_from_json.py msgid "" -"Everything seems to mutate nowadays. Even survivors. I wonder if I would " -"look good with antlers? Hats would be out of the question…" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" msgstr "" #: lang/json/snippet_from_json.py @@ -145762,7 +148437,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" #: lang/json/snippet_from_json.py @@ -145778,12 +148453,12 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" +msgid "\"my car is a diamond in the rough… literally\"" msgstr "" #: lang/json/snippet_from_json.py @@ -145806,8 +148481,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... " -"WHAM! You goin' somewhere.\"" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM! " +"You goin' somewhere.\"" msgstr "" #: lang/json/speech_from_json.py @@ -147563,13 +150238,13 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" @@ -147581,7 +150256,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" @@ -147592,7 +150267,7 @@ msgid "" msgstr "" #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" +msgid "Hello again. To reiterate our previous warning: [garbled]" msgstr "" #: lang/json/speech_from_json.py @@ -147668,7 +150343,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " "anyway." msgstr "" @@ -147700,7 +150375,8 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'd just like to point out that you were given every opportunity to succeed. " +"I'd just like to point out that you were given every opportunity to " +"succeed. " msgstr "" #: lang/json/speech_from_json.py @@ -147748,7 +150424,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" @@ -147785,7 +150461,7 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" +msgid "\"E.T. phone home.\"" msgstr "" #: lang/json/speech_from_json.py @@ -147849,7 +150525,7 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" msgstr "" #: lang/json/speech_from_json.py @@ -148216,7 +150892,7 @@ msgid "\"I'm scared!\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" +msgid "\"Something's wrong…\"" msgstr "" #: lang/json/speech_from_json.py @@ -148244,15 +150920,15 @@ msgid "\"Excuse me?\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" +msgid "\"I'm different…\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" +msgid "\"Thanks anyway…\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" +msgid "\"Take me with you…\"" msgstr "" #: lang/json/speech_from_json.py @@ -148332,7 +151008,7 @@ msgid "\"This time is OUR time.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" +msgid "\"Second time's a charm…\"" msgstr "" #: lang/json/speech_from_json.py @@ -148404,7 +151080,7 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" +msgid "\"Well, I tried. Best of luck!\"" msgstr "" #: lang/json/speech_from_json.py @@ -148698,7 +151374,7 @@ msgid "Cabin" msgstr "" #: lang/json/start_location_from_json.py -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Hospital" msgstr "" @@ -148850,7 +151526,7 @@ msgstr "" msgid "Mansion Entrance" msgstr "" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "" @@ -148867,7 +151543,7 @@ msgid "Clothing Store" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." +msgid "You there. Quiet down. Can you hear it? The song?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -148875,7 +151551,7 @@ msgid "You're back. Have you come to listen to the song?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" +msgid "Acolyte." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149023,17 +151699,16 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149049,16 +151724,17 @@ msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149120,13 +151796,13 @@ msgid "I see. Very well then." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"You bear my mark, meaning I believe you have potential to learn to truly " -"listen to the Song. Yes, I will lend my skills to you, for now." +msgid "Only those who bear my mark will prove themselves worthy of my skills." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgid "" +"You bear my mark, meaning I believe you have potential to learn to truly " +"listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149645,16 +152321,16 @@ msgstr "" msgid "Thanks. I have some things for you to do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "" @@ -149725,11 +152401,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." +msgid "Anything to do before I go to sleep?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" +msgid "Just few minutes more..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149737,11 +152413,11 @@ msgid "Make it quick, I want to go back to sleep." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." +msgid "Just let me sleep, !" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" +msgid "No, just no..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149930,7 +152606,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py #: src/activity_handlers.cpp src/avatar.cpp #: src/avatar.cpp src/avatar_action.cpp -#: src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar_action.cpp src/crafting.cpp #: src/game.cpp #: src/handle_action.cpp #: src/handle_action.cpp src/handle_liquid.cpp @@ -150232,11 +152908,11 @@ msgid "Sure thing, I'll make my way there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -150407,11 +153083,11 @@ msgid "I don't care." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I don't have any jobs for you." +msgid "I have another job for you. Want to hear about it?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." +msgid "I just have one job for you. Want to hear about it?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -150423,11 +153099,11 @@ msgid "I have more jobs for you. Want to hear about them?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" +msgid "I don't have any jobs for you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" +msgid "I don't have any more jobs for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -150660,15 +153336,15 @@ msgid "Thanks!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I must focus on the road!" +msgid "Focus on the road, mate!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too thirsty, give me something to drink." +msgid "I have some reason for not telling you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." +msgid "Nothing comes to my mind now. Ask me later perhaps?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -150676,15 +153352,15 @@ msgid "I'm too tired, let me rest first." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgid "I'm too hungry, give me something to eat." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." +msgid "I'm too thirsty, give me something to drink." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" +msgid "I must focus on the road!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -150692,7 +153368,7 @@ msgid "Ah, okay." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." +msgid "Why should I travel with you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -150700,7 +153376,7 @@ msgid "You asked me recently; ask again later." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" +msgid "Not until I get some antibiotics..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -150792,19 +153468,19 @@ msgid "On second thought, never mind." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while I'm operating a vehicle!" +msgid "I can't train you properly while you're operating a vehicle!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Give it some time, I'll show you something new later..." +msgid "I have some reason for denying you training." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." +msgid "Give it some time, I'll show you something new later..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" +msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -150844,11 +153520,11 @@ msgid "I understand…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." +msgid "Why should I share my equipment with you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Why should I share my equipment with you?" +msgid "You just asked me for stuff; ask later." msgstr "" #: lang/json/talk_topic_from_json.py @@ -150993,16 +153669,16 @@ msgstr "" msgid "You might be seeing more of me…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "" @@ -152118,15 +154794,15 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." +msgid "Greeting citizen, what brings you to the FoodLair?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" +msgid "Still here? Take your time, it's rough out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" +msgid "Greetings friend, it's nice to see you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -152134,11 +154810,11 @@ msgid "Welcome home Foodkid!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." +msgid "What sorcery is this?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" +msgid "So you're back… Explain yourself!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -153475,10 +156151,6 @@ msgid "" "although honestly I'm just busy not dying." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a " @@ -153487,7 +156159,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was " "a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -153498,8 +156171,11 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was " "a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." msgstr "" #: lang/json/talk_topic_from_json.py @@ -153835,13 +156511,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" @@ -153900,8 +156576,7 @@ msgid "I'm sorry you lost someone." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" +msgid "Just another tale of love and loss. Not one I like to tell." msgstr "" #: lang/json/talk_topic_from_json.py @@ -153911,7 +156586,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -153935,35 +156611,35 @@ msgid "Oh, . This doesn't have anything to do with you, or with us." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." +msgid "All right, fine. I had someone. I lost her." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost her." +msgid "All right, fine. I had someone. I lost him." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " +"She was at home when the bombs started dropping and the world went to hell. " "I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people " "and cars. Soldiers trying to stop them, but hitting people in the crossfire " "as much as anything. And then the collateral damage would get right back up " -"and join the enemy. If it hadn't been for my husband, I would have just " -"left, but I did what I could and I slipped through. I actually made " -"it alive." +"and join the enemy. If it hadn't been for my wife, I would have just left, " +"but I did what I could and I slipped through. I actually made it " +"alive." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell. " +"He was at home when the bombs started dropping and the world went to hell. " "I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people " "and cars. Soldiers trying to stop them, but hitting people in the crossfire " "as much as anything. And then the collateral damage would get right back up " -"and join the enemy. If it hadn't been for my wife, I would have just left, " -"but I did what I could and I slipped through. I actually made it " -"alive." +"and join the enemy. If it hadn't been for my husband, I would have just " +"left, but I did what I could and I slipped through. I actually made " +"it alive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -154014,11 +156690,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -154026,11 +156702,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -154662,6 +157338,16 @@ msgid "" "Hell on Earth. I wish I'd paid more attention in Sunday School." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -154673,16 +157359,6 @@ msgid "" "channel." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -154758,14 +157434,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky. " -"A full bottle, mind you." +"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " +"interested in getting attached. You didn't pay me to be your friend." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " -"interested in getting attached. You didn't pay me to be your friend." +"Like I said, you want me to tell you a story, you gotta pony up the whisky. " +"A full bottle, mind you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155070,18 +157746,18 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " -"peel out of there with his sister - my maid of honor - in her pickup truck " -"as things went bad. So, until I run into them again one way or another, I'm " +"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " +"peel out of there with her brother - my best man - in his pickup truck as " +"things went bad. So, until I run into them again one way or another, I'm " "just gonna keep on believing they're out there, doing well. That's more " "than most of us have." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " -"peel out of there with her brother - my best man - in his pickup truck as " -"things went bad. So, until I run into them again one way or another, I'm " +"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " +"peel out of there with his sister - my maid of honor - in her pickup truck " +"as things went bad. So, until I run into them again one way or another, I'm " "just gonna keep on believing they're out there, doing well. That's more " "than most of us have." msgstr "" @@ -155091,11 +157767,11 @@ msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155121,9 +157797,7 @@ msgid "Sounds good, Barry." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155131,7 +157805,9 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155162,7 +157838,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " +"It was pink and really fast, it had lots of limbs, definitely not human. It " "easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -155190,7 +157866,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155206,19 +157882,19 @@ msgid "Where can I find Chris?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +msgid "Hi, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" +msgid "" +"I see that badge. You need to leave our land, my relatives have no fondness " +"for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155231,7 +157907,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155261,7 +157937,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field. " "I didn't get close but I swear unbelievable monsters were coming out of it. " "It kinda shimmered, almost like it wasn't quite there. I've been tracking " -"those monsters for a while..." +"those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155271,7 +157947,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -155296,7 +157972,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155306,7 +157982,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" +msgid "Hi, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155314,7 +157990,7 @@ msgid "Hello, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" +msgid "Is that a U.S. Marshal's badge you're wearing?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155349,7 +158025,7 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are " -"so different now..." +"so different now…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155362,7 +158038,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" @@ -155403,7 +158079,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " +"Jesse and her family live up at the horse farm. They may have some jobs for " "you." msgstr "" @@ -155433,6 +158109,12 @@ msgstr "" msgid "Where is your brother's place?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "" @@ -155497,6 +158179,10 @@ msgid "" "a forage set up." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "" @@ -155611,11 +158297,11 @@ msgid "That's all for now. I'd best get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." +msgid "Hello, We don't see many people these days." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, We don't see many people these days." +msgid "Leave our property, Marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155743,11 +158429,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I see that badge, you should leave before my father sees you." +msgid "Hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello." +msgid "I see that badge, you should leave before my father sees you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155817,7 +158503,9 @@ msgid "Tell me about your dad." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." +msgid "" +"Ma'am, I don't know how the hell you got down here but if you have any sense " +"you'll get out while you can." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155827,9 +158515,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense " -"you'll get out while you can." +msgid "Marshal, I hope you're here to assist us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155891,7 +158577,7 @@ msgid "Whatever they did it must have worked since we are still alive…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm rather surprised to see you here." +msgid "Ma'am you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155899,7 +158585,7 @@ msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." +msgid "Marshal, I'm rather surprised to see you here." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155937,47 +158623,47 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." +msgid "Hey, citizen… I'm not sure you belong here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." +msgid "You should mind your own business, nothing to see here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." +msgid "If you need something you'll need to talk to someone else." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." +msgid "Ma'am" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, citizen… I'm not sure you belong here." +msgid "Hey miss, don't you think it would be safer if you stuck with me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should mind your own business, nothing to see here." +msgid "Sir." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "If you need something you'll need to talk to someone else." +msgid "Dude, if you can hold your own you should look into enlisting." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Sir." +msgid "Hello, marshal." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Dude, if you can hold your own you should look into enlisting." +msgid "Marshal, I'm afraid I can't talk now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am" +msgid "I'm not in charge here, marshal." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgid "I'm supposed to direct all questions to my leadership, marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -156035,14 +158721,12 @@ msgid "I've no use for weaklings. Run. Now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" +msgid "Please, help me. I need food." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help me?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156051,11 +158735,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156075,14 +158761,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -156181,13 +158867,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"That's quite the offer, but I don't think I'd survive the trip. I don't " -"think you realize how useless I am in this world." +msgid "I'm sorry, I'm too hungry to make a big decision like that." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgid "" +"That's quite the offer, but I don't think I'd survive the trip. I don't " +"think you realize how useless I am in this world." msgstr "" #: lang/json/talk_topic_from_json.py @@ -156231,16 +158917,16 @@ msgid "All right! Let's get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Have I told you about cardboard, friend? Do you have any?" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -156271,16 +158957,16 @@ msgstr "" msgid "Do you need something to eat?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "" @@ -156372,15 +159058,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" +"That's it! I'm just gonna need a little time to get it all set up. " +"Thanks. You've helped me a lot. I'm feeling much more myself with all this " +"to keep me going." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That's it! I'm just gonna need a little time to get it all set up. " -"Thanks. You've helped me a lot. I'm feeling much more myself with all this " -"to keep me going." +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156400,15 +159086,18 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." +msgid "Don't bother with these assholes." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgid "Hey there, not-asshole. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit " +"cranky. We cool?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156418,18 +159107,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit " -"cranky. We cool?" +msgid "Hey there. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." +msgid "Fuck off, dickwaddle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -156716,16 +159402,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " -"bring me a sample maybe I'll help you set up a lab to study this stuff. " -"Almost anything could work, but if this stuff is as dangerous as you make it " -"sound, maybe make sure it's not a sporulating body." +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." +"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " +"bring me a sample maybe I'll help you set up a lab to study this stuff. " +"Almost anything could work, but if this stuff is as dangerous as you make it " +"sound, maybe make sure it's not a sporulating body." msgstr "" #: lang/json/talk_topic_from_json.py @@ -156783,11 +159469,11 @@ msgid "I'll see what I can do." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." +msgid "Hey, are you a big fan of survival of the fittest?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, are you a big fan of survival of the fittest?" +msgid "Thanks again for the grub, my friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -156808,14 +159494,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." +"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " +"Help a poor sickly soul out?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " -"Help a poor sickly soul out?" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." msgstr "" #: lang/json/talk_topic_from_json.py @@ -156839,12 +159525,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157116,6 +159802,10 @@ msgstr "" msgid "What's your take on the situation here?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey there." msgstr "" @@ -157132,10 +159822,6 @@ msgstr "" msgid "Aw hey, look who's back." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "" @@ -157153,7 +159839,7 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." +msgid "I'm not a kid, okay? I'm fourteen." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157161,7 +159847,7 @@ msgid "I'm not a kid, okay? I'm fifteen." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." +msgid "I'm not a kid, okay? I'm sixteen." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157172,6 +159858,14 @@ msgstr "" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's " +"all so stupid, and nobody can tell me anything." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -157181,14 +159875,6 @@ msgid "" "here. We can hear them at night." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's " -"all so stupid, and nobody can tell me anything." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -157230,7 +159916,8 @@ msgid "How are things here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157240,8 +159927,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -157271,33 +159957,33 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." +"Now that you are here, everything. Is there anything Alonso can… *do for " +"you*?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Now that you are here, everything. Is there anything Alonso can… *do for " -"you*?" +"Well, it's a lot better now that you're here. Nice to see a familiar face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" +msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alonso cannot help himself, in the face of someone so fine as you." +msgid "You know me, I gotta be me, right?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -157326,6 +160012,12 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -157334,8 +160026,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157345,9 +160037,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." +msgid "Ah, another new face. Hello. I am Boris." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157362,10 +160052,6 @@ msgstr "" msgid "It is good to see you again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -157434,12 +160120,6 @@ msgstr "" msgid "I'm sorry. I'd better get going." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, now that you mention it, with the back bay cleared I could probably " -"set up back there and start work. I'll think about it, get back to me later." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -157450,6 +160130,12 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, now that you mention it, with the back bay cleared I could probably " +"set up back there and start work. I'll think about it, get back to me later." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -157479,15 +160165,15 @@ msgid "Got any more bread I can trade flour for?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, nice to see you again." +msgid "Hi there. I'm Dana, nice to see a new face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "It's good to see you're still around." +msgid "Hello, nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." +msgid "It's good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157539,8 +160225,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try " -"to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight " +"cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157551,10 +160239,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight " -"cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try " +"to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -157576,6 +160262,12 @@ msgid "" "that's a lot more than most." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -157597,12 +160289,6 @@ msgid "" "now." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something " @@ -157632,10 +160318,6 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here " @@ -157643,6 +160325,10 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -157679,16 +160365,16 @@ msgid "" "consider getting out of here and signing up." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "" @@ -157923,11 +160609,11 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158027,14 +160713,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158086,21 +160772,21 @@ msgid "Is there anything I can do to help you out?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again." +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you're still around." +msgid "Hello again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hi." +msgid "Good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." +msgid "Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158196,15 +160882,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Well, hello." +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you again." +msgid "Well, hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgid "Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158270,17 +160956,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi." +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey again." +msgid "Hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." +msgid "Hey again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158330,12 +161016,12 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." +msgid "" +"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." +msgid "Nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158486,6 +161172,15 @@ msgid "" "this before somebody snaps." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -158498,15 +161193,6 @@ msgid "" "want to know?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "" @@ -158572,6 +161258,14 @@ msgid "" "hope that there's a future to be had." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but " +"I'm not totally sure. He seems nice enough, but he's a man of few words. I " +"can't get a good bead on them. I've learned not to pry too much though." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -158584,10 +161278,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but " -"I'm not totally sure. He seems nice enough, but he's a man of few words. I " -"can't get a good bead on them. I've learned not to pry too much though." +"I really can't get a bead on them. They never really talk to anyone outside " +"of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158601,10 +161295,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside " -"of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it " +"yet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158621,25 +161319,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it " -"yet." +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." msgstr "" #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -158692,11 +161378,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158739,15 +161425,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158948,12 +161634,12 @@ msgid "What brings you around here? We don't see a lot of new faces." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Need to talk?" +msgid "" +"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." +msgid "Need to talk?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -159044,17 +161730,17 @@ msgid "Do you want to talk about your story?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hm? Oh, hi." +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "...Hi." +msgid "Hm? Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." +msgid "...Hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159166,16 +161852,16 @@ msgstr "" msgid "Hmm, can we change this shave a little please?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " "Vanessa." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "" @@ -159212,14 +161898,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"do some work to keep me busy though, and the extra merch does go a long way " -"to keeping my belly full. People like getting a good haircut." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -159228,6 +161906,14 @@ msgid "" "out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"do some work to keep me busy though, and the extra merch does go a long way " +"to keeping my belly full. People like getting a good haircut." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -159405,15 +162091,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what " +"we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what " -"we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159772,11 +162458,11 @@ msgid "Just on watch, move along." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Rough out there, isn't it?" +msgid "Ma'am, you really shouldn't be traveling out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." +msgid "Rough out there, isn't it?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -159812,11 +162498,11 @@ msgid "Well, I'd better be going. Bye." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." +msgid "Welcome..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Welcome..." +msgid "Welcome marshal..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160044,11 +162730,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal..." +msgid "Citizen..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Citizen..." +msgid "Marshal..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160106,11 +162792,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" +msgid "Heh, you look important." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Heh, you look important." +msgid "That sure is a shiny badge you got there!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160180,13 +162866,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Same way you got yours, I bet. Keep quiet about it, some people here look " -"down on people like us." +msgid "Ssh. Some people in here hate… mutations. This was an accident." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgid "" +"Same way you got yours, I bet. Keep quiet about it, some people here look " +"down on people like us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160214,19 +162900,19 @@ msgid "Who needs rebar?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." +msgid "Screw You!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Screw You!" +msgid "As if you're one to talk. Screw You." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." +msgid "Huh, thought I smelled someone new. Can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh, thought I smelled someone new. Can I help you?" +msgid "I thought I smelled a pig. I jest… please don't arrest me." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160498,7 +163184,9 @@ msgid "Glad to have you aboard." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So, do you need something?" +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160506,9 +163194,7 @@ msgid "We haven't changed our mind. Go away." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." +msgid "So, do you need something?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160761,38 +163447,38 @@ msgid "Keep it civil, merc." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Still plenty of outlaws in the roads, perhaps you should tend to your job, " -"marshal..." +msgid "Here to trade, I hope?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You see anything you want, marshal?" +msgid "Safe travels, scavenger." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, a U.S. marshal, how quaint." +msgid "" +"Still plenty of outlaws in the roads, perhaps you should tend to your job, " +"marshal..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" +msgid "You see anything you want, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." +msgid "Oh, a U.S. marshal, how quaint." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I keep to my own business, and you keep to yours, marshal. Seems like a " -"fair deal?" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." +"I keep to my own business, and you keep to yours, marshal. Seems like a " +"fair deal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161007,7 +163693,7 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" +msgid "Morning ma'am, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161015,7 +163701,7 @@ msgid "Morning sir, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" +msgid "Can I help you, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161121,11 +163807,11 @@ msgid "Not now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." +msgid "I can take a look at you or your companions if you are injured." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can take a look at you or your companions if you are injured." +msgid "Come back later, I need to take care of a few things first." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161284,19 +163970,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "How are you?" +msgid "Howdy! You seem new, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Welcome!" +msgid "How are you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "How's the weather?" +msgid "Welcome!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Howdy! You seem new, what brings you here?" +msgid "How's the weather?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161325,7 +164011,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -161344,7 +164030,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" @@ -161358,7 +164044,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " +"You have to earn the right to trade with us. Plus we created our own " "currency before the Cataclysm" msgstr "" @@ -161382,7 +164068,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " "you need crypto coins" msgstr "" @@ -161396,9 +164082,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161414,9 +164100,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre-Cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep " -"it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161445,14 +164131,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up " +"top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Interesting..." +msgid "Interesting…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161462,7 +164148,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I see..." +msgid "I see…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161472,7 +164158,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hmm..." +msgid "Hmm…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161482,7 +164168,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alright..." +msgid "Alright…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161490,7 +164176,7 @@ msgid "Not at the moment, check back later perhaps." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Sure..." +msgid "Sure…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161510,7 +164196,7 @@ msgid "So are you busting us out of here or what?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." +msgid "Hold tight, . I've got to clear a path." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165200,6 +167886,15 @@ msgstr "" msgid "A closed metal gate." msgstr "" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "" @@ -166925,14 +169620,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" +msgid "fuel tank" msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "" @@ -168694,6 +171398,26 @@ msgstr "" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "" @@ -169064,8 +171788,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -169079,7 +171803,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -169431,7 +172155,8 @@ msgstr "" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp +#: src/recipe.cpp msgid "none" msgstr "" @@ -170058,7 +172783,7 @@ msgstr "" msgid "Luggage Cart" msgstr "" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "" @@ -173160,7 +175885,7 @@ msgstr "" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " +"A set of continuous, interlocking tracks made out of blob. They can be used " "in place of wheels, and provide good traction and off-road performance." msgstr "" @@ -174363,9 +177088,7 @@ msgstr "" #: src/activity_handlers.cpp #, c-format -msgid "" -"You struggle to reload the fouled %s, but manage to loosen some debris and " -"make it somewhat operational." +msgid "You manage to loosen some debris and make your %s somewhat operational." msgstr "" #: src/activity_handlers.cpp @@ -175682,6 +178405,10 @@ msgstr "" msgid "spoilage" msgstr "" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp msgid "amt weight vol" @@ -177691,6 +180418,10 @@ msgstr "" msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "" + #: src/avatar_action.cpp #, c-format msgid "You're too full to eat the leaves from the %s." @@ -177763,6 +180494,14 @@ msgstr "" msgid "You can't muster up the effort to throw anything…" msgstr "" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "" + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -178627,15 +181366,13 @@ msgstr "" #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" #: src/bionics.cpp @@ -179413,6 +182150,34 @@ msgstr "" msgid "Liquid from your inventory has leaked onto the ground." msgstr "" +#: src/character.cpp +#, c-format +msgid "You cannot swap the side on which your %s is worn." +msgstr "" + +#: src/character.cpp +#, c-format +msgid " cannot swap the side on which their %s is worn." +msgstr "" + +#: src/character.cpp +#, c-format +msgid "You swap the side on which your %s is worn." +msgstr "" + +#: src/character.cpp +#, c-format +msgid " swaps the side on which their %s is worn." +msgstr "" + +#: src/character.cpp src/player.cpp +msgid "You are not wearing that item." +msgstr "" + +#: src/character.cpp +msgid " isn't wearing that item." +msgstr "" + #: src/character.cpp #, c-format msgid "Your current health value is %d." @@ -180961,7 +183726,8 @@ msgid "Press %s to view and edit key-bindings." msgstr "" #: src/construction.cpp -msgid "Stage/Variant #" +#, c-format +msgid "Stage/Variant #%d: " msgstr "" #: src/construction.cpp @@ -181158,8 +183924,9 @@ msgstr "" #: src/consumption.cpp src/iuse.cpp #: src/iuse.cpp +#: src/iuse.cpp src/iuse_actor.cpp #: src/iuse_actor.cpp -#: src/player.cpp +#: src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "" @@ -182028,11 +184795,11 @@ msgstr "" msgid "Dark craftable? %s" msgstr "" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "" @@ -182524,6 +185291,10 @@ msgstr "" msgid "Test weather" msgstr "" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "" @@ -182728,7 +185499,7 @@ msgstr "" msgid "Altruism: %d" msgstr "" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "" @@ -183411,386 +186182,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "" - -#: src/defense.cpp -msgid "Previous option" -msgstr "" - -#: src/defense.cpp -msgid "Next option" -msgstr "" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "" - -#: src/defense.cpp -msgid "Zombies" -msgstr "" - -#: src/defense.cpp -msgid "Triffids" -msgstr "" - -#: src/defense.cpp -msgid "Robots" -msgstr "" - -#: src/defense.cpp -msgid "Subspace" -msgstr "" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "" - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "" - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "" - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "" - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "" - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "" - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "" - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "" - -#: src/defense.cpp -msgid "Medium" -msgstr "" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "" - -#: src/defense.cpp -msgid "Skynet" -msgstr "" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "" - -#: src/defense.cpp -msgid "A custom game." -msgstr "" - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "" - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "" - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "" - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "" - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "" - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "" - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "" - -#: src/defense.cpp -msgid "Public Works" -msgstr "" - -#: src/defense.cpp -msgid "Megastore" -msgstr "" - -#: src/defense.cpp -msgid "Bar" -msgstr "" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "" - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "" - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "" - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "" - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "" -msgstr[1] "" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "" - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, Esc/" @@ -184351,52 +186742,52 @@ msgstr "" #: src/effect.cpp #, c-format -msgid "Strength +%d; " +msgid "Strength +%d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " +msgid "Strength %d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " +msgid "Dexterity +%d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " +msgid "Dexterity %d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " +msgid "Perception +%d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " +msgid "Perception %d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " +msgid "Intelligence +%d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " +msgid "Intelligence %d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " +msgid "Speed +%d; " msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " +msgid "Speed %d; " msgstr "" #: src/effect.cpp @@ -185386,7 +187777,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -186036,7 +188428,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -186241,7 +188634,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -187291,6 +189685,7 @@ msgstr "" #: src/game.cpp #: src/game.cpp src/iuse.cpp #: src/iuse.cpp +#: src/iuse.cpp src/iuse_actor.cpp #: src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "" @@ -187779,14 +190174,6 @@ msgstr "" msgid "%s helps with this task…" msgstr "" -#: src/game.cpp -msgid "Change side for item" -msgstr "" - -#: src/game.cpp -msgid "You don't have sided items worn." -msgstr "" - #: src/game.cpp #, c-format msgid "The %s is already fully loaded!" @@ -187808,23 +190195,16 @@ msgid "You can't reload a %s!" msgstr "" #: src/game.cpp -msgid "Reload item" -msgstr "" - -#: src/game.cpp -msgid "You have nothing to reload." -msgstr "" - -#: src/game.cpp -msgid "Unload item" +#, c-format +msgid "You struggle to reload the fouled %s." msgstr "" #: src/game.cpp -msgid "You have nothing to unload." +msgid "Reload item" msgstr "" #: src/game.cpp -msgid "You're not wielding anything." +msgid "You have nothing to reload." msgstr "" #: src/game.cpp @@ -188574,11 +190954,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "" -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "" - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "" @@ -188944,12 +191319,12 @@ msgstr "" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" +msgid "Choose an item to put into your %s" msgstr "" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." +msgid "You have no items you could put into your %s." msgstr "" #: src/game_inventory.cpp src/iuse.cpp @@ -189189,6 +191564,399 @@ msgstr "" msgid "Defense" msgstr "" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "" + +#: src/gamemode_defense.cpp +#: src/handle_action.cpp +msgid "Food" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "" + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "" +msgstr[1] "" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have " +"been warned." +msgstr "" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "" @@ -189535,6 +192303,10 @@ msgstr "" msgid "You may want to deactivate these before you sleep." msgstr "" +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -192954,6 +195726,10 @@ msgstr "" msgid "Vitamins (RDA): " msgstr "" +#: src/item.cpp +msgid "Other contents: " +msgstr "" + #: src/item.cpp msgid "* This food will cause an allergic reaction." msgstr "" @@ -194431,7 +197207,7 @@ msgstr "" msgid "That %s doesn't have room to expand." msgstr "" -#: src/item.cpp +#: src/item.cpp src/item_factory.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "" @@ -194562,14 +197338,6 @@ msgid "" "present." msgstr "" -#: src/item_factory.cpp -msgid "cannot specify revert_msg without revert_to" -msgstr "" - -#: src/item_factory.cpp -msgid "Invalid tool subtype" -msgstr "" - #: src/item_factory.cpp src/trait_group.cpp msgid "Test which group?" msgstr "" @@ -194851,6 +197619,14 @@ msgstr "" msgid "Blech, that burns your throat!" msgstr "" +#: src/iuse.cpp +msgid "This looks unclean, sure you want to drink it?" +msgstr "" + +#: src/iuse.cpp +msgid "This looks unclean, sure you want to eat it?" +msgstr "" + #: src/iuse.cpp msgid "The meal is revitalizing." msgstr "" @@ -195111,7 +197887,7 @@ msgid "Modify what?" msgstr "" #: src/iuse.cpp -#: src/iuse.cpp src/iuse_actor.cpp +#: src/iuse_actor.cpp msgid "You do not have that item!" msgstr "" @@ -196159,6 +198935,10 @@ msgstr "" msgid "Lights on!" msgstr "" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -196580,10 +199360,6 @@ msgstr "" msgid "You need a mechanics skill of 2 to use this repair kit." msgstr "" -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "" @@ -196593,8 +199369,7 @@ msgstr "" msgid "You cannot repair your %s." msgstr "" -#: src/iuse.cpp -#: src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp #, c-format msgid "You cannot improve your %s any more this way." msgstr "" @@ -196635,23 +199410,6 @@ msgstr "" msgid "You cancel unloading the tool." msgstr "" -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "" - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "" - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "" @@ -197703,6 +200461,14 @@ msgid "" "but best to stop messing with it." msgstr "" +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "" + #: src/iuse.cpp msgid "Using cable:" msgstr "" @@ -197731,14 +200497,6 @@ msgstr "" msgid "You attach the cable to the solar pack." msgstr "" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "" @@ -200218,11 +202976,8 @@ msgid "Congratulations, you won!" msgstr "" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" +#, c-format +msgid "Min: %d Max: %d" msgstr "" #: src/iuse_software_minesweeper.cpp @@ -201323,6 +204078,14 @@ msgstr "" msgid "DANGER! MINEFIELD!" msgstr "" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -201621,6 +204384,17 @@ msgid_plural "Skills" msgstr[0] "" msgstr[1] "" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" +msgstr[1] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "" @@ -207731,9 +210505,11 @@ msgctxt "Full Name" msgid "%1$s '%3$s' %2$s" msgstr "" -#: src/newcharacter.cpp src/player.cpp +#: src/newcharacter.cpp #, c-format -msgid "Select a style. (press %s for more info)" +msgid "" +"Select a style. (press %s for more info)\n" +"STR: %d, DEX: %d, PER: %d, INT: %d" msgstr "" #: src/newcharacter.cpp @@ -208101,11 +210877,13 @@ msgid "None" msgstr "" #: src/newcharacter.cpp -msgid "toggled" +#, c-format +msgid "%s (toggled)" msgstr "" #: src/newcharacter.cpp -msgid "activated" +#, c-format +msgid "%s (activated)" msgstr "" #: src/newcharacter.cpp @@ -208117,7 +210895,8 @@ msgid "Spells:" msgstr "" #: src/newcharacter.cpp -msgid " level " +#, c-format +msgid "%s level %d" msgstr "" #: src/newcharacter.cpp @@ -208481,7 +211260,8 @@ msgid "Completely trusting" msgstr "" #: src/npc.cpp -msgid "Trust: " +#, c-format +msgid " (Trust: %d); " msgstr "" #: src/npc.cpp @@ -208509,7 +211289,8 @@ msgid "Very afraid" msgstr "" #: src/npc.cpp -msgid "Fear: " +#, c-format +msgid " (Fear: %d); " msgstr "" #: src/npc.cpp @@ -208541,7 +211322,8 @@ msgid "Best Friends Forever!" msgstr "" #: src/npc.cpp -msgid "Value: " +#, c-format +msgid " (Value: %d); " msgstr "" #: src/npc.cpp @@ -208573,7 +211355,8 @@ msgid "About to kill you" msgstr "" #: src/npc.cpp -msgid "Anger: " +#, c-format +msgid " (Anger: %d)" msgstr "" #: src/npc.cpp @@ -209319,7 +212102,8 @@ msgid "I have news." msgstr "" #: src/npctalk.cpp -msgid "Yes, let's resume training " +#, c-format +msgid "Yes, let's resume training %s" msgstr "" #: src/npctalk.cpp @@ -213603,6 +216387,11 @@ msgstr "" msgid "You are too weak to wield %s with only one arm." msgstr "" +#: src/player.cpp +#, c-format +msgid "Select a style. (press %s for more info)" +msgstr "" + #: src/player.cpp msgid "Keep hands free (off)" msgstr "" @@ -213687,6 +216476,11 @@ msgstr "" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -213766,34 +216560,6 @@ msgstr "" msgid "This %s is too small to wear comfortably! Maybe it could be refitted…" msgstr "" -#: src/player.cpp -#, c-format -msgid "You cannot swap the side on which your %s is worn." -msgstr "" - -#: src/player.cpp -#, c-format -msgid " cannot swap the side on which their %s is worn." -msgstr "" - -#: src/player.cpp -#, c-format -msgid "You swap the side on which your %s is worn." -msgstr "" - -#: src/player.cpp -#, c-format -msgid " swaps the side on which their %s is worn." -msgstr "" - -#: src/player.cpp -msgid "You are not wearing that item." -msgstr "" - -#: src/player.cpp -msgid " isn't wearing that item." -msgstr "" - #: src/player.cpp msgid " is not wearing that item." msgstr "" @@ -214138,78 +216904,75 @@ msgstr "" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "" -msgstr[1] "" +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "" -msgstr[1] "" +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "" -msgstr[1] "" +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "" -msgstr[1] "" +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " +msgid "Dodge skill: %+.1f\n" msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " +msgid "Melee attack rolls: %+d%%\n" msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." +"Head encumbrance has no effect; it simply limits how much you " +"can put on." msgstr "" #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." msgstr "" #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items." +"\n" +"\n" msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" +msgid "Dexterity when throwing items: %+.1f\n" msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." +msgid "Reduced gun aim speed: %.1f" msgstr "" #: src/player_display.cpp @@ -214300,8 +217063,8 @@ msgstr "" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without food. " -"Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without " +"food. Having too much, or too little, can be unhealthy." msgstr "" #: src/player_display.cpp @@ -215294,6 +218057,10 @@ msgstr "" msgid "[%c] to take precise aim and fire." msgstr "" +#: src/ranged.cpp +msgid "turrets" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -216821,18 +219588,6 @@ msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "" msgstr[1] "" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have " -"been warned." -msgstr "" - #: src/veh_interact.cpp msgid "Select part" msgstr "" diff --git a/lang/po/de.po b/lang/po/de.po index 60c2e63566500..0668244a456fc 100644 --- a/lang/po/de.po +++ b/lang/po/de.po @@ -15,19 +15,19 @@ # paraDiXson, 2019 # Sam Doe , 2019 # Xtrem532 , 2019 -# kurtice087 , 2019 -# Pupsi , 2019 # Brett Dong , 2019 -# Vlasov Vitaly , 2019 # Wuzzy , 2019 +# Pupsi , 2019 +# Vlasov Vitaly , 2019 +# kurtice087 , 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" -"Last-Translator: Wuzzy , 2019\n" +"Last-Translator: kurtice087 , 2019\n" "Language-Team: German (https://www.transifex.com/cataclysm-dda-translators/teams/2217/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1743,8 +1743,8 @@ msgstr "Reinigungsmittel" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." -msgstr "Ein beliebtes Waschpulver aus der Zeit vor der großen Katastrophe." +msgid "A popular pre-Cataclysm washing powder." +msgstr "" #: lang/json/AMMO_from_json.py msgid "soap flakes" @@ -2083,6 +2083,17 @@ msgstr[1] "Lampenöl" msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "Ein dünnes und leicht entflammbares Öl zur Verwendung in Öllampen." +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -2258,6 +2269,69 @@ msgstr "" "spezialisierten medizinischen Equipment benutzt zu werden und kann nicht " "manuell verabreicht werden." +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "40mm-Leuchtfackel" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "" +"Eine 40mm-Signalleuchtfackel. Sie wird für eine Minute lang hell leuchten " +"und eine dünne Rauchspur um ihr herum hinterlassen." + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "" +"Eine 40mm-Blendgranate, die mit einem lauten Knall und sehr grellem Licht " +"explodiert. Personen, die sich in der Nähe des Explosionsbereiches " +"aufhalten, werden dabei kurzzeitig orientierungslos, da Seh- und " +"Hörwahrnehmung stark beeinträchtigt werden." + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "40mm-Brandgranate" +msgstr[1] "40mm-Brandgranaten" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "" +"Eine 40mm-Granate mit einer kleinen Napalmladung. Sie wurde entwickelt, um " +"beim Aufprall das umliegende Gebiet zu entzünden." + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40mm-Rauchgranaten" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "Eine 40mm-Granate, die dir durch Rauch Deckung bietet." + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "40mm Schrotpatrone" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "10´mm Auto FMJ" @@ -3173,143 +3247,132 @@ msgid ".40 S&W JHP, reloaded" msgstr "" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40mm-Granate" +msgid "40x46mm grenade" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "40mm-Beanbag" +msgid "40x46mm M1006" +msgstr "" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." msgstr "" -"Die weniger tödliche, 40mm-Beanbag Munition. Diese Säckchen sind " -"normalerweise mit Sand gefüllt und haben eine enorme Einschlagskraft. Sie " -"führen beim Aufprall zwingend zu starken Schmerzen und Desorientierung." #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40mm-Erschütterungsgranaten" +msgid "40x46mm M433" +msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "Eine 40mm-Granate mit einer Erschütterungsexplosionsladung." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "40mm-Leuchtfackel" +msgid "40x46mm M576" +msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." msgstr "" -"Eine 40mm-Signalleuchtfackel. Sie wird für eine Minute lang hell leuchten " -"und eine dünne Rauchspur um ihr herum hinterlassen." #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "40mm-Blendgranate" +msgid "40x46mm M651" +msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" msgstr "" -"Eine 40mm-Blendgranate, die mit einem lauten Knall und sehr grellem Licht " -"explodiert. Personen, die sich in der Nähe des Explosionsbereiches " -"aufhalten, werden dabei kurzzeitig orientierungslos, da Seh- und " -"Hörwahrnehmung stark beeinträchtigt werden." #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "40mm-Flechet" +msgid "40x46mm buckshot" +msgstr "" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." msgstr "" -"40mm Granate geladen mit einer Menge Panzerdurchdringender, pfeilförmiger " -"Projektile." #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40mm-Splittergranaten" +msgid "40x46mm slug" +msgstr "" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." msgstr "" -"Eine 40mm-Granate mit einer kleinen Explosivladung und eine hohen Anzahl " -"Schaden anrichtender Splitter." #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "40mm-Brandgranate" -msgstr[1] "40mm-Brandgranaten" +msgid "40x46mm flechette" +msgstr "" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M1001" +msgstr "" + +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." msgstr "" -"Eine 40mm-Granate mit einer kleinen Napalmladung. Sie wurde entwickelt, um " -"beim Aufprall das umliegende Gebiet zu entzünden." #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "40mm-Posten" +msgid "40x53mm M430A1" +msgstr "" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40mm-Rauchgranaten" +msgid "40x53mm buckshot" +msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "Eine 40mm-Granate, die dir durch Rauch Deckung bietet." +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "40mm-Tränengasgranate" -msgstr[1] "40mm-Tränengasgranaten" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." msgstr "" -"Eine 40mm-Tränengasgranate. Beim Aufprall wird eine Wolke aus höchst " -"giftigem und lähmendem Gas freigesetzt." #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "40mm Schrotpatrone" +msgid "40x53mm flechette" +msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." msgstr "" #: lang/json/AMMO_from_json.py @@ -5226,11 +5289,9 @@ msgstr[1] "Silber" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "" -"Ein weiches glänzendes Metall. Vor der Katastrophe wäre es einiges wert " -"gewesen, aber nun ist dessen Wert stark reduziert." #: lang/json/AMMO_from_json.py msgid "small metal sheet" @@ -5780,15 +5841,6 @@ msgstr "Eine handvoll Darts, nützlich als Munition für Blasrohre." msgid "plutonium cell" msgstr "Plutoniumzelle" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "" -"Freiliegende Batterieladung. Diese kann in wiederaufladbare Batteriezellen " -"geladen werden, kann aber nie entladen werden." - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5859,7 +5911,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" @@ -6405,21 +6457,6 @@ msgstr "" "Schwere runde aus Blei gegossene Projektile, nützlich als Munition für " "Steinschleudern." -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "Knochen-Armbrustbolzen" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "" -"Ein geschärfter Bolzen, der aus Knochen geschnitzt wurde, mit einer " -"Befiederung. Er ist leicht, bietet anständigen Schaden und Treffsicherheit. " -"Hat eine gute Chance, nach dem Feuern intakt zu bleiben." - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -6968,10 +7005,8 @@ msgstr[1] "Blobfutter" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" -"Eine Mischung aus diversen Arten von organischem Material, enthält alles, " -"was der Blob braucht, um gesund zu sein. Glaubst du zumindest." #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -7378,11 +7413,9 @@ msgstr[1] "Nomadenkleidungen" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "" -"Ein selbstgemachtes Outfit aus vorkatastrophischer Kleidung, ausgelegt für " -"lange Reisen. Es hat viel Lagerplatz." #: lang/json/ARMOR_from_json.py msgid "light nomad gear" @@ -7393,13 +7426,10 @@ msgstr[1] "leichte Nomadenkleidungen" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "" -"Ein leichtes, selbstgemachtes Outfit aus vorkatastrophischer Kleidung, " -"welches für lange Sommerreisen ausgelegt ist. Es bietet weniger Lagerplatz " -"und Rüstung verglichen mit als herkömmlicher Nomadenbekleidung." #: lang/json/ARMOR_from_json.py msgid "plated leather armor" @@ -7465,11 +7495,9 @@ msgstr[1] "Sammlerausrüstungen" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." msgstr "" -"Ein selbstgemachtes Sammler-Outfit aus vorkatastrophischer Kleidung, " -"ausgelegt für lange Reisen. Es hat viel Lagerplatz." #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -12063,9 +12091,9 @@ msgstr "Eine starke pelzgefütterte Hose." #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" -msgstr[0] "Kunstpelzhose" -msgstr[1] "Kunstpelzhosen" +msgid_plural "faux fur pants" +msgstr[0] "" +msgstr[1] "" #. ~ Description for faux fur pants #: lang/json/ARMOR_from_json.py @@ -13934,9 +13962,9 @@ msgstr "Ein rein weißer Zubon, wie er bei Kampfkünsten verwendet wird." #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" -msgstr[0] "Violinkoffer" -msgstr[1] "Violinkoffer" +msgid_plural "violin cases" +msgstr[0] "" +msgstr[1] "" #. ~ Description for violin case #: lang/json/ARMOR_from_json.py @@ -14647,12 +14675,9 @@ msgstr[1] "Riesige Novelty Rucksäcke" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." msgstr "" -"Ein riesiger Stoffrucksack, der vor der Apokalypse meist als Witz gedacht " -"war. Jetzt ist er noch immer ziemlich albern, aber er kann eine Menge Sachen" -" aufnehmen." #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -16030,6 +16055,142 @@ msgstr "" "Sie passen fürchterlich, aber sehen sehr glänzend aus. Für den hochklassigen" " Gangsa-Rap-Look." +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -16953,6 +17114,552 @@ msgstr "" "Ein glänzender schwarzer Lederschwanz, der mit winzigen Plastikkügelchen " "beschwert ist. Wackelt hinter dir, wenn du gehst." +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -17518,8 +18225,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17531,10 +18238,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" #: lang/json/ARMOR_from_json.py @@ -17546,10 +18253,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17561,7 +18268,7 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" @@ -17575,8 +18282,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" @@ -17589,7 +18296,7 @@ msgstr[1] "" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -17617,8 +18324,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" @@ -17632,8 +18339,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17645,8 +18352,8 @@ msgstr[1] "" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17658,9 +18365,9 @@ msgstr[1] "" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17673,7 +18380,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -17687,10 +18394,10 @@ msgstr[1] "" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -17716,11 +18423,11 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" @@ -17733,9 +18440,9 @@ msgstr[1] "" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -17749,10 +18456,10 @@ msgstr[1] "" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17765,9 +18472,9 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17779,30 +18486,30 @@ msgstr[1] "" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" +msgid_plural "C.R.I.T trousers" msgstr[0] "" msgstr[1] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" @@ -17814,7 +18521,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17825,20 +18532,20 @@ msgstr[1] "" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "" msgstr[1] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -17850,7 +18557,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" @@ -17863,7 +18570,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -17878,8 +18585,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17979,10 +18686,11 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17991,13 +18699,6 @@ msgid_plural "silver infusion bracelets" msgstr[0] "" msgstr[1] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -18305,7 +19006,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" +msgid_plural "flesh pouches" msgstr[0] "" msgstr[1] "" @@ -18317,6 +19018,19 @@ msgid "" "minimize encumbrance." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -20237,7 +20951,7 @@ msgstr[1] "Ionenüberlastungserzeuger-KBMs" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" "Ein leistungsstarker Ionen-Energiegenerator wurde deiner Brust implantiert. " @@ -22266,6 +22980,138 @@ msgstr "" "Eine unterhaltsame Sammlung von Folklore mit den üblichen Verdächten: Feen, " "Goblins und Trolle." +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -22744,9 +23590,8 @@ msgstr[1] "Erotikromane" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." msgstr "" -"Ein banales Narrativ, der minderwertigen literaischen Schmutz verdeckt." #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -23538,7 +24383,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" @@ -25165,9 +26010,9 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" #: lang/json/BOOK_from_json.py @@ -25196,12 +26041,9 @@ msgstr[1] "Roboter hacken aus Spaß & Profit" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" -"Ein Buch über das illegale Erlangen, Umprogrammieren und Modifizieren von " -"Robotern. Es enthält viele hilfreiche Schritt-für-Schritt-Anleitungen und " -"Beispiel-Blaupausen." #: lang/json/BOOK_from_json.py msgid "Popular Robotics" @@ -25434,6 +26276,17 @@ msgstr[1] "Salzwasser" msgid "Water with salt added. Not good for drinking." msgstr "Wasser mit Salz. Nicht zum Trinken geeignet." +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -26064,12 +26917,9 @@ msgstr[1] "selbstgemachter Schnaps" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "" -"Nur der stärkste, reinste gute alte Fusel, destilliert aus Getreide und " -"Zucker. Lässt dich garantiert diese ganze Sache mit der Apokalypse " -"vergessen, oder du wiedererlangst deine Fantasie." #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -26202,6 +27052,75 @@ msgstr[1] "Single-Malt-Whisky" msgid "Only the finest whiskey straight from the bung." msgstr "Nur der beste Whisky, frisch gezapft." +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "edler Landstreicher" @@ -26967,6 +27886,20 @@ msgid_plural "meat jerky" msgstr[0] "Dörrfleisch" msgstr[1] "Dörrfleisch" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "Dörrmenschenfleisch" +msgstr[1] "Dörrmenschenfleisch" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26990,23 +27923,28 @@ msgstr "" "wird er dich durstig machen." #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "Dörrmenschenfleisch" -msgstr[1] "Dörrmenschenfleisch" +msgid "smoked meat" +msgstr "Rauchfleisch" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "" -"Salziges getrocknetes Menschenfleisch, das für eine lange Zeit haltbar " -"bleibt, allerdings wird es dich durstig machen." +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "Rauchfleisch" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "" +msgstr[1] "" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -27034,19 +27972,6 @@ msgstr "" "könnte noch länger geräuchert werden, um ihm vollständig das Wasser zu " "entziehen und somit zu dehydrieren." -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "geräucherter Gimpel" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "" -"Eine stark geräucherte Portion Menschenfleisch. Hält für eine sehr lange " -"Zeit und schmeckt - wenn du so etwas magst - ziemlich gut." - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -28573,8 +29498,8 @@ msgstr "Rasierklauen-Rogen" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." -msgstr "Ein Klumpen Rasierklaueneier. Eine nachkatastrophische Delikatesse." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -29953,12 +30878,12 @@ msgstr "" " etwas Käse, vielleicht etwas Fleisch gebrauchen." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" -msgstr[0] "Nachos mit Käse" -msgstr[1] "Nachos mit Käse" +msgid "cheese nachos" +msgid_plural "cheese nachos" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -29968,57 +30893,57 @@ msgstr "" " schaden." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" -msgstr[0] "Nachos mit Fleisch" -msgstr[1] "Nachos mit Fleisch" - -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "" -"Gesalzene Chips aus Mais-Tortillas, nun mit Fleisch. Allerdings könnten sie " -"vielleicht etwas Käse gebrauchen." +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "Nörgler-Nachos" msgstr[1] "Nörgler-Nachos" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." msgstr "" -"Gesalzene Chips aus Mais-Tortillas mit Menschenfleisch. Etwas Käse könnten " -"sie noch verbessern." +"Gesalzene Chips aus Mais-Tortillas, nun mit Fleisch. Allerdings könnten sie " +"vielleicht etwas Käse gebrauchen." +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "Nörgler-Nachos mit Käse" msgstr[1] "Nörgler-Nachos mit Käse" -#. ~ Description for niño nachos with cheese -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "" -"Gesalzene Chips auis Mais-Tortillas mit Menschenfleisch und bedeckt in Käse." -" Lecker." - +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "Nachos mit Fleisch und Käse" -msgstr[1] "Nachos mit Fleisch und Käse" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -30096,17 +31021,6 @@ msgstr[1] "Chili Dogs" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Ein Hot Dog mit Chili con Carne als Garnierung. Mjam!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "Cheater Chili Dogs" -msgstr[1] "Cheater Chili Dogs" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "Ein Hot Dog mit Chili con Cabron als Belag. Köstlich!" - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -30202,10 +31116,8 @@ msgstr[1] "ungekochte Hot Dogs" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." +"Cataclysm. It would taste much better prepared." msgstr "" -"Eine stark verarbeitete Wurst, üblich bei Baseballspielen vor der " -"Katastrophe. Zubereitet würde sie viel besser schmecken." #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -30253,6 +31165,24 @@ msgstr "" msgid "raw sausage" msgstr "Rohwurst" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -30263,6 +31193,13 @@ msgstr "" msgid "sausage" msgstr "Wurst" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -30274,25 +31211,18 @@ msgstr "" msgid "cooked sausage" msgstr "geckochte Wurst" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "Eine deftige geckochte Wurst." -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "Mannwurst" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "" -"Eine deftige Menschenfleischwurst, die für die lange Konservierung gepökelt " -"und geräuchert wurde. Sehr lecker, falls du im Markt für Menschenfleisch " -"bist." - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -30311,6 +31241,21 @@ msgid_plural "bratwursts" msgstr[0] "Bratwurst" msgstr[1] "Bratwürste" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30392,6 +31337,14 @@ msgstr "" msgid "glazed tenderloins" msgstr "glasierte Filets" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30407,6 +31360,22 @@ msgstr "" msgid "currywurst" msgstr "Currywurst" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30420,6 +31389,22 @@ msgstr "" msgid "aspic" msgstr "Sülze" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30505,6 +31490,14 @@ msgstr "" msgid "lunch meat" msgstr "Aufschnitt" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30518,6 +31511,22 @@ msgstr "" msgid "bologna" msgstr "Fleischwurst" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30585,6 +31594,21 @@ msgid_plural "sausage gravies" msgstr[0] "Wurstbratensoße" msgstr[1] "Wurstbratensoßen" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "Mannwurstbratensoße" +msgstr[1] "Mannwurstbratensoßen" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30598,6 +31622,22 @@ msgstr "" msgid "pemmican" msgstr "Pemmikan" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30614,6 +31654,21 @@ msgstr "" msgid "hamburger helper" msgstr "Hamburger Helper" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30638,6 +31693,20 @@ msgid_plural "chilis con carne" msgstr[0] "Chili con Carne" msgstr[1] "Chili con Carne" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -30712,14 +31781,26 @@ msgstr "Geschnittene Venusmuscheln in Wasser." msgid "clam chowder" msgstr "sämige Muschelsuppe" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." msgstr "" -"Eine leckere klumpige weiße Suppe aus Muscheln und Kartoffeln. Ein Gemack " -"des vergangenen Glanzes von Neuengland." #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" @@ -30727,6 +31808,13 @@ msgid_plural "baked beans" msgstr[0] "gebackene Bohnen" msgstr[1] "gebackene Bohnen" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -30738,6 +31826,13 @@ msgid_plural "meat fried rice" msgstr[0] "gebratener Reis mit Fleisch" msgstr[1] "gebratener Reis mit Fleisch" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -30749,6 +31844,14 @@ msgid_plural "deluxe beans and rice" msgstr[0] "Bohnen mit Reis deluxe" msgstr[1] "Bohnen mit Reis deluxe" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30762,6 +31865,21 @@ msgstr "" msgid "meat pie" msgstr "Fleischpastete" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -30771,6 +31889,21 @@ msgstr "Ein leckere gebackene Pastete mit einer leckeren Fleischfüllung." msgid "meat pizza" msgstr "Fleischpizza" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30780,12 +31913,29 @@ msgstr "" "Eine Fleischpizza, für alle Fleichfresser da draußen. Knüppelvoll mit " "Hackfleisch und stark gewürzt." +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" msgstr[0] "Luxus-Rührei" msgstr[1] "Luxus-Rühreier" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30799,6 +31949,13 @@ msgstr "" msgid "canned meat" msgstr "Dosenfleisch" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "Soylent-Stückchen" +msgstr[1] "Soylent-Stückchen" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30813,6 +31970,13 @@ msgstr "" msgid "salted meat slice" msgstr "gesalzenes Fleischstück" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -30824,6 +31988,21 @@ msgid_plural "spaghetti bolognese" msgstr[0] "Spaghetti Bolognese" msgstr[1] "Spaghetti Bolognese" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -30833,6 +32012,22 @@ msgstr "Spaghetti mit einer dicken Fleischsoße bedeckt. Lecker!" msgid "lasagne" msgstr "Lasagne" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30856,19 +32051,48 @@ msgstr "Gebraten ist dieses Frühstücksfleisch tatsächlich ziemlich lecker." msgid "cheeseburger" msgstr "Cheeseburger" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." +"Cataclysm culinary achievement." msgstr "" -"Ein Sandwich mit Hackfleisch und Käse mit Gewürzen. Die Höhe der " -"vorkatastrophischen kulinarischen Errungenschaften." #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "Hamburger" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -30878,6 +32102,21 @@ msgstr "Ein Sandwich mit Hackfleisch und Gewürzen." msgid "sloppy joe" msgstr "Sloppy Joe" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "Menschwich" +msgstr[1] "Menschwiches" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30891,6 +32130,22 @@ msgstr "" msgid "taco" msgstr "Taco" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30904,6 +32159,13 @@ msgstr "" msgid "pickled meat" msgstr "eingelegtes Fleisch" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30916,6 +32178,15 @@ msgstr "" msgid "dehydrated meat" msgstr "dehydriertes Fleisch" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30944,6 +32215,15 @@ msgid_plural "haggii" msgstr[0] "Haggis" msgstr[1] "Haggis" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30978,6 +32258,14 @@ msgid_plural "meat temaki" msgstr[0] "Fleisch-Temaki" msgstr[1] "Fleisch-Temaki" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31015,6 +32303,14 @@ msgstr "" msgid "pelmeni" msgstr "Pelmeni" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31028,6 +32324,13 @@ msgstr "" msgid "homemade burrito" msgstr "" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31036,368 +32339,6 @@ msgid "" "but homemade and delicious!" msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "dehydriertes Menschenfleisch" -msgstr[1] "dehydriertes Menschenfleisch" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "" -"Dyhydrierte Menschenfleischflocken. Mit einer korrekten Lagerhaltung wird " -"das getrocknete Essen für eine unglaublich lange Zeit essbar bleiben." - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "rehydriertes Menschenfleisch" -msgstr[1] "rehydriertes Menschenfleisch" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "" -"Wiederhergestellte Menschenfleischflocken, die nun viel genießbarer sind, " -"nachdem sie rehydriert worden sind." - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "Menschen-Haggis" -msgstr[1] "Menschen-Haggis" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"Dieser traditionelle schottische Bohnenkrautpudding besteht aus " -"Menschenfleisch und Innereien, die mit Haferflocken gemischt werden und in " -"einen menschlichen Magen genäht sind. Überraschend schmackhaft, wenn mann " -"darauf steht. Schmeckt am besten mit gekochtem Wurzelgemüse und starken " -"Whisky." - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "Menschenfleischwurst" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" -"Konserviertes und geschnittenes Menschenfleisch. Sein Vorname könnte Oskar " -"gewesen sein. Du kannst es kalt essen, du kaltblütiger Menschenfresser!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "Currymannwurst" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "" -"Eine Mannwurst, die in einer Curry-Ketchup-Soße bedeckt ist. Gleichzeitig " -"ziemlich würzig und beeindruckend." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "Mannwurstbratensoße" -msgstr[1] "Mannwurstbratensoßen" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "" -"Kekse, Menschenfleisch und eine leckere Pilzsuppe, all das zusammen in einem" -" wundervoll glitschigen und schmackhaften Matsch zusammengepanscht." - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "Sündensülze" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "" -"Ein Gericht, in welches Menschenfleisch in eine Gelantine aus " -"Menschenknochen gelassen wurde. Mörderisch lecker – wenn du so etwas magst." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "Prepper-Pemmikan" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "" -"Eine konzentrierte Mischung aus Fett und Proteinen. Sie wird als nahrhaftes " -"energiereiches Lebensmittel verwendet. Sie besteht aus Talg, essbaren " -"Pflanzen und einem glücklosen Überlebensfanatiker." - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "Sapiens-Sandwich" -msgstr[1] "Sapiens-Sandwichs" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "Brot und Menschenfleisch, Überraschung!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "Luxus-Sapiens-Sandwich" -msgstr[1] "Luxus-Sapiens-Sandwichs" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "" -"Ein Sandwich mit Menschenfleisch, Gemüse, Käse und Gewürzen. Ergötze dich an" -" den Seelen deiner Feinde und ihrem leckeren Gartengemüse!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "Hobo Helper" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "" -"Makkaroni mit überbackenem Käse und Hackfleisch aus Menschenfleisch. Es ist " -"so gut wie Mord." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "Chili con Cabron" -msgstr[1] "Chilis con Cabrones" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "" -"Ein würziger Eintopf, der Chilipulver, Menschenfleisch, Tomaten und Bohnen " -"enthält." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "Menschenfleischpastete" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -"Eine Pastete mit etwas Soldat, oder vielleicht Wissenschaflter, wer weiß? " -"Gott, das ist gut!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "Menschenpizza" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "" -"Eine Fleischpizza für all die Kannibalen da draußen. Gerammelt voll mit " -"zerhacktem Menschenfleisch und stark gewürzt." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "Soylent-Stückchen" -msgstr[1] "Soylent-Stückchen" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -"Natriumarmes konserviertes Menschenfleisch. Es wurde gekocht und " -"konserviert. Enthält die meisten Nährstoffe, aber wenig des Geschmacks von " -"gekochtem Fleisch." - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "gesalzene Gimpelstückchen" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "" -"Vakuumverpackte mit Pökel überdeckte Menschenfleischstücke. Salzig aber, " -"wenn wirklich notwendig, lecker." - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "Schwachkopf-Spaghetti" -msgstr[1] "Schwachkopf-Spaghetti" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "" -"Spaghetti, mit einer dicken Menschenfleischsoße bedeckt. Schmeckt großartig," -" wenn du solche Sachen magst." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "Luigi-Lasagne" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "" -"Eine sehr alte Art eines Nudelgerichts, hergestellt aus mehreren Schichten " -"Lasagneblättern, die abwechselnd mit Käse, Saucen und Fleisch bedeckt " -"werden. Diese Portion wurde durch Menschenfleisch aufgewertet." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "Chatoencheeseburger" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "" -"Ein Sandwich mit gehacktem Menschenfleisch und Käse mit Gewürzen. Der " -"Höhepunkt der postapokalyptischen kannibalistischen kulinarischen " -"Errungenschaften." - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "Hansburger" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "" -"Dieser Hamburger enthält mehr als die von der FDA zugelassenen 4% " -"Menschenfleisch." - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "Menschwich" -msgstr[1] "Menschwiches" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "" -"Ein Sandwich ist ein Sandwich, aber dieser hier ist aus Leuten gemacht!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "Trottel-Taco" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -"Ein Taco aus gehacktem Menschenfleisch statt Hackfleisch. Aus irgendeinem " -"Grund kannst du aus der Ferne eine Glocke hören." - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "Rohmannwurst" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "" -"Eine deftige rohe Menschenfleischwurst, die zum Räuchern oder Kochen " -"vorbereitet wurde." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "gekochte Mannwurst" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "" -"Eine deftige gekochte Menschenfleischwurst: Sie riecht so lecker wie " -"menschenmöglich." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "Mannbrat" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "" -"Eine typisch deutsche Wurst aus fein gehackten Menschen, die in der Pfanne " -"gebraten oder geröstet wird. Am besten heiß und frisch genießen. Du kannst " -"im Übrigen jeden verfügbaren Menschen verarbeiten – es müssen nicht zwingend" -" Deutsche sein." - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "eingelegter Rabauke" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "" -"Dies ist eine Portion frisch eingepökeltem und konservierten " -"Menschenfleisches. Lecker und nahrhaft, falls du so etwas magst." - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -32308,11 +33249,8 @@ msgstr "aromatisierte Knochenmehl-Tablette" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" -"Selbstgemachtes Kalzium-Nahrungsergänzungsmittel aus Knochenmehl. Durch " -"Zumengen von Süße, um der pulvrigen Textur und dem Geschmack von Asche " -"entgegenzuwirken, fast so schmackhaft wie die Tabletten vor der Katastrophe." #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -32995,7 +33933,7 @@ msgstr "Vogelserum" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" @@ -33934,13 +34872,9 @@ msgstr[1] "Marlossgelantine" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" -"Dies sieht wie eine Handvoll einer zitronenfarbenen Flüssigkeit, die sich " -"festgesetzt hat, aus, ähnlich wie vorkatastrophische Götterspeise. Es hat " -"ein starkes aber leckeres Aroma, aber es ist eindeutig entweder mutiert oder" -" außerirdischem Ursprungs." #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -34251,14 +35185,14 @@ msgstr "" "Dies ist Futter für Hunde. Es riecht seltsam, aber Hunde scheinen es zu " "mögen." -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "Katzenfutter" msgstr[1] "Katzenfutter" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "" "Dies ist Futter für Katzen. Es riecht seltsam, aber Katzen scheinen es zu " @@ -34300,69 +35234,30 @@ msgstr[1] "" msgid "Some nectar. Seeing this item is a bug." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "Proteingetränk" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "Soylent-Green-Getränk" msgstr[1] "Soylent-Green-Getränke" -#. ~ Description for soylent green drink +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "" -"Ein dünner Brei mit raffiniertem menschlichen Protein, das mit Wasser " -"vermischt wurde. Obwohl es sehr nahrhaft ist, ist es nicht besonders lecker." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" -"Rohes, raffiniertes Protein, welches aus Menschen gewonnen wurde. Obwohl es " -"recht nahrhaft ist, ist es unmöglich, es in seiner Reinform zu genießen. " -"Versuche, Wasser hinzuzufügen." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "Soylent-Green-Shake" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "" -"Ein dickflüssiges und leckeres Getränk aus reinem raffinierten menschlichen " -"Protein und nährstoffhaltigen Früchten." - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "angereicherter Soylent-Green-Shake" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "" -"Ein dickflüssiges und leckeres Getränk aus reinem raffinierten menschlichen " -"Protein und nährstoffhaltigen Früchten. Es wurde mit zusätzlichen Vitaminen " -"und Mineralien ergänzt." - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "Proteingetränk" - #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34378,6 +35273,14 @@ msgid_plural "protein powder" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34388,13 +35291,10 @@ msgstr "" " es in seiner Reinform zu genießen. Versuche, Wasser hinzuzufügen." #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "" -msgstr[1] "" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -34410,6 +35310,13 @@ msgstr "" msgid "protein shake" msgstr "Proteinshake" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34423,6 +35330,14 @@ msgstr "" msgid "fortified protein shake" msgstr "angereicherter Proteinshake" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35266,6 +36181,13 @@ msgid_plural "deluxe sandwiches" msgstr[0] "Luxus-Sandwich" msgstr[1] "Luxus-Sandwichs" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35365,6 +36287,22 @@ msgid_plural "meat sandwiches" msgstr[0] "Fleisch-Sandwich" msgstr[1] "Fleisch-Sandwichs" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "Sapiens-Sandwich" +msgstr[1] "Sapiens-Sandwichs" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -36343,15 +37281,6 @@ msgstr "Knochenmarkbrühe" msgid "A tasty and nutritious broth made from bones." msgstr "Eine leckere und nahrhafte Brühe aus Knochen." -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "Menschenbrühe" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "Eine nahrhafte Brühe aus Menschenknochen." - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "Gemüsesuppe" @@ -36365,6 +37294,13 @@ msgstr "Eine nahrhafte und lecker-herzhafte Gemüsesuppe." msgid "meat soup" msgstr "Fleischsuppe" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -36396,6 +37332,13 @@ msgid_plural "curries with meat" msgstr[0] "Curry mit Fleisch" msgstr[1] "Currys mit Fleisch" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -36406,6 +37349,13 @@ msgstr "" msgid "woods soup" msgstr "Wäldersuppe" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." @@ -36413,17 +37363,6 @@ msgstr "" "Eine nahrhafte und leckere Suppe, die aus den Geschenken der Natur gemacht " "wurde." -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "Trottelsuppe" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "" -"Eine Suppe, die aus jemanden, der viel besser als ein Gericht als eine " -"Person taugt, gemacht wurde." - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "Hühnchen-Nudelsuppe" @@ -37581,17 +38520,6 @@ msgid "" " resembles spoiled milk." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "" @@ -37640,6 +38568,17 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "" @@ -37658,8 +38597,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37674,7 +38613,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -37924,20 +38863,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "verharzte Kordel" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "" -"Ein primitives Bindematerial, das aus Kordeln und natürlichem Klebstoff " -"hergetellt wurde. Benutze es, um Gegenstände aus Holz, Papier, Knochen oder " -"Chitin zu reparieren." - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -37945,8 +38870,8 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37970,10 +38895,8 @@ msgstr[1] "beerenförmige Anomalien" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "" -"Wenn wir sie so ließen, wie sie sein sollte, könnte man einfach so zur Blüte" -" spazieren und von der Frucht naschen. Das können wir nicht machen, oder?" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -37985,11 +38908,8 @@ msgstr[1] "samenförmige Anomalien" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "" -"Wenn wir sie so ließen, wie sie sein sollte, könnte man einfach so kampflos " -"in den Garten gehen, und etwas von dem Samen nehmen. Das können wir nicht " -"machen, oder?" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -38001,11 +38921,8 @@ msgstr[1] "Marlossgelantine" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "" -"Wenn wir dies so ließen, wie es sein sollte, könnte man einfach so kampflos " -"zum Turm gehen, und etwas von dem Saft naschen. Moment mal, wie hast du dies" -" überhaupt GEKRIEGT?" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -38016,12 +38933,9 @@ msgstr[1] "obstförmige Anomalien" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" -"Wir existieren nicht im Moment. Kluger kleiner Mensch, offensichtlich " -"debuggst du, um dies zu sehen, nicht wahr? Wir werden dir nicht erlauben, " -"uns beizutreten, solange wir ausgemoddet sind." #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -38149,11 +39063,8 @@ msgstr[1] "glutenfreie Erdnussbutter-Honig-Sandwichs" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" -"Irgendso ein armseliger Dummkopf hat Honig auf dieses Erdnussbuttersandwich " -"getan, wer um alles in der Welt würde … Moment mal, das ist eigentlich " -"ziemlich gut. Und glutenfrei ist es auch noch!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free PB&M sandwich" @@ -38177,20 +39088,16 @@ msgstr "laktosefreie Hickorynuss-Ambrosia" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "" -"Leckere Hickorynuss-Ambrosia. Ein Getränk, dass Göttern würdig ist. Diese " -"hier wurde mit einer Alternative zur Kuhmilch gemacht." #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "" -"Du glaubst, dass es Maisstärke ist … oder Reismehl … oder etwas anderes. Wie" -" auch immer, es ist sicher nicht Weizenmehl. Es ist nützlich zum Backen." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free johnnycake" @@ -38199,12 +39106,9 @@ msgstr "glutenfreier Johnnycake" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "" -"Manchmal sehnen wir uns alle nach Kuchen. Dieses Lebensmittel hier ist nicht" -" perfekt, aber es ist ein leckerer und nahrhafter glutenfreier " -"Brotleckerbissen. " #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit pancake" @@ -38246,12 +39150,9 @@ msgstr[1] "gluten- und laktosefreie Obstpfannkuchen" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" -"Lockere und leckere Pfannkuchen die nur aus den Dingen bestehen, die du noch" -" essen kannst. Aber wenigstens haben sie noch echten Ahornsirup. Sie wurden " -"süßer und gesünder mit dem Hinzufügen gesunder Früchte gemacht." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free chocolate pancake" @@ -38292,12 +39193,9 @@ msgstr[1] "gluten- und laktosefreie Arme Ritter" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" -"Glutenfreie Brotscheiben, die in einem laktosefreien Milch- und Eiermix " -"getunkt und anschließend geröstet wurden. Du hast nie geglaubt, dass es " -"möglich wäre, aber jetzt fühlst du dich wie ein waschechter Post-90er." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free biscuit" @@ -38396,10 +39294,8 @@ msgstr "glutenfreier Cheeseburger" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." +"of pre-Cataclysm culinary achievement." msgstr "" -"Ein glutenfreies Sandwich mit Hackfleisch und Käse mit Gewürzen. Die Höhe " -"der vorkatastrophischen kulinarischen Errungenschaften." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -38537,11 +39433,8 @@ msgstr[1] "glutenfreie fade Sandwichs" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "" -"Ein einfaches glutenfreies Soßensandwich. Nicht sehr füllend, aber es ist " -"besser, als einfach nur das Brot zu essen … besonders, wenn es die falsche " -"Brotsorte ist!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free waffle" @@ -38549,9 +39442,8 @@ msgstr "glutenfreie Waffel" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." msgstr "" -"Glutenfreie Waffel. Das ist praktisch ein Pfannkuchen in Hashtag-Form." #: lang/json/COMESTIBLE_from_json.py msgid "lactose free waffle" @@ -38559,18 +39451,15 @@ msgstr "laktosefreie Waffel" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." msgstr "" -"Laktosefreie Waffel. Das ist praktisch ein Pfannkuchen in Hashtag-Form." #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "" -"Gluten- und laktosefreie Waffel. Das ist praktisch ein Pfannkuchen in " -"Hashtag-Form." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit waffle" @@ -38621,11 +39510,9 @@ msgstr[1] "Reismilch" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "" -"Süßer als die Milch von echten Kühen, schmeckt fast so wie Vanilleeis. " -"Verdirbt schnell." #: lang/json/COMESTIBLE_from_json.py msgid "coconut water" @@ -38636,11 +39523,9 @@ msgstr[1] "Kokosnusswasser" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "" -"Kokosnussmilch, der Wasser hinzugefügt wurde, um sie zu strecken. Schmeckt " -"jedoch akzeptabel. Verdirbt schnell." #: lang/json/COMESTIBLE_from_json.py msgid "jarred coconut milk" @@ -39566,6 +40451,17 @@ msgid "" "it's anyone's guess what it's for." msgstr "" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -40402,6 +41298,29 @@ msgid_plural "corpses" msgstr[0] "Leiche" msgstr[1] "Leichen" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -40420,13 +41339,7 @@ msgid "" " so with a gigantic claw." msgstr "" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "" @@ -40516,6 +41429,34 @@ msgid "" "wound." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -42502,6 +43443,149 @@ msgstr[1] "Diamanten" msgid "A sparkling diamond." msgstr "Ein funkelnder Diamant." +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -43655,12 +44739,9 @@ msgstr[1] "Cestusse" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." msgstr "" -"Ein schwerer Metallschutz, der die Faust bedeckt und die Schlagkraft erhöht." -" Unter ihm ist eine kräftige Plattierung, um die Hand des Trägers zu " -"schützen." #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -44463,17 +45544,17 @@ msgstr[1] "" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "Geschützturmeinbaurahmen" -msgstr[1] "Geschützturmeinbaurahmen" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" #: lang/json/GENERIC_from_json.py @@ -46652,6 +47733,288 @@ msgid_plural ".50 ammo belt linkages" msgstr[0] ".50-Munitionsgurtscharnier" msgstr[1] ".50-Munitionsgurtscharniere" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -46793,15 +48156,43 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "40mm-Kanister" -msgstr[1] "40mm-Kanister" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing +#: lang/json/GENERIC_from_json.py +msgid "A large canister from a spent 40mm cartridge." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for 40mm canister #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "Ein großer Kanister einer verbrauchten 40mm-Granate." +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -47181,16 +48572,6 @@ msgid_plural "generic silverwares" msgstr[0] "" msgstr[1] "" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -50117,6 +51498,28 @@ msgid "" "twist ties, duct tape, and other random stuff has been used to compensate." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -51953,8 +53356,8 @@ msgstr[1] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -52086,9 +53489,79 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -54274,7 +55747,21 @@ msgstr[1] "" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" #: lang/json/GENERIC_from_json.py @@ -55467,6 +56954,17 @@ msgstr[1] "" msgid "A small book, containing spells created by a novice magician." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -55639,6 +57137,47 @@ msgid "" "hopes to discover a more permanent solution." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -56035,12 +57574,9 @@ msgstr[1] "kaputte entwaffnete Scheuchboter" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" -"Ein kaputter Scheuchboter. Seine integrierten Waffenmodule wurden entfernt. " -"Könnte für seine Bestandteile entkernt oder zu einem geborgenen Roboter " -"verarbeitet werden." #. ~ Description for broken skitterbot #: lang/json/GENERIC_from_json.py @@ -56066,12 +57602,9 @@ msgstr[1] "kaputte entwaffnete Verteidigungsroboter" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Ein kaputter Verteidigungsroboter. Seine internen Waffen wurden entfernt. " -"Könnte für seine Bestandteile entkernt oder zu einem geborgenen Roboter " -"verarbeitet werden." #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -56107,12 +57640,9 @@ msgstr[1] "kaputte entwaffnete Chicken-Walker" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Ein kaputter Chicken-Walker. Seine internen Waffen wurden entfernt. Könnte " -"für seine Bestandteile entkernt oder zu einem geborgenen Roboter verarbeitet" -" werden." #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -56727,10 +58257,8 @@ msgstr[1] "kaputte Schrottplatz-Cowboys" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "" -"Ein kaputter geborgener Roboter. Er könnte noch für seine Bestandteile " -"demontiert, oder wieder aufgebaut werden." #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -56759,12 +58287,9 @@ msgstr[1] "kaputte Militärausbildungsroboter" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" -"Ein kaputter Militärausbildungsroboter, zerbrochen und inaktiv. Dieses " -"Exemplar ist mit einer eingebauten Paintballwaffe bewaffnet. Könnte für " -"Teile auseinandergenommen werden." #: lang/json/GENERIC_from_json.py msgid "broken military robot" @@ -56775,62 +58300,44 @@ msgstr[1] "kaputte Militärroboter" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" -"Ein kaputter Militärausbildungsroboter, zerbrochen und inaktiv. Dieses " -"Exemplar ist mit einer eingebauten 5,56mm-Feuerwaffe ausgestattet. Könnte " -"für Teile auseinandergenommen werden." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" -"Ein kaputter Militärausbildungsroboter, zerbrochen und inaktiv. Dieses " -"Exemplar ist mit einer eingebauten 7,62mm-Feuerwaffe ausgestattet. Könnte " -"für Teile auseinandergenommen werden." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" -"Ein kaputter Militärausbildungsroboter, zerbrochen und inaktiv. Dieses " -"Exemplar ist mit einer eingebauten Kaliber-50-Feuerwaffe ausgestattet. " -"Könnte für Teile auseinandergenommen werden." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" -"Ein kaputter Militärausbildungsroboter, zerbrochen und inaktiv. Dieses " -"Exemplar ist mit einer eingebauten 8×40mm-Feuerwaffe ausgestattet. Könnte " -"für Teile auseinandergenommen werden." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" -"Ein kaputter Militärausbildungsroboter, zerbrochen und inaktiv. Dieses " -"Exemplar ist mit einer eingebauten Flechet-Feuerwaffe ausgestattet. Könnte " -"für Teile auseinandergenommen werden." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" -"Ein kaputter Militärausbildungsroboter, zerbrochen und inaktiv. Dieses " -"Exemplar ist mit einem eingebauten 40mm-Granatenwerfer ausgestattet. Könnte " -"für Teile auseinandergenommen werden." #: lang/json/GENERIC_from_json.py msgid "broken military flame robot" @@ -56841,12 +58348,9 @@ msgstr[1] "kaputte Militärflammenroboter" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" -"Ein kaputter Militärausbildungsroboter, zerbrochen und inaktiv. Dieses " -"Exemplar ist mit einem eingebauten Flammenwerfer ausgestattet. Könnte für " -"Teile auseinandergenommen werden." #: lang/json/GENERIC_from_json.py msgid "broken robo-guardian" @@ -56859,11 +58363,13 @@ msgstr[1] "" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "" -"Ein kaputter geborgener Roboter. Könnte auseinandergebaut oder zu etwas " -"neuem gebaut werden." +"Ein kaputter geborgener Roboter. Er könnte noch für seine Bestandteile " +"demontiert, oder wieder aufgebaut werden." #: lang/json/GENERIC_from_json.py msgid "broken robote deluxe" @@ -56873,10 +58379,8 @@ msgstr[1] "kaputte robote deluxe" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "" -"Ein kaputter Deluxe-Roboter. Könnte auseinandergebaut oder zu etwas neuem " -"gebaut werden." #: lang/json/GENERIC_from_json.py msgid "broken robo-protector" @@ -56899,12 +58403,9 @@ msgstr[1] "kaputte entwaffnete fortgeschrittene Bots" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Ein kaputter fortgeschrittener Roboter. Seine internen Waffen wurden " -"entfernt. Könnte für seine Bestandteile entkernt oder zu einem geborgenen " -"Roboter verarbeitet werden." #: lang/json/GENERIC_from_json.py msgid "broken advanced robot" @@ -56915,42 +58416,30 @@ msgstr[1] "kaputte fortgeschrittene Roboter" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" -"Ein kaputter fortgeschrittener Roboter. Dieser ist mit einem integrierten " -"Laser-Emitter ausgerüstet. Er könnte noch für seine Bestandteile demontiert " -"werden." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" -"Ein kaputter fortgeschrittener Roboter. Dieser ist mit einem integrierten " -"Plasma-Werfer ausgerüstet. Er könnte noch für seine Bestandteile demontiert " -"werden." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" -"Ein kaputter fortgeschrittener Roboter. Dieser ist mit einem integrierten " -"Elektro-Werfer ausgerüstet. Er könnte noch für seine Bestandteile demontiert" -" werden." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" -"Ein kaputter fortgeschrittener Roboter. Dieser ist mit einem integrierten " -"EMP-Projektor ausgerüstet. Er könnte noch für seine Bestandteile demontiert " -"werden." #: lang/json/GENERIC_from_json.py msgid "broken glittering lady" @@ -56975,12 +58464,9 @@ msgstr[1] "kaputte Kettensägenschrecken" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "" -"Ein kaputter geborgener Roboter. Gott sei Dank ist er endlich wirklich " -"kaputt. Er könnte noch für seine Bestandteile demontiert, oder wieder " -"aufgebaut werden." #: lang/json/GENERIC_from_json.py msgid "broken screeching terror" @@ -57000,14 +58486,6 @@ msgid_plural "broken fist kings" msgstr[0] "kaputter Faustkönig" msgstr[1] "kaputte Faustkönige" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "" -"Ein kaputter geborgener Roboter. Er könnte noch für seine Bestandteile " -"demontiert, oder wieder aufgebaut werden." - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -57145,18 +58623,8 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." -msgstr "" -"Diese amorphe Masse scheint sich fertig entwickelt zu haben; ihre " -"fortgeschrittenen inneren Strukturen bezeugen das. Sie ist in der Lage, sich" -" mittels inneren hydraulischen Drucks fortzubewegen, wodurch beträchtliche " -"Ladungen bewegt werden können und, in einer erstaunlichen Zuschaustellung " -"von Intelligenz, ist sie mittels ausgefahrener Scheinfüßchen in der Lage, " -"alles, woran sie befestigt wurde, zu steuern, sei es blobbasiert oder etwas " -"anderes. Du glaubst, dass du in der Lage bist, sie zu manipulieren und " -"dadurch alle mit ihr verbundenen Teile. Jedoch musst du dich dafür so " -"positionieren, dass du im direkten Kontakt mit dieser Masse bist; und sie " -"scheint nervenaufreibend gewillt zu sein, dich zu begleiten." +"you…" +msgstr "" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -57219,6 +58687,12 @@ msgstr "" "Effizienz aufgrund der Fähigkeit, der Sonne zu folgen. Allerdings kommt das " "auf Kosten eines ungeheuer hohen Gewichts und es ist sehr auffällig." +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "Geschützturmeinbaurahmen" +msgstr[1] "Geschützturmeinbaurahmen" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -57278,13 +58752,9 @@ msgstr[1] "stabilisierte Portale" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"Während du in die scheinbar unendlichen Tiefen dieses tragbaren Lochs in der" -" Realität blickst, ertönt in deinen Gedanken immer wieder eine Redewendung " -"aus einer endlos vergangenen Zeit: »Es gibt zwei Dinge, die unendlich sind: " -"Das Universum und menschliche Kleptomanie.«" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -58585,6 +60055,17 @@ msgid "" " reload a compatible revolver." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "" @@ -58650,6 +60131,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "AF2011A1-Magazin" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "" @@ -58984,8 +60476,8 @@ msgstr "" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -60327,14 +61819,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"Es ist ein biologisches Mysterium: Dieser Blob die Fähigkeit entwickelt, " -"langsam Elektrizität mithilfe eines unbekannten Prozesses zu erzeugen. Er " -"strahlt dabei ein schwaches phosphoreszierendes Glühen aus. Er ist außerdem " -"in der Lage, Elektrizität aus anderen Quellen zu speichern, aber dadurch " -"wird er inaktiv. Er scheint nachgiebig genug zu sein, um ihn " -"auseinanderzuziehen." #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -60395,26 +61881,6 @@ msgstr "" msgid "pebble hopper" msgstr "Kieselsteintrichter" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "AF2011A1-Magazin" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "" -"Zwei Magazine, die an einem gemeinsamen Sockel befestigt sind. Einzigartig " -"für die AF2011A1." - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "M1991A1-.38-Super-Magazin" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "Ein Magazin mit 9 Schuss für die M1991A1-.38-Super-Pistole." - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "Standard" @@ -60646,11 +62112,9 @@ msgstr "Fujis Mehr Gebäude" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "" -"Fügt mehr Gebäude und mehr Variationen bestehender Gebäuden hinzu. " -"(Benötigt: Mehr Orte)" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -60672,7 +62136,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -60704,7 +62168,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" @@ -60806,10 +62270,8 @@ msgstr "Mutanten-NPCs" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "" -"Umherwandernde NPCs werden manchmal Mutationen haben – auch deine Feinde. " -"Nimm dich in acht!" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -60818,9 +62280,8 @@ msgstr "" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61138,11 +62599,9 @@ msgstr "Bens GF-Rezepte" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "" -"Einige einfache gluten- und laktosefreie Alternativrezepte. NICHT " -"ERSCHÖPFEND." #: lang/json/MOD_INFO_from_json.py msgid "Tough Zombies" @@ -61178,11 +62637,9 @@ msgstr "Alternative Kartenlegende" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" -"Mach die Oberkarte lesbarer. Gebäude werden nach Typ farbkodiert und " -"benutzen den Anfangsbuchstaben ihres Namens statt »^v<>«." #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -61328,7 +62785,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -61340,7 +62797,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61351,7 +62808,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61361,7 +62818,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -61441,11 +62898,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." msgstr "" -"Eine Stockente, oft um Flüssen und anderen Flusskörpern gesehen. Sie ernährt" -" sich hauptsächlich von Insekten, Samen, Wurzeln und – vor der Katastrophe –" -" Brotkrümeln." #: lang/json/MONSTER_from_json.py msgid "goose" @@ -62246,7 +63700,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" #: lang/json/MONSTER_from_json.py @@ -62409,7 +63863,7 @@ msgid_plural "skittering plagues" msgstr[0] "" msgstr[1] "" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "" @@ -62421,7 +63875,7 @@ msgid_plural "plague nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "Eine infizierte Mutantenkakerlake in etwa der Größe einer Ratte." @@ -62432,7 +63886,7 @@ msgid_plural "plague vectors" msgstr[0] "" msgstr[1] "" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -62459,7 +63913,7 @@ msgid_plural "giant cockroach nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "Eine junge Mutantenkakerlake von der Größe einer Ratte." @@ -62483,7 +63937,7 @@ msgid_plural "giant bees" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -62499,7 +63953,7 @@ msgid_plural "giant centipedes" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -62544,7 +63998,7 @@ msgid_plural "giant mosquitos" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -62559,7 +64013,7 @@ msgid_plural "giant cellar spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -62576,7 +64030,7 @@ msgid_plural "immature giant cellar spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -62591,7 +64045,7 @@ msgid_plural "giant jumping spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -62607,7 +64061,7 @@ msgid_plural "giant trapdoor spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -62622,7 +64076,7 @@ msgid_plural "giant web spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -62637,7 +64091,7 @@ msgid_plural "fungal spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -62651,7 +64105,7 @@ msgid_plural "immature giant web spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -62666,7 +64120,7 @@ msgid_plural "giant black widows" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -62681,7 +64135,7 @@ msgid_plural "giant black widow spiderlings" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -62696,7 +64150,7 @@ msgid_plural "giant wolf spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -62712,7 +64166,7 @@ msgid_plural "giant wasps" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -62728,7 +64182,7 @@ msgid_plural "dermatiks" msgstr[0] "" msgstr[1] "" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -62758,7 +64212,7 @@ msgid_plural "giant ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -62773,7 +64227,7 @@ msgid_plural "giant acidic ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -62806,7 +64260,7 @@ msgid_plural "acidic queen ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -62824,7 +64278,7 @@ msgid_plural "acidic soldier ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -62842,7 +64296,7 @@ msgid_plural "fungal ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -62873,7 +64327,7 @@ msgid_plural "queen ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -62889,7 +64343,7 @@ msgid_plural "soldier ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -62904,7 +64358,7 @@ msgid_plural "giant locusts" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -62919,7 +64373,7 @@ msgid_plural "locust nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -63877,14 +65331,14 @@ msgid_plural "marloss zealots" msgstr[0] "" msgstr[1] "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -63897,7 +65351,7 @@ msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -63915,7 +65369,7 @@ msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -63932,7 +65386,7 @@ msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -63949,7 +65403,7 @@ msgid_plural "mi-gos" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -63971,7 +65425,7 @@ msgid_plural "mi-go slavers" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -63988,7 +65442,7 @@ msgid_plural "mi-go surgeons" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -64002,7 +65456,7 @@ msgid_plural "mi-go guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -64019,7 +65473,7 @@ msgid_plural "mi-go myrmidons" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -64036,7 +65490,7 @@ msgid_plural "mi-go scouts" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -65830,6 +67284,19 @@ msgid "" "able to see." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -66555,7 +68022,7 @@ msgid_plural "experimental mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -66570,7 +68037,7 @@ msgid_plural "evolved mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -67083,7 +68550,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" @@ -67099,7 +68566,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" @@ -67114,7 +68581,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" @@ -67525,7 +68992,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -67540,7 +69007,21 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67972,9 +69453,9 @@ msgstr[1] "" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67986,10 +69467,10 @@ msgstr[1] "" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68002,7 +69483,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -68016,8 +69497,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" @@ -68031,7 +69512,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -68045,10 +69526,10 @@ msgstr[1] "" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68060,9 +69541,9 @@ msgstr[1] "" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -68076,8 +69557,8 @@ msgstr[1] "" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68089,20 +69570,18 @@ msgstr[1] "" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" -"Ein menschlicher Körper mit blassblauem Fleisch, knisternd vor elektischer " -"Energie. Es scheint begierig darauf zu sein, dir etwas zu sagen." #: lang/json/MONSTER_from_json.py msgid "mr skeltal" @@ -68114,13 +69593,9 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" -"Fleischlos und von allen Organen befreit lässt dich dieses schreitende " -"Skelett bis auf die Knochen erschaudern. In seiner bleichen Hand hält es " -"eine makellose Trompete, die ungeachtet des Endes der Welt noch völlig " -"unbeschädigt ist." #: lang/json/MONSTER_from_json.py msgid "minion of skeltal" @@ -68146,10 +69621,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" -"Eine rauchende Hülle ist alles, was von diesem einst stolzen Bär übrigblieb." -" Seine schwarzen Augen sehen dich mit Bosheit an … und Hunger." #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -68484,6 +69957,87 @@ msgid "" "like jaws." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -69066,12 +70620,9 @@ msgstr[1] "" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" -"Ein automatisierter Verteidigungsroboter, der aufgrund seiner internen " -"Energiequelle noch immer aktiv ist. Dieser ist mit einem Elektroschocker und" -" einer integrierten 9mm-Feuerwaffe bewaffnet." #: lang/json/MONSTER_from_json.py msgid "security robot" @@ -69082,12 +70633,9 @@ msgstr[1] "" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" -"Ein automatisierter Verteidigungsroboter, der aufgrund seiner internen " -"Energiequelle noch immer aktiv ist. Dieser ist mit einer integrierten 9mm-" -"Feuerwaffe ausgestattet." #: lang/json/MONSTER_from_json.py msgid "riotcontrol robot" @@ -69098,14 +70646,10 @@ msgstr[1] "" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" -"Ein automatisierter Verteidigungsroboter, der aufgrund seiner internen " -"Energiequelle noch immer aktiv ist. Dieser ist mit einem Elektroschocker, " -"einem Tränengas-Sprüher und einem integrierten 40mm-Beanbag-Werfer " -"ausgestattet." #: lang/json/MONSTER_from_json.py msgid "necco" @@ -69515,13 +71059,9 @@ msgstr[1] "" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" -"Ein geborgener Hilfsroboter, der zu einem automatischen Staubsauber umgebaut" -" wurde. Er wird herumliegende Gegenstände auf dem Boden aufsaugen und sie " -"mit seinen internen Säurereserven auflösen. Ein nützlicher Helfer, um deinen" -" Rasen im Vorgarten vom Müll zu befreien … oder von Leichen." #: lang/json/MONSTER_from_json.py msgid "bee bot" @@ -69585,12 +71125,9 @@ msgstr[1] "" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" -"Der Elixirator funktioniert noch nicht. Also nicht bauen!!! Ein geborgener " -"Medizin-Roboter, dessen interne Medikamentenherstellung zur Erzeugung von " -"Mutagen umfunktioniert wurde." #: lang/json/MONSTER_from_json.py msgid "party bot" @@ -71187,6 +72724,17 @@ msgstr "" msgid "Ethereal Grasp" msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "" @@ -71608,6 +73156,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "" @@ -73689,6 +75260,19 @@ msgstr "" "Dies ist ein medizinisches Abhörgerät. Benutze es, um Dingen zuzuhören. Ganz" " genau." +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -73992,9 +75576,9 @@ msgstr[1] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74005,7 +75589,7 @@ msgstr[1] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -74018,9 +75602,9 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74037,7 +75621,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -74050,22 +75634,22 @@ msgstr[1] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." -msgstr "Energieniveau zu niedrig für sicheres Hochfahren..." +msgid "Power levels too low for safe bootup…" +msgstr "" #. ~ Description for CRIT EM vest (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74081,8 +75665,8 @@ msgstr "Rüstung ausschalten" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." -msgstr "C.R.I.T E.M wird ausgeschaltet..." +msgid "C.R.I.T E.M powering off…" +msgstr "" #. ~ Description for CRIT EM vest (on) #: lang/json/TOOL_ARMOR_from_json.py @@ -74090,8 +75674,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74109,7 +75693,7 @@ msgstr "Du schaltest das %s ein." #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -74128,10 +75712,10 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74386,6 +75970,32 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -74949,12 +76559,13 @@ msgstr "" #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "»Tick.«" @@ -75036,11 +76647,10 @@ msgstr "Du ziehst den Stift der Störgranate." #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" #: lang/json/TOOL_from_json.py @@ -75059,6 +76669,58 @@ msgstr "" " im Wirkungsbereich wechseln vorrübergehend auf deine Seite und kämpfen für " "dich." +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "EMP-Granate" +msgstr[1] "EMP-Granaten" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "Du ziehst den Stift der EMP-Granate." + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +"Dies ist eine Granate, die einen elektromagnetischen Puls mit einer Reihe " +"Kondensatoren mit geringer Induktivität generiert, der in einer " +"Einzelschleifenantenne entladen wird. Benutze diesen Gegenstand, um den " +"Stift zu ziehen und die Zündschnur anzuzünden, was ihn in eine aktive EMP-" +"Granate verwandelt. Du wirst dann drei Züge Zeit bis zur Detonation, die ein" +" EMP-Feld, das Roboter beschädigt und den Strom von Bioniken entlädt, haben." + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "aktive EMP-Granate" +msgstr[1] "aktive EMP-Granaten" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "Du hast schon den Stift von %s gezogen, versuch es mal mit Werfen." + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"Diese EMP-Granate ist aktiv und wird gleich detonieren, was ein EMP-Feld, " +"das Roboter beschädigt und den Strom von Bioniken entlädt, erzeugt. Du " +"willst sie nicht mehr lange behalten." + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -75493,31 +77155,30 @@ msgstr "" "die weitere Verwendung zu entfalten." #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "EMP-Granate" -msgstr[1] "EMP-Granaten" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "" +msgstr[1] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "Du ziehst den Stift der EMP-Granate." +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -"Dies ist eine Granate, die einen elektromagnetischen Puls mit einer Reihe " -"Kondensatoren mit geringer Induktivität generiert, der in einer " -"Einzelschleifenantenne entladen wird. Benutze diesen Gegenstand, um den " -"Stift zu ziehen und die Zündschnur anzuzünden, was ihn in eine aktive EMP-" -"Granate verwandelt. Du wirst dann drei Züge Zeit bis zur Detonation, die ein" -" EMP-Feld, das Roboter beschädigt und den Strom von Bioniken entlädt, haben." #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -75535,29 +77196,24 @@ msgstr "" "angebracht wird." #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "aktive EMP-Granate" -msgstr[1] "aktive EMP-Granaten" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "" +msgstr[1] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "Du hast schon den Stift von %s gezogen, versuch es mal mit Werfen." +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"Diese EMP-Granate ist aktiv und wird gleich detonieren, was ein EMP-Feld, " -"das Roboter beschädigt und den Strom von Bioniken entlädt, erzeugt. Du " -"willst sie nicht mehr lange behalten." #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -76068,14 +77724,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -"Eine 35mm-Digital-Spiegelreflexkamera, mit optischen und digitalen Suchern, " -"zoombaren Objektiv mit Autofokus und Stabilisator und einem Blitzlicht. Du " -"kannst dir deine Fotos darauf ansehen oder sie auf eine Speicherkarte " -"übertragen; sie wird mit gewöhnlichen Batterien betrieben. Vor der " -"Katastrophe hättest du damit professionelle Fotos schießen können." #: lang/json/TOOL_from_json.py msgid "candle" @@ -76895,6 +78546,7 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -76908,13 +78560,10 @@ msgstr[1] "E-Ink-Tablet-PCs" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -"Ein Tablet-PC, das einen effizienten Farb-E-Ink-Display verwendet. Vor der " -"Katastrophe waren sie nette technische Spielzeuge; jetzt sind sie eine fast " -"unbezahlbarer Ressource. Wird mit gewöhnlichen Batterien betrieben." #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -78200,12 +79849,9 @@ msgstr[1] "selbstgebaute Hämmer" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "" -"Dies ist ein grober Hammer, der aus einem Stück Metall hergestellt wurde, " -"das an einem Stock befestigt ist. Er funktioniert adäquat wie ein Hammer, " -"kann aber wirklich nicht mit einem richtigen Hammer verglichen werden." #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -79337,21 +80983,6 @@ msgstr "" "Dies ist ein sehr scharfes Messer, das für OP-Schnitte gedacht ist. Dessen " "kleine, scharfe Klinge ermöglicht Präzisionsstiche in erfahrenen Händen." -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "Schere" -msgstr[1] "Scheren" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "" -"Dies ist eine lange Hochleistungsschere. Benutze die Schwere, um Gegenstände" -" aus Stoff (wie Kleidung) zu Lumpen zu zerschneiden." - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -81853,6 +83484,18 @@ msgid "" "distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -84163,6 +85806,21 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "Schere" +msgstr[1] "Scheren" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "" +"Dies ist eine lange Hochleistungsschere. Benutze die Schwere, um Gegenstände" +" aus Stoff (wie Kleidung) zu Lumpen zu zerschneiden." + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -84346,6 +86004,28 @@ msgid_plural "precision soldererss" msgstr[0] "" msgstr[1] "" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -84543,12 +86223,12 @@ msgstr[1] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -84560,10 +86240,11 @@ msgstr[1] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -84575,7 +86256,7 @@ msgstr[1] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -84588,7 +86269,7 @@ msgstr[1] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -84602,10 +86283,10 @@ msgstr[1] "" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -84618,7 +86299,7 @@ msgstr[1] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -84632,7 +86313,7 @@ msgstr[1] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -85146,7 +86827,7 @@ msgstr[1] "" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" @@ -85159,7 +86840,7 @@ msgstr[1] "" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" @@ -85172,7 +86853,7 @@ msgstr[1] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" @@ -85185,7 +86866,7 @@ msgstr[1] "" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" @@ -85198,8 +86879,8 @@ msgstr[1] "" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85211,8 +86892,8 @@ msgstr[1] "" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85224,7 +86905,7 @@ msgstr[1] "" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" @@ -85237,8 +86918,8 @@ msgstr[1] "" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85250,7 +86931,7 @@ msgstr[1] "" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -85339,24 +87020,18 @@ msgstr[1] "Dusks" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." msgstr "" -"Ein Langschwert, das aus einem sehr dunklen, fast schwarzen Metall " -"hergestellt wurde. Es scheint eine größere Schneide als die üblichen " -"Stahlklingen zu haben und fühlt sich … komfortabler in der Hand an. Während " -"die Klinge aus diesem dunklen Metall gemacht wurde, scheinen die " -"Parierstange und der Schwertknauf aus einem helleren Material, das sich " -"unnatürlich kühl anfühlt, hergestellt zu sein, " #. ~ Use action use_message for disarmed defense turret. #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." -msgstr "Fehler. Keine Waffensysteme gefunden." +msgid "Error. No weapon systems found." +msgstr "" #. ~ Description for disarmed defense turret #: lang/json/TOOL_from_json.py @@ -85569,14 +87244,9 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Ein inaktiver militärischer Granaten-Geschützturm. Bis zu 50 Standard-40mm-" -"Splittergranaten werden automatisch aus deinem Inventar in den Geschützturm " -"geladen, wenn er aktiviert wird. Platziere den Geschützturm und er wird dich" -" als Freund mit seiner fortgeschrittenen Freund-Feind-Erkennungs-Software " -"erkennen. Lies das Sicherheitshandbuch im Falle einer Fehlfunktion." #: lang/json/TOOL_from_json.py msgid "inactive military flamethrower turret" @@ -85645,16 +87315,10 @@ msgstr[1] "inaktive fortgeschrittene Schienengewehrgeschütztürme" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Ein inaktiver Schienengewehrgeschützturm. Bis zu 50 " -"Standardschienenprojektile werden automatisch aus deinem Inventar in den " -"Geschützturm geladen, wenn er aktiviert wird. Platziere den Geschützturm und" -" er wird dich als Freund mit seiner fortgeschrittenen Freund-Feind-" -"Erkennungs-Software erkennen. Lies das Sicherheitshandbuch im Falle einer " -"Fehlfunktion." #: lang/json/TOOL_from_json.py msgid "inactive advanced acid turret" @@ -85666,13 +87330,9 @@ msgstr[1] "inaktive fortschrittliche Säure-Geschütztürme" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Ein inaktiver fortgeschrittener Säuregeschützturm. Platziere den " -"Geschützturm und er wird dich als Freund mit seiner fortgeschrittenen " -"Freund-Feind-Erkennungs-Software erkennen. Lies das Sicherheitshandbuch im " -"Falle einer Fehlfunktion." #: lang/json/TOOL_from_json.py msgid "inactive advanced EMP turret" @@ -85684,13 +87344,9 @@ msgstr[1] "inaktive fortschrittliche EMP-Geschütztürme" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Ein inaktiver fortgeschrittener EMP-Geschützturm. Platziere den Geschützturm" -" und er wird dich als Freund mit seiner fortgeschrittenen Freund-Feind-" -"Erkennungs-Software erkennen. Lies das Sicherheitshandbuch im Falle einer " -"Fehlfunktion." #: lang/json/TOOL_from_json.py msgid "inactive advanced electro turret" @@ -86064,14 +87720,10 @@ msgstr[1] "Inaktive schwebende Heizungen" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" -"Ein geborgener Schauboter, der zu einem schwebenden Lufterhitzer umgebaut " -"wurde. Er stößt einen beständigen Strom an warmer Luft aus, um einen " -"geschlossenen Raum zu erhitzen. Er ist nicht aggressiv und hat keine " -"Waffensysteme. Aktiviere diesen Gegenstand, um den Roboter einzusetzen." #: lang/json/TOOL_from_json.py msgid "inactive floating furnace" @@ -86082,15 +87734,11 @@ msgstr[1] "Inaktive schwebende Öfen" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." msgstr "" -"Ein geborgener Schauboter, der zu einem schwebenden Lufterhitzer umgebaut " -"wurde. Er stößt einen beständigen Strom an gefährlich heißer Luft aus, um " -"einen geschlossenen Raum zu erhitzen. Er ist nicht aggressiv und hat keine " -"Waffensysteme. Aktiviere diesen Gegenstand, um den Roboter einzusetzen." #: lang/json/TOOL_from_json.py msgid "inactive burning eye" @@ -86163,15 +87811,11 @@ msgstr[1] "inaktive Digestrons" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" -"Ein geborgener Hilfsroboter, der zu einem automatischen Staubsauger umgebaut" -" wurde. Er wird herumliegende Gegenstände vom Boden saugen und sie mit " -"seinem inneren Säurereserven auflösen. Er ist nicht aggressiv und hat keine " -"Waffensysteme. Aktiviere diesen Gegenstand, um den Roboter einzusetzen." #: lang/json/TOOL_from_json.py msgid "inactive bee-bot" @@ -86210,13 +87854,10 @@ msgstr[1] "inaktive Assassinenroboter" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" -"Ein geborgener Medizinroboter, der zu einer Mördermaschine umgebaut wurde. " -"Er wird feindliche Ziele mit einer Reihe an Klingen und einer Giftnadel " -"angreifen. Aktiviere diesen Gegenstand, um den Roboter einzusetzen." #: lang/json/TOOL_from_json.py msgid "inactive elixirator" @@ -86260,13 +87901,10 @@ msgstr[1] "inaktive Rattenfänger" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" -"Ein geborgener Scheuchboter, der für die Jagd auf Kleinwild umfunktioniert " -"wurde. Er greift Ziele mit einer Zange und einem integrierten Taser an. " -"Aktiviere diesen Gegenstand, um den Roboter einzusetzen." #: lang/json/TOOL_from_json.py msgid "inactive grab-bot" @@ -86317,12 +87955,9 @@ msgstr[1] "inaktive nekrotische Cyborgs" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" -"Ein geborgener Cyborg, der den Kopf eines Zombiebeschwörers trägt. Der " -"lebendige Kopf hat noch etwas seiner Fähigkeit, Zombies zu beschwören. " -"Aktiviere diesen Gegenstand, um den Roboter einzusetzen." #: lang/json/TOOL_from_json.py msgid "inactive defense robot" @@ -86374,13 +88009,8 @@ msgstr[1] "inaktive Hoppla-Paladine" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" -"Ein geborgener Verteidigungsroboter, der mit einem selbstgebauten " -"Flammenwerfer und zwei glühend heißen Klingen neu ausgestattet wurde. " -"Aktiviere diesen Gegenstand, mit Benzin in deinem Inventar, um diesen " -"Roboter zu beladen und einzusetzen … vorzugsweise fernab von allen " -"brennbaren Materialien." #: lang/json/TOOL_from_json.py msgid "inactive military robot" @@ -86758,14 +88388,8 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" -"Es ist ein biologisches Mysterium: Die internen Strukturen dieses Blobs " -"befinden sich in einem Reservoir aus einer Flüssigkeit mit niedriger Dichte," -" die flüssig bleibt, obwohl er sich in einem extrem gekühltem Zustand " -"befindet; dennoch verfügt er über die ganze Formbarkeit seiner ehemaligen " -"Form. Frostfragmente fallen ständig von ihm ab. Er scheint biegsam genug, um" -" ihn auseinanderzuziehen." #: lang/json/TOOL_from_json.py msgid "growing cold mass" @@ -86999,14 +88623,10 @@ msgstr "Der Brocken zerfällt in deinen Händen." #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" -"Ein Brocken mit künstlichen Kristallen, die von einer Diamantmatrik " -"abgebrochen sind. Obwohl die Substanz normalerweise zerfällt, wenn sie vom " -"Katalysator getrennt wird, scheint sich dieser Brocken aufgrund eines " -"unbekannten Mechanismus selbst zu erhalten." #: lang/json/TOOL_from_json.py msgid "diamond matrix" @@ -87017,10 +88637,8 @@ msgstr[1] "Diamantmatrizen" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +"Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "" -"Deine Sinne stumpfen ab, während du in die Tiefen des Zentrums dieses " -"Edelsteins starrst …" #. ~ Description for diamond matrix #: lang/json/TOOL_from_json.py @@ -87041,17 +88659,12 @@ msgstr[1] "Vortexmotoren" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" -"Sozusagen ein Tornado in der Box. Das Innere dieses harmlosen Tanks enthält " -"entweder den Höhepunkt menschlicher Innovation im Bereich saubere Energie " -"oder eine Massenvernichtungswaffe, die die Zivilisation - oder, was von ihr " -"übrig geblieben ist - von der Karte tilgen kann. Ein externer Mechanismus " -"ermöglicht die Anbringung an einem Fahrzeug." #: lang/json/TOOL_from_json.py lang/json/vehicle_part_from_json.py msgid "vortex generator" @@ -87062,18 +88675,12 @@ msgstr[1] "Vortexgeneratoren" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" -"Sozusagen ein Tornado in der Box. Das Innere dieses harmlosen Tanks enthält " -"entweder den Höhepunkt menschlicher Innovation im Bereich saubere Energie " -"oder eine Massenvernichtungswaffe, die die Zivilisation - oder, was von ihr " -"übrig geblieben ist - von der Karte tilgen kann. Ein externer Mechanismus " -"ermöglicht den Anschluss an eine Batterie, um die damit erzeugte Energie zu " -"speichern." #: lang/json/TOOL_from_json.py msgid "control chip" @@ -90526,6 +92133,10 @@ msgstr "Palisade bauen" msgid "Build Stone Wall" msgstr "Steinwand bauen" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "" @@ -94382,6 +95993,35 @@ msgid "" "from the inside." msgstr "" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "Erhellt" @@ -95060,11 +96700,9 @@ msgstr "Unausgeschlafen" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "" -"Deine Schlafrückstand hat seit einiger Zeit stetig zugenommen. Du solltest " -"dich wirklich ausruhen." #. ~ Apply message for effect(s) 'Sleep Deprived'. #: lang/json/effects_from_json.py @@ -95245,7 +96883,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -95259,14 +96897,8 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" -" Fand einen neuen Sinn im Leben nach deinem Tod. Obwohl er es dir nie " -"erzählte, hatten seine Kapitalverbrechen in der vergangenen Welt ihn daran " -"gehindert, jemals einen richtigen Platz in der Gesellschaft einzunehmen. Mit" -" der Zerstörung der existierenden Strafregister nahm er es sich vor, seinen " -"Stellenwert gegenüber seinen Begleitern zu beweisen. Starb an einem " -"Herzinfarkt auf einem einsamen Ausflug viele Jahre nach der Katastrophe." #: lang/json/epilogue_from_json.py msgid "" @@ -95288,20 +96920,12 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " "enact revenge himself." msgstr "" -" War niemals bekannt als ein besonders mutiges oder emotional " -"gefestigtes Individuum. Seine Reue darüber, dass er in den ersten Tagen der " -"Katastrophe keinen Leuten half, brachte ihn dazu, mehrmals in den folgenden " -"Jahren Suizid zu begehen. Das Leben verbesserte sich kurzzeitig, als er " -"einen altbekannten Überlebenden heiratete, aber war erschüttert, als sein " -"Ehemann von Mitgliedern eines mysteriösen Weltuntergangskults getötet wurde." -" Er wurde getötet, als er versuchte, sich in das Gelände des Kults " -"hereinzuschleichen, um Rache zu üben." #: lang/json/epilogue_from_json.py msgid "" @@ -95336,18 +96960,10 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" -" Arbeitete hart nach deinem Tod, um seine eigene Überlebendenbande zu " -"organisieren. Heiratete und zog zwei Kinder auf und brachte ihnen jede " -"Überlebensfertigkeit bei, die sie jemals bräuchten. Seine Vergangenheit " -"holte ihn jedoch ein, als er mit einem Oberst der Alten Garde in Konflikt " -"geriet. Da er von seinem Posten als Soldat der Nationalgarde während der " -"Katastrophe floh, wurde er wegen Fahnenflucht gehängt, trotz der Proteste " -"einer riesigen Anzahl an Überlebenden, welche von seinen Diensten über die " -"Jahre profitierten." #: lang/json/epilogue_from_json.py msgid "" @@ -95777,7 +97393,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -95814,20 +97430,12 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " "of crimes against humanity." msgstr "" -" War niemals bekannt als ein besonders mutiges oder emotional " -"gefestigtes Individuum. Ihre Unfähigkeit, emotional mit dem Leben nach der " -"Katastrophe zurecht zu kommen, führte sie in den folgenden Jahren dazu, " -"mehrfach Selbstmord zu versuchen. Von den Versprechen einer Erneuerung und " -"der Aussicht, einer neuen Familie anzugehören wurde sie in einen " -"charismatischen Kult verwickelt. Sie war ein unschuldiger Kollateralschaden," -" als Soldaten der Alten Garde das Gelände aufgrund eines Verdachtes auf " -"Verbrechen gegen die Menschlichkeit stürmte." #: lang/json/epilogue_from_json.py msgid "" @@ -96140,7 +97748,7 @@ msgstr "" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" @@ -96318,17 +97926,11 @@ msgstr "Flüchtlinge" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." msgstr "" -"Die verstreuten Überbleibsel der Zivilisation. Diese wenigen Glücklichen " -"haben es geschafft, sich innen während der frühesten Phasen der Apokalypse " -"zu verbarrikadieren. Obwohl sie vorläufig sicher sind, sind ihre Vorräte " -"knapp und ihnen fehlen die Fertigkeiten, um mehr zu erhalten. Es ist nur " -"eine Frage der Zeit, bis auch sie die Beute jenseitiger Kreaturen oder " -"allzumenschlicher Monster werden." #: lang/json/fault_from_json.py msgid "Dusty" @@ -96398,6 +98000,20 @@ msgstr "" msgid "You clean your %s." msgstr "" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "" @@ -96421,6 +98037,29 @@ msgstr "" msgid "You eject the spent casing from the %s." msgstr "" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "" @@ -96441,6 +98080,11 @@ msgstr "" msgid "Clean gun" msgstr "" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "" @@ -97173,11 +98817,13 @@ msgstr "" msgid "A big, blocky metal device for refrigerating large areas." msgstr "" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "Metall knirschen." -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "»Kläng!«." @@ -99021,6 +100667,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "Gestell" @@ -99967,8 +101622,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -100001,7 +101656,7 @@ msgstr "" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -100012,7 +101667,7 @@ msgstr "" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -100023,7 +101678,7 @@ msgstr "" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -100034,7 +101689,7 @@ msgstr "" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -102153,10 +103808,10 @@ msgstr "" "keine Actionfilmhelden sind." #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" -msgstr[0] ".308-Rohrgewehr" -msgstr[1] ".308-Rohrgewehre" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" +msgstr[0] "" +msgstr[1] "" #: lang/json/gun_from_json.py msgid "" @@ -102393,6 +104048,19 @@ msgid "" "hammers of the four barrels arranged in a square formation." msgstr "" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -102510,6 +104178,18 @@ msgid "" "quality, durable materials." msgstr "" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -102693,23 +104373,6 @@ msgstr "" "moderneren Granatenwerfern ersetzt wurde, wird der M79 immer noch von vielen" " Einheiten weltweit benutzt." -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "Mark-19-Granatwerfer" -msgstr[1] "Mark-19-Granatwerfer" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"Ein schwerer auf Dreibein gestützter Granatenwerfer mit Gurtzuführung. Er " -"wurde vom U.S.-Militär seit des Beginns des Kalten Kriegs bis zur " -"Katastrophe benutzt, und wenn du ein paar 40mm-Granaten finden kannst, " -"vielleicht sogar noch darüber hinaus." - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -102765,6 +104428,23 @@ msgstr "" msgid "multi" msgstr "Multi" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "Mark-19-Granatwerfer" +msgstr[1] "Mark-19-Granatwerfer" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"Ein schwerer auf Dreibein gestützter Granatenwerfer mit Gurtzuführung. Er " +"wurde vom U.S.-Militär seit des Beginns des Kalten Kriegs bis zur " +"Katastrophe benutzt, und wenn du ein paar 40mm-Granaten finden kannst, " +"vielleicht sogar noch darüber hinaus." + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -102778,6 +104458,19 @@ msgid "" "shell at a time like most shotguns." msgstr "" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -103084,6 +104777,18 @@ msgstr "" "Der Taurus Raging Bull ist ein fünfschüssiger Revolver, der die .454-Casull-" "Patrone benutzt. Er hat eine beeindruckene Mannstoppwirkung." +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "Taurus Raging Judge Magnum" +msgstr[1] "Taurus Raging Judge Magnum" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -103124,6 +104829,36 @@ msgid "" "ammunition." msgstr "" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "Bond Arms Derringer" +msgstr[1] "Bond Arms Derringers" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -103270,13 +105005,9 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" -"Ein schweres Maschinengewehr, dass vom US-Militär am Beginn der Katastrophe " -"benutzt wurde, und in seltenen Fällen sogar von Überlebenden der " -"Katastrophe. Dessen enorme Große und Design machen es unmöglich, es zu " -"benutzen, außer, wenn es auf ein Fahrzeug befestigt wird." #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -104875,7 +106606,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -105040,15 +106771,9 @@ msgstr[1] "A7-Lasergewehre" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" -"Ein Lasergewehr auf dem neusten Stand der Technik, entwickelt von der " -"Forschungs-und-Entwicklungseinrichtung »Aerial Labs«. Die ursprüngliche " -"Leistung konkurrierte mit Rivtechs besten Waffen, und es gingen Gerüchte " -"über unternehmerische Hinterlist um. Obwohl die Apokalypse diese Waffe auf " -"dem Aschehaufen der Geschichte geworfen hat, kann diese Waffe immer noch " -"deine Feinde zu selbigem verwandeln." #: lang/json/gun_from_json.py msgid "V29 laser pistol" @@ -105127,6 +106852,18 @@ msgstr "" "Ein hölzernes Blasrohr, das einfach zu benutzen und sehr genau ist. Darts " "werden als Munition benutzt." +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -105179,7 +106916,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -105192,7 +106929,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -105206,7 +106943,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -105218,8 +106955,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" #: lang/json/gun_from_json.py @@ -105230,12 +106967,12 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" #: lang/json/gun_from_json.py @@ -105260,11 +106997,11 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" #: lang/json/gun_from_json.py @@ -105275,7 +107012,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -105287,8 +107024,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -105301,7 +107038,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -105313,8 +107050,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -105326,7 +107063,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -105354,8 +107091,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" @@ -105496,12 +107233,10 @@ msgstr[1] "JHEC M128s" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" -"Der M128-Autorevolver von Johnson Heavy Equipment Co.; alle anderen sind ihm" -" nicht gewachsen. Johnson Heavy Equipment Co. ist ein Tochterunternehmen von" -" D&B Minneapolis." #: lang/json/gun_from_json.py msgid "Boomlighter 454" @@ -105603,10 +107338,10 @@ msgstr "" "1776: Aus dem Arsenal der Freiheit!" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" -msgstr[0] "L.T.-Karabiner" -msgstr[1] "L.T.-Karabiner" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" +msgstr[0] "" +msgstr[1] "" #: lang/json/gun_from_json.py msgid "" @@ -106048,13 +107783,9 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" -"Ein starker Elektro-Laser, der von einer paramilitärischen Forschungs- und " -"Entwicklungseinrichtung lange vor der Apokalypse entwickelt wurde. Besonders" -" effektiv gegen elektronische Ziele. Er wird mit Esz.-Ladestationen " -"aufgeladen." #: lang/json/gun_from_json.py msgid "hand-held laser cannon" @@ -106079,18 +107810,11 @@ msgstr[1] "Lasergewehre" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" -"Ein Lasergewehr auf dem neusten Stand der Technik welches mit Esz.-Strom " -"betrieben wird. Entwickelt wurde es von einer paramilitärischen Forschungs-" -"und-Entwicklungseinrichtung kurz vor der Apokalypse. Die ursprüngliche " -"Leistung dieser Waffe konkurrierte mit den fortgeschrittensten Waffen ihrer " -"Zeit. Obwohl die Apokalypse diese Waffe auf dem Aschehaufen der Geschichte " -"geworfen hat, kann diese Waffe immer noch deine Feinde zu selbigem " -"verwandeln." #: lang/json/gun_from_json.py msgid "laser pistol" @@ -106252,6 +107976,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -106281,10 +108009,8 @@ msgstr[1] "Basis-Robogewehre" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "" -"Das ist ein Pseudo-Gegenstand für die Berechnung von Monsterangriffen. Wenn " -"du das siehst, dann handelt es sich dabei um einen Fehler." #: lang/json/gun_from_json.py msgid "integral 12 gauge shotgun" @@ -106498,16 +108224,8 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" -"Ein lebendiger Blob, der in eine autonome Waffe verwandelt wurde, dafür " -"geeignet über einen Rahmen als eine Art Barriere gestreckt zu werden. Er hat" -" die Fähigkeit entwickelt, ständig verkalkende Herausragungen zu erzeugen, " -"welche ihrerseits mit geschmeidigen dehnbaren Strängen gesteuert werden " -"können. Diese »Zähne« können dann benutzt werden, alles, was sich in der " -"Nähe befindet, zu verwunden. Die äußere Membran ist außerdem wesentlich " -"dicker geworden, um ihre strapaziösere Bewegung zu unterstützen; jedoch " -"scheint sie noch nachgiebig genug zu sein, um sie auseinanderzuziehen." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "gel shooter" @@ -106521,15 +108239,8 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" -"Ein lebendiger Blob, der in eine autonome Waffe verwandelt wurde. Er " -"durchkämmt den Boden nach Materialien, welchen er dann Nährstoffe entzieht. " -"Die Überbleibsel werden dann mit hoher Geschwindigkeit in Richtung aller " -"möglichen Gefahren in der Nähe ausgestoßen. Die formlose Masse kann geformt " -"und von Hand befestigt werden, aber die Waffe selbst ist ohne etwas, um sie " -"zu steuern, inaktiv. Dieses Ding scheint nachgiebig genug zu sein, um es " -"auseinanderzuziehen." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "frost lancer" @@ -107240,19 +108951,6 @@ msgstr "" "diese Funktionen es sehr unhandlich und es muss auf einer Plattform zur " "Befestigung montiert werden, damit man damit schießen kann." -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "Model-10-Revolver" -msgstr[1] "Model-10-Revolver" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "" -"Ein sechsschüssiger Revolver. Er hat eine ausschwenkbare Trommel für ein " -"leichteres Nachladen." - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -107272,54 +108970,6 @@ msgstr "" "produziert, die nach einem Unfall gestrandet sein könnten, später von " "diversen Unternehmen kommerziell produziert." -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "Colt Lightning .45" -msgstr[1] "Colt Lightning .45" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -"Eine moderne Nachbildung eines Colt-Vorderschaftrepetiergewehrs. " -"Ursprünglich ausgelegt für .44-40, jedoch benutzen moderne Versionen " -"üblicherweise .45 Long Colt, was die Single Action Army als eine Feuerwaffe " -"für das Westernschießen ergänzt." - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "Bond Arms Derringer" -msgstr[1] "Bond Arms Derringers" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" -"Bond Arms Derringer ist eine Serie von doppelläufigen kompakten Pistolen. Am" -" häufigsten sind sie für .45 Long Colt gebaut und haben Patronenlager, die " -"lang genug sind, um kompatibel mit .410-Flintenmunition zu sein." - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] ".410-Jugendflinte" -msgstr[1] ".410-Jugendflinten" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" -"Eine alte Kipplaufverschlussflinte, Kaliber .410. Sie wurde als eine " -"Alternative zum Kaliber 12 entworfen, ist leichtgewichtig und einfach in der" -" Herstellung." - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -107335,50 +108985,6 @@ msgstr "" "das an einem Schaft angebracht wurde, mit einem Hammer, um die einzige " "Patrone, die sie hält, abzufeuern." -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "AF2011A1 .38 Super" -msgstr[1] "AF2011A1 .38 Supers" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "" -"Eine doppelläufige halbautomatische Pistole. Es sieht so aus, als wären zwei" -" M1911s zusammengeschweißt worden." - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38 Super" -msgstr[1] "M1991A1 .38 Supers" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "" -"Eine moderne M1911 für die .38-Super-Patrone. Sie kann eine gute " -"Treffsicherheit erzielen." - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "Taurus Raging Judge Magnum" -msgstr[1] "Taurus Raging Judge Magnum" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" -"Der Taurus Raging Judge Magnum ist ein fünfschüssiger Revolver, der die .454" -"-Casull-Patrone benutzt. Er ist in der Lage, .410-Schrotpatronen und .45" -"-Long-Colt-Patronen zu feuern." - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -108713,7 +110319,7 @@ msgstr[1] "Zielfernrohre" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" @@ -109122,6 +110728,18 @@ msgid "" "weapon other than pistols and pump-action guns, if you so want." msgstr "" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -109394,7 +111012,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -109418,9 +111036,9 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -109432,7 +111050,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -109632,20 +111250,6 @@ msgstr "" " Distanzangriffe vornehmen kann, falls sie an einer langen Waffe oder einer " "Armbrust befestigt ist." -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "M6-ASW-Flinte" -msgstr[1] "M6-ASW-Flinten" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "" -"Die integrierte .410-Flinte der M6-Aircrew-Überlebenswaffe. Sie kann nicht " -"entfernt werden." - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "Du nimmst den Fisch aus und entgrätest ihn" @@ -111299,10 +112903,6 @@ msgstr "Bolzen oder Drähte schneiden" msgid "Heat up food (with it)" msgstr "Nahrung erhitzen (mit)" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "Holz/Papier/Knochen/Chitin reparieren" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "Als Werkzeugmodifikation befestigen" @@ -112206,6 +113806,11 @@ msgstr "" "Dieses Kleidungsstück funktioniert gut, sogar wenn es " "triefnass ist. Das kann sich gut anfühlen." +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -113386,7 +114991,8 @@ msgstr "Gelände bebauen" msgid "Disassemble items" msgstr "Gegenstände demontieren" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "Schlafen" @@ -114196,7 +115802,8 @@ msgstr "" msgid "Wasp nest is here." msgstr "" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "Spinnen" @@ -114255,6 +115862,33 @@ msgstr "" msgid "Small pond is here." msgstr "" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "" @@ -114325,7 +115959,7 @@ msgstr "" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "" #. ~ Computer name @@ -115108,6 +116742,16 @@ msgstr "Rennen VERBOTEN!" msgid "NO Diving!" msgstr "Tauchen VERBOTEN!" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -115246,8 +116890,7 @@ msgid "Emergency Message" msgstr "Notfallnachricht" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "Externe Stromversorgung deaktivieren" @@ -115891,7 +117534,7 @@ msgstr "" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -116904,7 +118547,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116927,7 +118570,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -116938,7 +118581,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116947,7 +118590,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -116958,7 +118601,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -116968,7 +118611,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116979,7 +118622,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -117153,6 +118796,10 @@ msgstr "ruiniert" msgid "Diamond" msgstr "Diamant" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "Ei" @@ -117370,8 +119017,8 @@ msgid "Mushroom" msgstr "Pilz" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "Wasser" @@ -118847,7 +120494,7 @@ msgstr "" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" @@ -118991,11 +120638,11 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119036,6 +120683,10 @@ msgstr "" msgid "What good does this do me?" msgstr "" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "" @@ -119076,7 +120727,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119114,12 +120765,12 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119188,7 +120839,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119206,7 +120857,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" @@ -119227,7 +120878,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" #: lang/json/mission_def_from_json.py @@ -119235,7 +120886,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119987,7 +121638,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" @@ -120405,7 +122056,7 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -120741,16 +122392,10 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" -"Also das sieht nach monatenlangen, vielleicht jahrelangen Experimenten aus, " -"und dieser Datensatz muss gigantisch sein. Datenbankserver, die groß genug " -"wären, um sie zu speichern, würden unter Notstrom überhitzen. Aber ich habe " -"ein Nachrichten aus einem Labor gefunden, das eine Art Frostportal hatte, " -"das während des Katastrope geöffnet war; es hat die gesamte Temperatur unter" -" null gebracht. Ich wette, die Archive in diesem Labor funktionieren noch." #: lang/json/mission_def_from_json.py msgid "" @@ -122395,7 +124040,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -122421,10 +124066,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "Danke fürs Versuchen … denk ich mal." - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -122449,7 +124090,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -122489,8 +124130,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -122511,7 +124152,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -122538,7 +124179,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -122553,7 +124194,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -122626,6 +124267,54 @@ msgstr "" msgid "The %1$s tries to slam into , but fails to." msgstr "" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -130930,10 +132619,8 @@ msgstr "Überlebendengeschichte" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" +msgid "This NPC could tell you about how they survived the Cataclysm" msgstr "" -"Dieser NPC könnte dir etwas über das Überleben in der Welt kurz nach und " -"während der Katastrophe erzählen." #: lang/json/mutation_from_json.py msgid "Mark of the Seer" @@ -131488,7 +133175,7 @@ msgstr "" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -131552,18 +133239,10 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "" @@ -132195,7 +133874,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -132228,10 +133907,8 @@ msgid "I'm just trying to stay alive." msgstr "Ich versuche lediglich, am Leben zu bleiben." #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." msgstr "" -"Ich versuche lediglich, am Leben zu bleiben … und das ist nicht so einfach, " -"wie es aussieht." #: lang/json/npc_class_from_json.py msgid "Lizard Mutant" @@ -132239,11 +133916,9 @@ msgstr "Echsenmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Echsenmutagen. Diese Welt ist kein Ort für Menschen mehr, und" -" ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Medical Mutant" @@ -132251,11 +133926,9 @@ msgstr "Medizinmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach medizinischem Mutagen. Diese Welt ist kein Ort für Menschen " -"mehr, und ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Bird Mutant" @@ -132263,11 +133936,9 @@ msgstr "Vogelmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Ich suche nach Vogelmutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Fish Mutant" @@ -132275,11 +133946,9 @@ msgstr "Fischmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Ich suche nach Fuschmutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Beast Mutant" @@ -132287,11 +133956,9 @@ msgstr "Biestmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Ich suche nach Biestmutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Ursine Mutant" @@ -132299,11 +133966,9 @@ msgstr "Bärenmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Bärenmutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Feline Mutant" @@ -132311,11 +133976,9 @@ msgstr "Katzenmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Katzenmutagen. Diese Welt ist kein Ort für Menschen mehr, und" -" ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Lupine Mutant" @@ -132323,11 +133986,9 @@ msgstr "Luchsmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Luchsmutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Cattle Mutant" @@ -132335,11 +133996,9 @@ msgstr "Kuhmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Kuhmutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Insect Mutant" @@ -132347,11 +134006,9 @@ msgstr "Insektenmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Insektenmutagen. Diese Welt ist kein Ort für Menschen mehr, " -"und ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Plant Mutant" @@ -132359,11 +134016,9 @@ msgstr "Pflanzenmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Ich suche nach Pflanzenmutagen. Diese Welt ist kein Ort für Menschen mehr, " -"und ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Slime Mutant" @@ -132371,11 +134026,9 @@ msgstr "Schleimmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Ich suche nach Schleimmutagen. Diese Welt ist kein Ort für Menschen mehr, " -"und ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Troglobite Mutant" @@ -132383,11 +134036,9 @@ msgstr "Troglophilsmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -"Ich suche nach Troglophilsmutagen. Diese Welt ist kein Ort für Menschen " -"mehr, und ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Cephalopod Mutant" @@ -132395,11 +134046,9 @@ msgstr "Kopffüßermutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -"Ich suche nach Kopffüßlermutagen. Diese Welt ist kein Ort für Menschen mehr," -" und ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Spider Mutant" @@ -132407,11 +134056,9 @@ msgstr "Spinnenmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Spinnenmutagen. Diese Welt ist kein Ort für Menschen mehr, " -"und ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Rat Mutant" @@ -132419,11 +134066,9 @@ msgstr "Rattenmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" -"Ich suche nach Rattenmutagen. Diese Welt ist kein Ort für Menschen mehr, und" -" ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Mouse Mutant" @@ -132431,11 +134076,9 @@ msgstr "Mausmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Ich suche nach Mausmutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Alpha Mutant" @@ -132443,11 +134086,9 @@ msgstr "Alphamutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Ich suche nach Alphamutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Elfa Mutant" @@ -132455,11 +134096,9 @@ msgstr "Elfamutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Ich suche nach Elfamutagen. Diese Welt ist kein Ort für Menschen mehr, und " -"ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Chimera Mutant" @@ -132467,11 +134106,9 @@ msgstr "Chimärenmutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Chimärenmutagen. Diese Welt ist kein Ort für Menschen mehr, " -"und ich habe nicht vor, einer zu bleiben." #: lang/json/npc_class_from_json.py msgid "Raptor Mutant" @@ -132479,11 +134116,9 @@ msgstr "Raptormutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Ich suche nach Raptormutagen. Diese Welt ist kein Ort für Menschen mehr, und" -" ich habe nicht vor, einer zu bleiben." #: lang/json/npc_from_json.py msgid "Brigitte LaCroix" @@ -135746,14 +137381,10 @@ msgstr "Geschützter Überlebender" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"Zu Beginn der Katastrophe hast du in einem Luftschutzbunker Unterschlupf " -"gesucht. Jetzt ist es Winter und du hoffst, dass dein Sammelsurium aus " -"Fertigkeiten, welche du aus all den Büchern gelernt hast, dir beim Überleben" -" hilft." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135764,14 +137395,10 @@ msgstr "Geschützte Überlebende" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"Zu Beginn der Katastrophe hast du in einem Luftschutzbunker Unterschlupf " -"gesucht. Jetzt ist es Winter und du hoffst, dass dein Sammelsurium aus " -"Fertigkeiten, welche du aus all den Büchern gelernt hast, dir beim Überleben" -" hilft." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135782,13 +137409,10 @@ msgstr "Untergebrachte Miliz" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Zu Beginn der Katastrophe hast du in einem Luftschutzbunker Unterschlupf " -"gesucht. Jetzt ist es Winter und du hoffst, dass deine Waffen und die " -"Fertigkeiten, die du erlernt hast, dir beim Überleben helfen." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135799,13 +137423,10 @@ msgstr "Untergebrachte Miliz" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Zu Beginn der Katastrophe hast du in einem Luftschutzbunker Unterschlupf " -"gesucht. Jetzt ist es Winter und du hoffst, dass deine Waffen und die " -"Fertigkeiten, die du erlernt hast, dir beim Überleben helfen." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135889,12 +137510,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"Du weischt nütscht über diese komische Ort oder welch wirre Magie dech " -"hergführt hett. Schaut so us, als müschtest du a neus Lebe anfonge in dr " -"brutalschte Katastroof, die Mensche sit dr Sintflut je gsehn hätt." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135907,12 +137525,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"Du weischt nütscht über diese komische Ort oder welch wirre Magie dech " -"hergführt hett. Schaut so us, als müschtest du a neus Lebe anfonge in dr " -"brutalschte Katastroof, die Mensche sit dr Sintflut je gsehn hätt." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136028,12 +137643,9 @@ msgstr "Imker" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Du warst eine Berufsimkerin. Du musstest deine kostbaren Bienen aufgeben, " -"als die Katastrophe kam, aber wenigstens konntest du dir ein paar Utensilien" -" und Honig mitnehmen." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -136045,12 +137657,9 @@ msgstr "Imkerin" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Du warst eine Berufsimkerin. Du musstest deine kostbaren Bienen aufgeben, " -"als die Katastrophe kam, aber wenigstens konntest du dir ein paar Utensilien" -" und Honig mitnehmen." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136061,13 +137670,10 @@ msgstr "Basketballspieler" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"Dein erstes großes Spiel stand bevor, doch dann kam die Katastrophe. Dank " -"deiner schnellen Füße warst du eine der glücklichen Wenigen, die überlebten " -"und vor den Kreaturen flohen." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -136078,13 +137684,10 @@ msgstr "Basketballspielerin" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"Dein erstes großes Spiel stand bevor, doch dann kam die Katastrophe. Dank " -"deiner schnellen Füße warst du eine der glücklichen Wenigen, die überlebten " -"und vor den Kreaturen flohen." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136241,12 +137844,9 @@ msgstr "Butler" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Du arbeitetest in einem wohlhabenden Haushalt, aber nach der Katastrophe " -"unternahmen sie einen Familienausflug zu einen unbekannten Ort. Du musst nun" -" für dich selbst sorgen." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -136257,12 +137857,9 @@ msgstr "Magd" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Du arbeitetest in einem wohlhabenden Haushalt, aber nach der Katastrophe " -"unternahmen sie einen Familienausflug zu einen unbekannten Ort. Du musst nun" -" für dich selbst sorgen." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137303,13 +138900,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Du arbeitetest für irgendwelche unbedeutenden Geschäftseigentümer, indem du " -"kleinere elektrische Arbeiten gemacht hast und so kam es, dass du an einer " -"Notunterkunft arbeitetest, als die Katastrophe ausbrach. Unglücklicherweise " -"konntest du außer vom Computer keine Verdrahtungen fertigstellen." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137322,13 +138915,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Du arbeitetest für irgendwelche unbedeutenden Geschäftseigentümer, indem du " -"kleinere elektrische Arbeiten gemacht hast und so kam es, dass du an einer " -"Notunterkunft arbeitetest, als die Katastrophe ausbrach. Unglücklicherweise " -"konntest du außer vom Computer keine Verdrahtungen fertigstellen." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137409,7 +138998,7 @@ msgstr "Dusch-Opfer" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -137423,7 +139012,7 @@ msgstr "Dusch-Opfer" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -137467,11 +139056,9 @@ msgstr "Turniertänzer" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"Vor der Katastrophe warst du ein Turniertänzer und nun benutzt du deine " -"Erfahrung, um dein Leben zu retten." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137482,11 +139069,9 @@ msgstr "Turniertänzerin" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"Vor der Katastrophe warst du eine Turniertänzerin und nun benutzt du deine " -"Erfahrung, um dein Leben zu retten." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138403,12 +139988,9 @@ msgstr "Bräutigam" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"Die Katastrophe schlug am großen Tag zu und du flohst mit nichts außer " -"deiner Hochzeitstracht. Kalte Füße? Du solltest lieber dafür sorgen, dass " -"deine Füße dran bleiben!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138419,12 +140001,9 @@ msgstr "Braut" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"Die Katastrophe schlug am großen Tag zu und du flohst mit nichts außer " -"deiner Hochzeitstracht. Kalte Füße? Du solltest lieber dafür sorgen, dass " -"deine Füße dran bleiben!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138506,11 +140085,8 @@ msgstr "Ungezogener Junge" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Deine Ska-Punk-Band löste sich auf, nachdem der Drummer zum Zombie wurde. " -"Nun bist du alleine in der Katastrophe mit ein paar Zigaretten und deinem " -"MP3-Player." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138522,11 +140098,8 @@ msgstr "Ungezogenes Mädchen" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Deine Ska-Punk-Band löste sich auf, nachdem der Drummer zum Zombie wurde. " -"Nun bist du alleine in der Katastrophe mit ein paar Zigaretten und deinem " -"MP3-Player." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138569,11 +140142,9 @@ msgstr "Verurteilter" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"Die Katastrophe gab dir eine Chance zur Flucht, aber die Freiheit verlangt " -"einen hohen Preis." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138584,11 +140155,9 @@ msgstr "Verurteilte" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"Die Katastrophe gab dir eine Chance zur Flucht, aber die Freiheit verlangt " -"einen hohen Preis." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139023,11 +140592,9 @@ msgstr "Rabbi" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Du zelebriertest mit deiner Gemeinde im Tempel, als die Katastrophe " -"zuschlug. Jetzt könntest du einen Messias gebrauchen!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139038,11 +140605,9 @@ msgstr "Rabbi" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Du zelebriertest mit deiner Gemeinde im Tempel, als die Katastrophe " -"zuschlug. Jetzt könntest du einen Messias gebrauchen!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139248,14 +140813,10 @@ msgstr "Pizzaausträger" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Du warst dabei, die letzte Pizza der Nacht zum örtlichen Kyrogeniklabor " -"auszuliefern, als die Katastrophe zuschlug. Du flohst zur nächsten " -"Unterkunft und hat nur deinen Verstand und etwas Pizza übrig. Und sie haben " -"noch nicht mal ein Trinkgeld hinterlassen!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139267,14 +140828,10 @@ msgstr "Pizzaausträgerin" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Du warst dabei, die letzte Pizza der Nacht zum örtlichen Kyrogeniklabor " -"auszuliefern, als die Katastrophe zuschlug. Du flohst zur nächsten " -"Unterkunft und hat nur deinen Verstand und etwas Pizza übrig. Und sie haben " -"noch nicht mal ein Trinkgeld hinterlassen!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139395,13 +140952,10 @@ msgstr "Bauer" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Als die Katastrophe zuschlug, verdientest du dir deinen Lebensunterhalt mit " -"Kulturpflanzen. Mit deiner treuen Hacke und ein paar Samen ist es an der " -"Zeit, die Erde wieder aufzubauen, Pflanze für Pflanze." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139412,13 +140966,10 @@ msgstr "Bäuerin" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Als die Katastrophe zuschlug, verdientest du dir deinen Lebensunterhalt mit " -"Kulturpflanzen. Mit deiner treuen Hacke und ein paar Samen ist es an der " -"Zeit, die Erde wieder aufzubauen, Pflanze für Pflanze." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139465,13 +141016,10 @@ msgstr "Abgehärteter Sammler" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Als eine der glücklichen Wenigen, die der Katastrophe entflohen, bautest du " -"dir dein Leben auf den Ruinen der Anderen auf. Ob über Gewalt, List oder " -"Glück, du dir hast die beste Ausrüstung, die du finden konntest, ergattert." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139482,13 +141030,10 @@ msgstr "Abgehärtete Sammlerin" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Als eine der glücklichen Wenigen, die der Katastrophe entflohen, bautest du " -"dir dein Leben auf den Ruinen der Anderen auf. Ob über Gewalt, List oder " -"Glück, du dir hast die beste Ausrüstung, die du finden konntest, ergattert." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139817,16 +141362,11 @@ msgstr "Junior-Überlebenskünstler" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Deine Eltern waren Überlebensfanatiker, die dachten, dass eine »Katastrophe«" -" kommen würde, sie bestanden darauf, vorbereitet zu sein. Da hatten sie wohl" -" Recht. Du hattest keine Gelegenheit, ihnen zu danken. Das Einzige, was du " -"für sie noch tun kannst, ist das, worauf sie immer gehofft hatten: " -"überleben." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139837,16 +141377,11 @@ msgstr "Junior-Überlebenskünstlerin" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Deine Eltern waren Überlebensfanatiker, die dachten, dass eine »Katastrophe«" -" kommen würde, sie bestanden darauf, vorbereitet zu sein. Da hatten sie wohl" -" Recht. Du hattest keine Gelegenheit, ihnen zu danken. Das Einzige, was du " -"für sie noch tun kannst, ist das, worauf sie immer gehofft hatten: " -"überleben." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -140846,7 +142381,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -140863,7 +142398,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -141114,10 +142649,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -141130,10 +142665,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -141145,9 +142680,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -141161,9 +142696,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -141177,7 +142712,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -141191,7 +142726,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -141206,9 +142741,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -141223,9 +142758,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -141239,13 +142774,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -141257,13 +142792,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -141276,8 +142811,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -141292,8 +142827,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -141308,9 +142843,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -141323,9 +142858,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -141337,13 +142872,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -141355,13 +142890,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -141373,10 +142908,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -141388,10 +142923,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -141403,12 +142938,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -141420,12 +142955,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -141437,17 +142972,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -141459,17 +142994,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -141483,9 +143018,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -141499,9 +143034,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -141515,10 +143050,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -141534,10 +143069,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -141552,9 +143087,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -141567,9 +143102,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -141581,11 +143116,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -141597,11 +143133,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -141753,7 +143290,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -141766,7 +143303,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -141803,7 +143340,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -141816,7 +143353,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -141829,7 +143366,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -141842,7 +143379,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -141910,7 +143447,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -141921,7 +143458,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -141985,7 +143522,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -141998,7 +143535,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -142090,7 +143627,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -142104,7 +143641,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -142120,7 +143657,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -142135,7 +143672,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -143235,13 +144772,10 @@ msgstr "Baseballspieler" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"Du warst ein Batter eines örtlichen Minor-League-Teams vor der Katastrophe. " -"Du flohst mit deiner Ausrüstung, aber wie lange kannst du überleben, bis " -"deine Innings zu Ende sind?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143252,13 +144786,10 @@ msgstr "Baseballspielerin" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"Du warst ein Batter eines örtlichen Minor-League-Teams vor der Katastrophe. " -"Du flohst mit deiner Ausrüstung, aber wie lange kannst du überleben, bis " -"deine Innings zu Ende sind?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -143343,12 +144874,9 @@ msgstr "Geweckter" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Du wurdest mitten in der Nacht von einem seltsamen Geräusch geweckt. Nur mit" -" einer Taschenlampe ausgerüstet, bist du losgezogen, um dem Lärm auf den " -"Grund zu gehen und hast dich in der Apokalypse wiedergefunden." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143359,12 +144887,9 @@ msgstr "Geweckte" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Du wurdest mitten in der Nacht von einem seltsamen Geräusch geweckt. Nur mit" -" einer Taschenlampe ausgerüstet, bist du losgezogen, um dem Lärm auf den " -"Grund zu gehen und hast dich in der Apokalypse wiedergefunden." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -143376,13 +144901,9 @@ msgstr "Bionikradfahrer" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Dein Training und deine Augmentationen für den Cyber-Olympics-" -"Radsportwettbewerb haben dir einen schönen Vorteil verschafft, um dem Beginn" -" der Katastrophe zu entkommen. Kannst du der Apokalypse für immer davon " -"laufen?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143394,13 +144915,9 @@ msgstr "Bionikradfahrerin" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Dein Training und deine Augmentationen für den Cyber-Olympics-" -"Radsportwettbewerb haben dir einen schönen Vorteil verschafft, um dem Beginn" -" der Katastrophe zu entkommen. Kannst du der Apokalypse für immer davon " -"laufen?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -143411,14 +144928,10 @@ msgstr "Schweißer" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"Du hast vor der Katastrophe für eine Offshore-Firma als Schweißer " -"gearbeitet, und warst gerade auf dem Weg nach Hause, als sich das Ende " -"anbahnte und schließlich mit aller Wucht zuschlug. Wenigstens hast du noch " -"dein Handwerkszeug bei dir." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143429,14 +144942,10 @@ msgstr "Schweißerin" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"Du hast vor der Katastrophe für eine Offshore-Firma als Schweißerin " -"gearbeitet, und warst gerade auf dem Weg nach Hause, als sich das Ende " -"anbahnte und schließlich mit aller Wucht zuschlug. Wenigstens hast du noch " -"dein Handwerkszeug bei dir." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -143447,15 +144956,10 @@ msgstr "Primitiver Überlebenskünstler" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Du wusstest, dass der Tag kommt. Der Tag, an dem alles den Bach runter geht." -" Du hast dich gut vorbereitet, nicht durch schnöde Ausrüstung, sondern durch" -" Training und das Einüben von Fertigkeiten. All die Tage im Wald zahlen sich" -" nun aus. Wenn deine Vorfahren ohne Technik überlebt konnten, dann wirst du " -"verdammt sein, wenn du es nicht auch schaffst." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143466,15 +144970,10 @@ msgstr "Primitive Überlebenskünstlerin" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Du wusstest, dass der Tag kommt. Der Tag, an dem alles den Bach runter geht." -" Du hast dich gut vorbereitet, nicht durch schnöde Ausrüstung, sondern durch" -" Training und das Einüben von Fertigkeiten. All die Tage im Wald zahlen sich" -" nun aus. Wenn deine Vorfahren ohne Technik überlebt konnten, dann wirst du " -"verdammt sein, wenn du es nicht auch schaffst." #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py @@ -148015,13 +149514,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Als die Katastrophe kam, wurdest du zu einer naheliegenden Unterkunft " -"gebracht. Hier hast du gelebt und das Gebäude nie verlassen, aus Furcht " -"davor, dass dich das Unbekannte in der Außenwelt verletzen könnte. Die " -"Vorräte werden knapp und für das erste Mal seit der Katastrophe wirst du " -"gezwungen sein, dich der Außenwelt zu stellen." #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -148030,13 +149524,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Als die Katastrophe kam, wurdest du zu einer naheliegenden Unterkunft " -"gebracht. Hier hast du gelebt und das Gebäude nie verlassen, aus Furcht " -"davor, dass dich das Unbekannte in der Außenwelt verletzen könnte. Die " -"Vorräte werden knapp und für das erste Mal seit der Katastrophe wirst du " -"gezwungen sein, dich der Außenwelt zu stellen." #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -148104,7 +149593,7 @@ msgstr "Gefängnis" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -148113,7 +149602,7 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -148217,26 +149706,18 @@ msgstr "Experiment" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Seit der Geburt ist dein einziger Lebenszweck der Fortschritt der " -"Genforschung, egal, ob freiwillig oder nicht. Als die Katastrophe zuschlug, " -"verließest du das Labor und wandertest ziellos umher und bist in einen Wald " -"geraten." #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Seit der Geburt ist dein einziger Lebenszweck der Fortschritt der " -"Genforschung, egal, ob freiwillig oder nicht. Als die Katastrophe zuschlug, " -"verließest du das Labor und wandertest ziellos umher und bist in einen Wald " -"geraten." #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -148481,8 +149962,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Description for scenario 'Lost Faith' for a female character. @@ -148490,8 +149971,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Starting location for scenario 'Lost Faith'. @@ -148520,7 +150001,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Description for scenario 'The Wizard's Apprentice' for a female @@ -148532,7 +150013,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -148558,8 +150039,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -148568,8 +150049,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -148673,9 +150154,9 @@ msgstr "Herausforderung: FEMA-Todeslager" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female @@ -148684,9 +150165,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -149794,6 +151275,11 @@ msgstr "" " erschießt, wird wahrscheinlich kein Fleisch mehr übrig bleiben! Benutze " "eine Luftpistole oder vielleicht ein .22-Gewehr." +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -149820,11 +151306,27 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." +"impossible unless you have a big tactical advantage." msgstr "" -"Wenn du eine große Horde von Zombies kommen siehst, LAUF! Versuchen, sie " -"alle zu bekämpfen, ist Selbstmord, außer du hast einen großen taktischen " -"Vorteil." + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "" +"Wenn du von einer Zombiehorde gejagt wirst, versuch dich in die U-Bahn zu " +"verscharren, geh ein oder zwei Felder umher, dann komm wieder zurück nach " +"oben." #: lang/json/snippet_from_json.py msgid "" @@ -150170,7 +151672,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" @@ -150410,6 +151912,12 @@ msgstr "" "fallen zu lassen, obwohl du sie eigentlich werfen wolltest, könnte tödlich " "sein." +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -150466,9 +151974,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" #: lang/json/snippet_from_json.py @@ -150487,6 +151994,12 @@ msgstr "" "Beim Nächsten mal, in dem du ein Lebensmittelgeschäft besuchst, sammel " "Konserven. Sie werden niemals schlecht!" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -150516,15 +152029,6 @@ msgid "" "defense… it's perfect!" msgstr "" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "" -"Wenn du von einer Zombiehorde gejagt wirst, versuch dich in die U-Bahn zu " -"verscharren, geh ein oder zwei Felder umher, dann komm wieder zurück nach " -"oben." - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -150535,9 +152039,9 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" #: lang/json/snippet_from_json.py @@ -150603,32 +152107,41 @@ msgstr "Ein Wodka-O am Tag hält den Skorbut auf Trab." #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "" -"Hungriger als normal? Natürliche Öle können helfen. Nicht wirklich lecker, " -"aber wen kümmert es, wenn das Aufessen deines Beines die zweite Wahl wäre?" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." msgstr "" -"Das Gelände kann einen Kampf entscheiden, nutze es gegen deine Feinde, lass " -"sie es nicht gegen dich verwenden." #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" -"Leute, die an der Mine vorbeigingen, sagten etwas über einen üblen Gestank. " -"Wenn du planst, dort einen Besuch abzustatten, nimm eine Gasmaske mit." #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "Wissen ist Macht. Ernsthaft, nimm doch mal ein Buch in die Hand." +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -150709,14 +152222,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" -"Ein Lötkolben kann der beste Freund eines aufstrebenden Mechanikers sein. Du" -" kannst auch Wunden damit kauterisieren, aber es starben genausoviele Leute " -"an dieser Behandlung, wie Leute, die weiterlebten, also denke ich, dass es " -"die letzte Wahl ist." #: lang/json/snippet_from_json.py msgid "" @@ -150763,14 +152272,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" -"Ich war gegen Drogen, bis ich fast von einem Zombie getötet wurde und ich " -"meinen jämmerlichen Arsch von der Horde wegbewegen musste, mit nichts weiter" -" als etwas weißem Pulver, den ich von diesen Zombie gekriegt hatte. Es hat " -"mich dieses mal gerettet." #: lang/json/snippet_from_json.py msgid "" @@ -150802,6 +152307,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -150911,6 +152422,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -150932,6 +152467,13 @@ msgid "" "either, if you catch my drift." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -150984,6 +152526,12 @@ msgid "" " a cold ground." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -151029,7 +152577,7 @@ msgid "Hey there's some pink tablets, take some!" msgstr "" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" msgstr "" #: lang/json/snippet_from_json.py @@ -153867,16 +155415,16 @@ msgid "" msgstr "" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." -msgstr "Erzähl mir, wie du die Katastrophe überlebt hast." +msgid "Tell me about how you survived the Cataclysm." +msgstr "" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" -msgstr "Wie hast du die Katastrophe überlebt?" +msgid "How did you survive the Cataclysm?" +msgstr "" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" -msgstr "Wie war die Katastrophe für dich?" +msgid "What was the Cataclysm like for you?" +msgstr "" #: lang/json/snippet_from_json.py msgid "How did you make it through the initial chaos?" @@ -154137,8 +155685,8 @@ msgid "eldritch horror" msgstr "" #: lang/json/snippet_from_json.py -msgid "the cataclysm" -msgstr "die Katastrophe" +msgid "the Cataclysm" +msgstr "" #: lang/json/snippet_from_json.py msgid "the apocalypse" @@ -154503,6 +156051,306 @@ msgid "" "Refer to file EXO-M-312 for full report." msgstr "" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -155746,7 +157594,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "" #: lang/json/snippet_from_json.py @@ -160528,11 +162376,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" -"»Oh Schande, die Spirale in einer solch Verzerrten Form zu Sehen! " -"Manipuliert für ihre Vortexbewegung! Ihrer Fortwährenden Anmut! Ihre " -"Schönheit, Angeschlagen …«" #: lang/json/snippet_from_json.py msgid "\"My friend died, but at least I made her into a blob turret.\"" @@ -160552,16 +162397,13 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" -"»40. Tag. Steuerung kaputt – der magische Reaktor des Autos lässt es " -"unaufhaltsam weiterfahren. Gigantische Walzen an der Vorderseite demolieren " -"Wald. Maine, jetzt komme ich.«" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" -msgstr "»mein Auto ist ein Diamant auf groben Stein … wortwörtlich«" +msgid "\"my car is a diamond in the rough… literally\"" +msgstr "" #: lang/json/snippet_from_json.py msgid "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" @@ -160589,11 +162431,9 @@ msgstr "»eines tages werde ich auch ein teil eines autos sein«" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" -"»Ein bissele Dynamit da und 'ne halbe Landmine hier in einer alten Limidose " -"… BUMM! Jetzt fliegste in alle Richtungen.«" #: lang/json/speech_from_json.py msgid "\"Hello?\"" @@ -162230,6 +164070,38 @@ msgstr "" msgid "WOOF!" msgstr "" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "»Bring mich nicht dazu, dich über die Planke zu schicken!«" @@ -162340,19 +164212,15 @@ msgstr "Wenn die Tests vorrüber sind, wird man Sie vermissen." #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" -"Unglaublich. Sie, [Name des Subjekts], müssen der Stolz von [Wohnort des " -"Subjekts] sein!" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" -"Dieses Ding ist vermutlich so eine Art Behälter für unbehandeltes Abwasser. " -"Na, machen Sie schon, reiben Sie sich Ihr ganzes Gesicht damit ein." #: lang/json/speech_from_json.py msgid "" @@ -162364,11 +164232,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" -"Niemand wird Sie beschuldigen, wenn Sie aufgeben. Tatsächlich ist es eine " -"vollkommen vernünftige Reaktion, an diesem Punkt aufzuhören." #: lang/json/speech_from_json.py msgid "" @@ -162379,9 +164245,8 @@ msgstr "" "extremen Pessimismus." #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" +msgid "Hello again. To reiterate our previous warning: [garbled]" msgstr "" -"Hallo mal wieder. Um unsere vorherige Warnung zu wiederholen: [entstellt]" #: lang/json/speech_from_json.py msgid "Weeeeeeeeeeeeeeeeeeeeee[bzzt]" @@ -162468,11 +164333,9 @@ msgstr "Jemand wird schwer verletzt werden." #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "" -"Oh-oh. Jemand hat den Kuchen angeschnitten. Ich hab ihnen gesagt, dass sie " -"für Sie warten sollen, aber sie taten es trotzdem." #: lang/json/speech_from_json.py msgid "This is your fault. It didn't have to be like this." @@ -162505,10 +164368,8 @@ msgstr "Was war das? Haben Sie etwas gesagt?" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "" -"Ich möchte Sie daran erinnern, dass Ihnen jede Möglichkeit gegeben wurde, " -"zum Erfolg zu kommen." #: lang/json/speech_from_json.py msgid "What's your point, anyway? Survival?" @@ -162567,11 +164428,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" -"Ich hab ein paar Baupläne angeschaut und ich denke … Ja, genau hier. Sie " -"gehen eindeutig in die falsche Richtung." #: lang/json/speech_from_json.py msgid "Are you even listening to me?" @@ -162606,8 +164465,8 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "»Was wir hier haben, sind Kommunikationsschwierigkeiten.«" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" -msgstr "»E.T. nach Hause telefonieren.«" +msgid "\"E.T. phone home.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"I'm as mad as hell, and I'm not going to take this anymore!\"" @@ -162678,8 +164537,8 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "»Straßen? Dort, wohin wir gehen, brauchen wir keine Straßen.«" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" -msgstr "»Gut anschnallen! Es wird eine holprige Nacht.«" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "" @@ -163050,8 +164909,8 @@ msgid "\"I'm scared!\"" msgstr "»Ich hab Angst!«" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" -msgstr "»Etwas stimmt nicht …«" +msgid "\"Something's wrong…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"What are you doing?\"" @@ -163078,16 +164937,16 @@ msgid "\"Excuse me?\"" msgstr "»Entschuldigung?«" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" -msgstr "»Ich bin anders …«" +msgid "\"I'm different…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" -msgstr "»Trotzdem Danke …«" +msgid "\"Thanks anyway…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" -msgstr "»Nimm mich mit …«" +msgid "\"Take me with you…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"You have excellent aim!\"" @@ -163166,8 +165025,8 @@ msgid "\"This time is OUR time.\"" msgstr "»Das ist jetzt UNSERE Zeit.«" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" -msgstr "»Wiedersehen macht Freude!«" +msgid "\"Second time's a charm…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Howdy, stranger!\"" @@ -163239,8 +165098,8 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "»[seufz] Erzähl niemanden davon.«" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" -msgstr "»Tja, ich gab mein Bestes. Viel Glück!«" +msgid "\"Well, I tried. Best of luck!\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Hey, safe travels, there.\"" @@ -163535,7 +165394,7 @@ msgid "Cabin" msgstr "Blockhaus" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "Krankenhaus" @@ -163687,7 +165546,7 @@ msgstr "Fema-Lager" msgid "Mansion Entrance" msgstr "Villeneingang" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "Villa" @@ -163761,7 +165620,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -163860,42 +165719,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164606,7 +166465,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -164925,13 +166784,13 @@ msgstr "" "Was ist los?" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding " -"up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding " +"up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -165021,14 +166880,14 @@ msgstr "Okay, keine plötzlichen Bewegungen!" msgid "Keep your distance!" msgstr "Bleib fern!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "Das ist mein Gebiet, ." - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "Das ist mein Gebiet, ." + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "Ruhig Blut. Ich habe nicht vor, dich zu verletzen." @@ -165082,29 +166941,29 @@ msgid "I don't care." msgstr "Ist mir egal." #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "Ich hab nur eine Aufgabe für dich. Willst du sie hören?" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "Ich habe noch eine Aufgabe für dich. Willst du sie hören?" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "" +msgid "I have another job for you. Want to hear about it?" +msgstr "Ich habe noch eine Aufgabe für dich. Willst du sie hören?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "Ich hab nichts weiteres für dich zu tun." +msgid "I just have one job for you. Want to hear about it?" +msgstr "Ich hab nur eine Aufgabe für dich. Willst du sie hören?" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "Ich hab nichts für dich zu tun." +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "Ich hab nichts weiteres für dich zu tun." + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -165114,6 +166973,10 @@ msgstr "Oh, okay." msgid "Never mind, I'm not interested." msgstr "Vergiss es, ich bin nicht interessiert." +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "Welche Aufgabe?" @@ -165122,10 +166985,6 @@ msgstr "Welche Aufgabe?" msgid "What about it?" msgstr "Wie wär’s?" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "Ich mach’s!" @@ -165344,10 +167203,6 @@ msgstr "Hmm, okay." msgid "Thanks!" msgstr "Danke!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "" @@ -165372,6 +167227,10 @@ msgstr "Ich bin zu durstig, gib mir was zu Trinken." msgid "I must focus on the road!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Ah, okay." @@ -165476,10 +167335,6 @@ msgstr "Nein, wir sind hier okay." msgid "On second thought, never mind." msgstr "Wenn ich darüber nachdenke, vergiss es." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "Ich kann dich nicht trainieren, solange du ein Fahrzeug benutzt!" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "Ich habe Gründe, um dir die Ausbildung zu verweigern." @@ -165492,6 +167347,10 @@ msgstr "Nur Geduld, ich werd dir später etwas neues zeigen …" msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "Ich kann dich nicht trainieren, solange du ein Fahrzeug benutzt!" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "Auf keinen Fall! Ich würde alleine zurückgelassen werden." @@ -166163,8 +168022,8 @@ msgid "How are you alive?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" -msgstr "Was hast du vor der Katastrophe gemacht?" +msgid "What did you do before the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -166384,32 +168243,32 @@ msgid "This is a season spring test response." msgstr "Das ist eine Jahreszeit-(Frühling)-Testantwort." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." -msgstr "Dies ist eine 30-Tage-seit-der-Katastrophe-Testantwort." +msgid "This is a days since Cataclysm 30 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season summer test response." msgstr "Das ist eine Jahreszeit-(Sommer)-Testantwort." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." -msgstr "Dies ist eine 120-Tage-seit-der-Katastrophe-Testantwort." +msgid "This is a days since Cataclysm 120 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season autumn test response." msgstr "Das ist eine Jahreszeit-(Herbst)-Testantwort." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." -msgstr "Dies ist eine 210-Tage-seit-der-Katastrophe-Testantwort." +msgid "This is a days since Cataclysm 210 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season winter test response." msgstr "Das ist eine Jahreszeit-(Winter)-Testantwort." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." -msgstr "Dies ist eine 300-Tage-seit-der-Katastrophe-Testantwort." +msgid "This is a days since Cataclysm 300 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a is day test response." @@ -166925,7 +168784,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" @@ -167291,8 +169150,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" -msgstr "Was hast du gemacht als du von der Katastrophe erfahren hast?" +msgid "What did you do when you found out about the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -168838,10 +170697,8 @@ msgstr "Nein, das ist gestört." #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" -"Ja, das verstehe ich. Manchmal habe ich das Gefühl, dass meine Existenz erst" -" kurz nach der Katastrophe begann." #: lang/json/talk_topic_from_json.py msgid "" @@ -170430,7 +172287,7 @@ msgid "What were you saying before that?" msgstr "Was hast du davor gesagt?" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -170469,7 +172326,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "" @@ -170501,8 +172358,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -170529,7 +172386,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170550,14 +172407,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170570,7 +172427,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -170600,7 +172457,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -170610,7 +172467,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -170635,7 +172492,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170688,7 +172545,7 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -170701,7 +172558,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" @@ -170742,8 +172599,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170772,6 +172629,12 @@ msgstr "" msgid "Where is your brother's place?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "" @@ -170836,6 +172699,10 @@ msgid "" " a forage set up." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "" @@ -171159,19 +173026,19 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." +"Sir, I don't know how the hell you got down here but if you have any sense " +"you'll get out while you can." msgstr "" -"Hey, ich weiß nicht, wie zur Hölle du hier nach unten gekommen sind, aber " +"Junge, ich weiß nicht, wie zur Hölle du hier nach unten gekommen sind, aber " "wenn du irgendeine Form von Anstand hast, solltest du von hier verschwinden," " solange du noch kannst." #: lang/json/talk_topic_from_json.py msgid "" -"Sir, I don't know how the hell you got down here but if you have any sense " -"you'll get out while you can." +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." msgstr "" -"Junge, ich weiß nicht, wie zur Hölle du hier nach unten gekommen sind, aber " +"Hey, ich weiß nicht, wie zur Hölle du hier nach unten gekommen sind, aber " "wenn du irgendeine Form von Anstand hast, solltest du von hier verschwinden," " solange du noch kannst." @@ -171636,12 +173503,12 @@ msgstr "" "Hab ich dir was über Pappkarton erzählt, mein Freund? Hast du welchen?" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172436,12 +174303,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" -"Ekelig, nicht wahr? Fühlt sich wie Schamhaar an. Es fing an, überall zu " -"wachsen, kurz nach der Katastrophe. Keine Idea, was es verursacht hat. Ich " -"kann ihnen nicht die Schuld geben, dass sie es hassen; ich hasse es." #: lang/json/talk_topic_from_json.py msgid "" @@ -172497,7 +174361,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" @@ -173056,7 +174920,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -175304,14 +177168,14 @@ msgstr "Bleib zivil oder es wird schmerzhaft." msgid "Just on watch, move along." msgstr "Ich bin nur auf Wache, weitergehen." -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "Gnä’ Frau, Sie sollten wirklich nicht hier draußen reisen." - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "Es ist gefährlich da draußen, nicht wahr?" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "Gnä’ Frau, Sie sollten wirklich nicht hier draußen reisen." + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "" @@ -176618,12 +178482,9 @@ msgstr "Ich möchte dich einstellen." #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" -"Ich wurde hierher geschickt, um beim Aufbau des Bauernhofs zu helfen. Die " -"meisten von uns haben keine richtigen Fertigkeiten, die sie aus der Zeit vor" -" der Apokalypse mitbringen konnten, also wird hier viel herumprobiert." #: lang/json/talk_topic_from_json.py msgid "" @@ -177056,7 +178917,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -177075,7 +178936,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" @@ -177089,8 +178950,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" #: lang/json/talk_topic_from_json.py @@ -177113,8 +178974,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" #: lang/json/talk_topic_from_json.py @@ -177127,9 +178988,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -177145,9 +179006,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -177176,20 +179037,15 @@ msgstr "Brauchst du bei irgendetwas Hilfe?" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" -"Nein, nein … Naja, vielleicht ein bisschen. Es war ein bisschen demoliert " -"hier unten, als ich es hier vorgefunden habe, es war nicht zu schwierig, es " -"zu reparieren. Du bist willkommen, im Gästezimmer für eine Weile zu bleiben," -" mach nur keine Hausbesetzung daraus. Du bist nicht der einzige Sammler " -"hier." #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "Interessant…" +msgid "Interesting…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -177201,8 +179057,8 @@ msgstr "" "dazu hast." #: lang/json/talk_topic_from_json.py -msgid "I see..." -msgstr "Ich verstehe..." +msgid "I see…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -177214,8 +179070,8 @@ msgstr "" "und allem verbunden." #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "Hmm..." +msgid "Hmm…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -177226,16 +179082,16 @@ msgstr "" "mehr Geld gebrauchen." #: lang/json/talk_topic_from_json.py -msgid "Alright..." -msgstr "In Ordung..." +msgid "Alright…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Not at the moment, check back later perhaps." msgstr "Nicht im Moment, versuch es später vielleicht noch mal." #: lang/json/talk_topic_from_json.py -msgid "Sure..." -msgstr "Sicher..." +msgid "Sure…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Are you part of the rescue team?" @@ -177254,8 +179110,8 @@ msgid "So are you busting us out of here or what?" msgstr "Also hilfst du uns hier raus oder was?" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." -msgstr "Bleib stehen, . Ich muss einen Weg freiräumen." +msgid "Hold tight, . I've got to clear a path." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Pack your bags, . We're going on a trip." @@ -181102,6 +182958,15 @@ msgstr "" msgid "A closed metal gate." msgstr "" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "" @@ -183040,14 +184905,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "Tank mit Benzin" +msgid "fuel tank" +msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "zerstörte Benzinzapfsäule" @@ -184951,6 +186825,27 @@ msgstr "kleine Blechunterlage" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "Fenster" @@ -185392,8 +187287,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -185407,7 +187302,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -185760,7 +187655,7 @@ msgstr "" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "nichts" @@ -186562,7 +188457,7 @@ msgstr "Eiswagen" msgid "Luggage Cart" msgstr "Gepäckwagen" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "Einkaufswagen" @@ -190015,12 +191910,9 @@ msgstr "LACP-Lasergeschützturm" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" -"Eine Reihe an durchgehenden ineinandergreifenden Raupenketten aus Blob. Sie " -"können anstelle von Rädern benutzt werden und bieten gute Bodenhaftung und " -"Leistung bei der Geländefahrt." #. ~ Description for gel shooter #. ~ Description for snapping ooze @@ -190834,6 +192726,10 @@ msgstr "Vitamin C" msgid "Toxins" msgstr "" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "Drücke " @@ -191363,6 +193259,12 @@ msgstr "Du kannst %s nicht nachladen." msgid "You reload the %s." msgstr "Du lädst %s nach." +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -192280,6 +194182,10 @@ msgstr "" msgid "The required items are not available to complete this task." msgstr "" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -192700,6 +194606,10 @@ msgstr "" msgid "spoilage" msgstr "Frische" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -194735,6 +196645,44 @@ msgstr "%s kann im momentanen Zustand nicht gefeuert werden." msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "Du hältst nichts." + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "Du bist zu satt, um die Bläter von %s zu essen." + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "Du isst das Gestrüpp." + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "Du bist zu satt zum Grasen." + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "Du frisst das Gras." + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "Das Gras ist zu kurz zum Grasen." + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "Dieses Gras ist tot und zu sehr zerfetzt, um hier zu grasen." + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "Das Gras ist mit Farbe verdorben und daher ungenießbar." + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "Du hinterlässt: %s (leer)" + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "Du kannst nicht gut werfen, solange du in deinem Panzer bist." @@ -194772,6 +196720,14 @@ msgstr "Du bemühst dich sehr, dich zu konzentrieren und dein Körper gehorcht!" msgid "You can't muster up the effort to throw anything…" msgstr "" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "Gegenstand entladen" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "Du hast nichts zum Entladen." + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -195660,18 +197616,13 @@ msgstr "Du bist aufgeregt, als die Operation beginnt." #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" -"Du bist aufgeregt, als der Autodoktor schmerzfrei in dich schneidet. Du " -"genießt die Sicht von Skalpellen, die dich zerschneiden, aber während die " -"Operation weitergeht, fühlst du dich plötzlich müde und wirst ohnmächtig" #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" #: src/bionics.cpp @@ -198239,8 +200190,8 @@ msgstr "Das sieht in der jetzigen Form nicht essbar aus." msgid "This is full of dirt after being on the ground." msgstr "Das ist nun voller Schmutz, nachdem es auf Boden gelegen hat." -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "Du kannst das nicht tun, solange du im Wasser bist." @@ -199144,11 +201095,11 @@ msgstr "Stapelzeitersparnis: %s" msgid "Dark craftable? %s" msgstr "" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "Einfach" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "Schwierig" @@ -199644,6 +201595,10 @@ msgstr "" msgid "Test weather" msgstr "Wetter testen" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "" @@ -199846,7 +201801,7 @@ msgstr "Sammler: %d" msgid "Altruism: %d" msgstr "Altruismus: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "Bedürfnisse:" @@ -200532,393 +202487,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "Bitte warte auf die Erzeugung der Welt [ 0%%]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "Du brauchst nicht zu schlafen!" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "Im Verteidigungsmodus kannst du nicht speichern." - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "Du kannst diesen Ort (%s) nicht zurücklassen!" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "Du hast es geschafft, bis zur %d. Welle zu überleben." - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "Bitte warte auf die Generierung der Welt [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "Vorherige Option" - -#: src/defense.cpp -msgid "Next option" -msgstr "Nächste Option" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "Einstellungswert wechseln" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "Einstellung umschalten" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "Du musst mindestens eine Monstergruppe auswählen!" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "Besondere Zombies" - -#: src/defense.cpp -msgid "Zombies" -msgstr "Zombies" - -#: src/defense.cpp -msgid "Triffids" -msgstr "Triffiden" - -#: src/defense.cpp -msgid "Robots" -msgstr "Roboter" - -#: src/defense.cpp -msgid "Subspace" -msgstr "Subebene" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "Essen" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "Söldner" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "VERTEIDIGUNGSMODUS" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "Richtungstasten zum Wechseln, Enter zum Umschalten" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "Szenario:" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "Ort:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "Erstschwierigkeit:" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "Der Schwierigkeitsgrad der ersten Welle." - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "Wellenschwierigkeit:" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "Der Anstieg des Schwierigkeitsgrad nach jeder Welle." - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "Pause zw. Wellen:" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "Die Dauer (in Minuten) zwischen Wellen." - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "Pause zw. Karawanen:" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "Die Anzahl der Wellen zwischen Karawanen." - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "Startgeld:" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "Mit wieviel Geld der Spieler startet." - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "Geld für 1. Welle:" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "Das Preisgeld für die erste Welle." - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "Preisgelderhöhung:" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "Die Erhöhung des Preisgeldes pro Welle." - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "Gegner-Auswahl:" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "Benutzerdefiniert" - -#: src/defense.cpp -msgid "Medium" -msgstr "Mittelschwer" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "Shaun of the Dead" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "Zombie" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "Arac Attack" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "Tag der Triffiden" - -#: src/defense.cpp -msgid "Skynet" -msgstr "Skynet" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "Cthulhus Ruf" - -#: src/defense.cpp -msgid "A custom game." -msgstr "Ein benutzerdefiniertes Spiel." - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "Einfache Monster und massig Geld." - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "Schwerere Monster. Du musst essen." - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "Alle Monster. Du musst essen und trinken." - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "Verteidige eine Bar gegen gewöhnliche Zombies." - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "Gewöhnliche Zombies. Langsamer und realistischer." - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "Schneller und spaßiger Spinnenkampf." - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "Verteidige deine Villa gegen die Triffiden." - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "Die Roboter erklärten die Menschen zum Feind!" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "Wehre zahlreiche unheimliche Schrecken ab." - -#: src/defense.cpp -msgid "Public Works" -msgstr "Öffentliche Bauarbeiten" - -#: src/defense.cpp -msgid "Megastore" -msgstr "Kaufhaus" - -#: src/defense.cpp -msgid "Bar" -msgstr "Kneipe" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "Ein Eingang und viele Räume. Einige Medikamente." - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "Leicht zu befestigen. Viele nützliche Werkzeuge." - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "Ein großes Gebäude mit diversen Vorräten." - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "Ein kleines Gebäude mit viel Alkohol." - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "Ein großes Haus mit vielen Räumen." - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" -"KARAWANE:\n" -"Fang an, indem du eine Kategorie mit deinen Lieblings-Hoch-/Runter-\n" -"Tasten auswählst. Wechsle zwischen der Kategorie- und Gegenstands-\n" -"auswahl mit der »%s«-Taste. Wähle einen Gegenstand mit den Hoch-/\n" -"Runter-Tasten aus, drücke die Links-/Rechtstaste für einen weniger/\n" -"mehr. Drücke %s, um alles im Einkaufswagen zu kaufen,\n" -"drücke %s, um nichts zu kaufen." - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "Wirklich nichts kaufen?" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "Du kannst dir diese Gegenstände nicht leisten!" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "%d Gegenstand kaufen und dabei %s behalten?" -msgstr[1] "%d Gegenstände kaufen und dabei %s behalten?" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "Du lässt ein paar Gegenstände fallen." - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "Nahkampfwaffen" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "Fernwaffen" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "Munition" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "Fertigungs- u. Baukomponenten" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "Nahrung u. Pharmaka" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "Kleidung u. Rüstung" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "Werkzeuge, Fallen u. Granaten" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "Drücke ? für Hilfe." - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "Dein Geld: %s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "Willkommen zur %d. Welle!" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "%d. Welle: " - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "Invasion der %s!" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "Angriff der %s!" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "%s greifen an!" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "%s aus der Hölle!" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "Der %s-Tag!" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "Rache der %s!" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "Aufstieg der %s!" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -201503,53 +203071,53 @@ msgstr "Dieses Gras war das allergeilste Schnippschnappsäckchen." #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "Stärke +%d; " +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "Stärke %d; " +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "Geschicklichkeit +%d; " +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "Geschicklichkeit %d; " +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "Wahrnehmung +%d; " +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "Wahrnehmung %d; " +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "Intelligenz +%d; " +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "Intelligenz %d; " +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "Geschwindigkeit +%d; " +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "Geschwindigkeit %d; " +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -202539,7 +204107,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -203178,7 +204747,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -203384,7 +204954,8 @@ msgstr "Expansion wählen:" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -203658,6 +205229,26 @@ msgstr "Teile von %s wurden über ein paar Büsche verteilt gefunden." msgid "(You wonder if your companions are fit to work on their own…)" msgstr "" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -204455,7 +206046,8 @@ msgstr "" msgid "Without extra fuel it will burn for between %s to %s." msgstr "" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "" @@ -204973,40 +206565,6 @@ msgstr "" msgid "%s helps with this task…" msgstr "" -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "Du bist zu satt, um die Bläter von %s zu essen." - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "Du isst das Gestrüpp." - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "Du bist zu satt zum Grasen." - -#: src/game.cpp -msgid "You eat the grass." -msgstr "Du frisst das Gras." - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "Das Gras ist zu kurz zum Grasen." - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "Dieses Gras ist tot und zu sehr zerfetzt, um hier zu grasen." - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "Das Gras ist mit Farbe verdorben und daher ungenießbar." - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "Du hinterlässt: %s (leer)" - #: src/game.cpp msgid "Change side for item" msgstr "Seite für Gegenstand wechseln" @@ -205035,6 +206593,11 @@ msgstr "%s ist schon voll!" msgid "You can't reload a %s!" msgstr "Du kannst %s nicht nachladen!" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "" + #: src/game.cpp msgid "Reload item" msgstr "Gegenstand nachladen" @@ -205043,18 +206606,6 @@ msgstr "Gegenstand nachladen" msgid "You have nothing to reload." msgstr "Du hast nichts zum Nachladen." -#: src/game.cpp -msgid "Unload item" -msgstr "Gegenstand entladen" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "Du hast nichts zum Entladen." - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "Du hältst nichts." - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -205139,6 +206690,13 @@ msgstr "Festgehaltenes Objekt konnte nicht gefunden werden." msgid "You cannot board a vehicle whilst riding." msgstr "" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "" @@ -205827,11 +207385,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "Dein Inventar ist leer." -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "Du hast %s nicht." - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "HINDERUNG" @@ -205970,8 +207523,8 @@ msgid "CBM" msgstr "KBM" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "ENERGIE" +msgid "ENERGY (kJ)" +msgstr "" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -206196,13 +207749,13 @@ msgstr "Gegenstand in Halfter stecken" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" -msgstr "Wähle eine Waffe, die du in %s stecken möchtest" +msgid "Choose an item to put into your %s" +msgstr "" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." -msgstr "Du hast keine Waffen, die du in %s stecken könntest." +msgid "You have no items you could put into your %s." +msgstr "" #: src/game_inventory.cpp src/iuse.cpp msgid "Cut up what?" @@ -206444,6 +207997,405 @@ msgstr "Einführung" msgid "Defense" msgstr "Verteidigung" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "Bitte warte auf die Erzeugung der Welt [ 0%%]" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "Du brauchst nicht zu schlafen!" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "Im Verteidigungsmodus kannst du nicht speichern." + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "Du kannst diesen Ort (%s) nicht zurücklassen!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "Du hast es geschafft, bis zur %d. Welle zu überleben." + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "Bitte warte auf die Generierung der Welt [%2d%%]" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "Vorherige Option" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "Nächste Option" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "Einstellungswert wechseln" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "Einstellung umschalten" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "Du musst mindestens eine Monstergruppe auswählen!" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "Besondere Zombies" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "Zombies" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "Triffiden" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "Roboter" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "Subebene" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "Essen" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "Söldner" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "VERTEIDIGUNGSMODUS" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "Szenario:" + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "Ort:" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "Erstschwierigkeit:" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "Der Schwierigkeitsgrad der ersten Welle." + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "Wellenschwierigkeit:" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "Der Anstieg des Schwierigkeitsgrad nach jeder Welle." + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "Pause zw. Wellen:" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "Die Dauer (in Minuten) zwischen Wellen." + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "Pause zw. Karawanen:" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "Die Anzahl der Wellen zwischen Karawanen." + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "Startgeld:" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "Mit wieviel Geld der Spieler startet." + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "Geld für 1. Welle:" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "Das Preisgeld für die erste Welle." + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "Preisgelderhöhung:" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "Die Erhöhung des Preisgeldes pro Welle." + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "Gegner-Auswahl:" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "Benutzerdefiniert" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "Mittelschwer" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "Shaun of the Dead" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "Zombie" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "Arac Attack" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "Tag der Triffiden" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "Skynet" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "Cthulhus Ruf" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "Ein benutzerdefiniertes Spiel." + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "Einfache Monster und massig Geld." + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "Schwerere Monster. Du musst essen." + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "Alle Monster. Du musst essen und trinken." + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "Verteidige eine Bar gegen gewöhnliche Zombies." + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "Gewöhnliche Zombies. Langsamer und realistischer." + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "Schneller und spaßiger Spinnenkampf." + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "Verteidige deine Villa gegen die Triffiden." + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "Die Roboter erklärten die Menschen zum Feind!" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "Wehre zahlreiche unheimliche Schrecken ab." + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "Öffentliche Bauarbeiten" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "Kaufhaus" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "Kneipe" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "Ein Eingang und viele Räume. Einige Medikamente." + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "Leicht zu befestigen. Viele nützliche Werkzeuge." + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "Ein großes Gebäude mit diversen Vorräten." + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "Ein kleines Gebäude mit viel Alkohol." + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "Ein großes Haus mit vielen Räumen." + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" +"KARAWANE:\n" +"Fang an, indem du eine Kategorie mit deinen Lieblings-Hoch-/Runter-\n" +"Tasten auswählst. Wechsle zwischen der Kategorie- und Gegenstands-\n" +"auswahl mit der »%s«-Taste. Wähle einen Gegenstand mit den Hoch-/\n" +"Runter-Tasten aus, drücke die Links-/Rechtstaste für einen weniger/\n" +"mehr. Drücke %s, um alles im Einkaufswagen zu kaufen,\n" +"drücke %s, um nichts zu kaufen." + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "Wirklich nichts kaufen?" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "Du kannst dir diese Gegenstände nicht leisten!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "%d Gegenstand kaufen und dabei %s behalten?" +msgstr[1] "%d Gegenstände kaufen und dabei %s behalten?" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "Du lässt ein paar Gegenstände fallen." + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "Nahkampfwaffen" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "Fernwaffen" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "Munition" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "Fertigungs- u. Baukomponenten" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "Nahrung u. Pharmaka" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "Kleidung u. Rüstung" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "Werkzeuge, Fallen u. Granaten" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "Drücke ? für Hilfe." + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "Dein Geld: %s" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "Willkommen zur %d. Welle!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "%d. Welle: " + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "Invasion der %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "Angriff der %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "%s greifen an!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "%s aus der Hölle!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "Der %s-Tag!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "Rache der %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "Aufstieg der %s!" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "Max Mustermann" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "Da ist irgendsoein Witzbold im Weg!" @@ -206791,6 +208743,10 @@ msgstr "" msgid "You may want to deactivate these before you sleep." msgstr "Vielleicht möchtest du Nachfolgendes vor dem Schlafen ausschalten:" +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -211872,7 +213828,7 @@ msgstr "%1$s kann nicht mehr von %2$s enthalten." msgid "That %s doesn't have room to expand." msgstr "%s hat keinen Platz, um sich auszubreiten." -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%d × %s" @@ -211957,78 +213913,6 @@ msgstr "" msgid "Your %s disappears!" msgstr "" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "gehäutete Leiche (%s)" -msgstr[1] "gehäutete Leichen (%s)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "gehäuteter Kadaver (%s)" -msgstr[1] "gehäutete Kadaver (%s)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "Kadaver (%s)" -msgstr[1] "Kadaver (%s)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "gevierteilter Kadaver (%s)" -msgstr[1] "gevierteilte Kadaver (%s)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "Leiche (%s)" -msgstr[1] "Leichen (%s)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "gehäutete Leiche (%s) von %s" -msgstr[1] "gehäutete Leichen (%s) von %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "gehäuteter Kadaver (%s) von %s" -msgstr[1] "gehäutete Kadaver (%s) von %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "Kadaver (%s) von %s" -msgstr[1] "Kadaver (%s) von %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "Leiche (%s) von %s" -msgstr[1] "Leichen (%s) von %s" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -212044,6 +213928,21 @@ msgid_plural "%s blood" msgstr[0] "%s-Blut" msgstr[1] "%s-Blut" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "Du hast keinen Gegenstand, welcher diese Aktion ausführen kann." @@ -212659,7 +214558,7 @@ msgstr "Hier gibt es nichts zu füttern." msgid "Modify what?" msgstr "Was soll modifiziert werden?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "Diesen Gegenstand hast du nicht!" @@ -213734,6 +215633,10 @@ msgstr "Minesweeper" msgid "Lights on!" msgstr "Licht an!" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -214167,10 +216070,6 @@ msgstr "" "Du brauchst eine Mechanikfertigkeit von mindestens 2, um diesen " "Reparatursatz benutzen zu können." -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "Wähle die Feuerwaffe, die du reparieren möchtest" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "Das ist keine Feuerwaffe!" @@ -214223,25 +216122,6 @@ msgstr "Du hast keine kompatiblen Werkzeuge." msgid "You cancel unloading the tool." msgstr "Du brichst das Entladen des Werkzeuges ab." -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "Du kannst nicht genug erkennen zum Reparieren!" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "" -"Du benötigst eine Herstellungsfertigkeit von 1, um diesen Reparatursatz " -"benutzen zu können." - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "Wähle den zu reparierenden Gegenstand" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "Du verstärkst dein %s." - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "" @@ -214491,31 +216371,6 @@ msgstr "Du hast den Firmwareschutz ausgelöst und die Karte löscht ihre Daten!" msgid " on " msgstr "" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -215345,6 +217200,14 @@ msgstr "" "funktioniert er noch, aber es ist am besten, nicht mehr daran " "herumzubasteln." +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "" + #: src/iuse.cpp msgid "Using cable:" msgstr "Kabel benutzen:" @@ -215373,14 +217236,6 @@ msgstr "" msgid "You attach the cable to the solar pack." msgstr "" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "" @@ -217940,12 +219795,9 @@ msgid "Congratulations, you won!" msgstr "Gratulation, du hast gewonnen!" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "Max:" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "Min:" +#, c-format +msgid "Min: %d Max: %d" +msgstr "" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -218790,6 +220642,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "Jetzt spiele!" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" + #: src/main_menu.cpp msgid "No templates found!" msgstr "Keine Vorlage gefunden!" @@ -219017,6 +220897,14 @@ msgstr "Etwas krabbelte aus %s!" msgid "DANGER! MINEFIELD!" msgstr "" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -219150,20 +221038,9 @@ msgid "You're violently teleported!" msgstr "Du wirst gewaltsam teleportiert!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "Die Bienen stechen dich!" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "Die Bienen stechen dich einige Male!" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "Die Bienen stechen dich viele Male!" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "Die Bienen zerstechen deinen ganzen Körper!" +#, c-format +msgid "The bees sting you in %s!" +msgstr "" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -219327,6 +221204,17 @@ msgid_plural "Skills" msgstr[0] "Fertigkeit" msgstr[1] "Fertigkeiten" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" +msgstr[1] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "Benötigt: " @@ -224230,6 +226118,10 @@ msgstr "Die Säure, die %s bedeckt, schadet deiner Hand!" msgid "Acid sprays out of %s as it is hit!" msgstr "Beim Treffer auf %s spritzt Säure hinaus!" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" + #: src/monexamine.cpp msgid "zombie slave" msgstr "Zombiesklave" @@ -227209,8 +229101,9 @@ msgid "I have news." msgstr "Ich habe Neuigkeiten." #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "Ja, lasst uns weiter trainieren mit " +#, c-format +msgid "Yes, let's resume training %s" +msgstr "" #: src/npctalk.cpp #, c-format @@ -227926,6 +229819,16 @@ msgstr "" "Falls falsch, wird der Spieler neue Gegenstände, die das Gewichtslimit " "überschreiten, fallen lassen." +#: src/options.cpp +msgid "Dangerous running" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" + #: src/options.cpp msgid "Safe mode" msgstr "Sicherheitsmodus" @@ -230333,7 +232236,7 @@ msgstr "Suchbegriff:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" @@ -230773,6 +232676,10 @@ msgstr "" msgid "Heat :" msgstr "" +#: src/panels.cpp +msgid "Deaf!" +msgstr "Taub!" + #: src/panels.cpp msgid "Underground" msgstr "Unterirdisch" @@ -230831,10 +232738,6 @@ msgstr "Mond : " msgid "Lighting:" msgstr "Beleuch.:" -#: src/panels.cpp -msgid "Deaf!" -msgstr "Taub!" - #: src/panels.cpp msgid "Weapon :" msgstr "Waffe :" @@ -231371,7 +233274,7 @@ msgstr "" #: src/player.cpp msgid "Your stomach feels so empty…" -msgstr "" +msgstr "Dein Magen fühlt sich so leer an..." #: src/player.cpp msgid "You are EMACIATED!" @@ -231867,6 +233770,11 @@ msgstr "Welchen Defekt beheben?" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -232337,85 +234245,74 @@ msgstr "GESCHWINDIGKEIT" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "Schwimmen kostet %+d Bewegungspunkt. " -msgstr[1] "Schwimmen kostet %+d Bewegungspunkte. " +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "Laufen kostet %+d Bewegungspunkt. " -msgstr[1] "Laufen kostet %+d Bewegungspunkte. " +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "Nachladen kostet %+d Bewegungspunkt. " -msgstr[1] "Nachladen kostet %+d Bewegungspunke. " +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "Nahkampf- und Wurfattacken kosten %+d Bewegungspunkt. " -msgstr[1] "Nahkampf- und Wurfattacken kosten %+d Bewegungspunkte. " +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "Ausweicherfahrung %+.1f. " +msgid "Dodge skill: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "Nahkampfangriff rollt %+d%%; " +msgid "Melee attack rolls: %+d%%\n" +msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." +"Head encumbrance has no effect; it simply limits how much you" +" can put on." msgstr "" -"Kopfhinderung hat keine Auswirkung; sie beschränkt lediglich, wieviel du " -"aufsetzen kannst." #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"Wahrnehmung %+d beim Überprüfen von Fallen oder Feuern von Fernkampfwaffen;\n" -"Streuung %+d beim Wurf von Gegenständen." #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "Den Mund zu verdecken, macht es schwieriger, Luft zu holen." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." msgstr "" -"Armhinderung beeinflusst die Ausdauer beim Nahkampf und die Treffgenauigkeit" -" mit Fernwaffen." #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "Reduziert das Tempo, mit dem du Dinge benutzen/manipulieren kannst.\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "Geschicklichkeit %+.1f beim Werfen.\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "Reduziert die Zielgeschwindigkeit von Waffen um %.1f." +msgid "Reduced gun aim speed: %.1f" +msgstr "" #: src/player_display.cpp msgid "" @@ -232516,8 +234413,8 @@ msgstr "" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" #: src/player_display.cpp @@ -233279,6 +235176,16 @@ msgstr "Dein %s schlägt mit einem dumpfen Klick fehl." msgid "'s %s misfires with a muffled click!" msgstr "s %s schlägt mit einem dumpfen Klick fehl." +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -233319,6 +235226,16 @@ msgstr "" msgid "'s %s is damaged by their shot!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -233517,6 +235434,10 @@ msgstr "Genaues Zielen" msgid "[%c] to take precise aim and fire." msgstr "" +#: src/ranged.cpp +msgid "turrets" +msgstr "Geschütztürme" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -233951,7 +235872,7 @@ msgstr "Du hörtest %s!" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." +msgid "From your position you hear %1$s" msgstr "" #: src/sounds.cpp @@ -235077,18 +236998,6 @@ msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "%s gibt einen IFF-Warnton aus." msgstr[1] "%s gibt %d nervige Pieptöne ab." -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "Max Mustermann" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" - #: src/veh_interact.cpp msgid "Select part" msgstr "Teil wählen" @@ -237407,6 +239316,10 @@ msgstr "Sonnig" msgid "Cloudy" msgstr "Bewölkt" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "" + #: src/weather_data.cpp msgid "Drizzle" msgstr "Nieselregen" diff --git a/lang/po/es_AR.po b/lang/po/es_AR.po index e3e9931bbf189..1274976c26c19 100644 --- a/lang/po/es_AR.po +++ b/lang/po/es_AR.po @@ -1,13 +1,13 @@ # Translators: -# Vlasov Vitaly , 2019 # Brett Dong , 2019 +# Vlasov Vitaly , 2019 # Noctivagante , 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Noctivagante , 2019\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/es_AR/)\n" @@ -1759,8 +1759,8 @@ msgstr "detergente" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." -msgstr "Es un popular polvo limpiador pre-cataclismo." +msgid "A popular pre-Cataclysm washing powder." +msgstr "Es un popular polvo limpiador pre-Cataclismo." #: lang/json/AMMO_from_json.py msgid "soap flakes" @@ -2094,6 +2094,17 @@ msgstr "" "Un líquido aceitoso de combustión limpia que se utiliza en las lámparas de " "aceite." +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "aceite de motor" +msgstr[1] "aceite de motor" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "Es un aceite que se utiliza en los motores de los vehículos." + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -2271,6 +2282,69 @@ msgstr "" "estimulantes. Está pensado para ser utilizado con equipamiento médico " "especializado, y no puede ser administrado manualmente." +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "40mm de bengala" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "" +"Es una bengala de señalización 40mm. Arderá brillantemente durante un " +"minuto, y también creará una cortina de humo con su estela." + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "40x46mm " + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "" +"Es una granada 40mm con carga de destello. Su explosión libera un estallido " +"de luz y sonido. Está diseñada para enceguecer, ensordecer y desorientar." + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "incendiaria de 40mm" +msgstr[1] "incendiarias de 40mm" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "" +"Es una granada 40mm con una pequeña carga de napalm, diseñada para crear una" +" explosión de llamas." + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40mm fumígenas" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "Es una granada de 40mm diseñada para crear una cortina de humo." + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "posta 40mm" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "" +"Es un cartucho de 40mm cargado con una bala enorme. Despedite de tu hombro, " +"eso sí." + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "10mm Auto FMJ" @@ -3175,146 +3249,136 @@ msgid ".40 S&W JHP, reloaded" msgstr ".40 S&W JHP, recargada" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40mm granada" +msgid "40x46mm grenade" +msgstr "granada 40x46mm" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "40mm no letal" +msgid "40x46mm M1006" +msgstr "40x46mm M1006" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." msgstr "" -"Es un cartucho no letal de 40mm que causa un impacto fuerte en el objetivo, " -"causando mucho dolor y desorientación. Puede llegar a matar." +"Es un cartucho 40x46mm no letal de baja velocidad, con proyectil de goma y " +"plástico diseñado para causar dolor y aturdimiento. De todas maneras, puede " +"herir o matar." #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40mm de impacto" +msgid "40x46mm M433" +msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "Es una granada 40mm con carga explosiva de impacto." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "40mm de bengala" +msgid "40x46mm M576" +msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." msgstr "" -"Es una bengala de señalización 40mm. Arderá brillantemente durante un " -"minuto, y también creará una cortina de humo con su estela." #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "40mm de destello" +msgid "40x46mm M651" +msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" msgstr "" -"Es una granada 40mm con carga de destello. Su explosión libera un estallido " -"de luz y sonido. Está diseñada para enceguecer, ensordecer y desorientar." #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "40mm dardos perforantes" +msgid "40x46mm buckshot" +msgstr "" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." msgstr "" -"Es un cartucho de 40mm cargado de un gran número de dardos perforantes de " -"armadura." #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40mm fragmentarias" +msgid "40x46mm slug" +msgstr "" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." msgstr "" -"Es una granada 40mm con una pequeña carga explosiva y con gran " -"fragmentación." #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "incendiaria de 40mm" -msgstr[1] "incendiarias de 40mm" +msgid "40x46mm flechette" +msgstr "" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M1001" msgstr "" -"Es una granada 40mm con una pequeña carga de napalm, diseñada para crear una" -" explosión de llamas." +#. ~ Description for 40x53mm M1001 #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "perdigón grande 40mm" +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "" -#. ~ Description for 40mm buckshot +#: lang/json/AMMO_from_json.py +msgid "40x53mm M430A1" +msgstr "" + +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" -"Es un cartucho de 40mm de poderosos perdigones, diseñado para ser usado como" -" alternativa para escopetas o cuando se rompen barricadas u otros " -"obstáculos." #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40mm fumígenas" +msgid "40x53mm buckshot" +msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "Es una granada de 40mm diseñada para crear una cortina de humo." +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "40mm de gas lacrimógeno" -msgstr[1] "40mm de gas lacrimógeno" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." msgstr "" -"Es una granada 40mm con carga de gas lacrimógeno. Su explosión libera una " -"nube de gas muy incapacitante." #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "posta 40mm" +msgid "40x53mm flechette" +msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." msgstr "" -"Es un cartucho de 40mm cargado con una bala enorme. Despedite de tu hombro, " -"eso sí." #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -5292,10 +5356,10 @@ msgstr[1] "plata" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "" -"Es un metal suave y brillantes. Antes del cataclismo valía bastante, pero " +"Es un metal suave y brillante. Antes del Cataclismo valía bastante, pero " "ahora su valor está muy disminuido." #: lang/json/AMMO_from_json.py @@ -5913,15 +5977,6 @@ msgstr "" msgid "plutonium cell" msgstr "celda de plutonio" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "" -"Son unas cargas de batería sueltas. Pueden ser puestas en celdas " -"recargables, pero no pueden ser quitadas." - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -6000,12 +6055,9 @@ msgstr "cartucho de pulso" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" -"Es un cartucho helicoidal con balas de punta hueca que son impulsadas por " -"iniciadores. No es la cosa más letal que existe, pero tiene buena potencia " -"sin la preocupación de que un disparo loco pueda lastimar el ambiente." #: lang/json/AMMO_from_json.py msgid "6.54x42mm 9N8" @@ -6557,20 +6609,6 @@ msgstr "" "Son proyectiles pesados y redondos, fundidos de plomo. Útil como munición " "para hondas." -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "perno de hueso para ballesta" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "" -"Es un perno tallado en hueso con emplumado. Es liviano, lo que le otorga una" -" precisión y daño decentes. No se rompe fácilmente luego de ser utilizado." - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -7103,10 +7141,8 @@ msgstr[1] "alimento para blobo" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" -"Es una amalgama de varias clases de materiales orgánicos. Contiene todo lo " -"que un blobo necesita para estar sano. Eso te parece..." #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -7523,10 +7559,10 @@ msgstr[1] "equipos de nómada" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "" -"Es un traje improvisado hecho con ropa pre-cataclismo, diseñado para viajes " +"Es un traje improvisado hecho con ropa pre-Cataclismo, diseñado para viajes " "largos. Tiene mucha capacidad de almacenamiento." #: lang/json/ARMOR_from_json.py @@ -7538,11 +7574,11 @@ msgstr[1] "equipos ligeros de nómada" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "" -"Es un traje improvisado ligero hecho con ropa pre-cataclismo, diseñado para " +"Es un traje improvisado ligero hecho con ropa pre-Cataclismo, diseñado para " "viajes largos de verano. Tiene menos capacidad de almacenamiento y " "protección que el equipo normal de nómada." @@ -7609,11 +7645,11 @@ msgstr[1] "equipos de cartonero" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." msgstr "" "Es un resistente traje de cartonero, hecho con un equipo de protección de " -"antes del cataclismo reacondicionado. Tiene mucha capacidad de " +"antes del Cataclismo reacondicionado. Tiene mucha capacidad de " "almacenamiento." #: lang/json/ARMOR_from_json.py @@ -12262,9 +12298,9 @@ msgstr "Son unos pantalones pesados, recubiertos de piel." #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" -msgstr[0] "par de pantalones de piel artificial" -msgstr[1] "pares de pantalones de piel artificial" +msgid_plural "faux fur pants" +msgstr[0] "" +msgstr[1] "" #. ~ Description for faux fur pants #: lang/json/ARMOR_from_json.py @@ -14182,9 +14218,9 @@ msgstr "Un zubon blanco para utilizar en las artes marciales." #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" -msgstr[0] "estuche de violín" -msgstr[1] "estuches de violín" +msgid_plural "violin cases" +msgstr[0] "" +msgstr[1] "" #. ~ Description for violin case #: lang/json/ARMOR_from_json.py @@ -14912,12 +14948,9 @@ msgstr[1] "mochilas adornadas gigantes" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." msgstr "" -"Es una enorme mochila de tela hecha más que nada como chiste antes del " -"cataclismo. Ahora, sigue siendo un poco tonta, pero puede almacenar muchas " -"cosas." #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -16305,6 +16338,142 @@ msgstr "" "verdaderos. Quedan horribles, pero son muy brillantes. Perfectos para ese " "look de rapero de clase alta." +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -17307,6 +17476,552 @@ msgstr "" "Una cola negra de cuero con unas bolitas de plástico para mantenerla " "balanceada. Se mueve hacia los costados cuando caminás." +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -17903,13 +18618,9 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" -"Es la máscara facial estándar de C.R.I.T., con interior de kevlar para mayor" -" protección. Tiene unos filtros que brindan una protección decente al " -"ambiente, pero no está pensada para un uso intensivo. Tiene integrado un HUD" -" básico." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT boots" @@ -17920,15 +18631,11 @@ msgstr[1] "" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" -"Son las botas estándares de C.R.I.T. Con gel de última tecnología para " -"hacerlas cómodas e higiénicas durante misiones largas, y para absorber los " -"golpes y proteger del calor. Además, una malla de superaleación y goma " -"brinda un poco de protección química. Son bastante pesadas." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT LA boots" @@ -17939,15 +18646,11 @@ msgstr[1] "" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" -"Son botas C.R.I.T. reducidas a su armazón. Basadas en las botas C.R.I.T., " -"esta variante liviana fue creada para misiones en climas cálidos. Las botas " -"LA conservan la mayoría de las características de las estándares, pero dejan" -" la protección a cambio de la facilidad de movimiento." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT fingertip-less gloves" @@ -17958,13 +18661,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" -"Son los guantes C.R.I.T. estándares. Hechos con una maya de superaleación " -"para aquellos con genes modificados y/o mutaciones, sin incomodar la " -"manipulación de objetos y brindando una protección moderada." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT fingertip-less liners" @@ -17975,14 +18675,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" -"Son los guantes C.R.I.T. estándares. Hechos de neopreno y una maya de goma, " -"abrigados y sin dedos para aquellos con genes modificados y/o mutaciones, " -"sin incomodar la manipulación de objetos y brindando una protección " -"moderada." #: lang/json/ARMOR_from_json.py msgid "CRIT backpack" @@ -17993,16 +18689,11 @@ msgstr[1] "" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." msgstr "" -"Es la mochila C.R.I.T. estándar. Basada en el diseño de la mochila MOLLE, " -"esta es más pequeña con balance entre la capacidad de almacenamiento e " -"incomodidad y permite llevar colgada un arma grande, aunque enfundar y " -"desenfundar sigue siendo incómodo incluso con cargadores magnéticos, pero la" -" práctica ayuda." #: lang/json/ARMOR_from_json.py msgid "CRIT chestrig" @@ -18026,13 +18717,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" -"Son perneras C.R.I.T. estándares. Su diseño simple y material duradero " -"permite el movimiento fácil, y sus protecciones protegen las piernas y " -"abrigan en condiciones frías." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT arm guards" @@ -18044,12 +18732,9 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" -"Es un par de mangas hechas de superaleación sobre neopreno, y con una capa " -"de goma. Son duraderas y pueden bloquear ataques, pero son ridículamente " -"pesadas." #: lang/json/ARMOR_from_json.py msgid "CRIT web belt" @@ -18060,11 +18745,9 @@ msgstr[1] "" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" -"Es un cinturón C.R.I.T. estándar. Mantiene tus pantalones arriba y tus armas" -" a mano." #: lang/json/ARMOR_from_json.py msgid "CRIT infantry duster" @@ -18075,9 +18758,9 @@ msgstr[1] "" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -18090,15 +18773,10 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" -"Es un traje tejido con fibras compuestas, flexible y hermético, con placas " -"segmentadas de armadura. Un sistema complejo digitaliza objetos en un solo " -"universo de bolsillo para almacenarlos, a la vez que unos engranajes " -"articulados integrados generan la energía necesaria para alimentar la " -"interface." #: lang/json/ARMOR_from_json.py msgid "CRIT Armored Anomaly Suit" @@ -18109,16 +18787,11 @@ msgstr[1] "" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" -"Es una armadura relativamente simple. Es un conjunto de fibras compuestas " -"combinadas con una base de traje estéril, y estratégicamente ubicado en " -"placas segmentadas de kevlar que mantienen el bajo peso del traje y al que " -"lo usa, vivo. Ofrece una impresionante resistencia a los elementos y a la " -"radiación ambiental." #: lang/json/ARMOR_from_json.py msgid "CRIT drop leg pouch" @@ -18146,20 +18819,13 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" -"Es un conjunto de placas, guardas y hebillas que se monta en un traje de " -"armadura corporal y que va, generalmente, sobre otra armadura. Las placas de" -" acero superpuestas sobre placas de kevlar cubren grandes extensiones y la " -"armadura sobresale en algunos lugares para bloquear los ataques. Está " -"construida con la idea de que la comodidad es menos importante que la " -"seguridad. Esta armadura pesada es difícil de llevar pero muy protectora. " -"Tiene múltiples conectores como correas y ganchos para mantenerla armada." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT Enforcer docks" @@ -18170,16 +18836,12 @@ msgstr[1] "" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" -"Son unas placas de metal vagamente moldeadas para darle forma de pie grande," -" que se sujetan bajo tu calzado para mantener protegidos tus pies. Es " -"horrible y se sienten torpes a diferencia de los otros diseños de C.R.I.T., " -"pero vale la pena utilizarlos se estás en el medio de una zona de guerra." #: lang/json/ARMOR_from_json.py msgid "CRIT Soldier Suit" @@ -18190,16 +18852,11 @@ msgstr[1] "" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" -"Es un conjunto de armadura corporal. Placas de superaleación " -"estratégicamente ubicadas mantienen el peso del traje al mínimo, con placas " -"de kevlar en otras partes y un interior de neopreno para mejorar la " -"comodidad. Y lo que es más importante, puede ser utilizado debajo de otra " -"armadura." #: lang/json/ARMOR_from_json.py msgid "CRIT Lone Wolf Series Armor" @@ -18211,14 +18868,10 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" -"Es una armadura de placas negra mate, un poco antiguo e incómoda metida en " -"un traje de kevlar blando. Actualizada con las mejoras de armaduras nuevas, " -"esta armadura pesada te protegerá definitivamente de casi todo. Solamente, " -"asegurate de que podés caminar con esto puesto." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T blouse" @@ -18229,42 +18882,32 @@ msgstr[1] "blusas C.R.I.T." #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" -"Es una blusa C.R.I.T. estándar. Duradera, liviana y con abundante capacidad " -"de almacenamiento. El neopreno superflexible te mantiene abrigado y su " -"diseño elegante evita que seas demasiado llamativo. Un cierre en la espalda " -"y en la parte de adelante, permite ponerse y sacársela rápidamente." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" -msgstr[0] "pantalones C.R.I.T." -msgstr[1] "pantalones C.R.I.T." +msgid_plural "C.R.I.T trousers" +msgstr[0] "" +msgstr[1] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" -"Son pantalones C.R.I.T. estándares. Duraderos, livianos y con abundante " -"capacidad de almacenamiento. El neopreno superflexible te mantiene abrigado " -"en climas fríos." #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" -"Son pantalones de vestir C.R.I.T. Su elegante diseño minimalista los hace " -"livianos y con una buena cantidad de bolsillos. El neopreno superflexible te" -" mantiene abrigado en climas fríos." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T helmet liner" @@ -18274,9 +18917,8 @@ msgstr[1] "interiores de casco C.R.I.T." #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" -"Es un interior de casco C.R.I.T. estándar. Mantiene el balero calentito." #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T shoes" @@ -18286,26 +18928,21 @@ msgstr[1] "pares de zapatos de vestir C.R.I.T." #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" -"Es un elegante par de zapatos de vestir. Sofisticado pero fácil para los " -"ojos." #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" -msgstr[0] "par de guantes rec C.R.I.T." -msgstr[1] "pares de guantes rec C.R.I.T." +msgid_plural "pairs of C.R.I.T rec gloves" +msgstr[0] "" +msgstr[1] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" -"Son guantes rec C.R.I.T. estándares. Ajustados a la piel y elegantes, estos " -"guantes están hechos de algodón con interior de neopreno para brindar mejor " -"agarre y abrigo." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T web belt" @@ -18316,11 +18953,9 @@ msgstr[1] "cinturones cincha C.R.I.T." #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" -"Es un cinturón C.R.I.T. estándar. Mantiene tus pantalones arriba y tus " -"herramientas a mano." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T rec duster" @@ -18331,13 +18966,10 @@ msgstr[1] "gabardinas rec C.R.I.T." #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" -"Es una gabardina larga impermeable. Hecha con neopreno, la comodidad y la " -"funcionalidad se encuentran para formar un elegante diseño contemporáneo. " -"Tiene varios bolsillos para almacenar objetos." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T rec hat" @@ -18349,13 +18981,9 @@ msgstr[1] "sombreros rec C.R.I.T." #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" -"La funcionalidad se conjuga con la elegancia en este sombrero rec C.R.I.T. " -"estándar. Lo suficientemente grueso para brindar abrigo en climas fríos, " -"este sombrero comparte el mismo diseño elegante de la mayoría del equipo " -"C.R.I.T." #: lang/json/ARMOR_from_json.py msgid "CRIT canteen" @@ -18456,13 +19084,12 @@ msgstr[0] "pulsera de infusión de cobre" msgstr[1] "pulseras de infusión de cobre" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" -"Esta pulsera tiene runas gravadas. Sentís un cierto aire místico cuando la " -"mirás. Podría ser útil para imbuir maná en un material." #: lang/json/ARMOR_from_json.py msgid "silver infusion bracelet" @@ -18470,13 +19097,6 @@ msgid_plural "silver infusion bracelets" msgstr[0] "" msgstr[1] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -18805,9 +19425,9 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" -msgstr[0] "bolsa de carne" -msgstr[1] "bolsas de carne" +msgid_plural "flesh pouches" +msgstr[0] "" +msgstr[1] "" #. ~ Description for flesh pouch #: lang/json/ARMOR_from_json.py @@ -18820,6 +19440,19 @@ msgstr "" "tentáculos que agarran cualquier cosa que pongas dentro. Cambia y se ajusta " "para minimizar la incomodidad." +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -20851,7 +21484,7 @@ msgstr[1] "MCB Generador de Sobrecarga Iónica" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" "Es un poderoso generador de energía iónica que está implantado en tu pecho. " @@ -22907,6 +23540,138 @@ msgstr "" "Una divertida colección de cuentos tradicionales, con la participación de " "los protagonistas habituales como hadas, goblins y trolls." +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -23386,9 +24151,8 @@ msgstr[1] "novelas eróticas" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." msgstr "" -"Una narrativa estereotipada esconde obscenidades literarias de bajo nivel." #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -24177,7 +24941,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" @@ -25911,9 +26675,9 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" #: lang/json/BOOK_from_json.py @@ -25942,11 +26706,9 @@ msgstr[1] "Hackeando Robots por Diversión y Beneficio" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" -"Es un libro que trata sobre la manera ilegal de obtener, reprogramar o " -"modificar robots. Tiene muchas guías paso a paso con diseños de ejemplo." #: lang/json/BOOK_from_json.py msgid "Popular Robotics" @@ -26177,6 +26939,17 @@ msgstr[1] "agua salada" msgid "Water with salt added. Not good for drinking." msgstr "Es agua con sal añadida. No sirve para tomar." +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -26819,12 +27592,9 @@ msgstr[1] "aguardiente casero" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "" -"El más fuerte, el más puro, el mejor aguardiente a la vieja escuela., " -"destilado de maíz y azúcar. Garantizamos que olvidará todo acerca del " -"cataclismo, o le devolvemos su visión." #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -26958,6 +27728,75 @@ msgstr[1] "whisky puro de malta" msgid "Only the finest whiskey straight from the bung." msgstr "De los mejores whiskys." +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "indigente extravagante" @@ -27731,6 +28570,20 @@ msgid_plural "meat jerky" msgstr[0] "charqui de carne" msgstr[1] "charqui de carne" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "charqui de chabón" +msgstr[1] "charqui de chabón" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -27754,23 +28607,28 @@ msgstr "" " da sed." #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "charqui de chabón" -msgstr[1] "charqui de chabón" +msgid "smoked meat" +msgstr "carne ahumada" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "" -"Es carne humana seca y salada que aguanta mucho tiempo sin echarse a perder," -" pero te da sed." +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "carne ahumada" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "" +msgstr[1] "" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -27796,19 +28654,6 @@ msgstr "" "Es un pescado sabroso que ha sido ahumado para preservarlo mucho tiempo. " "Puede ser ahumado aún más para deshidratarlo completamente." -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "cabrón ahumado" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "" -"Es una porción muy ahumada de carne humana. Aguanta por bastante tiempo y " -"tiene bastante buen sabor, si es que te gustan estas cosas." - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -29355,9 +30200,8 @@ msgstr "hueva de garrafilada" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." msgstr "" -"Es un grupo de huevos de garrafilada. Una exquisitez postapocalíptica." #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -30714,12 +31558,12 @@ msgstr "" "carne también." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" -msgstr[0] "nachos con queso" -msgstr[1] "nachos con queso" +msgid "cheese nachos" +msgid_plural "cheese nachos" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -30729,56 +31573,57 @@ msgstr "" "carne." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" -msgstr[0] "nachos con carne" -msgstr[1] "nachos con carne" - -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "" -"Son nachos de maíz salados, ahora con carne. Le vendría bien un poco de " -"queso." +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "nachos niño" msgstr[1] "nachos niño" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." msgstr "" -"Son nachos de maíz salados, con carne humana. Un poco de queso les quedaría " -"muy bien." +"Son nachos de maíz salados, ahora con carne. Le vendría bien un poco de " +"queso." + +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "nachos niño con queso" msgstr[1] "nachos niño con queso" -#. ~ Description for niño nachos with cheese +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "" -"Son nachos de maíz salados con carne humana y queso cremoso. Delicioso." - -#: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "nachos con carne y queso" -msgstr[1] "nachos con carne y queso" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -30853,18 +31698,6 @@ msgstr[1] "panchos con chili" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Es un pancho con chili con carne como aderezo. ¡Rico!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "pancho con chili especial" -msgstr[1] "panchos con chili especial" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "" -"Es un pancho servido con chili con carne humana como aderezo. Delicioso." - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -30959,10 +31792,8 @@ msgstr[1] "panchos sin cocinar" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." +"Cataclysm. It would taste much better prepared." msgstr "" -"Una salchicha muy procesada, era común en los partidos de béisbol antes del " -"cataclismo. Si estuviera preparada sería mucho más rica." #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -31008,6 +31839,24 @@ msgstr "" msgid "raw sausage" msgstr "salchicha cruda" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -31017,6 +31866,13 @@ msgstr "Es una salchicha grande y cruda, lista para ahumar o para cocinar." msgid "sausage" msgstr "salchicha" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -31028,25 +31884,18 @@ msgstr "" msgid "cooked sausage" msgstr "salchicha cocinada" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "Es una gran salchicha que ha sido cocinada." -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "Juannwurst" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "" -"Es una gran salchicha de chancho que ha sido curada y ahumada para poder " -"preservarla por mucho tiempo. Muy sabrosa, si es que te gusta la carne " -"humana." - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -31065,6 +31914,21 @@ msgid_plural "bratwursts" msgstr[0] "bratwurst" msgstr[1] "bratwursts" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31146,6 +32010,14 @@ msgstr "" msgid "glazed tenderloins" msgstr "lomito glaseado" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31161,6 +32033,22 @@ msgstr "" msgid "currywurst" msgstr "currywurst" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31174,6 +32062,22 @@ msgstr "" msgid "aspic" msgstr "gelatina" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31253,6 +32157,14 @@ msgstr "Una porción deliciosa de pescado frito, crujiente y dorado." msgid "lunch meat" msgstr "fiambre" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31266,6 +32178,22 @@ msgstr "" msgid "bologna" msgstr "bologna" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31333,6 +32261,21 @@ msgid_plural "sausage gravies" msgstr[0] "salsa espesa de salchichas" msgstr[1] "salsas espesas de salchichas" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "salsa espesa de Juannwurst" +msgstr[1] "salsas espesas de Juannwurst" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31346,6 +32289,22 @@ msgstr "" msgid "pemmican" msgstr "pemmican" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31361,6 +32320,21 @@ msgstr "" msgid "hamburger helper" msgstr "refuerzo para hamburguesa" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31387,6 +32361,20 @@ msgid_plural "chilis con carne" msgstr[0] "chili con carne" msgstr[1] "chilis con carne" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -31461,14 +32449,26 @@ msgstr "Almejas molidas en agua." msgid "clam chowder" msgstr "crema de almeja" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." msgstr "" -"Una sopa blanca deliciosa y grumosa, hecha con almejas y papas. Con sabor a " -"la gloria perdida de New England." #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" @@ -31476,6 +32476,13 @@ msgid_plural "baked beans" msgstr[0] "porotos horneados" msgstr[1] "porotos horneados" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -31487,6 +32494,13 @@ msgid_plural "meat fried rice" msgstr[0] "arroz con carne frito" msgstr[1] "arroz con carne frito" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -31498,6 +32512,14 @@ msgid_plural "deluxe beans and rice" msgstr[0] "porotos con arroz deluxe" msgstr[1] "porotos con arroz deluxe" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31511,6 +32533,21 @@ msgstr "" msgid "meat pie" msgstr "tarta de carne" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -31520,6 +32557,21 @@ msgstr "Es una deliciosa tarta horneada con un delicioso relleno de carne." msgid "meat pizza" msgstr "pizza de carne" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31529,12 +32581,29 @@ msgstr "" "Es una pizza de carne para los carnívoros que andan por ahí. Rellena hasta " "el tope de carne picada y muy condimentada." +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" msgstr[0] "huevos revueltos deluxe" msgstr[1] "huevos revueltos deluxe" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31548,6 +32617,13 @@ msgstr "" msgid "canned meat" msgstr "carne enlatada" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "feta de soylent" +msgstr[1] "fetas de soylent" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31561,6 +32637,13 @@ msgstr "" msgid "salted meat slice" msgstr "feta de carne salada" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -31574,6 +32657,21 @@ msgid_plural "spaghetti bolognese" msgstr[0] "espagueti a la boloñesa" msgstr[1] "espagueti a la boloñesa" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -31583,6 +32681,22 @@ msgstr "Espagueti recubierto con abundante tuco. ¡Rico!" msgid "lasagne" msgstr "lasaña" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31605,19 +32719,48 @@ msgstr "Es carne en lata. Así frita, esta Viandada está bastante buena." msgid "cheeseburger" msgstr "hamburguesa con queso" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." +"Cataclysm culinary achievement." msgstr "" -"Un sánguche de carne picada y queso con condimentos. El ápice de la exitosa " -"cocina pre-cataclismo." #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "hamburguesa" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -31627,6 +32770,21 @@ msgstr "Un sánguche de carne picada con condimentos." msgid "sloppy joe" msgstr "sloppy joe" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "mánguche" +msgstr[1] "mánguches" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31640,6 +32798,22 @@ msgstr "" msgid "taco" msgstr "taco" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31653,6 +32827,13 @@ msgstr "" msgid "pickled meat" msgstr "carne al escabeche" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31663,6 +32844,15 @@ msgstr "Es una porción de carne en escabeche enlatada. Sabrosa y nutritiva." msgid "dehydrated meat" msgstr "carne deshidratada" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31689,6 +32879,15 @@ msgid_plural "haggii" msgstr[0] "haggis" msgstr[1] "haggii" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31723,6 +32922,14 @@ msgid_plural "meat temaki" msgstr[0] "temaki de carne" msgstr[1] "temaki de carne" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31760,6 +32967,14 @@ msgstr "" msgid "pelmeni" msgstr "pelmeni" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31773,6 +32988,13 @@ msgstr "" msgid "homemade burrito" msgstr "" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31781,359 +33003,6 @@ msgid "" "but homemade and delicious!" msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "carne humana deshidratada" -msgstr[1] "carne humana deshidratada" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "" -"Trozos de carne de humano deshidratada. Si se la guarda adecuadamente, esta " -"comida desecada puede durar por muchísimo tiempo." - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "carne humana rehidratada" -msgstr[1] "carne humana rehidratada" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "Son trozos de carne humana rehidratados. Así se disfrutan mucho más." - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "haggii humano" -msgstr[1] "haggii humano" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"Es el tradicional budín salado escocés hecho de carne humana y achuras " -"mezcladas con avena, que se cosen al estómago del humano y se hierven. " -"Sorprendentemente, es sabroso si no te molestan estas cosas, y te llena " -"bastante. Lo mejor es servirlo con raíces hervidas y un whisky fuerte." - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "bologna especial" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" -"Es carne humana preservada y rebanada. Su nombre de pila podría haber sido " -"Oscar. Se puede comer fría... fría como el caníbal de sangre fría que sos." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "currywurst miserable" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "" -"Una Juannwurst cubierta con salsa de ketchup y curry. ¡Bastante picante e " -"impresionante al mismo tiempo!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "salsa espesa de Juannwurst" -msgstr[1] "salsas espesas de Juannwurst" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "" -"Galletitas, carne humana y deliciosa sopa de hongos, todo mezclado en una " -"maravillosa, grasosa y sabrosa papilla." - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "gelatina amoral" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "" -"Es carne humana puesta en gelatina hecha con caldo de huesos humanos. " -"Deliciosamente asesina, si es que te gustan este tipo de cosas." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "pemmican de survivalista" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "" -"Es una mezcla concentrada de grasa y proteína, usada en las comidas " -"energéticas de gran valor nutritivo. Está compuesta de sebo, plantas " -"comestibles y un desafortunado survivalista." - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "sánguche de vago" -msgstr[1] "sánguches de vago" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "Pan y carne humana, ¡sorpresa!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "sánguche de chabón" -msgstr[1] "sánguches de chabón" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "" -"Es un sánguche de carne humana, verduras, queso y condimentos. ¡Date un " -"banquete con las almas de tus enemigos y con sabrosas verduras de huerta!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "refuerzo para indigente" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "" -"Son macarrones con queso y carne humana picada agregada. Es tan bueno como " -"asesinar." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "chili con cabrón" -msgstr[1] "chilis con cabrones" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "" -"Es un guiso picante que tiene ajíes, carne de humano, tomates y porotos." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "tarta de boludo" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -"Una tarta de carne con un pequeño soldado, o tal vez un científico, quién " -"sabe. Por dios, ¡está buena!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "pizza de impostor" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "" -"Es una pizza de carne para los caníbales que andan por ahí. Rellena hasta el" -" tope de carne humana picada y muy condimentada." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "feta de soylent" -msgstr[1] "fetas de soylent" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -"Carne humana preservada con bajo sodio. Fue hervida y enlatada. Contiene " -"casi todo el valor nutritivo, pero muy poco del sabor de la carne cocinada." - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "feta de papanatas salada" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "" -"Fetas de carne humana curadas en escabeche y cerradas al vacío. Saldas pero " -"sabrosas cuando hay hambre." - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "espagueti a la sinvergüenza" -msgstr[1] "espagueti a la sinvergüenza" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "" -"Espagueti recubierto con abundante tuco hecho con carne humana. Tiene buen " -"sabor, si es que te gustan estas cosas." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "lasaña de Luigi" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "" -"Es una clásica pasta hecha con varias capas de lasaña, alternadas con queso," -" salsas y carnes. Está hecho con carne humana." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "tonti-hamburguesa con queso" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "" -"Un sánguche de carne humana picada y queso con condimentos. El ápice de la " -"exitosa cocina caníbal post-cataclismo." - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "juanburguesa" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "" -"Esta hamburguesa contiene más del 4% de carne humana permitido por la FDA " -"(Agencia de Drogas y Alimentos)." - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "mánguche" -msgstr[1] "mánguches" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "Un sánguche es un sánguche, pero este ¡está hecho de gente!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "tío taco" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -"Un taco hecho con carne humana picada en lugar de carne de vaca. Por alguna " -"razón, podés escuchar la campana sonando en la distancia." - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "Juannwurst cruda" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "" -"Es una salchicha de cerdo grande y cruda, lista para ahumar o cocinar." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "Juannwurst cocinada" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "" -"Es una gran salchicha de carne humana que ha sido cocinada. Huele tan " -"apetitoso como puede oler un humano." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "Juannbrat" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "" -"Es un tipo de salchicha alemana hecha con carne humana picada muy fina y " -"pensada para ser frita o asada. Es mejor comerla caliente y recién hecha. " -"Dicho sea de paso, se usa cualquier humano, no es necesario que sean " -"alemanes." - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "punk al escabeche" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "" -"Es una porción de carne humana en escabeche enlatada. Sabrosa y nutritiva si" -" te gustan este tipo de cosas." - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -33033,11 +33902,8 @@ msgstr "pastilla de harina de hueso con sabor" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" -"Es un suplemento de calcio casero, hecho de harina de hueso. Debido a algo " -"dulce que ha sido mezclado contrarrestar la textura de polvo y el gusto a " -"ceniza, es casi tan apetitoso como una píldora de antes del cataclismo." #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -33715,7 +34581,7 @@ msgstr "suero de pájaro" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" @@ -34662,12 +35528,9 @@ msgstr[1] "gelatina de marloss" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" -"Parece un puñado de un líquido color limón que ha cuajado, muy parecido a la" -" gelatina pre-cataclismo. Tiene un aroma fuerte y delicioso, pero claramente" -" ha sufrido una mutación o es de origen extraterrestre." #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -34976,14 +35839,14 @@ msgstr "" "Es comida para perros. Tiene un olor extraño, pero a los perros parece que " "les gusta." -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "comida para gatos" msgstr[1] "comida para gatos" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "" "Es comida para gatos. Tiene un olor extraño, pero a los gatos parece que les" @@ -35025,68 +35888,30 @@ msgstr[1] "" msgid "Some nectar. Seeing this item is a bug." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "bebida de proteína" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "bebida de soylent verde" msgstr[1] "bebidas de soylent verde" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "" -"Es un líquido espeso hecho de proteína humana refinada mezclada con agua. " -"Aunque es bastante nutritivo, no es sabroso." - +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" -"Es proteína refinada y cruda ¡hecha con humanos! Aunque es bastante " -"nutritiva, es imposible disfrutarla así en este estado, probá con un poco de" -" agua." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "licuado de soylent verde" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "" -"Es una bebida sabrosa y espesa hecha con proteína humana refinada y alguna " -"fruta nutritiva." - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "licuado de soylent verde fortificado" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "" -"Es una bebida sabrosa y espesa hecha con proteína humana refinada y alguna " -"fruta nutritiva. Ha sido suplementada con más vitaminas y minerales." - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "bebida de proteína" - #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35102,6 +35927,14 @@ msgid_plural "protein powder" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35112,13 +35945,10 @@ msgstr "" "disfrutarla así en este estado, probá con un poco de agua." #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "" -msgstr[1] "" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -35134,6 +35964,13 @@ msgstr "" msgid "protein shake" msgstr "licuado de proteína" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35147,6 +35984,14 @@ msgstr "" msgid "fortified protein shake" msgstr "licuado de proteína fortificado" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35991,6 +36836,13 @@ msgid_plural "deluxe sandwiches" msgstr[0] "sánguche de lujo" msgstr[1] "sánguches de lujo" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -36091,6 +36943,22 @@ msgid_plural "meat sandwiches" msgstr[0] "sánguche de carne" msgstr[1] "sánguches de carne" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "sánguche de vago" +msgstr[1] "sánguches de vago" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -37074,15 +37942,6 @@ msgstr "caldo de hueso" msgid "A tasty and nutritious broth made from bones." msgstr "Un caldo sabroso y nutritivo hecho con huesos." -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "caldo de humano" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "Un caldo nutritivo hecho con huesos humanos." - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "sopa de verduras" @@ -37096,6 +37955,13 @@ msgstr "Una sopa deliciosa y nutritiva con abundantes verduras." msgid "meat soup" msgstr "sopa de carne" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -37127,6 +37993,13 @@ msgid_plural "curries with meat" msgstr[0] "curry con carne" msgstr[1] "currys con carne" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -37136,20 +38009,18 @@ msgstr "¡Picante y lleno de pedazos de morrón y carne! Está bastante bueno." msgid "woods soup" msgstr "sopa de madera" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "Un sopa deliciosa y nutritiva, hecha con regalos de la naturaleza." -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "sopa de savia" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "Una sopa hecha con lo que se pueda rescatar de un árbol." - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "sopa de pollo y fideos" @@ -38289,17 +39160,6 @@ msgid "" " resembles spoiled milk." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "" @@ -38348,6 +39208,17 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "" @@ -38366,8 +39237,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -38382,7 +39253,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -38632,19 +39503,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "cuerda resinosa" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "" -"Un material primitivo usado para atar, hecho con cuerda y pegamento natural." -" Se utiliza para arreglar objetos hechos de madera, papel, hueso o quitina." - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -38652,8 +39510,8 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -38677,10 +39535,8 @@ msgstr[1] "anomalías con forma de baya" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "" -"Si dejamos esto como debe ser, uno podría entrar caminando a la Floración " -"sin oposición ni participación de la Fruta. Pero no podemos hacer eso, ¿no?" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -38692,10 +39548,8 @@ msgstr[1] "anomalías con forma de semilla" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "" -"Si dejamos esto como debe ser, uno podría entrar caminando a la Jardín sin " -"oposición ni participación de la Semilla. Pero no podemos hacer eso, ¿no?" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -38707,11 +39561,8 @@ msgstr[1] "gelatinas de marloss" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "" -"Si dejamos esto como debe ser, uno podría entrar caminando al Chapitel sin " -"oposición ni participación de la Savia. Pará, ¿cómo hiciste para CONSEGUIR " -"esto?" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -38722,11 +39573,9 @@ msgstr[1] "anomalías con forma de fruta" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" -"No existimos en este momento. Pequeño humano inteligente, ¿así que debugging" -" para ver esto? No te vamos a permitir unirte mientras estamos modeando." #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -38855,10 +39704,8 @@ msgstr[1] "sánguches PB&H sin gluten" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" -"Algún estúpido puso miel en su sánguche de mantequilla de maní, que en su " -"sano juicio- ah, pará, está bastante bueno. ¡Y además no tiene gluten!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free PB&M sandwich" @@ -38882,21 +39729,16 @@ msgstr "ambrosía de nuez hickory sin lactosa" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "" -"Es una deliciosa ambrosía de nuez hickory. Una bebida digna de los dioses. " -"Esta ha sido hecha con un sustituto de la leche de vaca." #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "" -"Pensás que es harina de maíz... o harina de arroz... o algo así. Sin " -"embargo, ¡indudablemente no es harina de trigo! Igual es útil para cocinar " -"algo." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free johnnycake" @@ -38905,11 +39747,9 @@ msgstr "juanqueque sin gluten" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "" -"A todos nos agarra antojo de comer torta de vez en cuando. Esto no es " -"perfecto pero es un pan frito sabroso, nutritivo y sin gluten." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit pancake" @@ -38951,12 +39791,9 @@ msgstr[1] "panqueques de fruta sin lactosa ni gluten" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" -"Son panqueques suaves y deliciosos hechos con las pocas cosas que todavía " -"podés comer. Pero por lo menos tiene verdadero jarabe de arce, y agregando " -"una fruta son más dulces y saludables." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free chocolate pancake" @@ -38997,12 +39834,9 @@ msgstr[1] "tostadas francesas sin gluten ni lactosa" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" -"Son rebanadas de pan sin gluten mojadas en leche sin lactosa y huevo y luego" -" fritas. Nunca pensaste que esto sería posible, pero ahora te podés sentir " -"como un verdadero post milenial." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free biscuit" @@ -39101,10 +39935,8 @@ msgstr "hamburguesa sin gluten con queso" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." +"of pre-Cataclysm culinary achievement." msgstr "" -"Es un sánguche sin gluten de carne picada y queso con condimentos. El ápice " -"de la exitosa cocina pre-cataclismo." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -39244,11 +40076,8 @@ msgstr[1] "sánguches sosos sin gluten" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "" -"Es un simple sánguche sin gluten de salsa. No te llena mucho pero es un poco" -" mejor que comer el pan solo... ¡especialmente si es la clase equivocada de " -"pan!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free waffle" @@ -39256,8 +40085,8 @@ msgstr "wafle sin gluten" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." -msgstr "Es un wafle sin gluten. Es como un panqueque con diseño de numerales." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "lactose free waffle" @@ -39265,18 +40094,15 @@ msgstr "wafle sin lactosa" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." msgstr "" -"Es un wafle sin lactosa. Es como un panqueque con diseño de numerales." #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "" -"Es un wafle sin lactosa ni gluten. Es como un panqueque con diseño de " -"numerales." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit waffle" @@ -39326,11 +40152,9 @@ msgstr[1] "leche de arroz" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "" -"Es más dulce que la leche de vaca, casi que tiene el gusto del helado de " -"vainilla. Se pudre rápido." #: lang/json/COMESTIBLE_from_json.py msgid "coconut water" @@ -39341,11 +40165,9 @@ msgstr[1] "agua de coco" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "" -"Es leche de coco con agua agregada para que rinda más. Tiene buen sabor. Se " -"pudre rápido." #: lang/json/COMESTIBLE_from_json.py msgid "jarred coconut milk" @@ -40270,6 +41092,17 @@ msgid "" "it's anyone's guess what it's for." msgstr "" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -41099,6 +41932,29 @@ msgid_plural "corpses" msgstr[0] "cadáver" msgstr[1] "cadáveres" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -41117,13 +41973,7 @@ msgid "" " so with a gigantic claw." msgstr "" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "" @@ -41213,6 +42063,34 @@ msgid "" "wound." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -43181,6 +44059,149 @@ msgstr[1] "diamantes" msgid "A sparkling diamond." msgstr "Un diamante brillante." +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -44332,11 +45353,9 @@ msgstr[1] "caestus" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." msgstr "" -"Un brazal pesado de metal que cubre el puño y aumenta el poder de golpe, con" -" relleno grueso debajo para proteger la mano." #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -45136,17 +46155,17 @@ msgstr[1] "" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "chasis de torreta" -msgstr[1] "chasis de torreta" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" #: lang/json/GENERIC_from_json.py @@ -47308,6 +48327,288 @@ msgid_plural ".50 ammo belt linkages" msgstr[0] "unión metálica de munición .50" msgstr[1] "uniones metálicas de munición .50" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -47449,15 +48750,43 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "carcasa 40mm" -msgstr[1] "carcasas 40mm" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing +#: lang/json/GENERIC_from_json.py +msgid "A large canister from a spent 40mm cartridge." +msgstr "" -#. ~ Description for 40mm canister #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "Es una carcasa grande de una granada 40mm utilizada." +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -47835,16 +49164,6 @@ msgid_plural "generic silverwares" msgstr[0] "" msgstr[1] "" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -50747,6 +52066,28 @@ msgid "" "twist ties, duct tape, and other random stuff has been used to compensate." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -52577,8 +53918,8 @@ msgstr[1] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -52708,9 +54049,79 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -54893,7 +56304,21 @@ msgstr[1] "" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" #: lang/json/GENERIC_from_json.py @@ -56086,6 +57511,17 @@ msgstr[1] "" msgid "A small book, containing spells created by a novice magician." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -56258,6 +57694,47 @@ msgid "" "hopes to discover a more permanent solution." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -56648,11 +58125,9 @@ msgstr[1] "arañabots desarmados rotos" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" -"Es un arañabot roto. Su arma interna ha sido quitada. Puede ser desarmado " -"para recuperar partes o convertido en un robot recuperado." #. ~ Description for broken skitterbot #: lang/json/GENERIC_from_json.py @@ -56678,11 +58153,9 @@ msgstr[1] "defensibots desarmados rotos" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Es un robot defensivo roto. Sus armas internas han sido quitadas. Puede ser " -"desarmado para recuperar partes o convertido en un robot recuperado." #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -56716,11 +58189,9 @@ msgstr[1] "mecagallinas desarmadas rotas" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Es una meca-gallina rota. Sus armas internas han sido quitadas. Puede ser " -"desarmado para recuperar partes o convertido en un robot recuperado." #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -57329,10 +58800,8 @@ msgstr[1] "vaqueros de basurero rotos" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "" -"Es un robot rescatado roto. Puede ser desarmado para recuperar partes o " -"reconstruido." #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -57361,12 +58830,9 @@ msgstr[1] "militaribots de entrenamiento rotos" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" -"Es un robot militar de entrenamiento roto, destrozado e inerte. Este está " -"equipado con un arma de paintball integrada. Puede ser desarmado para " -"recuperar partes." #: lang/json/GENERIC_from_json.py msgid "broken military robot" @@ -57377,57 +58843,44 @@ msgstr[1] "militaribots rotos" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"arma 5.56mm integrada. Puede ser desarmado para recuperar partes." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"arma 7.62mm integrada. Puede ser desarmado para recuperar partes." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"calibre 50 integrada. Puede ser desarmado para recuperar partes." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"arma 8x40mm integrada. Puede ser desarmado para recuperar partes." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"arma de dardos perforantes integrada. Puede ser desarmado para recuperar " -"partes." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"lanzagranadas 40mm integrado. Puede ser desarmado para recuperar partes." #: lang/json/GENERIC_from_json.py msgid "broken military flame robot" @@ -57438,11 +58891,9 @@ msgstr[1] "militaribots flameantes rotos" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"lanzallamas integrado. Puede ser desarmado para recuperar partes." #: lang/json/GENERIC_from_json.py msgid "broken robo-guardian" @@ -57455,8 +58906,10 @@ msgstr[1] "" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "Es un robot rescatado roto. Puede ser desarmado o reconstruido." #: lang/json/GENERIC_from_json.py @@ -57467,8 +58920,8 @@ msgstr[1] "robots de lujo rotos" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." -msgstr "Es un robot de lujo roto. Puede ser desarmado o reconstruido." +msgid "A broken deluxe robot. Could be stripped or recrafted." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken robo-protector" @@ -57491,11 +58944,9 @@ msgstr[1] "robots avanzados desarmados y rotos" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Es un robot avanzado roto. Sus armas internas han sido quitadas. Puede ser " -"desarmado para recuperar partes o convertido en un robot recuperado." #: lang/json/GENERIC_from_json.py msgid "broken advanced robot" @@ -57506,38 +58957,30 @@ msgstr[1] "robots avanzados rotos" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" -"Es un robot avanzado roto. Este está armado con un emisor láser integrado. " -"Puede ser desarmado para recuperar partes." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" -"Es un robot avanzado roto. Este está armado con un eyectaplasma integrado. " -"Puede ser desarmado para recuperar partes." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" -"Es un robot avanzado roto. Este está armado con un lanza-rayos eléctricos " -"integrado. Puede ser desarmado para recuperar partes." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" -"Es un robot avanzado roto. Este está armado con un proyector PEM integrado. " -"Puede ser desarmado para recuperar partes." #: lang/json/GENERIC_from_json.py msgid "broken glittering lady" @@ -57562,11 +59005,9 @@ msgstr[1] "horrores motosierra rotos" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "" -"Es un robot rescatado roto. Gracias a dios que ya está muerto. Puede ser " -"desarmado o reconstruido." #: lang/json/GENERIC_from_json.py msgid "broken screeching terror" @@ -57586,12 +59027,6 @@ msgid_plural "broken fist kings" msgstr[0] "rey puño roto" msgstr[1] "reyes puños rotos" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "Es un robot rescatado roto. Puede ser desarmado o reconstruido." - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -57728,16 +59163,8 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." +"you…" msgstr "" -"Esta masa amorfa parece haber terminado de desarrollarse, sus complejas " -"estructuras internas lo demuestran. Es capaz de moverse debido a su presión " -"hidráulica interna, capaz de cargar bastante peso, y, en una sorprendente " -"demostración de inteligencia, es capaz de manipular cualquier cosa, sea " -"basado en un blobo o no, a través de sus seudópodos extensibles. Te parece " -"que podrías manipularlo, a través de él, a todas sus partes. Pero para hacer" -" eso vas a tener que estar en contacto con él, y parece que no tiene muchas " -"ganas de dejarte acomodar..." #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -57797,6 +59224,12 @@ msgstr "" "amenaza potencial, y mejora su eficiencia debido a que puede seguir al sol. " "Sin embargo, es imposiblemente pesado y molesto." +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "chasis de torreta" +msgstr[1] "chasis de torreta" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -57855,13 +59288,9 @@ msgstr[1] "portales estabilizados" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"Mientras mirás dentro de las profundidades aparentemente infinitas de este " -"agujero portátil de la realidad, una frase de un tiempo perdido se aparece " -"en tu mente. \"Hay dos cosas infinitas: el universo y la cleptomanía " -"humana.\"" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -59162,6 +60591,17 @@ msgid "" " reload a compatible revolver." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "" @@ -59227,6 +60667,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "cargador AF2011A1" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "" @@ -59549,8 +61000,8 @@ msgstr "" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -60889,13 +62340,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"Es un misterio biológico, este blobo ha evolucionado hasta tener la " -"habilidad de lentamente generar electricidad a través de algún procedimiento" -" desconocido. Emite un leve brillo fosforescente mientras lo hace. Es capaz " -"de almacenar electricidad desde otras fuentes, pero al hacerlo se queda " -"inactivo. Parece ser lo suficientemente maleable como para desarmarlo..." #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -60951,26 +62397,6 @@ msgstr "" msgid "pebble hopper" msgstr "tolva de piedritas" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "cargador AF2011A1" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "" -"Son dos cargadores conectados a una base en común. Es único para el " -"AF2011A1." - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "cargador M1991A1 .38 Super" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "Es un cargador de 9 balas para la pistola M1991A1 .38 Super." - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "predeterminado" @@ -61202,11 +62628,9 @@ msgstr "Fuji Más Edificios" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "" -"Agrega más edificios y más variantes de los edificios ya existentes " -"(Necesita el mod Más Lugares)" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -61228,7 +62652,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -61260,7 +62684,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" @@ -61361,10 +62785,8 @@ msgstr "PNJs mutantes" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "" -"Los PNJs que aparezcan por el mundo, a veces tendrán mutaciones --- tus " -"enemigos también. ¡Cuidado!" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -61373,9 +62795,8 @@ msgstr "" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61701,11 +63122,9 @@ msgstr "Recetas de Bens GF" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "" -"Son algunas alternativas en las recetas con opciones sin gluten ni lactosa. " -"NO ESTÁ COMPLETO" #: lang/json/MOD_INFO_from_json.py msgid "Tough Zombies" @@ -61741,12 +63160,9 @@ msgstr "Teclas Alternativas para Mapa" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" -"Cambia el mapa general para que sea más fácil de leer. Los edificios tienen " -"diferentes colores para los diferentes tipos y utilizan la letra inicial de " -"sus nombres en lugar de ^v<>." #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -61893,7 +63309,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -61905,7 +63321,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61916,7 +63332,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61926,7 +63342,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -62005,11 +63421,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." msgstr "" -"Un ánade real, a menudo visto cerca de los ríos y otros cuerpos de agua. Se " -"alimenta principalmente de insectos, semillas, raíces y, antes del " -"cataclismo, migas de pan." #: lang/json/MONSTER_from_json.py msgid "goose" @@ -62797,7 +64210,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" #: lang/json/MONSTER_from_json.py @@ -62960,7 +64373,7 @@ msgid_plural "skittering plagues" msgstr[0] "" msgstr[1] "" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "" @@ -62973,7 +64386,7 @@ msgid_plural "plague nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "Es una cucaracha mutante e infectada del tamaño de una rata." @@ -62984,7 +64397,7 @@ msgid_plural "plague vectors" msgstr[0] "" msgstr[1] "" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -63011,7 +64424,7 @@ msgid_plural "giant cockroach nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "Es una cucaracha mutante bebé, del tamaño de una rata." @@ -63035,7 +64448,7 @@ msgid_plural "giant bees" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -63051,7 +64464,7 @@ msgid_plural "giant centipedes" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -63096,7 +64509,7 @@ msgid_plural "giant mosquitos" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -63111,7 +64524,7 @@ msgid_plural "giant cellar spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -63128,7 +64541,7 @@ msgid_plural "immature giant cellar spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -63143,7 +64556,7 @@ msgid_plural "giant jumping spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -63158,7 +64571,7 @@ msgid_plural "giant trapdoor spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -63173,7 +64586,7 @@ msgid_plural "giant web spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -63188,7 +64601,7 @@ msgid_plural "fungal spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -63202,7 +64615,7 @@ msgid_plural "immature giant web spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -63217,7 +64630,7 @@ msgid_plural "giant black widows" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -63232,7 +64645,7 @@ msgid_plural "giant black widow spiderlings" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -63247,7 +64660,7 @@ msgid_plural "giant wolf spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -63262,7 +64675,7 @@ msgid_plural "giant wasps" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -63278,7 +64691,7 @@ msgid_plural "dermatiks" msgstr[0] "" msgstr[1] "" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -63308,7 +64721,7 @@ msgid_plural "giant ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -63323,7 +64736,7 @@ msgid_plural "giant acidic ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -63356,7 +64769,7 @@ msgid_plural "acidic queen ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -63374,7 +64787,7 @@ msgid_plural "acidic soldier ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -63391,7 +64804,7 @@ msgid_plural "fungal ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -63422,7 +64835,7 @@ msgid_plural "queen ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -63437,7 +64850,7 @@ msgid_plural "soldier ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -63452,7 +64865,7 @@ msgid_plural "giant locusts" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -63467,7 +64880,7 @@ msgid_plural "locust nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -64413,14 +65826,14 @@ msgid_plural "marloss zealots" msgstr[0] "" msgstr[1] "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -64433,7 +65846,7 @@ msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -64451,7 +65864,7 @@ msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -64468,7 +65881,7 @@ msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -64485,7 +65898,7 @@ msgid_plural "mi-gos" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -64506,7 +65919,7 @@ msgid_plural "mi-go slavers" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -64523,7 +65936,7 @@ msgid_plural "mi-go surgeons" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -64537,7 +65950,7 @@ msgid_plural "mi-go guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -64554,7 +65967,7 @@ msgid_plural "mi-go myrmidons" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -64571,7 +65984,7 @@ msgid_plural "mi-go scouts" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -66339,6 +67752,19 @@ msgid "" "able to see." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -67058,7 +68484,7 @@ msgid_plural "experimental mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -67073,7 +68499,7 @@ msgid_plural "evolved mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -67576,7 +69002,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" @@ -67592,7 +69018,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" @@ -67607,7 +69033,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" @@ -68013,7 +69439,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -68028,7 +69454,21 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68457,9 +69897,9 @@ msgstr[1] "" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68471,10 +69911,10 @@ msgstr[1] "" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68487,7 +69927,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -68501,8 +69941,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" @@ -68516,7 +69956,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -68530,10 +69970,10 @@ msgstr[1] "" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68545,9 +69985,9 @@ msgstr[1] "" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -68561,8 +70001,8 @@ msgstr[1] "" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68574,20 +70014,18 @@ msgstr[1] "" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" -"Es un cuerpo humano con la piel de color azul pálido, y chisporroteando de " -"energía eléctrica. Parece con ganas de decirte algo." #: lang/json/MONSTER_from_json.py msgid "mr skeltal" @@ -68599,12 +70037,9 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" -"Desprovisto completamente de carne y órganos, la presencia de este esqueleto" -" ambulante te cala hasta los huesos. En su mano huesuda, tiene una trompeta " -"prístina, intacta del fin del mundo." #: lang/json/MONSTER_from_json.py msgid "minion of skeltal" @@ -68628,10 +70063,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" -"Una cáscara humeante es todo lo que queda de lo que debe haber sido un " -"presuntuoso oso. Sus ojos negros te contemplan con malicia... y con hambre." #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -68965,6 +70398,87 @@ msgid "" "like jaws." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -69537,12 +71051,9 @@ msgstr[1] "" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" -"Es un robot defensivo automatizado, todavía activo debido a su fuente " -"interna de energía. Este está armado con una picana eléctrica y una 9mm " -"integrada." #: lang/json/MONSTER_from_json.py msgid "security robot" @@ -69553,11 +71064,9 @@ msgstr[1] "" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" -"Es un robot defensivo automatizado, todavía activo debido a su fuente " -"interna de energía. Este está equipado con un arma 9mm integrada." #: lang/json/MONSTER_from_json.py msgid "riotcontrol robot" @@ -69568,13 +71077,10 @@ msgstr[1] "" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" -"Es un robot defensivo automatizado, todavía activo debido a su fuente " -"interna de energía. Este está equipada con una picana eléctrica, un rociador" -" de gas lacrimógeno y un lanzaperdigones no letales de 40mm." #: lang/json/MONSTER_from_json.py msgid "necco" @@ -69973,13 +71479,9 @@ msgstr[1] "" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" -"Es un utilitaribot recuperado convertido en una aspiradora automatizada. " -"Agarra los objetos sueltos en el piso y los disuelve con su ácido interno. " -"Es un ayudante útil para mantener el patio delantero limpio de mugre... y " -"cadáveres." #: lang/json/MONSTER_from_json.py msgid "bee bot" @@ -70042,12 +71544,9 @@ msgstr[1] "" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" -"Esto todavía no anda en el juego. No lo construyas... Es un medicobot " -"recuperado con sus fabricadores internos de fármacos readaptados para " -"producir mutágeno." #: lang/json/MONSTER_from_json.py msgid "party bot" @@ -71616,6 +73115,17 @@ msgstr "" msgid "Ethereal Grasp" msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "" @@ -72037,6 +73547,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "" @@ -74095,6 +75628,19 @@ msgid "" msgstr "" "Es una herramienta médica para oir. Usalo para escuchar cosas. Más de cerca." +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -74392,9 +75938,9 @@ msgstr[1] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74405,7 +75951,7 @@ msgstr[1] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -74418,9 +75964,9 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74437,7 +75983,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -74450,12 +75996,12 @@ msgstr[1] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." +msgid "Power levels too low for safe bootup…" msgstr "" #. ~ Description for CRIT EM vest (off) @@ -74463,9 +76009,9 @@ msgstr "" msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74481,7 +76027,7 @@ msgstr "" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "" #. ~ Description for CRIT EM vest (on) @@ -74490,8 +76036,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74509,7 +76055,7 @@ msgstr "" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -74528,10 +76074,10 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74786,6 +76332,32 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -75350,12 +76922,13 @@ msgstr "" #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "Tick." @@ -75436,11 +77009,10 @@ msgstr "Sacás el gancho de la granada emisora de interferencias." #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" #: lang/json/TOOL_from_json.py @@ -75459,6 +77031,57 @@ msgstr "" " detonará enviando una onda de control que convertirá temporalmente a los " "robos en tus aliados." +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "granada PEM" +msgstr[1] "granadas PEM" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "Sacás el gancho de la granada PEM." + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +"Es una granada que genera un pulso electromagnético cuando el banco de " +"capacitares se descarga en una antena espira. Usala para sacar el gancho y " +"activar el detonador, lo que activa la granada PEM. Después de esto, tenés " +"tres turnos antes de que detone, creando un campo PEM que daña robots y " +"drena energía biónica." + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "granada PEM activada" +msgstr[1] "granadas PEM activadas" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "Ya le sacaste el pasador a la %s, ahora intentá tirarla." + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"Es una granada PEM activada, y en cualquier momento detonará creando un gran" +" campo PEM que daña robots y drena energía biónica. Tal vez no quieras " +"tenerla en la mano mucho más tiempo." + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -75891,30 +77514,30 @@ msgstr "" "más importantes de tu cuerpo. Usala para desplegarla y utilizarla." #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "granada PEM" -msgstr[1] "granadas PEM" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "" +msgstr[1] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "Sacás el gancho de la granada PEM." +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -"Es una granada que genera un pulso electromagnético cuando el banco de " -"capacitares se descarga en una antena espira. Usala para sacar el gancho y " -"activar el detonador, lo que activa la granada PEM. Después de esto, tenés " -"tres turnos antes de que detone, creando un campo PEM que daña robots y " -"drena energía biónica." #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -75930,29 +77553,24 @@ msgid "" msgstr "" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "granada PEM activada" -msgstr[1] "granadas PEM activadas" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "" +msgstr[1] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "Ya le sacaste el pasador a la %s, ahora intentá tirarla." +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"Es una granada PEM activada, y en cualquier momento detonará creando un gran" -" campo PEM que daña robots y drena energía biónica. Tal vez no quieras " -"tenerla en la mano mucho más tiempo." #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -76455,14 +78073,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -"Una cámara digital SLR (réflex de un objetivo) de 35mm, con un visor óptico " -"y otro digital, lente con zoom, autoenfoque y estabilizador, y flash. Podés " -"ver las fotos en su pantalla o transferirlas a una tarjeta de memoria. " -"Funciona con baterías normales. Antes del cataclismo, podrías haber sacado " -"fotos de calidad profesional con esta cámara." #: lang/json/TOOL_from_json.py msgid "candle" @@ -77261,6 +78874,7 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -77274,13 +78888,10 @@ msgstr[1] "lectores electrónicos" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -"Es una tableta que utiliza una pantalla eficiente de tinta electrónica de " -"color. Antes del cataclismo, estos eran unos aparatos copados. Ahora, es " -"casi un recurso invalorable. Funciona con baterías normales." #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -78542,11 +80153,9 @@ msgstr[1] "martillos improvisados" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "" -"Es un martillo rudimentario hecho con un pedazo de metal fijado a un palo. " -"Funciona adecuadamente pero no se puede comparar con uno verdadero." #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -79666,21 +81275,6 @@ msgstr "" "Es un cuchillo muy afilado diseñado para cortes quirúrgicos. Su pequeña hoja" " afilada permite golpes precisos en las manos de alguien hábil." -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "tijera" -msgstr[1] "tijeras" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "" -"Son un par de tijeras largas y resistentes. Podés usar las tijeras para " -"cortar objetos hechos de algodón (como la ropa) y hacer trapos." - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -82143,6 +83737,18 @@ msgid "" "distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -84421,6 +86027,21 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "tijera" +msgstr[1] "tijeras" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "" +"Son un par de tijeras largas y resistentes. Podés usar las tijeras para " +"cortar objetos hechos de algodón (como la ropa) y hacer trapos." + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -84601,6 +86222,28 @@ msgid_plural "precision soldererss" msgstr[0] "" msgstr[1] "" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -84798,12 +86441,12 @@ msgstr[1] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -84815,10 +86458,11 @@ msgstr[1] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -84830,7 +86474,7 @@ msgstr[1] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -84843,7 +86487,7 @@ msgstr[1] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -84857,10 +86501,10 @@ msgstr[1] "" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -84873,7 +86517,7 @@ msgstr[1] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -84887,7 +86531,7 @@ msgstr[1] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -85401,7 +87045,7 @@ msgstr[1] "" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" @@ -85414,7 +87058,7 @@ msgstr[1] "" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" @@ -85427,7 +87071,7 @@ msgstr[1] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" @@ -85440,7 +87084,7 @@ msgstr[1] "" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" @@ -85453,8 +87097,8 @@ msgstr[1] "" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85466,8 +87110,8 @@ msgstr[1] "" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85479,7 +87123,7 @@ msgstr[1] "" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" @@ -85492,8 +87136,8 @@ msgstr[1] "" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85505,7 +87149,7 @@ msgstr[1] "" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -85594,23 +87238,18 @@ msgstr[1] "Dusks" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." msgstr "" -"Es una espada larga, hecha de un metal muy oscuro, casi negro. Parece tener " -"una cuchilla más grande que las normales espadas de acero y se siente... más" -" cómoda en la mano. Aunque la cuchilla está hecha de este oscuro metal, la " -"guarda y el pomo parecen estar hechos de un material más brillante, que se " -"siente extrañamente frío al tacto." #. ~ Use action use_message for disarmed defense turret. #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." -msgstr "Error. No se encontraron armas." +msgid "Error. No weapon systems found." +msgstr "" #. ~ Description for disarmed defense turret #: lang/json/TOOL_from_json.py @@ -85817,14 +87456,9 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Es una torreta militar inactiva de granadas. Serán cargadas automáticamente " -"hasta 50 granadas de fragmentación 40mm desde tu inventario a la torreta " -"cuando la actives. Cuando pongas la torreta te va a identificar como aliado " -"con su software IFF avanzado. Consultá el manual de seguridad en caso de mal" -" funcionamiento." #: lang/json/TOOL_from_json.py msgid "inactive military flamethrower turret" @@ -85890,15 +87524,10 @@ msgstr[1] "" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Es una torreta avanzada inactiva de cañón de riel. Serán cargados " -"automáticamente hasta 100 proyectiles de riel desde tu inventario a la " -"torreta cuando la actives. Cuando pongas la torreta te va a identificar como" -" aliado con su software IFF avanzado. Consultá el manual de seguridad en " -"caso de mal funcionamiento." #: lang/json/TOOL_from_json.py msgid "inactive advanced acid turret" @@ -85910,12 +87539,9 @@ msgstr[1] "torretas avanzadas ácidas inactivas" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Es una torreta ácida avanzada inactiva. Poné la torreta y te va a " -"identificar como aliado con su software IFF avanzado. Consultá tu manual de " -"seguridad ante un eventual mal funcionamiento." #: lang/json/TOOL_from_json.py msgid "inactive advanced EMP turret" @@ -85927,12 +87553,9 @@ msgstr[1] "torretas avanzadas PEM inactivas" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Es una torreta PEM avanzada inactiva. Poné la torreta y te va a identificar " -"como aliado con su software IFF avanzado. Consultá tu manual de seguridad " -"ante un eventual mal funcionamiento." #: lang/json/TOOL_from_json.py msgid "inactive advanced electro turret" @@ -86291,13 +87914,10 @@ msgstr[1] "calentadores flotantes inactivos" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" -"Es un ojobot arreglado convertido en un calentador flotante. Emite un aire " -"tibio constante para calentar un espacio cerrado. No es agresivo y no tiene " -"armas. Activalo para desplegar el robot." #: lang/json/TOOL_from_json.py msgid "inactive floating furnace" @@ -86308,14 +87928,11 @@ msgstr[1] "hornos flotantes inactivos" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." msgstr "" -"Es un ojobot arreglado convertido en un calentador flotante. Emite " -"constantemente un aire caliente peligroso para calentar un espacio cerrado. " -"No es agresivo y no tiene armas. Activalo para desplegar el robot." #: lang/json/TOOL_from_json.py msgid "inactive burning eye" @@ -86384,14 +88001,11 @@ msgstr[1] "digestrones inactivos" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" -"Es un utilitaribot recuperado convertido en una aspiradora automatizada. " -"Agarra los objetos sueltos en el piso y los disuelve con su ácido interno. " -"No es agresivo y no tiene armas. Activalo para desplegar el robot." #: lang/json/TOOL_from_json.py msgid "inactive bee-bot" @@ -86428,13 +88042,10 @@ msgstr[1] "asesinobots inactivos" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" -"Es un robot médico reconvertido en una máquina asesina. Atacará a los " -"objetivos hostiles con un conjunto de cuchillas y una aguja tóxica. Activá " -"este objeto para desplegar el robot." #: lang/json/TOOL_from_json.py msgid "inactive elixirator" @@ -86477,13 +88088,10 @@ msgstr[1] "cazaratas inactivos" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" -"Es un arañabot reconvertido para cazar animales pequeños. Ataca a sus " -"objetivos con pinzas y una pistola eléctrica integrada. Activá este objeto " -"para desplegar el robot." #: lang/json/TOOL_from_json.py msgid "inactive grab-bot" @@ -86531,12 +88139,9 @@ msgstr[1] "androides necróticos inactivos" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" -"Es un androide reconvertido con la cabeza de un zombi nigromante. La cabeza " -"retiene algo de su habilidad para revivir zombis. Activá este objeto para " -"desplegar el robot." #: lang/json/TOOL_from_json.py msgid "inactive defense robot" @@ -86587,12 +88192,8 @@ msgstr[1] "paladines chambones inactivos" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" -"Es un robot defensivo reconvertido con un lanzallamas casero y dos cuchillas" -" ardientes. Si activás este objeto con combustible en tu inventario, vas a " -"cargar y desplegar el robot... en lo posible, alejado de cualquier cosa " -"inflamable." #: lang/json/TOOL_from_json.py msgid "inactive military robot" @@ -86959,13 +88560,8 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" -"Es un misterio biológico. Las estructuras internas de este blobo existen " -"dentro de una pileta de fluido de baja densidad que se mantiene líquido a " -"pesar de estar en un estado super-frío. Aún así, posee toda la maleabilidad " -"de su antigua forma. Continuamente, fragmentos de escarcha se descascaran. " -"Parece ser lo suficientemente flexible como para desarmar..." #: lang/json/TOOL_from_json.py msgid "growing cold mass" @@ -87196,14 +88792,10 @@ msgstr "El grupo se desarma en tus manos." #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" -"Es un grupo de cristales artificiales que se han desprendido de una matriz " -"de diamante. Aunque la sustancia normalmente se degrada cuando es separada " -"del catalizador, este grupo parece mantenerse debido a algún mecanismo " -"desconocido." #: lang/json/TOOL_from_json.py msgid "diamond matrix" @@ -87214,10 +88806,8 @@ msgstr[1] "matrices de diamante" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +"Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "" -"Tus sentidos se adormecen mientras mirás en las profundidades del centro de " -"esta gema..." #. ~ Description for diamond matrix #: lang/json/TOOL_from_json.py @@ -87238,17 +88828,12 @@ msgstr[1] "motores vórtice" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" -"Es un tornado en una caja, por decirlo de alguna manera. Adentro de este " -"inocuo tanque está la culminación de la innovación humana sobre energía " -"limpia, o un arma de destrucción masiva capaz de borrar la civilización del " -"mapa. o lo que queda de ella. El mecanismo externo permite unirlo a un " -"vehículo para hacer móvil." #: lang/json/TOOL_from_json.py lang/json/vehicle_part_from_json.py msgid "vortex generator" @@ -87259,17 +88844,12 @@ msgstr[1] "generadores vórtice" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" -"Es un tornado en una caja, por decirlo de alguna manera. Adentro de este " -"inocuo tanque está la culminación de la innovación humana sobre energía " -"limpia, o un arma de destrucción masiva capaz de borrar la civilización del " -"mapa. o lo que queda de ella. El mecanismo externo permite unirlo a una " -"batería para almacenar la energía generada." #: lang/json/TOOL_from_json.py msgid "control chip" @@ -90702,6 +92282,10 @@ msgstr "Construir Empalizada" msgid "Build Stone Wall" msgstr "Construir Pared de Piedra" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "" @@ -94511,6 +96095,35 @@ msgid "" "from the inside." msgstr "" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "Encendido" @@ -95184,11 +96797,9 @@ msgstr "Privado de Sueño" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "" -"La falta de sueño se te ha ido incrementando por un rato ya. Deberías " -"descansar." #. ~ Apply message for effect(s) 'Sleep Deprived'. #: lang/json/effects_from_json.py @@ -95363,7 +96974,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -95377,14 +96988,8 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" -"Le encontró un nuevo sentido a la vida luego de tu muerte. Aunque nunca te " -"lo dijo, sus crímenes en el mundo anterior evitaron que pudiera tener un " -"verdadero lugar en la sociedad. Con la destrucción de los registros " -"criminales, tomó el desafío de probar su valía a sus compañeros. Murió de un" -" ataque al corazón cuando estaba solo en un viaje muchos años después del " -"cataclismo." #: lang/json/epilogue_from_json.py msgid "" @@ -95406,19 +97011,12 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " "enact revenge himself." msgstr "" -"Nunca fue reconocido como una persona particularmente valiente, ni tampoco " -"como estable emocionalmente. Su remordimiento por no haber ayudado a la " -"gente durante los días iniciales del cataclismo lo llevaron a intentar " -"suicidarse varias veces en los años siguientes. La vida mejoró un poco " -"cuando se casó con un superviviente pero volvió a empeorar cuando su esposa " -"fue asesinada por miembros de un culto misterioso. A él lo mataron cuando " -"intentó meterse en las instalaciones del culto para vengarse." #: lang/json/epilogue_from_json.py msgid "" @@ -95452,18 +97050,10 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" -"Trabajó duro luego de tu muerte para organizar su propio grupo de " -"sobrevivientes. Llegó a casarse y a tener dos hijos que fueron criados para " -"aprender cada habilidad que pudieran necesitar para sobrevivir. " -"Eventualmente, su pasado lo atrapó cuando se enfrentó con un coronel de la " -"Vieja Guardia. Como él había abandonado su puesto como soldado de la Guardia" -" Nacional durante el cataclismo, fue ahorcado por desertor más allá de las " -"protestas de un gran número de sobrevivientes que habían sido ayudados por " -"él en estos años." #: lang/json/epilogue_from_json.py msgid "" @@ -95882,7 +97472,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -95918,20 +97508,12 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " "of crimes against humanity." msgstr "" -"Nunca fue reconocida como una persona particularmente valiente, ni tampoco " -"estable emocionalmente. Su incapacidad de conectarse emocionalmente con la " -"vida luego del cataclismo la llevó a intentar suicidarse reiteradas veces en" -" los años siguientes. Atraída por las promesas de renovación y el proyecto " -"de pertenecer a una nueva familia, se involucró con un carismático culto. " -"Fue una víctima inocente de la Vieja Guardia cuando los soldados irrumpieron" -" en el edificio por la sospecha de que se cometían crímenes contra la " -"humanidad." #: lang/json/epilogue_from_json.py msgid "" @@ -96235,7 +97817,7 @@ msgstr "" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" @@ -96412,17 +97994,11 @@ msgstr "Refugiados" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." msgstr "" -"Remanentes desperdigados de la civilización, estos pocos afortunados " -"lograron permanecer encerrados durante las primeras etapas del cataclismo. " -"Aunque por un tiempo estuvieron seguros, se están quedando sin suministros y" -" no tienen la capacidad de conseguir más. Es cuestión de tiempo que también " -"se conviertan en las presas de criaturas de otros mundos, o de otros " -"monstruos humanos." #: lang/json/fault_from_json.py msgid "Dusty" @@ -96492,6 +98068,20 @@ msgstr "" msgid "You clean your %s." msgstr "" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "" @@ -96515,6 +98105,29 @@ msgstr "" msgid "You eject the spent casing from the %s." msgstr "" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "" @@ -96535,6 +98148,11 @@ msgstr "" msgid "Clean gun" msgstr "" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "" @@ -97263,11 +98881,13 @@ msgstr "" msgid "A big, blocky metal device for refrigerating large areas." msgstr "" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "¡chillido de metal!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "¡clang!" @@ -99104,6 +100724,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "góndola" @@ -100047,8 +101676,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -100081,7 +101710,7 @@ msgstr "" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -100092,7 +101721,7 @@ msgstr "" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -100103,7 +101732,7 @@ msgstr "" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -100114,7 +101743,7 @@ msgstr "" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -102198,10 +103827,10 @@ msgstr "" " el hombro, ya que casi nadie es un héroe de película de acción." #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" -msgstr[0] "rifle de caño: .308" -msgstr[1] "rifles de caño: .308" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" +msgstr[0] "" +msgstr[1] "" #: lang/json/gun_from_json.py msgid "" @@ -102433,6 +104062,19 @@ msgid "" "hammers of the four barrels arranged in a square formation." msgstr "" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -102550,6 +104192,18 @@ msgid "" "quality, durable materials." msgstr "" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -102731,23 +104385,6 @@ msgstr "" "estadounidenses en la guerra de Vietnam. Aunque ya ha sido reemplazado por " "lanzadores modernos, el M79 todavía se usa en todo el mundo." -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "lanzagranadas Mark 19" -msgstr[1] "lanzagranadas Mark 19" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"Es un lanzagranadas pesado, montado en un trípode y alimentado con cinta de " -"munición, utilizado por el Ejército de EE.UU. desde comienzos de la Guerra " -"Fría hasta el cataclismo, y si podés encontrar algunas granadas 40mm, se " -"puede seguir usando." - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -102802,6 +104439,23 @@ msgstr "" msgid "multi" msgstr "multi" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "lanzagranadas Mark 19" +msgstr[1] "lanzagranadas Mark 19" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"Es un lanzagranadas pesado, montado en un trípode y alimentado con cinta de " +"munición, utilizado por el Ejército de EE.UU. desde comienzos de la Guerra " +"Fría hasta el cataclismo, y si podés encontrar algunas granadas 40mm, se " +"puede seguir usando." + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -102815,6 +104469,19 @@ msgid "" "shell at a time like most shotguns." msgstr "" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -103117,6 +104784,18 @@ msgstr "" "La Taurus Raging Bull es un revólver de 5 disparos para la .454. Casull. " "Tiene una potencia de detención impresionante." +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "Taurus Raging Judge Magnum" +msgstr[1] "Taurus Raging Judge Magnum" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -103157,6 +104836,36 @@ msgid "" "ammunition." msgstr "" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "Revólver Bond Arms" +msgstr[1] "Revólveres Bond Arms" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -103299,13 +105008,9 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" -"Una ametralladora pesada usada por el Ejército de Estados Unidos desde su " -"creación hasta el Cataclismo, e incluso también por algunos sobrevivientes " -"del cataclismo. Su enorme tamaño y su diseño la hacen imposible de usar " -"salvo que esté desplegada o montada en un vehículo." #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -104883,7 +106588,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -105047,14 +106752,9 @@ msgstr[1] "rifles láser A7" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" -"Es un rifle láser de última generación, desarrollado por el equipo de " -"investigación y desarrollo \"Aerial Lbas\". Compitió con lo mejor de " -"Rivtech, y hubo rumores sobre trampas empresariales. Aunque el cataclismo " -"puso eso en la pila de cenizas de la historia, esta arma puede hacer lo " -"mismo con tus enemigos." #: lang/json/gun_from_json.py msgid "V29 laser pistol" @@ -105132,6 +106832,18 @@ msgstr "" "Es una cerbatana de madera, fácil de usar y muy precisa. Usa dardos como " "munición." +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -105183,7 +106895,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -105196,7 +106908,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -105210,7 +106922,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -105222,8 +106934,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" #: lang/json/gun_from_json.py @@ -105234,12 +106946,12 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" #: lang/json/gun_from_json.py @@ -105264,11 +106976,11 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" #: lang/json/gun_from_json.py @@ -105279,7 +106991,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -105291,8 +107003,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -105305,7 +107017,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -105317,8 +107029,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -105330,7 +107042,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -105358,8 +107070,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" @@ -105497,12 +107209,10 @@ msgstr[1] "JHEC M128" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" -"Es el autorevólver M128 de Johnson Heavy Equipment Co., que deje chiquitos a" -" todos los demás que se quieren comparar. Johnson Heavy Equipment Co. es " -"subsidiaria de D&B Minneapolis." #: lang/json/gun_from_json.py msgid "Boomlighter 454" @@ -105602,10 +107312,10 @@ msgstr "" "libertad!" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" -msgstr[0] "carabina L.T." -msgstr[1] "carabinas L.T." +msgid "L.T. carbine" +msgid_plural "L.T. carbines" +msgstr[0] "" +msgstr[1] "" #: lang/json/gun_from_json.py msgid "" @@ -106044,12 +107754,9 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" -"Es un poderoso electroláser desarrollado por paramilitares R&D poco antes " -"del cataclismo. Es especialmente efectivo contra objetivos electrónicos. Se " -"carga con UPS." #: lang/json/gun_from_json.py msgid "hand-held laser cannon" @@ -106074,16 +107781,11 @@ msgstr[1] "rifles láser" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" -"Es un rifle láser de íltima generación que funciona con un UPS. Fue " -"desarrollado por paramilitares R&D poco antes del cataclismo. Su performance" -" compitió con las armas más avanzadas del momento. Aunque el cataclismo puso" -" eso en la pila de cenizas de la historia, esta arma todavía puede lastimar " -"a tus enemigos." #: lang/json/gun_from_json.py msgid "laser pistol" @@ -106244,6 +107946,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -106273,9 +107979,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "" -"Esto es un pseudoobjeto para ataques de monstruos. Si te aparece, es un bug." #: lang/json/gun_from_json.py msgid "integral 12 gauge shotgun" @@ -106487,15 +108192,8 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" -"Es un blobo vivo convertido en un arma autónoma. Hecha para ser puesta en un" -" armazón como una barrera. Ha desarrollado la habilidad de generar " -"constantemente protuberancias óseas que son controladas por hilos " -"extensibles. Estos \"dientes\" pueden ser usados para morder y herir " -"cualquier desafortunado que ande cerca. La membrana exterior también se ha " -"vuelto significativamente más gruesa para poder aguantar sus movimientos más" -" vigorosos, aunque parece ser suficientemente flexible como para romperse..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "gel shooter" @@ -106509,13 +108207,8 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" -"Es un blobo vivo convertido en un arma autónoma. Rastrea el suelo buscando " -"materiales de los que absorbe sus nutrientes. Tira el resto a una velocidad " -"importante hacia las amenazas cercanas. Puede dársele forma a la masa amorfa" -" y adaptado a tu tacto, pero el arma en sí misma está inerte si no es " -"controlada. Parece ser suficientemente flexible como para romperse..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "frost lancer" @@ -107205,19 +108898,6 @@ msgstr "" "increíblemente incómodo, y debe estar montado en plataforma de apoyo para " "poder ser disparado." -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "revolver Model 10" -msgstr[1] "revolver Model 10" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "" -"Es un revolver de seis disparos. Tiene un cilindro que se abre hacia afuera " -"para poder cargarlo más fácilmente." - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -107237,54 +108917,6 @@ msgstr "" "luego de un accidente, pero luego fue producido comercialmente por varias " "compañías." -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "Colt Lightning .45" -msgstr[1] "Colt Lightning .45" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -"Es una reproducción moderna del rifle Colt de acción de bombeo. " -"Originalmente hecha con calibre .44-40, las versiones modernas utilizan más " -"comúnmente el .45 Long Colt, complementando el Single Action Army con un " -"arma para los Cowboy Action Shooting." - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "Revólver Bond Arms" -msgstr[1] "Revólveres Bond Arms" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" -"El Revólver Bond Arms es de una serie de pistolas compactas de doble caño. " -"Comúnmente, con calibre .45 Long Colt, con la posibilidad de aceptar " -"cartuchos de escopeta .410." - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] "escopeta juvenil .410" -msgstr[1] "escopetas juveniles .410" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" -"Es una vieja escopeta de cañón de quiebre con calibre .410. Diseñada como " -"una alternativa de bajo retroceso al 12 gauge, es liviana y simple en su " -"construcción." - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -107299,49 +108931,6 @@ msgstr "" "Es una escopeta hecha en casa, calibre .410. Es simplemente un caño con una " "culata y un percutor para golpear la bala que contiene." -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "AF2011A1 .38 Super" -msgstr[1] "AF2011A1 .38 Supers" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "" -"Es una pistola semiautomática de doble cañón. Parece dos M1911 soldadas " -"juntas." - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38 Super" -msgstr[1] "M1991A1 .38 Supers" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "" -"Es una moderna M1911, con calibre para el cartucho .38 Super. Tiene buena " -"precisión." - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "Taurus Raging Judge Magnum" -msgstr[1] "Taurus Raging Judge Magnum" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" -"El Taurus Raging Judge Magnum es un revólver de 5 disparos para la .454. " -"Casull. Puede disparar cartuchos .410 y .45 Long Colt." - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -108661,7 +110250,7 @@ msgstr[1] "miras telescópicas" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" @@ -109069,6 +110658,18 @@ msgid "" "weapon other than pistols and pump-action guns, if you so want." msgstr "" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -109337,7 +110938,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -109361,9 +110962,9 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -109375,7 +110976,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -109574,20 +111175,6 @@ msgstr "" "algo similar, funciona bastante bien como arma de cuerpo a cuerpo por su " "alcance" -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "escopeta M6 ASW" -msgstr[1] "escopetas M6 ASW" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "" -"Es una escopeta integrada .410 del arma M6 Aircrew Survival. No se puede " -"quitar." - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "Destripás y fileteás el pescado" @@ -111235,10 +112822,6 @@ msgstr "Cortar tornillos o alambres" msgid "Heat up food (with it)" msgstr "Calentar comida (con esto)" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "Reparar madera/papel/hueso/quitina" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "Adjuntarlo como modificación de herramienta" @@ -112123,6 +113706,11 @@ msgstr "" "Esta ropa funciona bien incluso cuando está " "empapada. Se siente bien." +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -113296,7 +114884,8 @@ msgstr "Construir terreno" msgid "Disassemble items" msgstr "Desarmar objetos" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "Dormir" @@ -114106,7 +115695,8 @@ msgstr "" msgid "Wasp nest is here." msgstr "" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "Arañas" @@ -114165,6 +115755,33 @@ msgstr "" msgid "Small pond is here." msgstr "" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "" @@ -114235,7 +115852,7 @@ msgstr "" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "" #. ~ Computer name @@ -115014,6 +116631,16 @@ msgstr "¡NO Correr!" msgid "NO Diving!" msgstr "¡NO tirarse de cabeza!" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -115151,8 +116778,7 @@ msgid "Emergency Message" msgstr "Mensaje de Emergencia" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "Desactivar Energía Externa" @@ -115797,7 +117423,7 @@ msgstr "" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -116810,7 +118436,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116833,7 +118459,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -116844,7 +118470,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116853,7 +118479,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -116864,7 +118490,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -116874,7 +118500,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116885,7 +118511,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -117059,6 +118685,10 @@ msgstr "deshilachado/a" msgid "Diamond" msgstr "Diamante" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "Huevo" @@ -117276,8 +118906,8 @@ msgid "Mushroom" msgstr "Hongo" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "Agua" @@ -118729,7 +120359,7 @@ msgstr "" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" @@ -118873,11 +120503,11 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "" #: lang/json/mission_def_from_json.py @@ -118918,6 +120548,10 @@ msgstr "" msgid "What good does this do me?" msgstr "" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "" @@ -118958,7 +120592,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "" #: lang/json/mission_def_from_json.py @@ -118996,12 +120630,12 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119070,7 +120704,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119088,7 +120722,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" @@ -119109,7 +120743,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" #: lang/json/mission_def_from_json.py @@ -119117,7 +120751,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119862,7 +121496,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" @@ -120277,7 +121911,7 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -120603,16 +122237,10 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" -"Así que parece que hubo meses, tal vez años, de experimentos, y la " -"información debe ser enorme. Las bases de datos lo suficientemente grandes " -"para almacenarla se sobrecalentará. Pero encontré comunicaciones de un " -"laboratorio que tenía una especie de portal de congelamiento abierto durante" -" el cataclismo, haciendo que todo llegue a temperaturas bajo cero. Estoy " -"casi seguro que el laboratorio de ahí adentro sigue funcionando." #: lang/json/mission_def_from_json.py msgid "" @@ -122218,7 +123846,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -122244,10 +123872,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "Gracias por intentarlo... supongo." - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -122272,7 +123896,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -122312,8 +123936,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -122334,7 +123958,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -122361,7 +123985,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -122376,7 +124000,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -122448,6 +124072,54 @@ msgstr "" msgid "The %1$s tries to slam into , but fails to." msgstr "" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -130672,8 +132344,8 @@ msgstr "Historia de Superviviente" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" -msgstr "Este PNJ podría contarte cómo sobrevivió al cataclismo" +msgid "This NPC could tell you about how they survived the Cataclysm" +msgstr "" #: lang/json/mutation_from_json.py msgid "Mark of the Seer" @@ -131214,7 +132886,7 @@ msgstr "" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -131278,18 +132950,10 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "" @@ -131921,7 +133585,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -131954,8 +133618,8 @@ msgid "I'm just trying to stay alive." msgstr "Solo intento mantenerme vivo." #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." -msgstr "Solo intento mantenerme vivo... y no es tan fácil como parece." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Lizard Mutant" @@ -131963,11 +133627,9 @@ msgstr "Lagarto Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de lagarto... en este mundo ya no hay lugar para los" -" humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Medical Mutant" @@ -131975,11 +133637,9 @@ msgstr "Mutante Medicinal" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno medicinal... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Bird Mutant" @@ -131987,11 +133647,9 @@ msgstr "Pájaro Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de pájaro... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Fish Mutant" @@ -131999,11 +133657,9 @@ msgstr "Pez Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de pez... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Beast Mutant" @@ -132011,11 +133667,9 @@ msgstr "Bestia Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de bestia... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Ursine Mutant" @@ -132023,11 +133677,9 @@ msgstr "Osuno Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de osuno... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Feline Mutant" @@ -132035,11 +133687,9 @@ msgstr "Felino Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de felino... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Lupine Mutant" @@ -132047,11 +133697,9 @@ msgstr "Lobuno Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de lobuno... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Cattle Mutant" @@ -132059,11 +133707,9 @@ msgstr "Ganado Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de ganado... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Insect Mutant" @@ -132071,11 +133717,9 @@ msgstr "Insecto Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de insecto... en este mundo ya no hay lugar para los" -" humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Plant Mutant" @@ -132083,11 +133727,9 @@ msgstr "Planta Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de planta... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Slime Mutant" @@ -132095,11 +133737,9 @@ msgstr "Slime Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de slime... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Troglobite Mutant" @@ -132107,11 +133747,9 @@ msgstr "Trogloblo Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de trogloblo... en este mundo ya no hay lugar para " -"los humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Cephalopod Mutant" @@ -132119,11 +133757,9 @@ msgstr "Cefalópodo Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de cefalópodo... en este mundo ya no hay lugar para " -"los humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Spider Mutant" @@ -132131,11 +133767,9 @@ msgstr "Araña Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de araña... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Rat Mutant" @@ -132143,11 +133777,9 @@ msgstr "Rata Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de rata... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Mouse Mutant" @@ -132155,11 +133787,9 @@ msgstr "Ratón Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de ratón... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Alpha Mutant" @@ -132167,11 +133797,9 @@ msgstr "Alfa Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de alfa... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Elfa Mutant" @@ -132179,11 +133807,9 @@ msgstr "Elfa Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de elfa... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Chimera Mutant" @@ -132191,11 +133817,9 @@ msgstr "Quimera Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de quimera... en este mundo ya no hay lugar para los" -" humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Raptor Mutant" @@ -132203,11 +133827,9 @@ msgstr "Raptor Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de raptor... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_from_json.py msgid "Brigitte LaCroix" @@ -135464,13 +137086,10 @@ msgstr "Superviviente en Refugio" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"Cuando comenzó el cataclismo, te resguardaste en el refugio antibombas. " -"Ahora es invierno, y tu única esperanza es que el quilombo de habilidades " -"que aprendiste de todos esos libros te ayuden a sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135481,13 +137100,10 @@ msgstr "Superviviente en Refugio" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"Cuando comenzó el cataclismo, te resguardaste en el refugio antibombas. " -"Ahora es invierno, y tu única esperanza es que el quilombo de habilidades " -"que aprendiste de todos esos libros te ayuden a sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135498,13 +137114,10 @@ msgstr "Miliciano Refugiado" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Cuando comenzó el cataclismo, te resguardaste en el refugio antibombas. " -"Ahora es invierno y esperás que tus armas y las habilidades que aprendiste " -"te ayuden a sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135515,13 +137128,10 @@ msgstr "Miliciana Refugiada" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Cuando comenzó el cataclismo, te resguardaste en el refugio antibombas. " -"Ahora es invierno y esperás que tus armas y las habilidades que aprendiste " -"te ayuden a sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135602,13 +137212,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"¿¡Qué demonios!? No sabéis nada de este extraño sitio ni de qué perverso " -"encantamiento lo trajo. Con este equipamiento debes encontrar una nueva vida" -" en el cataclismo más horroroso que el hombre ha conocido desde el diluvio " -"que Noé escapó en su gran nave." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135621,13 +137227,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"¿¡Qué demonios!? No sabéis nada de este extraño sitio ni de qué perverso " -"encantamiento lo trajo. Con este equipamiento debes encontrar una nueva vida" -" en el cataclismo más horroroso que el hombre ha conocido desde el diluvio " -"que Noé escapó en su gran nave." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135743,12 +137345,9 @@ msgstr "Apicultor" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Antes eras apicultor profesional. Tuviste que abandonar a tus preciosas " -"abejas cuando llegó el cataclismo pero por lo menos te pudiste llevar " -"algunas herramientas y miel." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135760,12 +137359,9 @@ msgstr "Apicultora" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Antes eras apicultora profesional. Tuviste que abandonar a tus preciosas " -"abejas cuando llegó el cataclismo pero por lo menos te pudiste llevar " -"algunas herramientas y miel." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135776,13 +137372,10 @@ msgstr "Jugador de Básquet" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"Estabas por jugar tu partido más importante... pero sucedió el cataclismo. " -"Gracias a tus rápidos pies fuiste uno de los afortunados que se escapó de " -"las criaturas." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135793,13 +137386,10 @@ msgstr "Jugadora de Básquet" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"Estabas por jugar tu partido más importante... pero sucedió el cataclismo. " -"Gracias a tus rápidos pies fuiste una de los afortunados que se escapó de " -"las criaturas." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135954,12 +137544,9 @@ msgstr "Mayordomo" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Trabajabas en un hogar de gente adinerada pero después del cataclismo, la " -"familia se fue de vacaciones a un lugar desconocido, dejándote para que te " -"las arregles." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135970,12 +137557,9 @@ msgstr "Sirvienta" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Trabajabas en un hogar de gente adinerada pero después del cataclismo, la " -"familia se fue de vacaciones a un lugar desconocido, dejándote para que te " -"las arregles." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137008,13 +138592,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Trabajabas para algunas pequeñas empresas haciendo trabajos eléctricos " -"menores, y justo estabas trabajando en uno de esos refugios de evacuados " -"cuando sucedió el cataclismo. Lamentablemente, no pudiste terminar de " -"conectar nada excepto la computadora... que ahora no te sirve de mucho." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137027,13 +138607,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Trabajabas para algunas pequeñas empresas haciendo trabajos eléctricos " -"menores, y justo estabas trabajando en uno de esos refugios de evacuados " -"cuando sucedió el cataclismo. Lamentablemente, no pudiste terminar de " -"conectar nada excepto la computadora... que ahora no te sirve de mucho." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137114,7 +138690,7 @@ msgstr "Víctima en la Ducha" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -137128,7 +138704,7 @@ msgstr "Víctima en la Ducha" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -137172,11 +138748,9 @@ msgstr "Bailarín de Salón" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"Antes del cataclismo eras un bailarín de salón y ahora vas a usar tus " -"habilidades para salvar tu vida." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137187,11 +138761,9 @@ msgstr "Bailarina de Salón" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"Antes del cataclismo eras una bailarina de salón y ahora vas a usar tus " -"habilidades para salvar tu vida." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138108,11 +139680,9 @@ msgstr "Novio" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"El cataclismo sucedió justo el gran día y te escapaste con tu ropa para el " -"casorio. ¿Los pies fríos? ¡Te preocupa más poder mantener tus pies!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138123,11 +139693,9 @@ msgstr "Novia" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"El cataclismo sucedió justo el gran día y te escapaste con tu vestido de " -"novia. ¿Los pies fríos? ¡Te preocupa más poder mantener tus pies!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138207,10 +139775,8 @@ msgstr "Chico Rudo" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Tu banda de ska se separó después de que el batero se hizo zombi. Ahora " -"estás solo en el cataclismo con algunos cigarrillos y tu reproductor de mp3." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138222,10 +139788,8 @@ msgstr "Chica Ruda" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Tu banda de ska se separó después de que el batero se hizo zombi. Ahora " -"estás sola en el cataclismo con algunos cigarrillos y tu reproductor de mp3." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138266,11 +139830,9 @@ msgstr "Convicto" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"El cataclismo te dio la oportunidad de escapar, pero la libertad viene con " -"un precio demasiado elevado." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138281,11 +139843,9 @@ msgstr "Convicta" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"El cataclismo te dio la oportunidad de escapar, pero la libertad viene con " -"un precio demasiado elevado." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138718,11 +140278,9 @@ msgstr "Rabino" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Estabas en el templo celebrando con tus feligreses, cuando sucedió el " -"cataclismo. ¡Ahora sí que te vendría bien un mesías!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138733,11 +140291,9 @@ msgstr "Rabina" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Estabas en el templo celebrando con tus feligreses, cuando sucedió el " -"cataclismo. ¡Ahora sí que te vendría bien un mesías!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138943,14 +140499,10 @@ msgstr "Delivery de Pizza" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Estabas entregando la última pizza de la noche al laboratorio de " -"criogénesis, cuando sucedió el cataclismo. Escapaste al refugio más cercano," -" y solo te queda tu buen juicio y sobras de pizza. ¡Y ni siquiera te dieron " -"propina!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138962,14 +140514,10 @@ msgstr "Delivery de Pizza" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Estabas entregando la última pizza de la noche al laboratorio de " -"criogénesis, cuando sucedió el cataclismo. Escapaste al refugio más cercano," -" y solo te queda tu buen juicio y sobras de pizza. ¡Y ni siquiera te dieron " -"propina!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139086,13 +140634,10 @@ msgstr "Granjero" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Te ganabas la vida cultivando hasta que ocurrió el cataclismo. Ahora, con tu" -" querida azada y algunas semillas, es tiempo de reconstruir la Tierra, de a " -"una planta por vez." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139103,13 +140648,10 @@ msgstr "Granjera" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Te ganabas la vida cultivando hasta que ocurrió el cataclismo. Ahora, con tu" -" querida azada y algunas semillas, es tiempo de reconstruir la Tierra, de a " -"una planta por vez." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139156,13 +140698,10 @@ msgstr "Cartonero Curtido" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Fuiste uno de los pocos afortunados en escapar del cataclismo. Hiciste tu " -"vida a partir de las ruinas de los demás. Ya sea por la fuerza, la astucia o" -" la suerte, has conseguido el mejor equipamiento que podías encontrar." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139173,13 +140712,10 @@ msgstr "Cartonera Curtida" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Fuiste una de los pocos afortunados en escapar del cataclismo. Hiciste tu " -"vida a partir de las ruinas de los demás. Ya sea por la fuerza, la astucia o" -" la suerte, has conseguido el mejor equipamiento que podías encontrar." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139504,16 +141040,11 @@ msgstr "Survivalista Junior" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Tus padres eran unos preppers locos que pensaban que alguna clase de " -"\"cataclismo\" llegaría, e insistían en prepararte para eso. Al final tenían" -" razón. No pudiste agradecerles. Lo único que podés hacer por ellos es lo " -"que siempre quisieron que hicieras en estos días oscuros que se vienen: " -"sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139524,16 +141055,11 @@ msgstr "Survivalista Junior" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Tus padres eran unos preppers locos que pensaban que alguna clase de " -"\"cataclismo\" llegaría, e insistían en prepararte para eso. Al final tenían" -" razón. No pudiste agradecerles. Lo único que podés hacer por ellos es lo " -"que siempre quisieron que hicieras en estos días oscuros que se vienen: " -"sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -140523,7 +142049,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -140540,7 +142066,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -140791,10 +142317,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -140807,10 +142333,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -140822,9 +142348,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -140838,9 +142364,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -140854,7 +142380,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -140868,7 +142394,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -140883,9 +142409,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -140900,9 +142426,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -140916,13 +142442,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -140934,13 +142460,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -140953,8 +142479,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -140969,8 +142495,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -140985,9 +142511,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -141000,9 +142526,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -141014,13 +142540,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -141032,13 +142558,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -141050,10 +142576,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -141065,10 +142591,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -141080,12 +142606,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -141097,12 +142623,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -141114,17 +142640,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -141136,17 +142662,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -141160,9 +142686,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -141176,9 +142702,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -141192,10 +142718,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -141211,10 +142737,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -141229,9 +142755,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -141244,9 +142770,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -141258,11 +142784,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -141274,11 +142801,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -141430,7 +142958,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -141443,7 +142971,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -141480,7 +143008,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -141493,7 +143021,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -141506,7 +143034,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -141519,7 +143047,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -141589,7 +143117,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -141600,7 +143128,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -141664,7 +143192,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -141677,7 +143205,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -141769,7 +143297,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -141783,7 +143311,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -141799,7 +143327,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -141814,7 +143342,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -142902,13 +144430,10 @@ msgstr "Jugador de Béisbol" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"Eras bateador en un equipo de las ligas menores antes del cataclismo. Te " -"escapaste con tu ropa pero ¿cuánto podrás sobrevivir antes de que se " -"terminen las entradas?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -142919,13 +144444,10 @@ msgstr "Jugadora de Béisbol" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"Eras bateadora en un equipo de las ligas menores antes del cataclismo. Te " -"escapaste con tu ropa pero ¿cuánto podrás sobrevivir antes de que se " -"terminen las entradas?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -143010,11 +144532,9 @@ msgstr "Despertado" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Te despertó un ruido en mitad de la noche. Armado solamente con una " -"linterna, fuiste a investigar, y ahora te enfrentás al cataclismo." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143025,11 +144545,9 @@ msgstr "Despertada" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Te despertó un ruido en mitad de la noche. Armada solamente con una " -"linterna, fuiste a investigar, y ahora te enfrentás al cataclismo." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -143041,12 +144559,9 @@ msgstr "Ciclista Biónico" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Tu entrenamiento y tus mejoras para la competición de ciclismo de las Ciber-" -"Olimpiadas te dieron una ventaja para escapar al comienzo del cataclismo. " -"¿Vas a poder seguir corriendo para siempre?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143058,12 +144573,9 @@ msgstr "Ciclista Biónica" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Tu entrenamiento y tus mejoras para la competición de ciclismo de las Ciber-" -"Olimpiadas te dieron una ventaja para escapar al comienzo del cataclismo. " -"¿Vas a poder seguir corriendo para siempre?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -143074,13 +144586,10 @@ msgstr "Soldador" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"Trabajabas como soldador en una compañía en un paraíso fiscal antes del " -"cataclismo. Estabas volviendo a tu casa cuando llegó. Por lo menos tenés las" -" herramientas encima." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143091,13 +144600,10 @@ msgstr "Soldadora" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"Trabajabas como soldadora en una compañía en un paraíso fiscal antes del " -"cataclismo. Estabas volviendo a tu casa cuando llegó. Por lo menos tenés las" -" herramientas encima." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -143108,14 +144614,10 @@ msgstr "Survivalista Primitivo" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Sabías que llegaría el día, el día que se iba todo a la mierda. Te " -"preparaste con tus habilidades, pero no con equipamiento. Todos esos días en" -" el bosque ahora servirán. Si tus ancestros sobreviveron sin tecnología, por" -" qué vos no?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -143126,14 +144628,10 @@ msgstr "Sobreviviente Primitiva" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Sabías que llegaría el día, el día que se iba todo a la mierda. Te " -"preparaste con tus habilidades, pero no con equipamiento. Todos esos días en" -" el bosque ahora servirán. Si tus ancestros sobreviveron sin tecnología, por" -" qué vos no?" #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py @@ -147666,12 +149164,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Cuando sucedió el apocalipsis, fuiste empujado a un refugio cercano. Acá " -"sobreviviste, sin salir, por temor a que las cosas desconocidas del mundo " -"exterior te lastimen. Los suministros se están acabando, y por primera vez " -"desde el cataclismo, estarás forzado a enfrentar el mundo exterior." #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -147680,12 +149174,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Cuando sucedió el apocalipsis, fuiste empujada a un refugio cercano. Acá " -"sobreviviste, sin salir, por temor a que las cosas desconocidas del mundo " -"exterior te lastimen. Los suministros se están acabando, y por primera vez " -"desde el cataclismo, estarás forzada a enfrentar el mundo exterior." #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -147751,7 +149241,7 @@ msgstr "Cárcel" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -147760,7 +149250,7 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -147864,24 +149354,18 @@ msgstr "Experimento" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Desde tu nacimiento, tu único propósito en la vida fue el avance de la " -"ciencia genética, voluntariamente o no. Una vez que sucedió el cataclismo, " -"saliste del laboratorio, y caminaste sin rumbo, hasta terminar en un bosque." #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Desde tu nacimiento, tu único propósito en la vida fue el avance de la " -"ciencia genética, voluntariamente o no. Una vez que sucedió el cataclismo, " -"saliste del laboratorio, y caminaste sin rumbo, hasta terminar en un bosque." #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -148126,8 +149610,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Description for scenario 'Lost Faith' for a female character. @@ -148135,8 +149619,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Starting location for scenario 'Lost Faith'. @@ -148165,7 +149649,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Description for scenario 'The Wizard's Apprentice' for a female @@ -148177,7 +149661,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -148203,8 +149687,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -148213,8 +149697,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -148318,9 +149802,9 @@ msgstr "Desafío-Campamento FEMA de la Muerte" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female @@ -148329,9 +149813,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -149435,6 +150919,11 @@ msgstr "" " potencia, ¡probablemente no le dejes nada de carne! Usá una pistola de " "balines o tal vez un rifle calibre .22." +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -149461,10 +150950,26 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." +"impossible unless you have a big tactical advantage." msgstr "" -"Si ves una multitud de zombis acercándose, ¡CORRÉ! Querer pelearlos a todos " -"es un suicidio, salvo que tengas una gran ventaja táctica." + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "" +"Si te está persiguiendo una horda de zombis, intentá esconderte en los " +"túneles del subte y trasladarte una cuadra o dos, y después volvés a salir." #: lang/json/snippet_from_json.py msgid "" @@ -149809,7 +151314,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" @@ -150046,6 +151551,12 @@ msgstr "" "o las granadas. Si se te caen accidentalmente cuando lo querías tirar, te " "puede llegar a matar." +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -150101,9 +151612,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" #: lang/json/snippet_from_json.py @@ -150122,6 +151632,12 @@ msgstr "" "La próxima vez que vayas a un almacén, agarrá todos los alimentos enlatados." " ¡Esos no se echan a perder nunca!" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -150151,14 +151667,6 @@ msgid "" "defense… it's perfect!" msgstr "" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "" -"Si te está persiguiendo una horda de zombis, intentá esconderte en los " -"túneles del subte y trasladarte una cuadra o dos, y después volvés a salir." - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -150170,9 +151678,9 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" #: lang/json/snippet_from_json.py @@ -150236,33 +151744,41 @@ msgstr "¡Un destornillador por día mantendrá el escorbuto en la lejanía!" #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "" -"¿Más hambriento que lo normal? Los aceites naturales pueden ayudar. No son " -"sabrosos pero a quién le importa cuando tu segunda opción es comerte una " -"pierna." #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." msgstr "" -"El terreno puede definir una batalla, asegurate de usarlo contra tus " -"enemigos, y no dejes que sea usado en tu contra." #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" -"Los que anduvieron cerca de la mina dijeron algo sobre un olor nauseabundo. " -"Si pensás ir por ahí, considerá llevarte una máscara de gas." #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "El conocimiento es poder. De en serio, agarrá un libro." +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -150342,13 +151858,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" -"Una soldadora puede ser la mejor amiga de un aspirante a mecánico. También " -"podés cauterizar una herida con ella, pero han muerto tantos como han vivido" -" haciendo eso, así que tomalo como último recurso." #: lang/json/snippet_from_json.py msgid "" @@ -150394,13 +151907,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" -"Yo estaba en contra de las drogas hasta que casi me mata un zombi y tuve que" -" salir cagando de esa horda, sin tener nada más que un poco de polvo blanco." -" Esa vez me salvó." #: lang/json/snippet_from_json.py msgid "" @@ -150430,6 +151940,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -150539,6 +152055,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -150560,6 +152100,13 @@ msgid "" "either, if you catch my drift." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -150612,6 +152159,12 @@ msgid "" " a cold ground." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -150657,7 +152210,7 @@ msgid "Hey there's some pink tablets, take some!" msgstr "" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" msgstr "" #: lang/json/snippet_from_json.py @@ -153496,16 +155049,16 @@ msgid "" msgstr "" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." -msgstr "Contame cómo hiciste para sobrevivir al cataclismo." +msgid "Tell me about how you survived the Cataclysm." +msgstr "" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" -msgstr "¿Cómo sobreviviste al cataclismo?" +msgid "How did you survive the Cataclysm?" +msgstr "" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" -msgstr "¿Cómo fue el cataclismo para vos?" +msgid "What was the Cataclysm like for you?" +msgstr "" #: lang/json/snippet_from_json.py msgid "How did you make it through the initial chaos?" @@ -153766,8 +155319,8 @@ msgid "eldritch horror" msgstr "" #: lang/json/snippet_from_json.py -msgid "the cataclysm" -msgstr "el cataclismo" +msgid "the Cataclysm" +msgstr "" #: lang/json/snippet_from_json.py msgid "the apocalypse" @@ -154132,6 +155685,306 @@ msgid "" "Refer to file EXO-M-312 for full report." msgstr "" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -155372,7 +157225,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "" #: lang/json/snippet_from_json.py @@ -160086,10 +161939,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" -"\"¡Ajjjj, Ver el Espiral en tal Estado Deformado! ¡Manipulado por su " -"movimiento de Vórtice! ¡Su Perpetua Gracia! Si belleza Manchada...\"" #: lang/json/snippet_from_json.py msgid "\"My friend died, but at least I made her into a blob turret.\"" @@ -160108,16 +161959,13 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" -"\"Día 40. Los controles se rompieron-- el reactor mágico del auto avanza " -"inexorablemente. Los aplanadores gigantes del frente van demoliendo el " -"bosque. Maine, allá voy.\"" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" -msgstr "\"mi auto es un diamante en bruto... literalmente\"" +msgid "\"my car is a diamond in the rough… literally\"" +msgstr "" #: lang/json/snippet_from_json.py msgid "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" @@ -160143,11 +161991,9 @@ msgstr "\"algún día, yo también seré parte del auto\"" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" -"\"Puse un poco de dinamita y media mina en una lata vieja de gaseosa... " -"¡BOOM! Te estás yendo.\"" #: lang/json/speech_from_json.py msgid "\"Hello?\"" @@ -161780,6 +163626,38 @@ msgstr "" msgid "WOOF!" msgstr "" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "\"No me hagas hacerte caminar por la tabla.\"" @@ -161890,19 +163768,15 @@ msgstr "Te vamos a extrañar cuando terminemos con las pruebas." #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" -"Increíble. ¡Usted, [nombre del sujeto], tiene que estar orgulloso de [ciudad" -" natal del sujeto]!" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" -"Esa cosa debe ser algún tipo de recipiente para deshechos cloacales. Dele, " -"vaya y métase de cabeza ahí adentro." #: lang/json/speech_from_json.py msgid "" @@ -161914,11 +163788,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" -"Nadie le va a decir nada por darse por vencido. Es más, rendirse en este " -"momento es una respuesta perfectamente razonable." #: lang/json/speech_from_json.py msgid "" @@ -161929,8 +163801,8 @@ msgstr "" "extremo pesimismo." #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" -msgstr "Hola, otra vez. Para reiterar nuestra advertencia anterior: [confuso]" +msgid "Hello again. To reiterate our previous warning: [garbled]" +msgstr "" #: lang/json/speech_from_json.py msgid "Weeeeeeeeeeeeeeeeeeeeee[bzzt]" @@ -162014,11 +163886,9 @@ msgstr "Alguien va a terminar muy herido." #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "" -"Oh oh. Alguien cortó la torta. Les dije que lo esperaran a usted, pero igual" -" lo hicieron." #: lang/json/speech_from_json.py msgid "This is your fault. It didn't have to be like this." @@ -162051,9 +163921,8 @@ msgstr "¿Qué fue eso? ¿Usted dijo algo?" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "" -"Me gustaría señalar que a usted se le otorgó la oportunidad de tener éxito." #: lang/json/speech_from_json.py msgid "What's your point, anyway? Survival?" @@ -162114,11 +163983,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" -"Estoy comprobando algunos planos, y creo... Sí, aquí. Definitivamente, está " -"yendo en la dirección equivocada." #: lang/json/speech_from_json.py msgid "Are you even listening to me?" @@ -162153,8 +164020,8 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "\"Lo que tenemos aquí es una falla en la comunicación.\"" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" -msgstr "\"E.T. teléfono, casa.\"" +msgid "\"E.T. phone home.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"I'm as mad as hell, and I'm not going to take this anymore!\"" @@ -162221,8 +164088,8 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "\"¿Caminos? A donde vamos no necesitamos caminos.\"" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" -msgstr "\"Pónganse los cinturones. Va a ser una noche turbulenta.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "" @@ -162591,8 +164458,8 @@ msgid "\"I'm scared!\"" msgstr "\"¡Tengo miedo!\"" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" -msgstr "\"Algo anda mal...\"" +msgid "\"Something's wrong…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"What are you doing?\"" @@ -162619,16 +164486,16 @@ msgid "\"Excuse me?\"" msgstr "\"¿Perdón?\"" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" -msgstr "\"Soy distinto...\"" +msgid "\"I'm different…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" -msgstr "\"Gracias, igual...\"" +msgid "\"Thanks anyway…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" -msgstr "\"Llevame con vos...\"" +msgid "\"Take me with you…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"You have excellent aim!\"" @@ -162707,8 +164574,8 @@ msgid "\"This time is OUR time.\"" msgstr "\"Este es NUESTRO momento.\"" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" -msgstr "\"La segunda es la vencida...\"" +msgid "\"Second time's a charm…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Howdy, stranger!\"" @@ -162779,8 +164646,8 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "\"[suspiro] No le digas a nadie acerca de esto.\"" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" -msgstr "\"Bueno, lo intenté. ¡Que tengas suerte!\"" +msgid "\"Well, I tried. Best of luck!\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Hey, safe travels, there.\"" @@ -163075,7 +164942,7 @@ msgid "Cabin" msgstr "Cabaña" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "Hospital" @@ -163227,7 +165094,7 @@ msgstr "Campamento Fema" msgid "Mansion Entrance" msgstr "Entrada de Mansión" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "Mansión" @@ -163301,7 +165168,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -163400,42 +165267,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164146,7 +166013,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -164462,13 +166329,13 @@ msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "OK, así dejo de cagarme de frío un rato. ¿Cómo va?" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding " -"up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding " +"up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -164558,14 +166425,14 @@ msgstr "Bueno, sin hacer movimientos repentinos..." msgid "Keep your distance!" msgstr "¡Quedate lejos!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "Este es mi territorio, ." - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "Este es mi territorio, ." + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "Calmate. No te voy a lastimar." @@ -164619,29 +166486,29 @@ msgid "I don't care." msgstr "No me importa." #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "Tengo un trabajo para vos. ¿Querés que te cuente?" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "Tengo otro trabajo para vos. ¿Querés que te cuente?" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "" +msgid "I have another job for you. Want to hear about it?" +msgstr "Tengo otro trabajo para vos. ¿Querés que te cuente?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "No tengo ningún otro trabajo para vos." +msgid "I just have one job for you. Want to hear about it?" +msgstr "Tengo un trabajo para vos. ¿Querés que te cuente?" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "No tengo ningún trabajo para vos." +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "No tengo ningún otro trabajo para vos." + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -164651,6 +166518,10 @@ msgstr "Ah, bueno." msgid "Never mind, I'm not interested." msgstr "No importa, no estoy interesado." +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "¿Cuál trabajo?" @@ -164659,10 +166530,6 @@ msgstr "¿Cuál trabajo?" msgid "What about it?" msgstr "¿Qué te parece?" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "¡Yo lo hago!" @@ -164877,10 +166744,6 @@ msgstr "Hmm, bueno." msgid "Thanks!" msgstr "¡Gracias!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "" @@ -164905,6 +166768,10 @@ msgstr "Tengo mucha sed, dame algo para tomar." msgid "I must focus on the road!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Ah, ok." @@ -165009,11 +166876,6 @@ msgstr "No, vamos a estar bien acá." msgid "On second thought, never mind." msgstr "Pensandolo bien, olvidate." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "" -"çNo puedo entrenarte apropiadamente mientras estás controlando un vehículo!" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "Tengo razones para negarte el entrenamiento." @@ -165026,6 +166888,11 @@ msgstr "Dale tiempo, te voy a mostrar algo nuevo después..." msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "" +"çNo puedo entrenarte apropiadamente mientras estás controlando un vehículo!" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "¡No hay ninguna chance, me van a dejar atrás!" @@ -165697,8 +167564,8 @@ msgid "How are you alive?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" -msgstr "¿Qué hacías antes del cataclismo?" +msgid "What did you do before the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -165918,7 +167785,7 @@ msgid "This is a season spring test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." +msgid "This is a days since Cataclysm 30 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165926,7 +167793,7 @@ msgid "This is a season summer test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." +msgid "This is a days since Cataclysm 120 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165934,7 +167801,7 @@ msgid "This is a season autumn test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." +msgid "This is a days since Cataclysm 210 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165942,7 +167809,7 @@ msgid "This is a season winter test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." +msgid "This is a days since Cataclysm 300 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166459,7 +168326,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" @@ -166820,8 +168687,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" -msgstr "¿Y qué hiciste cuando te enteraste del cataclismo?" +msgid "What did you do when you found out about the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -168307,10 +170174,8 @@ msgstr "No, eso es medio de enfermo." #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" -"Sí, entiendo. A veces siento que mi existencia empezó poco después del " -"cataclismo." #: lang/json/talk_topic_from_json.py msgid "" @@ -169826,7 +171691,7 @@ msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -169865,7 +171730,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "" @@ -169897,8 +171762,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -169925,7 +171790,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169946,14 +171811,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169966,7 +171831,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -169996,7 +171861,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -170006,7 +171871,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -170031,7 +171896,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170084,7 +171949,7 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -170097,7 +171962,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" @@ -170138,8 +172003,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170168,6 +172033,12 @@ msgstr "" msgid "Where is your brother's place?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "" @@ -170232,6 +172103,10 @@ msgid "" " a forage set up." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "" @@ -170553,14 +172428,6 @@ msgstr "" msgid "Tell me about your dad." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." -msgstr "" -"Señora, no sé cómo demonios llegó hasta acá abajo pero si le queda un poco " -"de juicio se iría mientras pueda." - #: lang/json/talk_topic_from_json.py msgid "" "Sir, I don't know how the hell you got down here but if you have any sense " @@ -170569,6 +172436,14 @@ msgstr "" "Señor, no sé cómo demonios llegó hasta acá abajo pero si le queda un poco de" " juicio se iría mientras pueda." +#: lang/json/talk_topic_from_json.py +msgid "" +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." +msgstr "" +"Señora, no sé cómo demonios llegó hasta acá abajo pero si le queda un poco " +"de juicio se iría mientras pueda." + #: lang/json/talk_topic_from_json.py msgid "Marshal, I hope you're here to assist us." msgstr "Alguacil, espero que esté aquí para ayudarnos." @@ -171021,12 +172896,12 @@ msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "¿Te conté sobre el cartón, amigo? ¿Tenés un poco?" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -171818,12 +173693,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" -"Desagradable, ¿no? Parece vello púbico. Me empezó a crecer por todos lados " -"un poco después del cataclismo. Ni idea qué lo causó. No los puedo culpar " -"por odiarlo, yo mismo lo odio." #: lang/json/talk_topic_from_json.py msgid "" @@ -171879,7 +173751,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" @@ -172431,7 +174303,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -174591,14 +176463,14 @@ msgstr "Mantenete civilizado o te voy a causar dolor." msgid "Just on watch, move along." msgstr "Solo estoy de guardia, circulando." -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "Señora, no debería estar viajando por ahí afuera." - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "¿Está complicado ahí afuera, no?" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "Señora, no debería estar viajando por ahí afuera." + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "" @@ -175888,12 +177760,9 @@ msgstr "Me gustaría contratar tus servicios." #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" -"Me mandaron acá para ayudar a establecer la granja. Muchos de nosotros no " -"teníamos verdaderas habilidades antes del cataclismo, así que las cosas son " -"un poco a prueba y error." #: lang/json/talk_topic_from_json.py msgid "" @@ -176313,7 +178182,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -176332,7 +178201,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" @@ -176346,8 +178215,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" #: lang/json/talk_topic_from_json.py @@ -176370,8 +178239,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" #: lang/json/talk_topic_from_json.py @@ -176384,9 +178253,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176402,9 +178271,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176433,18 +178302,15 @@ msgstr "¿Necesitás ayuda con algo?" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" -"No, no... Bueno, por ahí un poco. Estaba tan roto acá abajo como estaba " -"arriba cuando lo encontré, no fue difícil arreglarlo. Sos bienvenido a " -"quedarte en una habitación, pero no la acapares. No sos el único cartonero." #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "Interesante..." +msgid "Interesting…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -176455,8 +178321,8 @@ msgstr "" " en mi montón de tesoros. Me gustaría venderte algo si tenés la plata." #: lang/json/talk_topic_from_json.py -msgid "I see..." -msgstr "Ya veo..." +msgid "I see…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -176468,8 +178334,8 @@ msgstr "" "del banco y todo." #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "Hmm..." +msgid "Hmm…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -176480,16 +178346,16 @@ msgstr "" "me viene bien la plata." #: lang/json/talk_topic_from_json.py -msgid "Alright..." -msgstr "Bueno..." +msgid "Alright…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Not at the moment, check back later perhaps." msgstr "Por ahora no, preguntame en otro momento." #: lang/json/talk_topic_from_json.py -msgid "Sure..." -msgstr "Seguro..." +msgid "Sure…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Are you part of the rescue team?" @@ -176508,8 +178374,8 @@ msgid "So are you busting us out of here or what?" msgstr "¿Así que nos vas a sacar de acá o no?" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." -msgstr "Agarrate fuerte, . Voy a tener que limpiar el camino." +msgid "Hold tight, . I've got to clear a path." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Pack your bags, . We're going on a trip." @@ -180344,6 +182210,15 @@ msgstr "" msgid "A closed metal gate." msgstr "" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "" @@ -182282,14 +184157,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "tanque con nafta" +msgid "fuel tank" +msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "surtidor de nafta roto" @@ -184182,6 +186066,27 @@ msgstr "soporte chico de metal" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "ventana" @@ -184615,8 +186520,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -184630,7 +186535,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -184983,7 +186888,7 @@ msgstr "" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "nada" @@ -185760,7 +187665,7 @@ msgstr "Carrito de Helados" msgid "Luggage Cart" msgstr "Carrita de Valijas" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "Chango" @@ -189186,12 +191091,9 @@ msgstr "torreta láser LACP" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" -"Es un conjunto de eslabones modulares que arman una oruga hecha de blobo. " -"Puede ser utilizada en lugar de ruedas, y brindar buena tracción y buen " -"desempeño todo terreno." #. ~ Description for gel shooter #. ~ Description for snapping ooze @@ -189987,6 +191889,10 @@ msgstr "Vitamina C" msgid "Toxins" msgstr "" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "Apretá " @@ -190507,6 +192413,12 @@ msgstr "No pudiste recargar el/a %s." msgid "You reload the %s." msgstr "Recargás el/a %s." +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -191430,6 +193342,10 @@ msgstr "" msgid "The required items are not available to complete this task." msgstr "" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -191847,6 +193763,10 @@ msgstr "" msgid "spoilage" msgstr "desecho" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -193876,6 +195796,44 @@ msgstr "El/a %s no puede ser disparado/a en su estado actual." msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "No estás empuñando nada." + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "" + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "Te comiste la maleza." + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "Estás demasiado lleno como para pastar." + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "Te comiste el pasto." + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "" + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "" + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "" + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "Dejás el/a %s vacío/a." + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "No podés tirar con eficacia mientras estás dentro de tu caparazón." @@ -193913,6 +195871,14 @@ msgstr "Te concentrás extremadamente, ¡y tu cuerpo obedece!" msgid "You can't muster up the effort to throw anything…" msgstr "" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "Descargar objeto" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "No tenés nada para descargar." + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -194796,15 +196762,13 @@ msgstr "" #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" #: src/bionics.cpp @@ -197361,8 +199325,8 @@ msgstr "Eso no parece ser comestible en su forma actual." msgid "This is full of dirt after being on the ground." msgstr "Esto está lleno de tierra después de haber estado en el suelo." -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "No podés hacer eso abajo del agua." @@ -198260,11 +200224,11 @@ msgstr "Ahorro de tiempo por tanda: %s" msgid "Dark craftable? %s" msgstr "" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "Fácil" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "Difícil" @@ -198762,6 +200726,10 @@ msgstr "" msgid "Test weather" msgstr "" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "" @@ -198964,7 +200932,7 @@ msgstr "Coleccionista: %d" msgid "Altruism: %d" msgstr "Altruismo: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "Necesita:" @@ -199651,393 +201619,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "Por favor, esperá que se genere el mapa [ 0%% ]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "¡No necesitás dormir!" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "¡No podés guardar la partida en el modo defensa!" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "¡No podés dejar el/a %s!" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "¡Lograste sobrevivir a la ola %d!" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "Por favor, esperá que se genere el mapa [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "Opción anterior" - -#: src/defense.cpp -msgid "Next option" -msgstr "Opción siguiente" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "Pasar el valor de la opción" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "Cambiar opción" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "¡Tenés que elegir por lo menos un grupo de monstruos!" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "Zombis Especiales" - -#: src/defense.cpp -msgid "Zombies" -msgstr "Zombis" - -#: src/defense.cpp -msgid "Triffids" -msgstr "Trífidos" - -#: src/defense.cpp -msgid "Robots" -msgstr "Robots" - -#: src/defense.cpp -msgid "Subspace" -msgstr "Subespacio" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "Comida" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "Mercenarios" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "MODO DEFENSA" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "Apretá las teclas de dirección para cambiar, ENTER para aplicar" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "Escenario: " - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "Lugar:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "Dificultad Inicial:" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "Es la dificultad de la primera ola." - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "Dificultad de la Ola:" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "Es el incremento de dificultad en cada ola." - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "Tiempo Entre Olas:" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "Es el tiempo, en minutos, entre ola y ola." - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "Olas Entre Caravanas:" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "Es el número de olas entre caravana y caravana." - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "Plata Inicial:" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "Es la cantidad de plata con la que comienza el jugador." - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "Plata para la Primera Ola:" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "Es el premio por resistir la primera ola." - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "Incremento del Premio:" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "Es el incremento del premio por cada ola." - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "Selección de Enemigo:" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "Personalizado" - -#: src/defense.cpp -msgid "Medium" -msgstr "Medio" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "Muertos de risa" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "El amanecer de los muertos" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "El ataque de las arañas" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "La amenaza verde" - -#: src/defense.cpp -msgid "Skynet" -msgstr "Skynet" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "La llamada de Cthulhu" - -#: src/defense.cpp -msgid "A custom game." -msgstr "Un juego personalizado." - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "Monstruos fáciles y mucha plata." - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "Monstruos más difíciles. Y tenés que comer." - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "Todos los monstruos. Tenés que comer y beber." - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "Hay que defender un bar de los zombis clásicos. Fácil y divertido." - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "Zombis clásicos. Lentos y más realista." - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "¡Lucha divertida de alto ritmo contra arañas!" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "Tenés que defender tu mansión del ataque de los trífidos." - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "¡Los robots han decidido que los humanos son el enemigo!" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "" -"Vas a tener que mantener a raya a legiones de horrores sobrenaturales." - -#: src/defense.cpp -msgid "Public Works" -msgstr "Obras Públicas" - -#: src/defense.cpp -msgid "Megastore" -msgstr "Supermercado" - -#: src/defense.cpp -msgid "Bar" -msgstr "Bar" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "Una entrada y muchas habitaciones. Hay algunos suministros médicos." - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "Es un edificio fácil de fortificar. Muchas herramientas útiles." - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "Un edificio grande con suministros varios." - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "Un pequeño lugar con suficiente alcohol." - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "Es una casa grande con muchas habitaciones." - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" -"CARAVANA:\n" -"Seleccioná una categoría usando tus teclas de arriba y abajo favoritas.\n" -"Cambiá la selección entre categoría y objeto apretando %s.\n" -"Agarrá un objeto con las teclas de arriba y abajo, y con izquierda y derecha\n" -"comprás 1 más o 1 menos.\n" -"Apretá %s para comprar todo lo que tenés en el carrito, %s para no comprar nada." - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "¿Seguro? ¿No vas a comprar nada?" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "¡No podés pagar esos objetos!" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "¿Querés comprar %d objeto? Te va a quedar %s" -msgstr[1] "¿Querés comprar %d objetos? Te van a quedar %s" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "Dejaste algunos objetos." - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "Armas de Cuerpo a cuerpo" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "Armas de Largo Alcance" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "Munición" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "Fabricación y Componentes para Construir" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "Comida y Drogas" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "Ropa y Armadura" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "Herramientas, Trampas y Granadas" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "Apretá ? para ver la ayuda." - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "Tu Plata: %s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "¡Bienvenido a la Ola %d!" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "Ola %d:" - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "¡Invasión de %s!" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "¡Ataque de %s!" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "¡%s atacan!" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "¡%s del infierno!" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "¡El Día de los %s!" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "¡La venganza de los %s!" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "¡El ascenso de los %s!" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -200620,53 +202201,53 @@ msgstr "Ese charuto estaba mortal." #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "Fuerza +%d; " +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "Fuerza %d; " +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "Destreza +%d; " +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "Destreza %d; " +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "Percepción +%d; " +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "Percepción %d; " +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "Inteligencia +%d; " +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "Inteligencia %d; " +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "Velocidad +%d; " +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "Velocidad %d; " +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -201657,7 +203238,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -202298,7 +203880,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -202503,7 +204086,8 @@ msgstr "Elegí una expansión:" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -202773,6 +204357,26 @@ msgstr "Se encontraron pedazos de %s desparramados entre los arbustos." msgid "(You wonder if your companions are fit to work on their own…)" msgstr "" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -203566,7 +205170,8 @@ msgstr "" msgid "Without extra fuel it will burn for between %s to %s." msgstr "" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "" @@ -204071,40 +205676,6 @@ msgstr "No tenés ganas y pensar en el trabajo te frena antes de empezar." msgid "%s helps with this task…" msgstr "" -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "" - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "Te comiste la maleza." - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "Estás demasiado lleno como para pastar." - -#: src/game.cpp -msgid "You eat the grass." -msgstr "Te comiste el pasto." - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "" - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "" - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "" - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "Dejás el/a %s vacío/a." - #: src/game.cpp msgid "Change side for item" msgstr "Cambiar lado para objeto" @@ -204133,6 +205704,11 @@ msgstr "¡El %s ya está lleno!" msgid "You can't reload a %s!" msgstr "¡No podés recargar un/a %s!" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "" + #: src/game.cpp msgid "Reload item" msgstr "Recargar objeto" @@ -204141,18 +205717,6 @@ msgstr "Recargar objeto" msgid "You have nothing to reload." msgstr "No tenés nada para recargar." -#: src/game.cpp -msgid "Unload item" -msgstr "Descargar objeto" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "No tenés nada para descargar." - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "No estás empuñando nada." - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -204237,6 +205801,13 @@ msgstr "No se encuentra objeto agarrado." msgid "You cannot board a vehicle whilst riding." msgstr "" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "" @@ -204913,11 +206484,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "Tu inventario está vacío." -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "No tenés un/a %s." - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "INCOMODIDAD" @@ -205056,8 +206622,8 @@ msgid "CBM" msgstr "MCB" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "ENERGÍA" +msgid "ENERGY (kJ)" +msgstr "" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -205282,13 +206848,13 @@ msgstr "Envainar objeto" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" -msgstr "Elegí un arma para poner en tu %s" +msgid "Choose an item to put into your %s" +msgstr "" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." -msgstr "No tenés ningún arma que se pueda poner en tu %s." +msgid "You have no items you could put into your %s." +msgstr "" #: src/game_inventory.cpp src/iuse.cpp msgid "Cut up what?" @@ -205528,6 +207094,405 @@ msgstr "Tutorial" msgid "Defense" msgstr "Defensa" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "Por favor, esperá que se genere el mapa [ 0%% ]" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "¡No necesitás dormir!" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "¡No podés guardar la partida en el modo defensa!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "¡No podés dejar el/a %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "¡Lograste sobrevivir a la ola %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "Por favor, esperá que se genere el mapa [%2d%%]" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "Opción anterior" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "Opción siguiente" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "Pasar el valor de la opción" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "Cambiar opción" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "¡Tenés que elegir por lo menos un grupo de monstruos!" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "Zombis Especiales" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "Zombis" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "Trífidos" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "Robots" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "Subespacio" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "Comida" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "Mercenarios" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "MODO DEFENSA" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "Escenario: " + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "Lugar:" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "Dificultad Inicial:" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "Es la dificultad de la primera ola." + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "Dificultad de la Ola:" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "Es el incremento de dificultad en cada ola." + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "Tiempo Entre Olas:" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "Es el tiempo, en minutos, entre ola y ola." + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "Olas Entre Caravanas:" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "Es el número de olas entre caravana y caravana." + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "Plata Inicial:" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "Es la cantidad de plata con la que comienza el jugador." + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "Plata para la Primera Ola:" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "Es el premio por resistir la primera ola." + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "Incremento del Premio:" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "Es el incremento del premio por cada ola." + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "Selección de Enemigo:" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "Personalizado" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "Medio" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "Muertos de risa" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "El amanecer de los muertos" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "El ataque de las arañas" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "La amenaza verde" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "Skynet" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "La llamada de Cthulhu" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "Un juego personalizado." + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "Monstruos fáciles y mucha plata." + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "Monstruos más difíciles. Y tenés que comer." + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "Todos los monstruos. Tenés que comer y beber." + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "Hay que defender un bar de los zombis clásicos. Fácil y divertido." + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "Zombis clásicos. Lentos y más realista." + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "¡Lucha divertida de alto ritmo contra arañas!" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "Tenés que defender tu mansión del ataque de los trífidos." + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "¡Los robots han decidido que los humanos son el enemigo!" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "" +"Vas a tener que mantener a raya a legiones de horrores sobrenaturales." + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "Obras Públicas" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "Supermercado" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "Bar" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "Una entrada y muchas habitaciones. Hay algunos suministros médicos." + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "Es un edificio fácil de fortificar. Muchas herramientas útiles." + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "Un edificio grande con suministros varios." + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "Un pequeño lugar con suficiente alcohol." + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "Es una casa grande con muchas habitaciones." + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" +"CARAVANA:\n" +"Seleccioná una categoría usando tus teclas de arriba y abajo favoritas.\n" +"Cambiá la selección entre categoría y objeto apretando %s.\n" +"Agarrá un objeto con las teclas de arriba y abajo, y con izquierda y derecha\n" +"comprás 1 más o 1 menos.\n" +"Apretá %s para comprar todo lo que tenés en el carrito, %s para no comprar nada." + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "¿Seguro? ¿No vas a comprar nada?" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "¡No podés pagar esos objetos!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "¿Querés comprar %d objeto? Te va a quedar %s" +msgstr[1] "¿Querés comprar %d objetos? Te van a quedar %s" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "Dejaste algunos objetos." + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "Armas de Cuerpo a cuerpo" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "Armas de Largo Alcance" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "Munición" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "Fabricación y Componentes para Construir" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "Comida y Drogas" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "Ropa y Armadura" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "Herramientas, Trampas y Granadas" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "Apretá ? para ver la ayuda." + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "Tu Plata: %s" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "¡Bienvenido a la Ola %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "Ola %d:" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "¡Invasión de %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "¡Ataque de %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "¡%s atacan!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "¡%s del infierno!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "¡El Día de los %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "¡La venganza de los %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "¡El ascenso de los %s!" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "John Smith" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "¡Hay un estúpido en el medio!" @@ -205876,6 +207841,10 @@ msgstr "" msgid "You may want to deactivate these before you sleep." msgstr "Por ahí quieras desactivar estos antes de dormirte." +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -210940,7 +212909,7 @@ msgstr "Tu %1$s no puede contener más %2$s." msgid "That %s doesn't have room to expand." msgstr "Ese/a %s no tiene más espacio para expandirlo/a." -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%d x %s" @@ -211023,78 +212992,6 @@ msgstr "" msgid "Your %s disappears!" msgstr "" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "carcasa de %s" -msgstr[1] "carcasas de %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "carcasa %s descuartizada" -msgstr[1] "carcasas %s descuartizadas" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "cadáver de %s" -msgstr[1] "cadáveres de %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "%s carcasa de %s" -msgstr[1] "%s carcasas de %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%s cadáver de %s" -msgstr[1] "%s cadáveres de %s" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -211110,6 +213007,21 @@ msgid_plural "%s blood" msgstr[0] "sangre de %s" msgstr[1] "sangre de %s" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "Te falta un objeto que pueda realizar esta acción." @@ -211716,7 +213628,7 @@ msgstr "Ahí no hay nada a lo que darle de comer." msgid "Modify what?" msgstr "¿Qué querés modificar?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "¡No tenés eso!" @@ -212780,6 +214692,10 @@ msgstr "Buscaminas" msgid "Lights on!" msgstr "¡Luces encendidas!" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -213210,10 +215126,6 @@ msgstr "" "Necesitás una habilidad en mecánica nivel 2 para usar este equipo de " "reparación." -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "Elegí el arma para reparar." - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "¡Eso no es un arma!" @@ -213264,25 +215176,6 @@ msgstr "No tenés herramientas compatibles." msgid "You cancel unloading the tool." msgstr "Cancelás la descarga de la herramienta." -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "¡No ves nada, no podés reparar!" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "" -"Necesitás una habilidad en fabricación de 1 para usar este equipo de " -"reparación." - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "Elegí el objeto para reparar" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "Reforzás tu %s." - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "" @@ -213534,31 +215427,6 @@ msgstr "" msgid " on " msgstr "" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -214395,6 +216263,14 @@ msgstr "" "¡Por estar toqueteando la multicocina casi la rompés! Por suerte, todavía " "funciona, pero mejor dejá de joder con ella." +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "" + #: src/iuse.cpp msgid "Using cable:" msgstr "Usar cable:" @@ -214423,14 +216299,6 @@ msgstr "" msgid "You attach the cable to the solar pack." msgstr "" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "" @@ -216964,12 +218832,9 @@ msgid "Congratulations, you won!" msgstr "¡Felicidades, ganó el juego!" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "Máx:" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "Mín:" +#, c-format +msgid "Min: %d Max: %d" +msgstr "" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -217814,6 +219679,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "-¡Jugar Ya!" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" + #: src/main_menu.cpp msgid "No templates found!" msgstr "¡No se encontraron plantillas!" @@ -218042,6 +219935,14 @@ msgstr "¡Algo salió arrastrándose del/a %s!" msgid "DANGER! MINEFIELD!" msgstr "" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -218174,20 +220075,9 @@ msgid "You're violently teleported!" msgstr "¡Sos teletransportado violentamente!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "¡Las abejas te pican!" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "¡Las abejas te pican varias veces!" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "¡Las abejas te pican muchas veces!" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "¡Las abejas te pican por todo el cuerpo!" +#, c-format +msgid "The bees sting you in %s!" +msgstr "" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -218351,6 +220241,17 @@ msgid_plural "Skills" msgstr[0] "Habilidad" msgstr[1] "Habilidades" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" +msgstr[1] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "Necesita: " @@ -223211,6 +225112,10 @@ msgstr "¡El %s cubierto de ácido te quema la mano!" msgid "Acid sprays out of %s as it is hit!" msgstr "¡Cuando el %s es golpeado, suelta ácido!" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" + #: src/monexamine.cpp msgid "zombie slave" msgstr "esclavo zombi" @@ -226167,8 +228072,9 @@ msgid "I have news." msgstr "Tengo noticias." #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "Sí, sigamos entrenando." +#, c-format +msgid "Yes, let's resume training %s" +msgstr "" #: src/npctalk.cpp #, c-format @@ -226886,6 +228792,16 @@ msgstr "" "Si está desactivado, el jugador dejará todos los objetos nuevos que lo hacen" " excederse del límite de carga de peso." +#: src/options.cpp +msgid "Dangerous running" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" + #: src/options.cpp msgid "Safe mode" msgstr "Modo seguro" @@ -229275,7 +231191,7 @@ msgstr "Buscar término:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" @@ -229715,6 +231631,10 @@ msgstr "Descanso:" msgid "Heat :" msgstr "Calor :" +#: src/panels.cpp +msgid "Deaf!" +msgstr "¡Sordo!" + #: src/panels.cpp msgid "Underground" msgstr "Bajo tierra" @@ -229773,10 +231693,6 @@ msgstr "Luna :" msgid "Lighting:" msgstr "Luz: " -#: src/panels.cpp -msgid "Deaf!" -msgstr "¡Sordo!" - #: src/panels.cpp msgid "Weapon :" msgstr "Arma :" @@ -230806,6 +232722,11 @@ msgstr "¿Qué falla querés arreglar?" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -231268,85 +233189,74 @@ msgstr "VELOCIDAD" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "Nadar cuesta %+d punto de movimiento. " -msgstr[1] "Nadar cuesta %+d puntos de movimiento. " +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "Correr cuesta %+d punto de movimiento. " -msgstr[1] "Correr cuesta %+d puntos de movimiento. " +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "Recargar cuesta %+d punto de movimiento. " -msgstr[1] "Recargar cuesta %+d puntos de movimiento. " +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "Ataques cuerpo a cuerpo y tirar cuesta %+d punto de movimiento." -msgstr[1] "Ataques cuerpo a cuerpo y tirar cuesta %+d puntos de movimiento." +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "Habilidad esquivar %+.1f. " +msgid "Dodge skill: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "Ataque cuerpo a cuerpo %+d%%; " +msgid "Melee attack rolls: %+d%%\n" +msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." +"Head encumbrance has no effect; it simply limits how much you" +" can put on." msgstr "" -"La incomodidad en la cabeza no afecta nada; simplemente limita cúantas cosas" -" te podés poner." #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"Percepción %+d cuando buscás trampas o disparás armas de distancia;\n" -"Dispersión %+d cuando tirás objetos." #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "Cubrir tu boca te hace más difícil respirar y recobrar el aliento." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." msgstr "" -"La incomodidad en los brazos afecta el gasto de resistencia para los ataques" -" cuerpo a cuerpo y la precisión con armas a distancia." #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "Reduce la velocidad en que podés manejar objetos\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "Destreza %+.1f cuando tirás objetos;\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "Reduce la velocidad para apuntar en %.1f." +msgid "Reduced gun aim speed: %.1f" +msgstr "" #: src/player_display.cpp msgid "" @@ -231447,8 +233357,8 @@ msgstr "" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" #: src/player_display.cpp @@ -232206,6 +234116,16 @@ msgstr "¡Tu %s falla con un chasquido amortiguado!" msgid "'s %s misfires with a muffled click!" msgstr "¡El %s de falla con un chasquido amortiguado!" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -232246,6 +234166,16 @@ msgstr "" msgid "'s %s is damaged by their shot!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -232444,6 +234374,10 @@ msgstr "Apuntar Precisamente" msgid "[%c] to take precise aim and fire." msgstr "" +#: src/ranged.cpp +msgid "turrets" +msgstr "torretas" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -232877,7 +234811,7 @@ msgstr "¡Escuchaste %s!" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." +msgid "From your position you hear %1$s" msgstr "" #: src/sounds.cpp @@ -233990,18 +235924,6 @@ msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "" msgstr[1] "" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "John Smith" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" - #: src/veh_interact.cpp msgid "Select part" msgstr "Elegir parte" @@ -236304,6 +238226,10 @@ msgstr "Soleado" msgid "Cloudy" msgstr "Nublado" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "" + #: src/weather_data.cpp msgid "Drizzle" msgstr "Llovizna" diff --git a/lang/po/es_ES.po b/lang/po/es_ES.po index ea56abb695df8..9579862744fc3 100644 --- a/lang/po/es_ES.po +++ b/lang/po/es_ES.po @@ -6,15 +6,15 @@ # Emma Forner, 2019 # lokatronao , 2019 # Brett Dong , 2019 -# Vlasov Vitaly , 2019 # Toni López , 2019 +# Vlasov Vitaly , 2019 # Miguel de Dios Matias , 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Miguel de Dios Matias , 2019\n" "Language-Team: Spanish (Spain) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/es_ES/)\n" @@ -206,7 +206,7 @@ msgstr "lodo acuosa de plutonio" #: lang/json/AMMO_from_json.py lang/json/snippet_from_json.py msgid "rock" -msgstr "" +msgstr "piedra" #. ~ Description for rock #: lang/json/AMMO_from_json.py @@ -343,7 +343,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "mixed gunpowder" -msgstr "" +msgstr "pólvora mezclada" #. ~ Description for mixed gunpowder #: lang/json/AMMO_from_json.py @@ -355,7 +355,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "smokeless shotgun powder" -msgstr "" +msgstr "pólvora sin humo para escopeta" #. ~ Description for smokeless shotgun powder #: lang/json/AMMO_from_json.py @@ -384,7 +384,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "smokeless rifle powder" -msgstr "" +msgstr "pólvora sin humo para rifle" #. ~ Description for smokeless rifle powder #: lang/json/AMMO_from_json.py @@ -894,7 +894,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "simple wooden arrow" -msgstr "" +msgstr "flecha simple de madera" #. ~ Description for simple wooden arrow #: lang/json/AMMO_from_json.py @@ -1675,8 +1675,8 @@ msgstr "detergente" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." -msgstr "Un popular jabón en polvo de antes del cataclismo." +msgid "A popular pre-Cataclysm washing powder." +msgstr "" #: lang/json/AMMO_from_json.py msgid "soap flakes" @@ -1980,6 +1980,17 @@ msgstr "" "Un líquido aceitoso de combustión limpia que se utiliza en las lámparas de " "aceite." +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -2141,6 +2152,69 @@ msgstr "" "estimulantes. Está pensado para ser utilizado con equipamiento médico " "especializado, y no puede ser administrado manualmente." +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "bengala de 40mm" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "" +"Una bengala de señalización 40mm. Arderá brillantemente durante un minuto, y" +" también creará una cortina de humo con su estela." + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "" +"Es una granada 40mm con carga de destello. Su explosión libera un estallido " +"de luz y sonido. Está diseñada para enceguecer, ensordecer y desorientar." + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "granada incendiaria de 40mm" +msgstr[1] "granada incendiaria de 40mm" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "" +"Es una granada 40mm con una pequeña carga de napalm, diseñada para crear una" +" explosión de llamas." + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40mm granada de humo" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "Es una granada de 40mm diseñada para crear una cortina de humo." + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "" +"Es un cartucho de 40mm cargado con una bala enorme. Despídete de tu hombro, " +"eso sí." + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "" @@ -3008,139 +3082,133 @@ msgid ".40 S&W JHP, reloaded" msgstr "" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "granada 40mm" +msgid "40x46mm grenade" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "granada menos letal de 40mm" +msgid "40x46mm M1006" +msgstr "" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40mm de impacto" +msgid "40x46mm M433" +msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "Es una granada 40mm con carga explosiva de impacto." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "bengala de 40mm" +msgid "40x46mm M576" +msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." msgstr "" -"Una bengala de señalización 40mm. Arderá brillantemente durante un minuto, y" -" también creará una cortina de humo con su estela." #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "granada de destello de 40mm" +msgid "40x46mm M651" +msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" msgstr "" -"Es una granada 40mm con carga de destello. Su explosión libera un estallido " -"de luz y sonido. Está diseñada para enceguecer, ensordecer y desorientar." #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "granada de dardos perforantes de 40mm" +msgid "40x46mm buckshot" +msgstr "" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40mm fragmentarias" +msgid "40x46mm slug" +msgstr "" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." msgstr "" -"Es una granada 40mm con una pequeña carga explosiva y con gran " -"fragmentación." #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "granada incendiaria de 40mm" -msgstr[1] "granada incendiaria de 40mm" +msgid "40x46mm flechette" +msgstr "" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M1001" +msgstr "" + +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." msgstr "" -"Es una granada 40mm con una pequeña carga de napalm, diseñada para crear una" -" explosión de llamas." #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "granada de postas de 40mm" +msgid "40x53mm M430A1" +msgstr "" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40mm granada de humo" +msgid "40x53mm buckshot" +msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "Es una granada de 40mm diseñada para crear una cortina de humo." +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "granada de gases lacrimógenos de 40mm" -msgstr[1] "granada de gases lacrimógenos de 40mm" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." msgstr "" -"Es una granada 40mm con carga de gas lacrimógeno. Su explosión libera una " -"nube de gas muy incapacitante." #: lang/json/AMMO_from_json.py -msgid "40mm slug" +msgid "40x53mm flechette" msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." msgstr "" -"Es un cartucho de 40mm cargado con una bala enorme. Despídete de tu hombro, " -"eso sí." #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -4989,11 +5057,9 @@ msgstr[1] "plata" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "" -"Es un metal suave y brillantes. Antes del cataclismo valía bastante, pero " -"ahora su valor está muy disminuido." #: lang/json/AMMO_from_json.py msgid "small metal sheet" @@ -5543,13 +5609,6 @@ msgstr "Un puñado de dardos, útiles como munición para una cerbatana." msgid "plutonium cell" msgstr "celda de plutonio" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "" - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5616,7 +5675,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" @@ -6150,20 +6209,6 @@ msgstr "" "Son proyectiles pesados y redondos, fundidos de plomo. Útil como munición " "para hondas." -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "perno de hueso para ballesta" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "" -"Es un perno tallado en hueso con emplumado. Es liviano, lo que le otorga una" -" precisión y daño decentes. No se rompe fácilmente luego de ser utilizado." - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -6694,11 +6739,8 @@ msgstr[1] "alimentos para monstruo masa amorfa gelatinosa" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" -"Es una amalgama de varias clases de materiales orgánicos. Contiene todo lo " -"que un monstruo masa amorfa gelatinosa necesita para estar sano. Eso te " -"parece..." #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -7104,11 +7146,9 @@ msgstr[1] "equipos de nómada" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "" -"Es un traje improvisado hecho con ropa pre-cataclismo, diseñado para viajes " -"largos. Tiene mucha capacidad de almacenamiento." #: lang/json/ARMOR_from_json.py msgid "light nomad gear" @@ -7119,13 +7159,10 @@ msgstr[1] "equipos de nómada ligeros" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "" -"Es un traje improvisado ligero hecho con ropa pre-cataclismo, diseñado para " -"viajes largos de verano. Tiene menos capacidad de almacenamiento y " -"protección que el equipo normal de nómada." #: lang/json/ARMOR_from_json.py msgid "plated leather armor" @@ -7191,12 +7228,9 @@ msgstr[1] "equipos de chatarrero" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." msgstr "" -"Es un resistente traje de chatarrero, hecho con un equipo de protección de " -"antes del cataclismo reacondicionado. Tiene mucha capacidad de " -"almacenamiento." #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -11733,7 +11767,7 @@ msgstr "Unos pantalones pesados, recubiertos de piel." #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" +msgid_plural "faux fur pants" msgstr[0] "" msgstr[1] "" @@ -13601,9 +13635,9 @@ msgstr "Un zubon blanco para utilizar en las artes marciales." #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" -msgstr[0] "funda de violín" -msgstr[1] "fundas de violín" +msgid_plural "violin cases" +msgstr[0] "" +msgstr[1] "" #. ~ Description for violin case #: lang/json/ARMOR_from_json.py @@ -14286,11 +14320,9 @@ msgstr[1] "mochilas innovadoras gigantes " #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." msgstr "" -"Una gran mochila de tela fabricada como una broma antes del cataclismo. " -"Ahora sigue siendo algo estúpida, pero puede cargar con bastantes cosas." #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -15650,6 +15682,142 @@ msgstr "" "verdaderos. Quedan horribles, pero son muy brillantes. Perfectos para ese " "look de rapero de clase alta." +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -16569,6 +16737,552 @@ msgstr "" "Una cola negra de cuero con unas bolitas de plástico para mantenerla " "balanceada. Se mueve hacia los costados cuando caminas." +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -17109,8 +17823,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17122,10 +17836,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" #: lang/json/ARMOR_from_json.py @@ -17137,10 +17851,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17152,7 +17866,7 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" @@ -17166,8 +17880,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" @@ -17180,7 +17894,7 @@ msgstr[1] "" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -17208,8 +17922,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" @@ -17223,8 +17937,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17236,8 +17950,8 @@ msgstr[1] "" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17249,9 +17963,9 @@ msgstr[1] "" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17264,7 +17978,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -17278,10 +17992,10 @@ msgstr[1] "" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -17307,11 +18021,11 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" @@ -17324,9 +18038,9 @@ msgstr[1] "" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -17340,10 +18054,10 @@ msgstr[1] "" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17356,9 +18070,9 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17370,35 +18084,32 @@ msgstr[1] "" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" -msgstr[0] "pantalones C.R.I.T." -msgstr[1] "pantalones C.R.I.T." +msgid_plural "C.R.I.T trousers" +msgstr[0] "" +msgstr[1] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" -"Son pantalones de vestir C.R.I.T. Su elegante diseño minimalista los hace " -"livianos y con una buena cantidad de bolsillos. El neopreno superflexible te" -" mantiene abrigado en climas fríos." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T helmet liner" @@ -17408,7 +18119,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17419,20 +18130,20 @@ msgstr[1] "" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "" msgstr[1] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -17444,7 +18155,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" @@ -17457,7 +18168,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -17472,8 +18183,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17575,10 +18286,11 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17587,13 +18299,6 @@ msgid_plural "silver infusion bracelets" msgstr[0] "" msgstr[1] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -17903,7 +18608,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" +msgid_plural "flesh pouches" msgstr[0] "" msgstr[1] "" @@ -17915,6 +18620,19 @@ msgid "" "minimize encumbrance." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -19847,13 +20565,9 @@ msgstr[1] "MCB Generador de Sobrecarga Iónica" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" -"Es un poderoso generador de energía iónica que está implantado en tu pecho. " -"Dispara un poderoso y continuo rayo de energía. El rayo final incendia " -"oxígeno creando fuego mientras se va moviendo y explotando al impactar. No " -"se recomienda utilizarlo a poca distancia del objetivo." #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py msgid "Blood Power Generator CBM" @@ -21859,6 +22573,138 @@ msgstr "" "Una divertida colección de cuentos tradicionales, con la participación de " "los protagonistas habituales como hadas, goblins y trolls." +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -22333,9 +23179,8 @@ msgstr[1] "novelas eróticas" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." msgstr "" -"Una narrativa estereotipada esconde obscenidades literarias de bajo nivel." #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -23124,7 +23969,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" @@ -24835,9 +25680,9 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" #: lang/json/BOOK_from_json.py @@ -24866,11 +25711,9 @@ msgstr[1] "Hackeando Robots por Diversión y Beneficio" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" -"Es un libro que trata sobre la manera ilegal de obtener, reprogramar o " -"modificar robots. Tiene muchas guías paso a paso con diseños de ejemplo." #: lang/json/BOOK_from_json.py msgid "Popular Robotics" @@ -25096,6 +25939,17 @@ msgstr[1] "agua salada" msgid "Water with salt added. Not good for drinking." msgstr "Es agua con sal añadida. No sirve para beber." +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -25706,7 +26560,7 @@ msgstr[1] "aguardientes caseros" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "" @@ -25838,6 +26692,75 @@ msgstr[1] "whisky puro de malta" msgid "Only the finest whiskey straight from the bung." msgstr "De los mejores whiskys." +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "indigente extravagante" @@ -26589,6 +27512,20 @@ msgid_plural "meat jerky" msgstr[0] "cecina de carne" msgstr[1] "cecinas de carne" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "cecina de hombre" +msgstr[1] "cecinas de hombre" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26610,21 +27547,28 @@ msgstr "" " da sed." #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "cecina de hombre" -msgstr[1] "cecinas de hombre" +msgid "smoked meat" +msgstr "carne ahumada" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "" +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "carne ahumada" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "" +msgstr[1] "" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -26650,17 +27594,6 @@ msgstr "" "Es un pescado sabroso que ha sido ahumado para preservarlo mucho tiempo. " "Puede ser ahumado aún más para deshidratarlo completamente." -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "cabrón ahumado" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -28152,9 +29085,8 @@ msgstr "hueva de garrafilada" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." msgstr "" -"Es un grupo de huevos de garrafilada. Una delicadeza postapocalíptica." #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -29488,12 +30420,12 @@ msgstr "" "carne también." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" -msgstr[0] "nachos con queso" -msgstr[1] "nachos con queso" +msgid "cheese nachos" +msgid_plural "cheese nachos" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -29501,53 +30433,57 @@ msgid "" msgstr "" #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" -msgstr[0] "nachos con carne" -msgstr[1] "nachos con carne" - -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "" -"Son nachos de maíz salados, ahora con carne. Le vendría bien un poco de " -"queso." +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "nachos niño" msgstr[1] "nachos niño" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." msgstr "" +"Son nachos de maíz salados, ahora con carne. Le vendría bien un poco de " +"queso." + +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "nachos niño con queso" msgstr[1] "nachos niño con queso" -#. ~ Description for niño nachos with cheese +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "" - -#: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "nachos con carne y queso" -msgstr[1] "nachos con carne y queso" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -29622,19 +30558,6 @@ msgstr[1] "perritos calientes con chili" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Un perrito caliente servido con chili con carne como aderezo. ¡Rico!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "perrito caliente con chili especial" -msgstr[1] "perritos calientes con chili especial" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "" -"Es un perrito caliente servido con chili con carne humana como aderezo. " -"Delicioso." - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -29729,10 +30652,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." +"Cataclysm. It would taste much better prepared." msgstr "" -"Una salchicha muy procesada, era común en los partidos de béisbol antes del " -"cataclismo. Si estuviera preparada sería mucho más rica." #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -29779,6 +30700,24 @@ msgstr "" msgid "raw sausage" msgstr "" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -29788,6 +30727,13 @@ msgstr "Es una salchicha grande y cruda, lista para ahumar o para cocinar." msgid "sausage" msgstr "salchicha" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -29799,22 +30745,18 @@ msgstr "" msgid "cooked sausage" msgstr "" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "Es una gran salchicha que ha sido cocinada." -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "Mannwurst" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -29832,6 +30774,21 @@ msgid_plural "bratwursts" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29911,6 +30868,14 @@ msgstr "" msgid "glazed tenderloins" msgstr "solomillo glaseado" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29926,6 +30891,22 @@ msgstr "" msgid "currywurst" msgstr "" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29939,6 +30920,22 @@ msgstr "" msgid "aspic" msgstr "áspic" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30016,6 +31013,14 @@ msgstr "Una porción deliciosa de pescado frito, crujiente y dorado." msgid "lunch meat" msgstr "fiambre" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30027,6 +31032,22 @@ msgstr "" msgid "bologna" msgstr "bolonia" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30092,6 +31113,21 @@ msgid_plural "sausage gravies" msgstr[0] "salsa espesa de salchichas" msgstr[1] "salsas espesas de salchichas" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "salsa espesa de Mannwurst" +msgstr[1] "salsas espesas de Mannwurst" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30105,6 +31141,22 @@ msgstr "" msgid "pemmican" msgstr "pemmican" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30120,6 +31172,21 @@ msgstr "" msgid "hamburger helper" msgstr "pasta instantánea sabor hamburguesa" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30146,6 +31213,20 @@ msgid_plural "chilis con carne" msgstr[0] "chili con carne" msgstr[1] "chilis con carne" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -30220,14 +31301,26 @@ msgstr "Almejas molidas en agua." msgid "clam chowder" msgstr "crema de almejas" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." msgstr "" -"Una sopa blanca deliciosa y grumosa, hecha con almejas y patatas. Con sabor " -"a la gloria perdida de New England." #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" @@ -30235,6 +31328,13 @@ msgid_plural "baked beans" msgstr[0] "alubias horneadas" msgstr[1] "alubias horneadas" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -30246,6 +31346,13 @@ msgid_plural "meat fried rice" msgstr[0] "arroz frito con carne" msgstr[1] "arroces fritos con carne" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -30257,6 +31364,14 @@ msgid_plural "deluxe beans and rice" msgstr[0] "alubias con arroz deluxe" msgstr[1] "alubias con arroz deluxe" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30270,6 +31385,21 @@ msgstr "" msgid "meat pie" msgstr "tarta de carne" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -30279,6 +31409,21 @@ msgstr "Es una deliciosa tarta horneada con un delicioso relleno de carne." msgid "meat pizza" msgstr "pizza de carne" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30288,12 +31433,29 @@ msgstr "" "Es una pizza de carne para los carnívoros que andan por ahí. Rellena hasta " "el tope de carne picada y muy condimentada." +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" msgstr[0] "huevos revueltos deluxe" msgstr[1] "huevos revueltos deluxe" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30307,6 +31469,13 @@ msgstr "" msgid "canned meat" msgstr "lata de carne" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "locha de soylent" +msgstr[1] "lochas de soylent" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30320,6 +31489,13 @@ msgstr "" msgid "salted meat slice" msgstr "rebanada de carne salada" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -30331,6 +31507,21 @@ msgid_plural "spaghetti bolognese" msgstr[0] "espagueti a la boloñesa" msgstr[1] "espagueti a la boloñesa" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -30340,6 +31531,22 @@ msgstr "Espagueti recubierto con abundante tuco. ¡Rico!" msgid "lasagne" msgstr "lasaña" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30360,19 +31567,48 @@ msgstr "Es carne en lata. Así frita, este SPAM está bastante bueno." msgid "cheeseburger" msgstr "hamburguesa con queso" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." +"Cataclysm culinary achievement." msgstr "" -"Un sandwich de carne picada y queso con condimentos. El ápice de la exitosa " -"cocina pre-cataclismo." #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "hamburguesa" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -30382,6 +31618,21 @@ msgstr "Un sandwich de carne picada con condimentos." msgid "sloppy joe" msgstr "" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "mánguche" +msgstr[1] "mánguches" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30393,6 +31644,22 @@ msgstr "" msgid "taco" msgstr "taco" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30406,6 +31673,13 @@ msgstr "" msgid "pickled meat" msgstr "carne en escabeche" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30416,6 +31690,15 @@ msgstr "Es una porción de carne en escabeche enlatada. Sabrosa y nutritiva." msgid "dehydrated meat" msgstr "carne deshidratada" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30442,6 +31725,15 @@ msgid_plural "haggii" msgstr[0] "haggis" msgstr[1] "haggii" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30476,6 +31768,14 @@ msgid_plural "meat temaki" msgstr[0] "temaki de carne" msgstr[1] "temaki de carne" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30513,6 +31813,14 @@ msgstr "" msgid "pelmeni" msgstr "" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30526,6 +31834,13 @@ msgstr "" msgid "homemade burrito" msgstr "" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30534,350 +31849,6 @@ msgid "" "but homemade and delicious!" msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "carne humana deshidratada" -msgstr[1] "carne humana deshidratada" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "" -"Trozos de carne de humano deshidratada. Si se la guarda adecuadamente, esta " -"comida desecada puede durar por muchísimo tiempo." - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "carne humana rehidratada" -msgstr[1] "carne humana rehidratada" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "Son trozos de carne humana rehidratados. Así se disfrutan mucho más." - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "haggii humano" -msgstr[1] "haggii humano" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"Es el tradicional budín salado escocés hecho de carne humana y achuras " -"mezcladas con avena, que se cosen al estómago del humano y se hierven. " -"Sorprendentemente, es sabroso si no te molestan estas cosas, y te llena " -"bastante. Lo mejor es servirlo con raíces hervidas y un whisky fuerte." - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "bolonia especial" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "" -"Una Mannwurst cubierta con salsa de ketchup y curry. ¡Bastante picante e " -"impresionante al mismo tiempo!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "salsa espesa de Mannwurst" -msgstr[1] "salsas espesas de Mannwurst" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "" -"Galletitas, carne humana y deliciosa sopa de hongos, todo mezclado en una " -"maravillosa, grasosa y sabrosa papilla." - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "áspic inmoral" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "" -"Es carne humana puesta en gelatina hecha con caldo de huesos humanos. " -"Deliciosamente asesina, si es que te gustan este tipo de cosas." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "" - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "sandwich de vago" -msgstr[1] "sandwiches de vago" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "Pan y carne humana, ¡sorpresa!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "sandwich de hombre" -msgstr[1] "sandwiches de hombre" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "" -"Es un sandwich de carne humana, verduras, queso y condimentos. ¡Date un " -"banquete con las almas de tus enemigos y con sabrosas verduras de huerta!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "pasta instantánea sabor vagabundo" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "" -"Algunos macarrones con queso y carne humana picada agregada. Es tan bueno " -"como asesinar." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "chili con cabrón" -msgstr[1] "chilis con cabrones" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "" -"Un guiso picante que tiene chiles, carne de humano, tomates y alubias." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -"Una tarta de carne con un pequeño soldado, o tal vez un científico, quién " -"sabe. Por dios, ¡está buena!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "" -"Es una pizza de carne para los caníbales que andan por ahí. Rellena hasta el" -" tope de carne humana picada y muy condimentada." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "locha de soylent" -msgstr[1] "lochas de soylent" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -"Carne humana preservada con bajo sodio. Fue hervida y enlatada. Contiene " -"casi todo el valor nutritivo, pero muy poco del sabor de la carne cocinada." - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "" -"Lochas de carne humana curadas en escabeche y cerradas al vacío. Saldas pero" -" sabrosas cuando hay hambre." - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "espagueti a la sinvergüenza" -msgstr[1] "espagueti a la sinvergüenza" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "" -"Espagueti recubierto con abundante tuco hecho con carne humana. Tiene buen " -"sabor, si es que te gustan estas cosas." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "lasaña de Luigi" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "" -"Es una clásica pasta hecha con varias capas de lasaña, alternadas con queso," -" salsas y carnes. Está hecho con carne humana." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "tonti-hamburguesa con queso" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "" -"Un sandwich de carne humana picada y queso con condimentos. El ápice de la " -"exitosa cocina caníbal post-cataclismo." - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "" -"Esta hamburguesa contiene más del 4% de carne humana permitido por la FDA " -"(Agencia de Drogas y Alimentos)." - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "mánguche" -msgstr[1] "mánguches" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "Un sandwich es un sandwich, pero este ¡está hecho de gente!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "tío taco" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -"Un taco hecho con carne humana picada en lugar de carne de vaca. Por alguna " -"razón, puedes escuchar la campana sonando en la distancia." - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "" -"Es una salchicha de cerdo grande y cruda, lista para ahumar o cocinar." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "" -"Es una gran salchicha de carne humana que ha sido cocinada. Huele tan " -"apetitoso como puede oler un humano." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "" - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "" -"Es una porción de carne humana en escabeche enlatada. Sabrosa y nutritiva si" -" te gustan este tipo de cosas." - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -31778,11 +32749,8 @@ msgstr "" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" -"Es un suplemento de calcio casero, hecho de harina de hueso. Debido a algo " -"dulce que ha sido mezclado contrarrestar la textura de polvo y el gusto a " -"ceniza, es casi tan apetitoso como una píldora de antes del cataclismo." #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -32409,7 +33377,7 @@ msgstr "suero de pájaro" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" @@ -33342,12 +34310,9 @@ msgstr[1] "gelatina de marloss" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" -"Parece un puñado de un líquido color limón que ha cuajado, muy parecido a la" -" gelatina pre-cataclismo. Tiene un aroma fuerte y delicioso, pero claramente" -" ha sufrido una mutación o es de origen extraterrestre." #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -33652,14 +34617,14 @@ msgstr "" "Es comida para perros. Tiene un olor extraño, pero a los perros parece que " "les gusta." -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "comida para gatos" msgstr[1] "comida para gatos" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "" "Es comida para gatos. Tiene un olor extraño, pero a los gatos parece que les" @@ -33701,65 +34666,30 @@ msgstr[1] "" msgid "Some nectar. Seeing this item is a bug." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "bebida de proteínas" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "" msgstr[1] "" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "" -"Es un líquido espeso hecho de proteína humana refinada mezclada con agua. " -"Aunque es bastante nutritivo, no es sabroso." - +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "" -"Es una bebida sabrosa y espesa hecha con proteína humana refinada y alguna " -"fruta nutritiva." - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "" -"Es una bebida sabrosa y espesa hecha con proteína humana refinada y alguna " -"fruta nutritiva. Ha sido suplementada con más vitaminas y minerales." - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "bebida de proteínas" - #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33775,6 +34705,14 @@ msgid_plural "protein powder" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33783,13 +34721,10 @@ msgid "" msgstr "" #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "" -msgstr[1] "" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -33805,6 +34740,13 @@ msgstr "" msgid "protein shake" msgstr "" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33818,6 +34760,14 @@ msgstr "" msgid "fortified protein shake" msgstr "" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34656,6 +35606,13 @@ msgid_plural "deluxe sandwiches" msgstr[0] "sandwich de lujo" msgstr[1] "sandwiches de lujo" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34756,6 +35713,22 @@ msgid_plural "meat sandwiches" msgstr[0] "sandwich de carne" msgstr[1] "sandwiches de carne" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "sandwich de vago" +msgstr[1] "sandwiches de vago" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -35738,15 +36711,6 @@ msgstr "caldo de huesos" msgid "A tasty and nutritious broth made from bones." msgstr "Un caldo sabroso y nutritivo hecho con huesos." -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "caldo de humano" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "Un caldo nutritivo hecho con huesos humanos." - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "sopa vegetal" @@ -35760,6 +36724,13 @@ msgstr "Una sopa deliciosa y nutritiva con abundantes verduras." msgid "meat soup" msgstr "sopa de carne" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -35791,6 +36762,13 @@ msgid_plural "curries with meat" msgstr[0] "curry con carne" msgstr[1] "currys con carne" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -35801,20 +36779,18 @@ msgstr "" msgid "woods soup" msgstr "sopa de los bosques" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "Un sopa deliciosa y nutritiva, hecha con regalos de la naturaleza." -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "sopa de savia" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "Una sopa hecha con lo que se pueda rescatar de un árbol." - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "sopa de pollo y tallarines" @@ -36948,17 +37924,6 @@ msgid "" " resembles spoiled milk." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "" @@ -37007,6 +37972,17 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "" @@ -37025,8 +38001,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37041,7 +38017,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -37288,19 +38264,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "" -"Un material primitivo usado para atar, hecho con cuerda y pegamento natural." -" Se utiliza para arreglar objetos hechos de madera, papel, hueso o quitina." - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -37308,8 +38271,8 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37333,10 +38296,8 @@ msgstr[1] "anomalías con forma de baya" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "" -"Si dejamos esto como debe ser, uno podría entrar caminando a la Floración " -"sin oposición ni participación de la Fruta. Pero no podemos hacer eso, ¿no?" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -37348,10 +38309,8 @@ msgstr[1] "anomalías con forma de semilla" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "" -"Si dejamos esto como debe ser, uno podría entrar caminando a la Jardín sin " -"oposición ni participación de la Semilla. Pero no podemos hacer eso, ¿no?" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -37363,11 +38322,8 @@ msgstr[1] "gelatinas de marloss" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "" -"Si dejamos esto como debe ser, uno podría entrar caminando al Chapitel sin " -"oposición ni participación de la Savia. Espera, ¿cómo hiciste para CONSEGUIR" -" esto?" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -37378,11 +38334,9 @@ msgstr[1] "anomalías con forma de fruta" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" -"No existimos en este momento. Pequeño humano inteligente, ¿así que debugging" -" para ver esto? No te vamos a permitir unirte mientras estamos modeando." #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -37500,7 +38454,7 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37523,15 +38477,15 @@ msgstr "" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "" #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37541,8 +38495,8 @@ msgstr "" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37581,7 +38535,7 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" @@ -37620,8 +38574,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37714,7 +38668,7 @@ msgstr "hamburguesa de queso sin gluten" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." +"of pre-Cataclysm culinary achievement." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37845,7 +38799,7 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37854,7 +38808,7 @@ msgstr "" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37863,13 +38817,13 @@ msgstr "" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." msgstr "" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "" @@ -37915,11 +38869,9 @@ msgstr[1] "leches de arroz" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "" -"Es más dulce que la leche de vaca, casi que tiene el gusto del helado de " -"vainilla. Se pudre rápido." #: lang/json/COMESTIBLE_from_json.py msgid "coconut water" @@ -37930,7 +38882,7 @@ msgstr[1] "" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "" @@ -38847,6 +39799,17 @@ msgid "" "it's anyone's guess what it's for." msgstr "" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -39652,6 +40615,29 @@ msgid_plural "corpses" msgstr[0] "cadáver" msgstr[1] "cadáveres" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -39670,13 +40656,7 @@ msgid "" " so with a gigantic claw." msgstr "" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "" @@ -39766,6 +40746,34 @@ msgid "" "wound." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -41708,6 +42716,149 @@ msgstr[1] "diamantes" msgid "A sparkling diamond." msgstr "Un diamante brillante." +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -42846,11 +43997,9 @@ msgstr[1] "caestus" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." msgstr "" -"Un brazal pesado de metal que cubre el puño y aumenta el poder de golpe, con" -" relleno grueso debajo para proteger la mano." #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -43637,17 +44786,17 @@ msgstr[1] "" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "chasis de torreta" -msgstr[1] "chasis de torreta" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" #: lang/json/GENERIC_from_json.py @@ -45710,6 +46859,288 @@ msgid_plural ".50 ammo belt linkages" msgstr[0] "unión metálica de munición .50" msgstr[1] "uniones metálicas de munición .50" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -45851,15 +47282,43 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "carcasa 40mm" -msgstr[1] "carcasas 40mm" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing +#: lang/json/GENERIC_from_json.py +msgid "A large canister from a spent 40mm cartridge." +msgstr "" -#. ~ Description for 40mm canister #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "Es una carcasa grande de una granada 40mm utilizada." +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -46225,16 +47684,6 @@ msgid_plural "generic silverwares" msgstr[0] "" msgstr[1] "" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -49098,6 +50547,28 @@ msgid "" "twist ties, duct tape, and other random stuff has been used to compensate." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -50866,8 +52337,8 @@ msgstr[1] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -50997,9 +52468,79 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -53182,7 +54723,21 @@ msgstr[1] "" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" #: lang/json/GENERIC_from_json.py @@ -54375,6 +55930,17 @@ msgstr[1] "" msgid "A small book, containing spells created by a novice magician." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -54547,6 +56113,47 @@ msgid "" "hopes to discover a more permanent solution." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -54913,7 +56520,7 @@ msgstr[1] "arañabots desarmados rotos" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" @@ -54941,11 +56548,9 @@ msgstr[1] "" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Es un robot defensivo roto. Sus armas internas han sido quitadas. Puede ser " -"desarmado para recuperar partes o convertido en un robot recuperado." #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -54979,11 +56584,9 @@ msgstr[1] "mecagallinas desarmadas rotas" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Es una meca-gallina rota. Sus armas internas han sido quitadas. Puede ser " -"desarmado para recuperar partes o convertido en un robot recuperado." #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -55557,10 +57160,8 @@ msgstr[1] "vaqueros de basurero rotos" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "" -"Es un robot rescatado roto. Puede ser desarmado para recuperar partes o " -"reconstruido." #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -55589,12 +57190,9 @@ msgstr[1] "" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" -"Es un robot militar de entrenamiento roto, destrozado e inerte. Este está " -"equipado con un arma de paintball integrada. Puede ser desarmado para " -"recuperar partes." #: lang/json/GENERIC_from_json.py msgid "broken military robot" @@ -55605,53 +57203,44 @@ msgstr[1] "robots militares rotos" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"calibre 50 integrada. Puede ser desarmado para recuperar partes." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"arma 8x40mm integrada. Puede ser desarmado para recuperar partes." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"arma de dardos perforantes integrada. Puede ser desarmado para recuperar " -"partes." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"lanzagranadas 40mm integrado. Puede ser desarmado para recuperar partes." #: lang/json/GENERIC_from_json.py msgid "broken military flame robot" @@ -55662,11 +57251,9 @@ msgstr[1] "militaribots flameantes rotos" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" -"Es un robot militar roto, destrozado e inerte. Este está equipado con un " -"lanzallamas integrado. Puede ser desarmado para recuperar partes." #: lang/json/GENERIC_from_json.py msgid "broken robo-guardian" @@ -55679,9 +57266,11 @@ msgstr[1] "" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "Es un robot rescatado roto. Puede ser desarmado o reconstruido." +msgid "A broken salvaged robot. Could be stripped or recrafted." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken robote deluxe" @@ -55691,8 +57280,8 @@ msgstr[1] "robots de lujo rotos" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." -msgstr "Es un robot de lujo roto. Puede ser desarmado o reconstruido." +msgid "A broken deluxe robot. Could be stripped or recrafted." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken robo-protector" @@ -55715,11 +57304,9 @@ msgstr[1] "" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Es un robot avanzado roto. Sus armas internas han sido quitadas. Puede ser " -"desarmado para recuperar partes o convertido en un robot recuperado." #: lang/json/GENERIC_from_json.py msgid "broken advanced robot" @@ -55730,36 +57317,30 @@ msgstr[1] "robots avanzados rotos" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" -"Es un robot avanzado roto. Este está armado con un emisor láser integrado. " -"Puede ser desarmado para recuperar partes." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" -"Es un robot avanzado roto. Este está armado con un lanza-rayos eléctricos " -"integrado. Puede ser desarmado para recuperar partes." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" -"Es un robot avanzado roto. Este está armado con un proyector PEM integrado. " -"Puede ser desarmado para recuperar partes." #: lang/json/GENERIC_from_json.py msgid "broken glittering lady" @@ -55784,11 +57365,9 @@ msgstr[1] "horrores motosierra rotos" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "" -"Es un robot rescatado roto. Gracias a dios que ya está muerto. Puede ser " -"desarmado o reconstruido." #: lang/json/GENERIC_from_json.py msgid "broken screeching terror" @@ -55808,12 +57387,6 @@ msgid_plural "broken fist kings" msgstr[0] "" msgstr[1] "" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -55945,7 +57518,7 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." +"you…" msgstr "" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py @@ -56002,6 +57575,12 @@ msgid "" "obstructive." msgstr "" +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "chasis de torreta" +msgstr[1] "chasis de torreta" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -56060,13 +57639,9 @@ msgstr[1] "portales estabilizados" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"Mientras miras dentro de las profundidades aparentemente infinitas de este " -"agujero portátil de la realidad, una frase de un tiempo perdido se aparece " -"en tu mente. \"Hay dos cosas infinitas: el universo y la cleptomanía " -"humana.\"" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -56457,7 +58032,7 @@ msgstr "" #: lang/json/LOOT_ZONE_from_json.py msgid "Loot: Wood" -msgstr "" +msgstr "Cosas: Madera" #. ~ Description for Loot: Wood #: lang/json/LOOT_ZONE_from_json.py @@ -57363,6 +58938,17 @@ msgid "" " reload a compatible revolver." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "" @@ -57428,6 +59014,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "cargador AF2011A1" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "" @@ -57750,8 +59347,8 @@ msgstr "" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -59077,14 +60674,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"Es un misterio biológico, este monstruo masa amorfa gelatinosa ha " -"evolucionado hasta tener la habilidad de lentamente generar electricidad a " -"través de algún procedimiento desconocido. Emite un leve brillo " -"fosforescente mientras lo hace. Es capaz de almacenar electricidad desde " -"otras fuentes, pero al hacerlo se queda inactivo. Parece ser lo " -"suficientemente maleable como para desarmarlo..." #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -59134,24 +60725,6 @@ msgstr "" msgid "pebble hopper" msgstr "" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "cargador AF2011A1" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "" - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "" - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "predeterminado" @@ -59379,7 +60952,7 @@ msgstr "Más Edificios de Fuji" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "" @@ -59401,7 +60974,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -59433,7 +61006,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" @@ -59531,10 +61104,8 @@ msgstr "NPCs mutantes" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "" -"Los NPCs que deambulan por el páramo ocasionalmente tendrán mutaciones --- " -"incluidos tus enemigos. ¡Ten cuidado!" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -59543,9 +61114,8 @@ msgstr "" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -59863,7 +61433,7 @@ msgstr "" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "" @@ -59901,12 +61471,9 @@ msgstr "Símbolos de Mapa Alternativos" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" -"Cambia el mapa general para que sea más legible. Los edificios están " -"codificados por por tipo con colores y usan la letra inicial de sus nombres " -"en lugar de ^v<>." #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -60052,7 +61619,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -60064,7 +61631,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -60075,7 +61642,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -60085,7 +61652,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -60164,11 +61731,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." msgstr "" -"Un ánade real, a menudo visto cerca de los ríos y otros cuerpos de agua. Se " -"alimenta principalmente de insectos, semillas, raíces y, antes del " -"cataclismo, migas de pan." #: lang/json/MONSTER_from_json.py msgid "goose" @@ -60954,7 +62518,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61117,7 +62681,7 @@ msgid_plural "skittering plagues" msgstr[0] "" msgstr[1] "" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "" @@ -61130,7 +62694,7 @@ msgid_plural "plague nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "Es una cucaracha mutante e infectada del tamaño de una rata." @@ -61141,7 +62705,7 @@ msgid_plural "plague vectors" msgstr[0] "" msgstr[1] "" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -61165,7 +62729,7 @@ msgid_plural "giant cockroach nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "Es una cucaracha mutante bebé, del tamaño de una rata." @@ -61189,7 +62753,7 @@ msgid_plural "giant bees" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -61205,7 +62769,7 @@ msgid_plural "giant centipedes" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -61250,7 +62814,7 @@ msgid_plural "giant mosquitos" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -61265,7 +62829,7 @@ msgid_plural "giant cellar spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -61282,7 +62846,7 @@ msgid_plural "immature giant cellar spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -61297,7 +62861,7 @@ msgid_plural "giant jumping spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -61312,7 +62876,7 @@ msgid_plural "giant trapdoor spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -61327,7 +62891,7 @@ msgid_plural "giant web spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -61342,7 +62906,7 @@ msgid_plural "fungal spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -61356,7 +62920,7 @@ msgid_plural "immature giant web spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -61371,7 +62935,7 @@ msgid_plural "giant black widows" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -61386,7 +62950,7 @@ msgid_plural "giant black widow spiderlings" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -61401,7 +62965,7 @@ msgid_plural "giant wolf spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -61416,7 +62980,7 @@ msgid_plural "giant wasps" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -61432,7 +62996,7 @@ msgid_plural "dermatiks" msgstr[0] "" msgstr[1] "" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -61462,7 +63026,7 @@ msgid_plural "giant ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -61477,7 +63041,7 @@ msgid_plural "giant acidic ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -61507,7 +63071,7 @@ msgid_plural "acidic queen ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -61525,7 +63089,7 @@ msgid_plural "acidic soldier ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -61542,7 +63106,7 @@ msgid_plural "fungal ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -61574,7 +63138,7 @@ msgid_plural "queen ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -61589,7 +63153,7 @@ msgid_plural "soldier ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -61604,7 +63168,7 @@ msgid_plural "giant locusts" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -61617,7 +63181,7 @@ msgid_plural "locust nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -62523,14 +64087,14 @@ msgid_plural "marloss zealots" msgstr[0] "" msgstr[1] "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -62543,7 +64107,7 @@ msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -62561,7 +64125,7 @@ msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -62578,7 +64142,7 @@ msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -62595,7 +64159,7 @@ msgid_plural "mi-gos" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -62611,7 +64175,7 @@ msgid_plural "mi-go slavers" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -62628,7 +64192,7 @@ msgid_plural "mi-go surgeons" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -62642,7 +64206,7 @@ msgid_plural "mi-go guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -62659,7 +64223,7 @@ msgid_plural "mi-go myrmidons" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -62676,7 +64240,7 @@ msgid_plural "mi-go scouts" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -64390,6 +65954,19 @@ msgid "" "able to see." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -65109,7 +66686,7 @@ msgid_plural "experimental mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -65124,7 +66701,7 @@ msgid_plural "evolved mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -65619,7 +67196,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" @@ -65635,7 +67212,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" @@ -65650,7 +67227,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" @@ -66048,7 +67625,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -66063,7 +67640,21 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -66491,9 +68082,9 @@ msgstr[1] "" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" #: lang/json/MONSTER_from_json.py @@ -66505,10 +68096,10 @@ msgstr[1] "" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -66521,7 +68112,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -66535,8 +68126,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" @@ -66550,7 +68141,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -66564,10 +68155,10 @@ msgstr[1] "" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -66579,9 +68170,9 @@ msgstr[1] "" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -66595,8 +68186,8 @@ msgstr[1] "" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -66608,16 +68199,16 @@ msgstr[1] "" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" @@ -66631,12 +68222,9 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" -"Desprovisto completamente de carne y órganos, la presencia de este esqueleto" -" ambulante te cala hasta los huesos. En su mano huesuda, tiene una trompeta " -"prístina, intacta del fin del mundo." #: lang/json/MONSTER_from_json.py msgid "minion of skeltal" @@ -66660,10 +68248,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" -"Una cáscara humeante es todo lo que queda de lo que debe haber sido un " -"presuntuoso oso. Sus ojos negros te contemplan con malicia... y con hambre." #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -66996,6 +68582,87 @@ msgid "" "like jaws." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -67519,7 +69186,7 @@ msgstr[1] "" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" @@ -67532,11 +69199,9 @@ msgstr[1] "" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" -"Es un robot defensivo automatizado, todavía activo debido a su fuente " -"interna de energía. Este está equipado con un arma 9mm integrada." #: lang/json/MONSTER_from_json.py msgid "riotcontrol robot" @@ -67547,13 +69212,10 @@ msgstr[1] "" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" -"Es un robot defensivo automatizado, todavía activo debido a su fuente " -"interna de energía. Este está equipada con una picana eléctrica, un rociador" -" de gas lacrimógeno y un lanzaperdigones de 40mm." #: lang/json/MONSTER_from_json.py msgid "necco" @@ -67918,8 +69580,8 @@ msgstr[1] "" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67973,8 +69635,8 @@ msgstr[1] "" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" #: lang/json/MONSTER_from_json.py @@ -69477,6 +71139,17 @@ msgstr "" msgid "Ethereal Grasp" msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "" @@ -69898,6 +71571,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "" @@ -71911,6 +73607,19 @@ msgid "" msgstr "" "Es una herramienta médica para oir. Usalo para escuchar cosas. Más de cerca." +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -72198,9 +73907,9 @@ msgstr[1] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -72211,7 +73920,7 @@ msgstr[1] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -72224,9 +73933,9 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -72243,7 +73952,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -72256,12 +73965,12 @@ msgstr[1] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." +msgid "Power levels too low for safe bootup…" msgstr "" #. ~ Description for CRIT EM vest (off) @@ -72269,9 +73978,9 @@ msgstr "" msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -72287,7 +73996,7 @@ msgstr "" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "" #. ~ Description for CRIT EM vest (on) @@ -72296,8 +74005,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -72315,7 +74024,7 @@ msgstr "" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -72334,10 +74043,10 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -72592,6 +74301,32 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -73156,12 +74891,13 @@ msgstr "" #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "Tick." @@ -73242,11 +74978,10 @@ msgstr "Sacas el gancho de la granada emisora de interferencias." #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" #: lang/json/TOOL_from_json.py @@ -73265,6 +75000,52 @@ msgstr "" " detonará enviando una onda de control que convertirá temporalmente a los " "robos en tus aliados." +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "granada PEM" +msgstr[1] "granadas PEM" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "Sacas el gancho de la granada PEM." + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "granada PEM activada" +msgstr[1] "granadas PEM activadas" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "Ya le sacaste el pasador a la %s, ahora intenta tirarla." + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"Es una granada PEM activada, y en cualquier momento detonará creando un gran" +" campo PEM que daña robots y drena energía biónica. Tal vez no quieras " +"tenerla en la mano mucho más tiempo." + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -73697,24 +75478,29 @@ msgstr "" "más importantes de tu cuerpo. Úsala para desplegarla y utilizarla." #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "granada PEM" -msgstr[1] "granadas PEM" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "" +msgstr[1] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "Sacas el gancho de la granada PEM." +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" #: lang/json/TOOL_from_json.py @@ -73731,29 +75517,24 @@ msgid "" msgstr "" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "granada PEM activada" -msgstr[1] "granadas PEM activadas" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "" +msgstr[1] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "Ya le sacaste el pasador a la %s, ahora intenta tirarla." +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"Es una granada PEM activada, y en cualquier momento detonará creando un gran" -" campo PEM que daña robots y drena energía biónica. Tal vez no quieras " -"tenerla en la mano mucho más tiempo." #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -74251,14 +76032,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -"Una cámara digital SLR (réflex de un objetivo) de 35mm, con un visor óptico " -"y otro digital, lente con zoom, autoenfoque y estabilizador, y flash. Puedes" -" ver las fotos en su pantalla o transferirlas a una tarjeta de memoria. " -"Funciona con baterías normales. Antes del cataclismo, podrías haber sacado " -"fotos de calidad profesional con esta cámara." #: lang/json/TOOL_from_json.py msgid "candle" @@ -75043,6 +76819,7 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -75056,13 +76833,10 @@ msgstr[1] "" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -"Es una tableta que utiliza una pantalla eficiente de tinta electrónica de " -"color. Antes del cataclismo, estos eran unos aparatos copados. Ahora, es " -"casi un recurso invalorable. Funciona con baterías normales." #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -76315,12 +78089,9 @@ msgstr[1] "martillos improvisados" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "" -"Es un simple martillo hecho con un pedazo de metal fijado a un palo. " -"Funciona adecuadamente pero realmente no se puede comparar con uno " -"verdadero." #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -77428,21 +79199,6 @@ msgid "" "blade allows for precision strikes in the hands of the skilled." msgstr "" -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "tijera" -msgstr[1] "tijeras" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "" -"Son un par de tijeras largas y resistentes. Puedes usar las tijeras para " -"cortar objetos hechos de algodón (como la ropa) y hacer trapos." - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -79862,6 +81618,18 @@ msgid "" "distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -82106,6 +83874,21 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "tijera" +msgstr[1] "tijeras" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "" +"Son un par de tijeras largas y resistentes. Puedes usar las tijeras para " +"cortar objetos hechos de algodón (como la ropa) y hacer trapos." + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -82281,6 +84064,28 @@ msgid_plural "precision soldererss" msgstr[0] "" msgstr[1] "" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -82478,12 +84283,12 @@ msgstr[1] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -82495,10 +84300,11 @@ msgstr[1] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -82510,7 +84316,7 @@ msgstr[1] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -82523,7 +84329,7 @@ msgstr[1] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -82537,10 +84343,10 @@ msgstr[1] "" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -82553,7 +84359,7 @@ msgstr[1] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -82567,7 +84373,7 @@ msgstr[1] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -83079,7 +84885,7 @@ msgstr[1] "" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" @@ -83092,7 +84898,7 @@ msgstr[1] "" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" @@ -83105,7 +84911,7 @@ msgstr[1] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" @@ -83118,7 +84924,7 @@ msgstr[1] "" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" @@ -83131,8 +84937,8 @@ msgstr[1] "" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -83144,8 +84950,8 @@ msgstr[1] "" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -83157,7 +84963,7 @@ msgstr[1] "" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" @@ -83170,8 +84976,8 @@ msgstr[1] "" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -83183,7 +84989,7 @@ msgstr[1] "" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -83272,22 +85078,17 @@ msgstr[1] "Dusks" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." msgstr "" -"Es una espada larga, hecha de un metal muy oscuro, casi negro. Parece tener " -"una cuchilla más grande que las normales espadas de acero y se siente... más" -" cómoda en la mano. Aunque la cuchilla está hecha de este oscuro metal, la " -"guarda y el pomo parecen estar hechos de un material más brillante, que se " -"siente extrañamente frío al tacto." #. ~ Use action use_message for disarmed defense turret. #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." +msgid "Error. No weapon systems found." msgstr "" #. ~ Description for disarmed defense turret @@ -83471,14 +85272,9 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Es una torreta militar inactiva de granadas. Serán cargadas automáticamente " -"hasta 50 granadas de fragmentación 40mm desde tu inventario a la torreta " -"cuando la actives. Cuando pongas la torreta te va a identificar como aliado " -"con su software IFF avanzado. Consultá el manual de seguridad en caso de mal" -" funcionamiento." #: lang/json/TOOL_from_json.py msgid "inactive military flamethrower turret" @@ -83537,15 +85333,10 @@ msgstr[1] "" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Es una torreta avanzada inactiva de cañón de riel. Serán cargados " -"automáticamente hasta 100 proyectiles de riel desde tu inventario a la " -"torreta cuando la actives. Cuando pongas la torreta te va a identificar como" -" aliado con su software IFF avanzado. Consultá el manual de seguridad en " -"caso de mal funcionamiento." #: lang/json/TOOL_from_json.py msgid "inactive advanced acid turret" @@ -83557,7 +85348,7 @@ msgstr[1] "torretas avanzadas ácidas inactivas" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" @@ -83571,12 +85362,9 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Es una torreta PEM avanzada inactiva. Poné la torreta y te va a identificar " -"como aliado con su software IFF avanzado. Consultá tu manual de seguridad " -"ante un eventual mal funcionamiento." #: lang/json/TOOL_from_json.py msgid "inactive advanced electro turret" @@ -83924,7 +85712,7 @@ msgstr[1] "" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" @@ -83938,7 +85726,7 @@ msgstr[1] "" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." @@ -84002,10 +85790,10 @@ msgstr[1] "digestrones inactivos" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" #: lang/json/TOOL_from_json.py @@ -84043,13 +85831,10 @@ msgstr[1] "asesinobots inactivos" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" -"Es un robot médico reconvertido en una máquina asesina. Atacará a los " -"objetivos hostiles con un conjunto de cuchillas y una aguja tóxica. Activá " -"este objeto para desplegar el robot." #: lang/json/TOOL_from_json.py msgid "inactive elixirator" @@ -84087,13 +85872,10 @@ msgstr[1] "cazaratas inactivos" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" -"Es un arañabot reconvertido para cazar animales pequeños. Ataca a sus " -"objetivos con pinzas y una pistola eléctrica integrada. Activá este objeto " -"para desplegar el robot." #: lang/json/TOOL_from_json.py msgid "inactive grab-bot" @@ -84141,7 +85923,7 @@ msgstr[1] "androides necróticos inactivos" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" @@ -84191,7 +85973,7 @@ msgstr[1] "" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" #: lang/json/TOOL_from_json.py @@ -84535,14 +86317,8 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" -"Es un misterio biológico. Las estructuras internas de este monstruo masa " -"amorfa gelatinosa existen dentro de una pila de fregadero de fluido de baja " -"densidad que se mantiene líquido a pesar de estar en un estado super-frío. " -"Aún así, posee toda la maleabilidad de su antigua forma. Continuamente, " -"fragmentos de escarcha se descascaran. Parece ser lo suficientemente " -"flexible como para desarmar..." #: lang/json/TOOL_from_json.py msgid "growing cold mass" @@ -84776,14 +86552,10 @@ msgstr "El grupo se desarma en tus manos." #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" -"Es un grupo de cristales artificiales que se han desprendido de una matriz " -"de diamante. Aunque la sustancia normalmente se degrada cuando es separada " -"del catalizador, este grupo parece mantenerse debido a algún mecanismo " -"desconocido." #: lang/json/TOOL_from_json.py msgid "diamond matrix" @@ -84794,10 +86566,8 @@ msgstr[1] "matrices de diamante" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +"Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "" -"Tus sentidos se adormecen mientras miras en las profundidades del centro de " -"esta gema..." #. ~ Description for diamond matrix #: lang/json/TOOL_from_json.py @@ -84818,10 +86588,10 @@ msgstr[1] "motores vórtice" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" @@ -84834,17 +86604,12 @@ msgstr[1] "generadores vórtice" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" -"Es un tornado en una caja, por decirlo de alguna manera. Adentro de este " -"inocuo tanque está la culminación de la innovación humana sobre energía " -"limpia, o un arma de destrucción masiva capaz de borrar la civilización del " -"mapa. o lo que queda de ella. El mecanismo externo permite unirlo a una " -"batería para almacenar la energía generada." #: lang/json/TOOL_from_json.py msgid "control chip" @@ -88192,6 +89957,10 @@ msgstr "Const.Empalizada" msgid "Build Stone Wall" msgstr "Const.Pared de Piedra" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "" @@ -91977,6 +93746,35 @@ msgid "" "from the inside." msgstr "" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "Iluminar" @@ -92637,11 +94435,9 @@ msgstr "Privación del sueño" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "" -"La falta de sueño se te ha ido incrementando por un rato ya. Deberías " -"descansar." #. ~ Apply message for effect(s) 'Sleep Deprived'. #: lang/json/effects_from_json.py @@ -92788,7 +94584,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -92802,14 +94598,8 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" -"Le encontró un nuevo sentido a la vida luego de tu muerte. Aunque nunca te " -"lo dijo, sus crímenes en el mundo anterior evitaron que pudiera tener un " -"verdadero lugar en la sociedad. Con la destrucción de los registros " -"criminales, tomó el desafío de probar su valía a sus compañeros. Murió de un" -" ataque al corazón cuando estaba solo en un viaje muchos años después del " -"cataclismo." #: lang/json/epilogue_from_json.py msgid "" @@ -92825,7 +94615,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " @@ -92859,7 +94649,7 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" @@ -93224,7 +95014,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -93255,7 +95045,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " @@ -93545,7 +95335,7 @@ msgstr "" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" @@ -93719,7 +95509,7 @@ msgstr "" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." @@ -93793,6 +95583,20 @@ msgstr "" msgid "You clean your %s." msgstr "" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "" @@ -93816,6 +95620,29 @@ msgstr "" msgid "You eject the spent casing from the %s." msgstr "" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "" @@ -93836,6 +95663,11 @@ msgstr "" msgid "Clean gun" msgstr "" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "" @@ -94564,11 +96396,13 @@ msgstr "" msgid "A big, blocky metal device for refrigerating large areas." msgstr "" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "¡chirrido de metal!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "¡clang!" @@ -96397,6 +98231,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "estante" @@ -97313,8 +99156,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -97347,7 +99190,7 @@ msgstr "" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -97358,7 +99201,7 @@ msgstr "" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -97369,7 +99212,7 @@ msgstr "" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -97380,7 +99223,7 @@ msgstr "" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -99424,8 +101267,8 @@ msgstr "" " el hombro, ya que casi nadie es un héroe de película de acción." #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" msgstr[0] "" msgstr[1] "" @@ -99659,6 +101502,19 @@ msgid "" "hammers of the four barrels arranged in a square formation." msgstr "" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -99776,6 +101632,18 @@ msgid "" "quality, durable materials." msgstr "" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -99957,23 +101825,6 @@ msgstr "" "estadounidenses en la guerra de Vietnam. Aunque ya ha sido reemplazado por " "lanzadores modernos, el M79 todavía se usa en todo el mundo." -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "lanzagranadas Mark 19" -msgstr[1] "lanzagranadas Mark 19" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"Es un lanzagranadas pesado, montado en un trípode y alimentado con cinta de " -"munición, utilizado por el Ejército de EE.UU. desde comienzos de la Guerra " -"Fría hasta el cataclismo, y si puedes encontrar algunas granadas 40mm, se " -"puede seguir usando." - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -100028,6 +101879,23 @@ msgstr "" msgid "multi" msgstr "multi" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "lanzagranadas Mark 19" +msgstr[1] "lanzagranadas Mark 19" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"Es un lanzagranadas pesado, montado en un trípode y alimentado con cinta de " +"munición, utilizado por el Ejército de EE.UU. desde comienzos de la Guerra " +"Fría hasta el cataclismo, y si puedes encontrar algunas granadas 40mm, se " +"puede seguir usando." + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -100041,6 +101909,19 @@ msgid "" "shell at a time like most shotguns." msgstr "" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -100340,6 +102221,18 @@ msgstr "" "El Taurus Raging Bull es un revólver de 5 disparos con calibre .454 Casull." " Tiene una potencia de parada impresionante." +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "Taurus Raging Judge Magnum" +msgstr[1] "Taurus Raging Judge Magnum" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -100380,6 +102273,36 @@ msgid "" "ammunition." msgstr "" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -100506,13 +102429,9 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" -"Una ametralladora pesada usada por el Ejército de Estados Unidos desde su " -"creación hasta el Cataclismo, e incluso también por algunos sobrevivientes " -"del cataclismo. Su enorme tamaño y su diseño la hacen imposible de usar " -"salvo que esté desplegada o montada en un vehículo." #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -102081,7 +104000,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -102245,14 +104164,9 @@ msgstr[1] "" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" -"Es un rifle láser de última generación, desarrollado por el equipo de " -"investigación y desarrollo \"Aerial Lbas\". Compitió con lo mejor de " -"Rivtech, y hubo rumores sobre trampas empresariales. Aunque el cataclismo " -"puso eso en la pila de cenizas de la historia, esta arma puede hacer lo " -"mismo con tus enemigos." #: lang/json/gun_from_json.py msgid "V29 laser pistol" @@ -102324,6 +104238,18 @@ msgstr "" "Es una cerbatana de madera, fácil de usar y muy precisa. Usa dardos como " "munición." +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -102375,7 +104301,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -102388,7 +104314,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -102402,7 +104328,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -102414,8 +104340,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" #: lang/json/gun_from_json.py @@ -102426,12 +104352,12 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" #: lang/json/gun_from_json.py @@ -102456,11 +104382,11 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" #: lang/json/gun_from_json.py @@ -102471,7 +104397,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -102483,8 +104409,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -102497,7 +104423,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -102509,8 +104435,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -102522,7 +104448,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -102550,8 +104476,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" @@ -102689,12 +104615,10 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." -msgstr "" -"El auto-revólver Johnson Heavy Equipment Co. M128; todos los demás fallan en" -" la medida. Johnson Heavy Equipment Co. es una subsidiaria de D&B " +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " "Minneapolis." +msgstr "" #: lang/json/gun_from_json.py msgid "Boomlighter 454" @@ -102794,8 +104718,8 @@ msgstr "" "libertad!" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" msgstr[0] "" msgstr[1] "" @@ -103227,12 +105151,9 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" -"Es un poderoso electroláser desarrollado por paramilitares R&D poco antes " -"del cataclismo. Es especialmente efectivo contra objetivos electrónicos. Se " -"carga con UPS." #: lang/json/gun_from_json.py msgid "hand-held laser cannon" @@ -103257,16 +105178,11 @@ msgstr[1] "rifles láser" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" -"Es un rifle láser de íltima generación que funciona con un UPS. Fue " -"desarrollado por paramilitares R&D poco antes del cataclismo. Su performance" -" compitió con las armas más avanzadas del momento. Aunque el cataclismo puso" -" eso en la pila de cenizas de la historia, esta arma todavía puede lastimar " -"a tus enemigos." #: lang/json/gun_from_json.py msgid "laser pistol" @@ -103427,6 +105343,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -103456,9 +105376,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "" -"Esto es un pseudoobjeto para ataques de monstruos. Si te aparece, es un bug." #: lang/json/gun_from_json.py msgid "integral 12 gauge shotgun" @@ -103670,7 +105589,7 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py @@ -103685,14 +105604,8 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" -"Es un monstruo masa amorfa gelatinosa vivo convertido en un arma autónoma. " -"Rastrea el suelo buscando materiales de los que absorbe sus nutrientes. Tira" -" el resto a una velocidad importante hacia las amenazas cercanas. Puede " -"dársele forma a la masa amorfa y adaptado a tu tacto, pero el arma en sí " -"misma está inerte si no es controlada. Parece ser suficientemente flexible " -"como para romperse..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "frost lancer" @@ -103726,6 +105639,13 @@ msgid "" "attached at your touch, but the weapon itself is inert without something to " "control it." msgstr "" +"Es un monstruo masa amorfa gelatinosa vivo convertido en un arma autónoma. " +"Una mutación incomprensible sucedida a una criatura ya de por sí " +"incomprensible. Este monstruo masa amorfa gelatinosa está cubierto por una " +"piel gruesa, que le sirve de protección. Además, tiene unas filas salientes " +"de fragmentos calcáreas afilados que parecen las mandíbulas de alguna " +"criatura más reconocible. Puede dársele forma a la masa amorfa y adaptado a " +"tu tacto, pero el arma en sí misma está inerte si no es controlada." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "blobsaw" @@ -104347,19 +106267,6 @@ msgstr "" "increíblemente incómodo, y debe estar montado en plataforma de apoyo para " "poder ser disparado." -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "revolver Model 10" -msgstr[1] "revolver Model 10" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "" -"Es un revolver de seis disparos. Tiene un cilindro que se abre hacia afuera " -"para poder cargarlo más fácilmente." - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -104379,51 +106286,6 @@ msgstr "" " podrían ser varados después de un accidente, más tarde producido " "comercialmente por diversas empresas." -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -"Es una reproducción moderna del rifle Colt de acción de bombeo. " -"Originalmente hecha con calibre .44-40, las versiones modernas utilizan más " -"comúnmente el .45 Long Colt, complementando el Single Action Army con un " -"arma para los Cowboy Action Shooting." - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" -"El Bond Arms Derringer es una serie de pistolas compactas de dos cañones. Lo" -" más común es el calibre .45 Colt largo, con recámaras para aceptar " -"cartuchos de escopeta calibre .410." - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -104439,47 +106301,6 @@ msgstr "" " un tubo unido a una culata, con un percutor para golpear la única bala que " "contiene." -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "AF2011A1 .38 Super" -msgstr[1] "AF2011A1 .38 Supers" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "" -"Es una pistola semiautomática de doble cañón. Parece dos M1911 soldadas " -"juntas." - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38 Super" -msgstr[1] "M1991A1 .38 Supers" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "" -"Es una moderna M1911, con calibre para el cartucho .38 Super. Tiene buena " -"precisión." - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "Taurus Raging Judge Magnum" -msgstr[1] "Taurus Raging Judge Magnum" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -105766,7 +107587,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" @@ -106169,6 +107990,18 @@ msgid "" "weapon other than pistols and pump-action guns, if you so want." msgstr "" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -106428,7 +108261,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -106452,9 +108285,9 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -106466,7 +108299,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -106665,20 +108498,6 @@ msgstr "" "proporcionando ataques de alcance cuando se monta en un arma grande o una " "ballesta." -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "escopeta M6 ASW" -msgstr[1] "escopetas M6 ASW" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "" -"La escopeta .410 integrada de la arma de supervivencia M6 Aircrew. No se " -"puede quitar." - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "" @@ -108304,10 +110123,6 @@ msgstr "Cortar tornillos o alambres" msgid "Heat up food (with it)" msgstr "Calentar comida (con esto)" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "Reparar madera/papel/hueso/quitina" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "Adjuntar como herramienta personalizada" @@ -109180,6 +110995,11 @@ msgstr "" "Esta ropa funciona bien incluso cuando está " "empapada. Esto te puede sentir bien." +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -110320,7 +112140,8 @@ msgstr "Construir terreno" msgid "Disassemble items" msgstr "Desmontar objetos" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "Dormir" @@ -111130,7 +112951,8 @@ msgstr "" msgid "Wasp nest is here." msgstr "" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "Arañas" @@ -111189,6 +113011,33 @@ msgstr "" msgid "Small pond is here." msgstr "" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "" @@ -111259,7 +113108,7 @@ msgstr "" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "" #. ~ Computer name @@ -112033,6 +113882,16 @@ msgstr "" msgid "NO Diving!" msgstr "" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -112167,8 +114026,7 @@ msgid "Emergency Message" msgstr "Mensaje de Emergencia" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "Desactivar Energía Externa" @@ -112806,7 +114664,7 @@ msgstr "" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -113140,7 +114998,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "Moonlight" -msgstr "" +msgstr "Luz de la Luna" #. ~ Description of buff 'Moonlight' for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py @@ -113819,7 +115677,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -113842,7 +115700,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -113853,7 +115711,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -113862,7 +115720,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -113873,7 +115731,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -113883,7 +115741,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -113894,7 +115752,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -114068,6 +115926,10 @@ msgstr "deshilachado/a" msgid "Diamond" msgstr "Diamante" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "Huevo" @@ -114285,8 +116147,8 @@ msgid "Mushroom" msgstr "Seta" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "Agua" @@ -114572,7 +116434,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "Do you have any better ideas?" -msgstr "" +msgstr "¿Tienes alguna idea mejor?" #: lang/json/mission_def_from_json.py msgid "" @@ -115631,7 +117493,7 @@ msgstr "" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" @@ -115775,11 +117637,11 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "" #: lang/json/mission_def_from_json.py @@ -115820,6 +117682,10 @@ msgstr "" msgid "What good does this do me?" msgstr "" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "" @@ -115860,7 +117726,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "" #: lang/json/mission_def_from_json.py @@ -115898,12 +117764,12 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "" #: lang/json/mission_def_from_json.py @@ -115972,7 +117838,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "" #: lang/json/mission_def_from_json.py @@ -115990,7 +117856,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" @@ -116011,7 +117877,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" #: lang/json/mission_def_from_json.py @@ -116019,7 +117885,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "" #: lang/json/mission_def_from_json.py @@ -116718,7 +118584,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" @@ -117115,7 +118981,7 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -117410,7 +119276,7 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" @@ -118835,7 +120701,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -118861,10 +120727,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "Gracias por intentarlo... supongo." - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -118889,7 +120751,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -118929,8 +120791,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -118951,7 +120813,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -118978,7 +120840,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -118993,7 +120855,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -119065,6 +120927,54 @@ msgstr "" msgid "The %1$s tries to slam into , but fails to." msgstr "" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -127048,8 +128958,8 @@ msgstr "Historia de Superviviente" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" -msgstr "Este PNJ podría contarte cómo sobrevivió al cataclismo" +msgid "This NPC could tell you about how they survived the Cataclysm" +msgstr "" #: lang/json/mutation_from_json.py msgid "Mark of the Seer" @@ -127526,7 +129436,7 @@ msgstr "" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -127590,18 +129500,10 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "" @@ -128233,7 +130135,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -128266,7 +130168,7 @@ msgid "I'm just trying to stay alive." msgstr "" #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." msgstr "" #: lang/json/npc_class_from_json.py @@ -128275,11 +130177,9 @@ msgstr "Mutante Lagarto" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de lagarto... en este mundo ya no hay lugar para los" -" humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Medical Mutant" @@ -128287,8 +130187,8 @@ msgstr "Mutante Médico" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -128297,11 +130197,9 @@ msgstr "Pájaro Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de pájaro... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Fish Mutant" @@ -128309,11 +130207,9 @@ msgstr "Pez Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de pez... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Beast Mutant" @@ -128321,7 +130217,7 @@ msgstr "Bestia Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -128331,8 +130227,8 @@ msgstr "Mutante Osuno" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -128341,11 +130237,9 @@ msgstr "Mutante Felino" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de felino... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Lupine Mutant" @@ -128353,8 +130247,8 @@ msgstr "Lobuno Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -128363,11 +130257,9 @@ msgstr "Mutante Ganado" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de ganado... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Insect Mutant" @@ -128375,11 +130267,9 @@ msgstr "Insecto Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de insectos... este mundo ya no es lugar para " -"humanos, y no pienso seguir siéndolo." #: lang/json/npc_class_from_json.py msgid "Plant Mutant" @@ -128387,11 +130277,9 @@ msgstr "Planta Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de planta... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Slime Mutant" @@ -128399,7 +130287,7 @@ msgstr "Slime Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -128409,7 +130297,7 @@ msgstr "Troglobio Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" @@ -128419,7 +130307,7 @@ msgstr "Mutante Cefalópodo" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" @@ -128429,8 +130317,8 @@ msgstr "Araña Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -128439,11 +130327,9 @@ msgstr "Rata Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de rata... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Mouse Mutant" @@ -128451,11 +130337,9 @@ msgstr "Ratón Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de ratón... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Alpha Mutant" @@ -128463,7 +130347,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -128473,8 +130357,8 @@ msgstr "Elfa Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -128483,11 +130367,9 @@ msgstr "Quimera Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de quimera... en este mundo ya no hay lugar para los" -" humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_class_from_json.py msgid "Raptor Mutant" @@ -128495,11 +130377,9 @@ msgstr "Raptor Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Estoy buscando mutágeno de raptor... en este mundo ya no hay lugar para los " -"humanos, y yo no quiero seguir siendo uno." #: lang/json/npc_from_json.py msgid "Brigitte LaCroix" @@ -131748,13 +133628,10 @@ msgstr "Superviviente en Refugio" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"Cuando comenzó el cataclismo, te resguardaste en el refugio antibombas. " -"Ahora es invierno, y tu única esperanza es que el barullo de habilidades que" -" aprendiste de todos esos libros te ayuden a sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -131765,13 +133642,10 @@ msgstr "Superviviente en Refugio" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"Cuando comenzó el cataclismo, te resguardaste en el refugio antibombas. " -"Ahora es invierno, y tu única esperanza es que el barullo de habilidades que" -" aprendiste de todos esos libros te ayuden a sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -131782,13 +133656,10 @@ msgstr "Miliciano Refugiado" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Cuando comenzó el cataclismo, te resguardaste en el refugio antibombas. " -"Ahora es invierno y esperas que tus armas y las habilidades que aprendiste " -"te ayuden a sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -131799,13 +133670,10 @@ msgstr "Miliciana Refugiada" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Cuando comenzó el cataclismo, te resguardaste en el refugio antibombas. " -"Ahora es invierno y esperas que tus armas y las habilidades que aprendiste " -"te ayuden a sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -131886,13 +133754,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"¿¡Qué demonios!? No sabéis nada de este extraño sitio ni de qué perverso " -"encantamiento lo trajo. Con este equipamiento debes encontrar una nueva vida" -" en el cataclismo más horroroso que el hombre ha conocido desde el diluvio " -"que Noé escapó en su gran nave." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -131905,13 +133769,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"¿¡Qué demonios!? No sabéis nada de este extraño sitio ni de qué perverso " -"encantamiento lo trajo. Con este equipamiento debes encontrar una nueva vida" -" en el cataclismo más horroroso que el hombre ha conocido desde el diluvio " -"que Noé escapó en su gran nave." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -132027,12 +133887,9 @@ msgstr "Apicultor" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Antes eras apicultor profesional. Tuviste que abandonar a tus preciosas " -"abejas cuando llegó el cataclismo pero por lo menos te pudiste llevar " -"algunas herramientas y miel." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -132044,12 +133901,9 @@ msgstr "Apicultora" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Antes eras apicultora profesional. Tuviste que abandonar a tus preciosas " -"abejas cuando llegó el cataclismo pero por lo menos te pudiste llevar " -"algunas herramientas y miel." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -132060,7 +133914,7 @@ msgstr "Jugador de Baloncesto" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" @@ -132074,7 +133928,7 @@ msgstr "Jugadora de Baloncesto" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" @@ -132232,12 +134086,9 @@ msgstr "Mayordomo" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Trabajabas en un hogar de gente adinerada pero después del cataclismo, la " -"familia se fue de vacaciones a un lugar desconocido, dejándote para que te " -"las arregles." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -132248,12 +134099,9 @@ msgstr "Sirvienta" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Trabajabas en un hogar de gente adinerada pero después del cataclismo, la " -"familia se fue de vacaciones a un lugar desconocido, dejándote para que te " -"las arregles." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -133286,13 +135134,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Trabajabas para algunas pequeñas empresas haciendo trabajos eléctricos " -"menores, y justo estabas trabajando en uno de esos refugios de evacuados " -"cuando ocurrió el cataclismo. Lamentablemente, no pudiste terminar de " -"conectar nada excepto la computadora... que ahora no te sirve de mucho." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -133305,13 +135149,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Trabajabas para algunas pequeñas empresas haciendo trabajos eléctricos " -"menores, y justo estabas trabajando en uno de esos refugios de evacuados " -"cuando ocurrió el cataclismo. Lamentablemente, no pudiste terminar de " -"conectar nada excepto la computadora... que ahora no te sirve de mucho." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -133384,7 +135224,7 @@ msgstr "Víctima en la Ducha" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -133398,7 +135238,7 @@ msgstr "Víctima en la Ducha" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -133442,11 +135282,9 @@ msgstr "Bailarín de Salón" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"Antes del cataclismo eras un bailarín de salón y ahora vas a usar tus " -"habilidades para salvar tu vida." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -133457,11 +135295,9 @@ msgstr "Bailarina de Salón" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"Antes del cataclismo eras una bailarina de salón y ahora vas a usar tus " -"habilidades para salvar tu vida." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -134362,11 +136198,9 @@ msgstr "Novio" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"El cataclismo sucedió justo el gran día y te escapaste con tu ropa para el " -"casorio. ¿Los pies fríos? ¡Te preocupa más poder mantener tus pies!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -134377,11 +136211,9 @@ msgstr "Novia" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"El cataclismo sucedió justo el gran día y te escapaste con tu vestido de " -"novia. ¿Los pies fríos? ¡Te preocupa más poder mantener tus pies!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -134453,10 +136285,8 @@ msgstr "Chico Rudo" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Tu banda de ska se separó después de que el batero se hizo zombi. Ahora " -"estás solo en el cataclismo con algunos cigarrillos y tu reproductor de mp3." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -134468,10 +136298,8 @@ msgstr "Chica Ruda" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Tu banda de ska se separó después de que el batero se hizo zombi. Ahora " -"estás sola en el cataclismo con algunos cigarrillos y tu reproductor de mp3." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -134512,11 +136340,9 @@ msgstr "Convicto" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"El cataclismo te dio la oportunidad de escapar, pero la libertad viene con " -"un precio demasiado elevado." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -134527,11 +136353,9 @@ msgstr "Convicta" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"El cataclismo te dio la oportunidad de escapar, pero la libertad viene con " -"un precio demasiado elevado." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -134964,11 +136788,9 @@ msgstr "Rabino" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Estabas en el templo celebrando con tus feligreses, cuando sucedió el " -"cataclismo. ¡Ahora sí que te vendría bien un mesías!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -134979,11 +136801,9 @@ msgstr "Rabina" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Estabas en el templo celebrando con tus feligreses, cuando sucedió el " -"cataclismo. ¡Ahora sí que te vendría bien un mesías!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135189,14 +137009,10 @@ msgstr "Repartidor de pizzas" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Estabas entregando la última pizza de la noche al laboratorio de " -"criogénesis, cuando ocurrió el cataclismo. Escapaste al refugio más cercano," -" y solo te queda tu buen juicio y sobras de pizza. ¡Y ni siquiera te dieron " -"propina!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135208,14 +137024,10 @@ msgstr "Repartidora de pizzas" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Estabas entregando la última pizza de la noche al laboratorio de " -"criogénesis, cuando ocurrió el cataclismo. Escapaste al refugio más cercano," -" y solo te queda tu buen juicio y sobras de pizza. ¡Y ni siquiera te dieron " -"propina!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135332,13 +137144,10 @@ msgstr "Granjero" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Te ganabas la vida cultivando hasta que ocurrió el cataclismo. Ahora, con tu" -" querida azada y algunas semillas, es tiempo de reconstruir la Tierra, de a " -"una planta por vez." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135349,13 +137158,10 @@ msgstr "Granjera" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Te ganabas la vida cultivando hasta que ocurrió el cataclismo. Ahora, con tu" -" querida azada y algunas semillas, es tiempo de reconstruir la Tierra, de a " -"una planta por vez." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135402,13 +137208,10 @@ msgstr "Chatarrero Curtido" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Fuiste uno de los pocos afortunados en escapar del cataclismo. Hiciste tu " -"vida a partir de las ruinas de los demás. Ya sea por la fuerza, la astucia o" -" la suerte, has conseguido el mejor equipamiento que podías encontrar." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135419,13 +137222,10 @@ msgstr "Chatarrera Curtida" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Fuiste una de los pocos afortunados en escapar del cataclismo. Hiciste tu " -"vida a partir de las ruinas de los demás. Ya sea por la fuerza, la astucia o" -" la suerte, has conseguido el mejor equipamiento que podías encontrar." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135750,16 +137550,11 @@ msgstr "Superviviente Junior" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Tus padres eran unos locos preppers que pensaban que alguna clase de " -"\"cataclismo\" estaba por llegar, e insistían en prepararte para eso. Al " -"final, tenían razón. No pudiste agradecerles. Lo único que puedes hacer por " -"ellos es lo que siempre quisieron que hicieras en estos días oscuros que se " -"vienen: sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135770,16 +137565,11 @@ msgstr "Superviviente Junior" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Tus padres eran unos locos preppers que pensaban que alguna clase de " -"\"cataclismo\" estaba por llegar, e insistían en prepararte para eso. Al " -"final, tenían razón. No pudiste agradecerles. Lo único que puedes hacer por " -"ellos es lo que siempre quisieron que hicieras en estos días oscuros que se " -"vienen: sobrevivir." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136737,7 +138527,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -136754,7 +138544,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -137005,10 +138795,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -137021,10 +138811,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -137036,9 +138826,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -137052,9 +138842,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -137068,7 +138858,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -137082,7 +138872,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -137097,9 +138887,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -137114,9 +138904,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -137130,13 +138920,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -137148,13 +138938,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -137167,8 +138957,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -137183,8 +138973,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -137199,9 +138989,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -137214,9 +139004,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -137228,13 +139018,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -137246,13 +139036,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -137264,10 +139054,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -137279,10 +139069,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -137294,12 +139084,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -137311,12 +139101,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -137328,17 +139118,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -137350,17 +139140,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -137374,9 +139164,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -137390,9 +139180,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -137406,10 +139196,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -137425,10 +139215,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -137443,9 +139233,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -137458,9 +139248,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -137472,11 +139262,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -137488,11 +139279,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -137644,7 +139436,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -137657,7 +139449,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -137694,7 +139486,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -137707,7 +139499,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -137720,7 +139512,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -137733,7 +139525,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -137799,7 +139591,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -137810,7 +139602,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -137874,7 +139666,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -137887,7 +139679,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -137979,7 +139771,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -137993,7 +139785,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -138009,7 +139801,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -138024,7 +139816,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -139076,13 +140868,10 @@ msgstr "Jugador de Béisbol" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"Eras bateador en un equipo de las ligas menores antes del cataclismo. Te " -"escapaste con tu ropa pero ¿cuánto podrás sobrevivir antes de que se " -"terminen las entradas?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139093,13 +140882,10 @@ msgstr "Jugadora de Béisbol" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"Eras bateadora en un equipo de las ligas menores antes del cataclismo. Te " -"escapaste con tu ropa pero ¿cuánto podrás sobrevivir antes de que se " -"terminen las entradas?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139184,11 +140970,9 @@ msgstr "Despertada" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Te despertó un ruido en mitad de la noche. Armado solamente con una " -"linterna, fuiste a investigar, y ahora te enfrentás al cataclismo." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139199,11 +140983,9 @@ msgstr "Despertada" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Te despertó un ruido en mitad de la noche. Armado solamente con una " -"linterna, fuiste a investigar, y ahora te enfrentás al cataclismo." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139215,12 +140997,9 @@ msgstr "Ciclista Biónica" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Tu entrenamiento y tus mejoras para la competición de ciclismo de las Ciber-" -"Olimpiadas te dieron una ventaja para escapar al comienzo del cataclismo. " -"¿Vas a poder seguir corriendo para siempre?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139232,12 +141011,9 @@ msgstr "Ciclista Biónica" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Tu entrenamiento y tus mejoras para la competición de ciclismo de las Ciber-" -"Olimpiadas te dieron una ventaja para escapar al comienzo del cataclismo. " -"¿Vas a poder seguir corriendo para siempre?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139248,8 +141024,8 @@ msgstr "Soldador" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" @@ -139262,8 +141038,8 @@ msgstr "Soldador" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" @@ -139276,9 +141052,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" #: lang/json/professions_from_json.py @@ -139290,9 +141066,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" #. ~ Crafting recipes category name @@ -143793,7 +145569,7 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" #. ~ Description for scenario 'Sheltered' for a female character. @@ -143803,7 +145579,7 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" #. ~ Starting location for scenario 'Sheltered'. @@ -143870,7 +145646,7 @@ msgstr "Cárcel" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -143879,7 +145655,7 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -143983,24 +145759,18 @@ msgstr "Experimento" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Desde tu nacimiento, tu único propósito en la vida fue el avance de la " -"ciencia genética, voluntariamente o no. Una vez que sucedió el cataclismo, " -"saliste del laboratorio, y caminaste sin rumbo, hasta terminar en un bosque." #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Desde tu nacimiento, tu único propósito en la vida fue el avance de la " -"ciencia genética, voluntariamente o no. Una vez que sucedió el cataclismo, " -"saliste del laboratorio, y caminaste sin rumbo, hasta terminar en un bosque." #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -144239,8 +146009,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Description for scenario 'Lost Faith' for a female character. @@ -144248,8 +146018,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Starting location for scenario 'Lost Faith'. @@ -144278,7 +146048,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Description for scenario 'The Wizard's Apprentice' for a female @@ -144290,7 +146060,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -144316,8 +146086,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -144326,8 +146096,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -144431,9 +146201,9 @@ msgstr "Desafío-Campamento de la muerte FEMA" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female @@ -144442,9 +146212,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -145442,7 +147212,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid " + forever" -msgstr "" +msgstr " + para siempre" #: lang/json/snippet_from_json.py msgid "N = R * fp * ne * fl * fi * fc * L drake was right" @@ -145450,7 +147220,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "kilroy was here" -msgstr "" +msgstr "kilroy estuvo aquí" #: lang/json/snippet_from_json.py msgid "" @@ -145461,6 +147231,11 @@ msgstr "" " potencia, ¡probablemente no le dejes nada de carne! Usa una pistola de " "balines o tal vez un rifle calibre .22." +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -145487,10 +147262,26 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." +"impossible unless you have a big tactical advantage." msgstr "" -"Si ves una multitud de zombis acercándose, ¡CORRE! Querer pelearlos a todos " -"es un suicidio, salvo que tengas una gran ventaja táctica." + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "" +"Si te está persiguiendo una horda de zombis, intenta esconderte en los " +"túneles del metro y viaja una casilla o dos, después vuelve a salir." #: lang/json/snippet_from_json.py msgid "" @@ -145836,7 +147627,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" @@ -146074,6 +147865,12 @@ msgstr "" " o las granadas. Si se te caen accidentalmente cuando lo querías tirar, te " "puede llegar a matar." +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -146130,9 +147927,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" #: lang/json/snippet_from_json.py @@ -146151,6 +147947,12 @@ msgstr "" "La próxima vez que vayas a un almacén, coge todos los alimentos enlatados. " "¡Esos no se echan a perder nunca!" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -146180,14 +147982,6 @@ msgid "" "defense… it's perfect!" msgstr "" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "" -"Si te está persiguiendo una horda de zombis, intenta esconderte en los " -"túneles del metro y viaja una casilla o dos, después vuelve a salir." - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -146199,9 +147993,9 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" #: lang/json/snippet_from_json.py @@ -146259,28 +148053,41 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." msgstr "" -"El terreno puede definir una batalla, asegurate de usarlo contra tus " -"enemigos, y no dejes que sea usado en tu contra." #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "" +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -146344,13 +148151,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" -"Una soldadora puede ser la mejor amiga de un aspirante a mecánico. También " -"podés cauterizar una herida con ella, pero han muerto tantos como han vivido" -" haciendo eso, así que tomalo como último recurso." #: lang/json/snippet_from_json.py msgid "" @@ -146393,13 +148197,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" -"Yo estaba en contra de las drogas hasta que casi me mata un zombi y tuve que" -" salir cagando de esa horda, sin tener nada más que un poco de polvo blanco." -" Esa vez me salvó." #: lang/json/snippet_from_json.py msgid "" @@ -146423,6 +148224,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -146530,6 +148337,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -146551,6 +148382,13 @@ msgid "" "either, if you catch my drift." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -146603,6 +148441,12 @@ msgid "" " a cold ground." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -146648,7 +148492,7 @@ msgid "Hey there's some pink tablets, take some!" msgstr "" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" msgstr "" #: lang/json/snippet_from_json.py @@ -148876,7 +150720,7 @@ msgstr ", " #: lang/json/snippet_from_json.py msgid "I think we won." -msgstr "" +msgstr "Creo que ganamos." #: lang/json/snippet_from_json.py msgid "Hey, , " @@ -148956,7 +150800,7 @@ msgstr "¡! ¡Gané otra vez!" #: lang/json/snippet_from_json.py msgid "Don't worry about it." -msgstr "" +msgstr "No te preocupes por eso." #: lang/json/snippet_from_json.py msgid "Don't worry." @@ -149480,15 +151324,15 @@ msgid "" msgstr "" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." +msgid "Tell me about how you survived the Cataclysm." msgstr "" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" +msgid "How did you survive the Cataclysm?" msgstr "" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" +msgid "What was the Cataclysm like for you?" msgstr "" #: lang/json/snippet_from_json.py @@ -149750,8 +151594,8 @@ msgid "eldritch horror" msgstr "" #: lang/json/snippet_from_json.py -msgid "the cataclysm" -msgstr "el cataclismo" +msgid "the Cataclysm" +msgstr "" #: lang/json/snippet_from_json.py msgid "the apocalypse" @@ -150116,6 +151960,306 @@ msgid "" "Refer to file EXO-M-312 for full report." msgstr "" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -150897,7 +153041,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "freak " -msgstr "" +msgstr "friki" #: lang/json/snippet_from_json.py msgid "surf " @@ -151109,7 +153253,7 @@ msgstr "-drums" #: lang/json/snippet_from_json.py msgid "-style" -msgstr "" +msgstr "-estilo" #: lang/json/snippet_from_json.py msgid "-chant" @@ -151356,7 +153500,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "" #: lang/json/snippet_from_json.py @@ -156012,10 +158156,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" -"\"¡Agh, para ver la espiral en una forma tan distorsionada, manipular su " -"movimiento de vórtice! ¡Su gracia perpetua! Su belleza empañada...\"" #: lang/json/snippet_from_json.py msgid "\"My friend died, but at least I made her into a blob turret.\"" @@ -156035,16 +158177,13 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" -"\"Día 40. Los controles están destrozados-- el reactor mágico del coche hace" -" que avance inexorablemente. Rodillos gigantes al frente para demoler " -"bosques. Maine, allá voy.\"" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" -msgstr "\"mi coche es un diamante en bruto... literalmente\"" +msgid "\"my car is a diamond in the rough… literally\"" +msgstr "" #: lang/json/snippet_from_json.py msgid "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" @@ -156068,11 +158207,9 @@ msgstr "\"algún día, seré parte del coche, seguro\"" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" -"\"Pones un poco de dinamita y la mitad de una mina en una lata vieja de " -"refresco y... ¡PAM! Vas a alguna parte.\"" #: lang/json/speech_from_json.py msgid "\"Hello?\"" @@ -157705,6 +159842,38 @@ msgstr "" msgid "WOOF!" msgstr "" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "\"No me hagas hacerte caminar por la tabla.\"" @@ -157815,15 +159984,13 @@ msgstr "Te vamos a extrañar cuando terminemos con las pruebas." #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" -"Increíble. ¡Usted, [nombre del sujeto], tiene que estar orgulloso de [ciudad" -" natal del sujeto]!" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" @@ -157837,7 +160004,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" @@ -157848,8 +160015,8 @@ msgid "" msgstr "" #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" -msgstr "Hola, otra vez. Para reiterar nuestra advertencia anterior: [confuso]" +msgid "Hello again. To reiterate our previous warning: [garbled]" +msgstr "" #: lang/json/speech_from_json.py msgid "Weeeeeeeeeeeeeeeeeeeeee[bzzt]" @@ -157926,8 +160093,8 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "" #: lang/json/speech_from_json.py @@ -157959,9 +160126,8 @@ msgstr "¿Qué fue eso? ¿Usted dijo algo?" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "" -"Me gustaría señalar que a usted se le otorgó la oportunidad de tener éxito." #: lang/json/speech_from_json.py msgid "What's your point, anyway? Survival?" @@ -158014,7 +160180,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" @@ -158051,8 +160217,8 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "\"Lo que tenemos aquí es una falla en la comunicación.\"" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" -msgstr "\"E.T. mi casa, teleefono.\"" +msgid "\"E.T. phone home.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"I'm as mad as hell, and I'm not going to take this anymore!\"" @@ -158115,7 +160281,7 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" msgstr "" #: lang/json/speech_from_json.py @@ -158482,7 +160648,7 @@ msgid "\"I'm scared!\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" +msgid "\"Something's wrong…\"" msgstr "" #: lang/json/speech_from_json.py @@ -158510,15 +160676,15 @@ msgid "\"Excuse me?\"" msgstr "\"¿Perdón?\"" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" -msgstr "\"Soy distinto...\"" +msgid "\"I'm different…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" -msgstr "\"Gracias, igual...\"" +msgid "\"Thanks anyway…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" +msgid "\"Take me with you…\"" msgstr "" #: lang/json/speech_from_json.py @@ -158598,7 +160764,7 @@ msgid "\"This time is OUR time.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" +msgid "\"Second time's a charm…\"" msgstr "" #: lang/json/speech_from_json.py @@ -158670,8 +160836,8 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" -msgstr "\"Bueno, lo intenté. ¡Que tengas suerte!\"" +msgid "\"Well, I tried. Best of luck!\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Hey, safe travels, there.\"" @@ -158966,7 +161132,7 @@ msgid "Cabin" msgstr "Cabaña" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "Hospital" @@ -159118,7 +161284,7 @@ msgstr "Campamento FEMA" msgid "Mansion Entrance" msgstr "Entrada de la mansión" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "Mansión" @@ -159192,7 +161358,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -159291,42 +161457,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160037,7 +162203,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -160351,13 +162517,13 @@ msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding " -"up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding " +"up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160447,14 +162613,14 @@ msgstr "Bueno, sin hacer movimientos repentinos..." msgid "Keep your distance!" msgstr "¡Quédate lejos!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "Este es mi territorio, ." - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "Este es mi territorio, ." + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "" @@ -160508,29 +162674,29 @@ msgid "I don't care." msgstr "No me importa." #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "Tengo un trabajo para ti. ¿Quieres que te cuente?" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "Tengo otro trabajo para ti. ¿Quieres que te cuente?" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "" +msgid "I have another job for you. Want to hear about it?" +msgstr "Tengo otro trabajo para ti. ¿Quieres que te cuente?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "No tengo ningún otro trabajo para ti." +msgid "I just have one job for you. Want to hear about it?" +msgstr "Tengo un trabajo para ti. ¿Quieres que te cuente?" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "No tengo ningún trabajo para ti." +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "No tengo ningún otro trabajo para ti." + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -160540,6 +162706,10 @@ msgstr "Ah, bueno." msgid "Never mind, I'm not interested." msgstr "No importa, no estoy interesado." +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "¿Cuál trabajo?" @@ -160548,10 +162718,6 @@ msgstr "¿Cuál trabajo?" msgid "What about it?" msgstr "¿Qué te parece?" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "¡Lo haré!" @@ -160766,10 +162932,6 @@ msgstr "Hmm, bueno." msgid "Thanks!" msgstr "¡Gracias!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "" @@ -160795,9 +162957,13 @@ msgid "I must focus on the road!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, okay." +msgid "Focus on the road, mate!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Ah, okay." +msgstr "Ah, bueno." + #: lang/json/talk_topic_from_json.py msgid "Why should I travel with you?" msgstr "¿Por qué tendría que viajar contigo?" @@ -160898,10 +163064,6 @@ msgstr "No, vamos a estar bien aquí." msgid "On second thought, never mind." msgstr "Pensandolo bien, olvidate." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "" @@ -160914,6 +163076,10 @@ msgstr "Dale tiempo, te voy a mostrar algo nuevo después..." msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "¡No hay ninguna oportunidad, me van a dejar atrás!" @@ -161583,8 +163749,8 @@ msgid "How are you alive?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" -msgstr "¿Qué hacías antes del cataclismo?" +msgid "What did you do before the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -161804,7 +163970,7 @@ msgid "This is a season spring test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." +msgid "This is a days since Cataclysm 30 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161812,7 +163978,7 @@ msgid "This is a season summer test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." +msgid "This is a days since Cataclysm 120 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161820,7 +163986,7 @@ msgid "This is a season autumn test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." +msgid "This is a days since Cataclysm 210 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161828,7 +163994,7 @@ msgid "This is a season winter test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." +msgid "This is a days since Cataclysm 300 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -162345,7 +164511,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" @@ -162658,7 +164824,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" +msgid "What did you do when you found out about the Cataclysm?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -163869,7 +166035,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165108,7 +167274,7 @@ msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -165147,7 +167313,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "" @@ -165179,8 +167345,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -165207,7 +167373,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165228,14 +167394,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165248,7 +167414,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -165278,7 +167444,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -165288,7 +167454,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -165313,7 +167479,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165366,7 +167532,7 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -165379,7 +167545,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" @@ -165420,8 +167586,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165450,6 +167616,12 @@ msgstr "" msgid "Where is your brother's place?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "" @@ -165514,6 +167686,10 @@ msgid "" " a forage set up." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "" @@ -165837,18 +168013,18 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." +"Sir, I don't know how the hell you got down here but if you have any sense " +"you'll get out while you can." msgstr "" -"Señora, no sé cómo demonios llegó hasta aquí abajo pero si le queda un poco " +"Señor, no sé cómo demonios llegó hasta aquí abajo pero si le queda un poco " "de juicio se iría mientras pueda." #: lang/json/talk_topic_from_json.py msgid "" -"Sir, I don't know how the hell you got down here but if you have any sense " -"you'll get out while you can." +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." msgstr "" -"Señor, no sé cómo demonios llegó hasta aquí abajo pero si le queda un poco " +"Señora, no sé cómo demonios llegó hasta aquí abajo pero si le queda un poco " "de juicio se iría mientras pueda." #: lang/json/talk_topic_from_json.py @@ -166081,7 +168257,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Please, help me. I need food." -msgstr "" +msgstr "Por favor, ayudame. Necesito comida." #: lang/json/talk_topic_from_json.py msgid "" @@ -166149,7 +168325,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "I'm sorry, I can't help you." -msgstr "" +msgstr "Perdón, no te puedo ayudar." #: lang/json/talk_topic_from_json.py msgid "Thank you so much." @@ -166281,12 +168457,12 @@ msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166303,7 +168479,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Cardboard?" -msgstr "" +msgstr "¿Cartón?" #: lang/json/talk_topic_from_json.py msgid "Why are you sitting out here?" @@ -167057,7 +169233,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" @@ -167115,7 +169291,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" @@ -167659,7 +169835,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -168671,7 +170847,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Yeah, I sure do." -msgstr "" +msgstr "Yep, claro que si." #: lang/json/talk_topic_from_json.py msgid "What can I do ya for?" @@ -168964,7 +171140,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Need to talk?" -msgstr "" +msgstr "¿Necesitas hablar?" #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Rhy." @@ -169065,7 +171241,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "...Hi." -msgstr "" +msgstr "...Hola." #: lang/json/talk_topic_from_json.py msgid "Stan, hey? Nice to meet you." @@ -169819,14 +171995,14 @@ msgstr "Mantenete civilizado o te voy a causar dolor." msgid "Just on watch, move along." msgstr "Solo estoy de guardia, circulando." -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "Señora, no debería estar viajando por ahí afuera." - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "¿Está complicado ahí afuera, no?" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "Señora, no debería estar viajando por ahí afuera." + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "" @@ -171092,12 +173268,9 @@ msgstr "Me gustaría contratar tus servicios." #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" -"Me mandaron aquí para ayudar a establecer la granja. Muchos de nosotros no " -"teníamos verdaderas habilidades antes del cataclismo, así que las cosas son " -"un poco a prueba y error." #: lang/json/talk_topic_from_json.py msgid "" @@ -171447,7 +173620,7 @@ msgstr "[$12000, 7d] 100 troncos" #: lang/json/talk_topic_from_json.py msgid "I'll be back later." -msgstr "" +msgstr "Vuelvo después." #: lang/json/talk_topic_from_json.py msgid "Don't have much time to talk." @@ -171478,11 +173651,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "How are you?" -msgstr "" +msgstr "¿Cómo estas?" #: lang/json/talk_topic_from_json.py msgid "Welcome!" -msgstr "" +msgstr "¡Bienvenido!" #: lang/json/talk_topic_from_json.py msgid "How's the weather?" @@ -171514,7 +173687,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -171533,13 +173706,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" #: lang/json/talk_topic_from_json.py msgid "I can pay." -msgstr "" +msgstr "Puedo pagar." #: lang/json/talk_topic_from_json.py msgid "Well I'm heading out then" @@ -171547,8 +173720,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" #: lang/json/talk_topic_from_json.py @@ -171571,13 +173744,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" #: lang/json/talk_topic_from_json.py msgid "Ok." -msgstr "" +msgstr "Ok." #: lang/json/talk_topic_from_json.py msgid "What are crypto coins?" @@ -171585,9 +173758,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -171603,9 +173776,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -171626,7 +173799,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "I need some supplies." -msgstr "" +msgstr "Necesito algunos recursos." #: lang/json/talk_topic_from_json.py msgid "Need help with anything?" @@ -171634,15 +173807,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "Interesante..." +msgid "Interesting…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -171651,8 +173824,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I see..." -msgstr "Entiendo..." +msgid "I see…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -171661,8 +173834,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "Hmm..." +msgid "Hmm…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -171671,7 +173844,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alright..." +msgid "Alright…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -171679,8 +173852,8 @@ msgid "Not at the moment, check back later perhaps." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Sure..." -msgstr "Seguro..." +msgid "Sure…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Are you part of the rescue team?" @@ -171699,7 +173872,7 @@ msgid "So are you busting us out of here or what?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." +msgid "Hold tight, . I've got to clear a path." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173951,7 +176124,7 @@ msgstr "" #: lang/json/technique_from_json.py #, python-format msgid " slashes at %s" -msgstr "" +msgstr " raja el/la %s" #: lang/json/technique_from_json.py msgid "Tipped Intent" @@ -174125,7 +176298,7 @@ msgstr "" #: lang/json/technique_from_json.py #, python-format msgid " smacks %s" -msgstr "" +msgstr " machaca %s" #: lang/json/technique_from_json.py msgid "Crowd Control" @@ -175062,6 +177235,8 @@ msgid "" "This apparently normal segment of metal wall has opened to reveal a secret " "passage." msgstr "" +"Este trozo de pared de metal parecía normal pero se ha abierto para revelar " +"un pasaje secreto." #: lang/json/terrain_from_json.py msgid "open metal door" @@ -175442,6 +177617,15 @@ msgstr "" msgid "A closed metal gate." msgstr "" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "" @@ -177250,14 +179434,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "tanque con gasolina" +msgid "fuel tank" +msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "surtidor de gasolina roto" @@ -179070,6 +181263,27 @@ msgstr "soporte chico de metal" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "ventana" @@ -179457,8 +181671,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -179472,7 +181686,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -179825,7 +182039,7 @@ msgstr "" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "nada" @@ -180598,7 +182812,7 @@ msgstr "Carrito de Helados" msgid "Luggage Cart" msgstr "Carrito de equipaje" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "Carrito de compra" @@ -183785,8 +185999,8 @@ msgstr "torreta láser LACP" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" #. ~ Description for gel shooter @@ -184515,6 +186729,10 @@ msgstr "Vitamina C" msgid "Toxins" msgstr "" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "Pulsa " @@ -185009,6 +187227,12 @@ msgstr "No pudiste recargar el/la %s." msgid "You reload the %s." msgstr "Recargas %s." +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -185920,6 +188144,10 @@ msgstr "" msgid "The required items are not available to complete this task." msgstr "" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -186336,6 +188564,10 @@ msgstr "" msgid "spoilage" msgstr "desperdicio" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -188365,6 +190597,44 @@ msgstr "" msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "No estás empuñando nada." + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "" + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "Te comiste la maleza." + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "" + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "Has comido hierba." + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "" + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "" + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "" + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "Dejas el/la %s vacío/a." + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "No puedes tirar con eficacia mientras estás dentro de tu caparazón." @@ -188402,6 +190672,14 @@ msgstr "Te concentrás extremadamente, ¡y tu cuerpo obedece!" msgid "You can't muster up the effort to throw anything…" msgstr "" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "Descargar objeto" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "No tienes nada para descargar." + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -189278,15 +191556,13 @@ msgstr "" #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" #: src/bionics.cpp @@ -190854,7 +193130,7 @@ msgstr "Filtro:" #: src/clzones.cpp src/vehicle_use.cpp msgid "No seed" -msgstr "" +msgstr "No semilla" #: src/clzones.cpp #, c-format @@ -191195,6 +193471,8 @@ msgid "" "SITE %d%d%d\n" "PERTINENT FOREMAN LOGS WILL BE PREPENDED TO NOTES" msgstr "" +"SITIO %d%d%d\n" +"LOS REGISTROS PERTINENTES DEL CAPATAZ SERÁN AÑADIDOS A LAS NOTAS" #: src/computer.cpp msgid "FILE CORRUPTED, PRESS ANY KEY…" @@ -191835,8 +194113,8 @@ msgstr "Eso no parece ser comestible en su forma actual." msgid "This is full of dirt after being on the ground." msgstr "" -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "No puedes hacer eso abajo del agua." @@ -192718,11 +194996,11 @@ msgstr "" msgid "Dark craftable? %s" msgstr "" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "Fácil" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "Difícil" @@ -193216,6 +195494,10 @@ msgstr "" msgid "Test weather" msgstr "" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "" @@ -193418,7 +195700,7 @@ msgstr "Coleccionista: %d" msgid "Altruism: %d" msgstr "Altruismo: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "Necesita:" @@ -194105,393 +196387,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "Por favor, esperá que se genere el mapa [ 0%% ]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "¡No necesitas dormir!" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "¡No puedes guardar la partida en el modo defensa!" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "¡No puedes dejar el/la %s!" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "¡Lograste sobrevivir a la ola %d!" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "Por favor, espera que se genere el mapa [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "Opción anterior" - -#: src/defense.cpp -msgid "Next option" -msgstr "Opción siguiente" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "Pasar el valor de la opción" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "Activar/Desactivar opción" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "¡Tienes que elegir por lo menos un grupo de monstruos!" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "Zombis Especiales" - -#: src/defense.cpp -msgid "Zombies" -msgstr "Zombis" - -#: src/defense.cpp -msgid "Triffids" -msgstr "Trífidos" - -#: src/defense.cpp -msgid "Robots" -msgstr "Robots" - -#: src/defense.cpp -msgid "Subspace" -msgstr "Subespacio" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "Comida" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "Mercenarios" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "MODO DEFENSA" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "Pulsa las teclas de dirección para cambiar, ENTER para aplicar" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "Escenario: " - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "Lugar:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "Dificultad Inicial:" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "Es la dificultad de la primera oleada." - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "Dificultad de la Oleada:" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "Es el incremento de dificultad en cada oleada." - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "Tiempo Entre Oleadas:" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "Es el tiempo, en minutos, entre oleadas." - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "Oleadas Entre Caravanas:" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "Es el número de oleadas entre caravana y caravana." - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "Dinero Inicial:" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "Es la cantidad de dinero con la que comienzas." - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "Dinero 1ª Oleada:" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "Es el premio por resistir la primera oleada." - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "Aumento del Dinero:" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "Es el aumento del premio por cada oleada." - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "Selección de Enemigo:" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "Personalizado" - -#: src/defense.cpp -msgid "Medium" -msgstr "Medio" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "Muertos de risa" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "El amanecer de los muertos" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "El ataque de las arañas" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "La amenaza verde" - -#: src/defense.cpp -msgid "Skynet" -msgstr "Skynet" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "La llamada de Cthulhu" - -#: src/defense.cpp -msgid "A custom game." -msgstr "Un juego personalizado." - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "Monstruos fáciles y mucho dinero." - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "Monstruos más difíciles. Tienes que comer." - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "Todos los monstruos. Tienes que comer y beber." - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "Hay que defender un bar de zombis clásicos. Fácil y divertido." - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "Zombis clásicos. Lento y más realista." - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "¡Lucha divertida de alto ritmo contra arañas!" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "Tienes que defender tu mansión del ataque de los trífidos." - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "¡Los robots han decidido que los humanos son el enemigo!" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "" -"Vas a tener que mantener a raya a legiones de horrores sobrenaturales." - -#: src/defense.cpp -msgid "Public Works" -msgstr "Obras Públicas" - -#: src/defense.cpp -msgid "Megastore" -msgstr "Supermercado" - -#: src/defense.cpp -msgid "Bar" -msgstr "Bar" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "Una entrada y muchas habitaciones. Hay algunos suministros médicos." - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "Es un edificio fácil de fortificar. Muchas herramientas útiles." - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "Un edificio grande con suministros varios." - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "Un pequeño lugar con suficiente alcohol." - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "Es una casa grande con muchas habitaciones." - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" -"CARAVANA:\n" -"Selecciona una categoría usando tus teclas de arriba y abajo favoritas.\n" -"Cambia la selección entre categoría y objeto apretando %s.\n" -"Coge un objeto con las teclas de arriba y abajo, y con izquierda y derecha\n" -"compras 1 más o 1 menos.\n" -"Pulsa %s para comprar todo lo que tienes en el carrito, %s para no comprar nada." - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "¿Seguro? ¿No vas a comprar nada?" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "¡No puedes pagar esos objetos!" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "" -msgstr[1] "" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "Dejaste algunos objetos." - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "Armas de Cuerpo a cuerpo" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "Armas a distancia" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "Munición" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "Fabricación y Componentes para Construir" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "Comida y Drogas" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "Ropa y Armadura" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "Herramientas, Trampas y Granadas" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "Pulsa ? para ver la ayuda." - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "Tu dinero: %s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "¡Bienvenido a la Oleada %d!" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "Oleada %d:" - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "¡Invasión de %s!" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "¡Ataque de %s!" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "¡%s atacan!" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "¡%s del infierno!" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "¡El Día de los %s!" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "¡La venganza de los %s!" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "¡El ascenso de los %s!" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -195070,53 +196965,53 @@ msgstr "Esa hierba estaba mortal." #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "Fuerza +%d; " +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "Fuerza %d; " +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "Destreza +%d; " +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "Destreza %d; " +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "Percepción +%d; " +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "Percepción %d; " +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "Inteligencia +%d; " +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "Inteligencia %d; " +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "Velocidad +%d; " +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "Velocidad %d; " +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -196107,7 +198002,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -196738,7 +198634,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -196943,7 +198840,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -197206,6 +199104,26 @@ msgstr "" msgid "(You wonder if your companions are fit to work on their own…)" msgstr "" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -197993,7 +199911,8 @@ msgstr "" msgid "Without extra fuel it will burn for between %s to %s." msgstr "" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "" @@ -198480,40 +200399,6 @@ msgstr "" msgid "%s helps with this task…" msgstr "" -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "" - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "Te comiste la maleza." - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "" - -#: src/game.cpp -msgid "You eat the grass." -msgstr "Has comido hierba." - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "" - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "" - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "" - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "Dejas el/la %s vacío/a." - #: src/game.cpp msgid "Change side for item" msgstr "Cambiar lugar para objeto" @@ -198540,6 +200425,11 @@ msgstr "¡El %s ya está lleno!" #: src/game.cpp src/ranged.cpp #, c-format msgid "You can't reload a %s!" +msgstr "¡No puedes recargar un %s!" + +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." msgstr "" #: src/game.cpp @@ -198550,18 +200440,6 @@ msgstr "Recargar objeto" msgid "You have nothing to reload." msgstr "No tienes nada para recargar." -#: src/game.cpp -msgid "Unload item" -msgstr "Descargar objeto" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "No tienes nada para descargar." - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "No estás empuñando nada." - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -198646,6 +200524,13 @@ msgstr "No se encuentra objeto agarrado." msgid "You cannot board a vehicle whilst riding." msgstr "" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "" @@ -199320,11 +201205,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "Tu inventario está vacío." -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "No tienes un/a %s." - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "" @@ -199463,8 +201343,8 @@ msgid "CBM" msgstr "MCB" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "ENERGÍA" +msgid "ENERGY (kJ)" +msgstr "" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -199689,12 +201569,12 @@ msgstr "Enfundar objeto" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" +msgid "Choose an item to put into your %s" msgstr "" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." +msgid "You have no items you could put into your %s." msgstr "" #: src/game_inventory.cpp src/iuse.cpp @@ -199915,7 +201795,7 @@ msgstr "" #: src/game_inventory.cpp msgid "Sterilization" -msgstr "" +msgstr "Esterilización" #: src/game_inventory.cpp msgid "Select one CBM to sterilize" @@ -199933,6 +201813,405 @@ msgstr "Tutorial" msgid "Defense" msgstr "Defensa" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "Por favor, esperá que se genere el mapa [ 0%% ]" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "¡No necesitas dormir!" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "¡No puedes guardar la partida en el modo defensa!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "¡No puedes dejar el/la %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "¡Lograste sobrevivir a la ola %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "Por favor, espera que se genere el mapa [%2d%%]" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "Opción anterior" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "Opción siguiente" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "Pasar el valor de la opción" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "Activar/Desactivar opción" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "¡Tienes que elegir por lo menos un grupo de monstruos!" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "Zombis Especiales" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "Zombis" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "Trífidos" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "Robots" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "Subespacio" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "Comida" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "Mercenarios" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "MODO DEFENSA" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "Escenario: " + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "Lugar:" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "Dificultad Inicial:" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "Es la dificultad de la primera oleada." + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "Dificultad de la Oleada:" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "Es el incremento de dificultad en cada oleada." + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "Tiempo Entre Oleadas:" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "Es el tiempo, en minutos, entre oleadas." + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "Oleadas Entre Caravanas:" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "Es el número de oleadas entre caravana y caravana." + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "Dinero Inicial:" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "Es la cantidad de dinero con la que comienzas." + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "Dinero 1ª Oleada:" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "Es el premio por resistir la primera oleada." + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "Aumento del Dinero:" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "Es el aumento del premio por cada oleada." + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "Selección de Enemigo:" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "Personalizado" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "Medio" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "Muertos de risa" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "El amanecer de los muertos" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "El ataque de las arañas" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "La amenaza verde" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "Skynet" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "La llamada de Cthulhu" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "Un juego personalizado." + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "Monstruos fáciles y mucho dinero." + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "Monstruos más difíciles. Tienes que comer." + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "Todos los monstruos. Tienes que comer y beber." + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "Hay que defender un bar de zombis clásicos. Fácil y divertido." + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "Zombis clásicos. Lento y más realista." + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "¡Lucha divertida de alto ritmo contra arañas!" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "Tienes que defender tu mansión del ataque de los trífidos." + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "¡Los robots han decidido que los humanos son el enemigo!" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "" +"Vas a tener que mantener a raya a legiones de horrores sobrenaturales." + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "Obras Públicas" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "Supermercado" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "Bar" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "Una entrada y muchas habitaciones. Hay algunos suministros médicos." + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "Es un edificio fácil de fortificar. Muchas herramientas útiles." + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "Un edificio grande con suministros varios." + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "Un pequeño lugar con suficiente alcohol." + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "Es una casa grande con muchas habitaciones." + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" +"CARAVANA:\n" +"Selecciona una categoría usando tus teclas de arriba y abajo favoritas.\n" +"Cambia la selección entre categoría y objeto apretando %s.\n" +"Coge un objeto con las teclas de arriba y abajo, y con izquierda y derecha\n" +"compras 1 más o 1 menos.\n" +"Pulsa %s para comprar todo lo que tienes en el carrito, %s para no comprar nada." + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "¿Seguro? ¿No vas a comprar nada?" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "¡No puedes pagar esos objetos!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "" +msgstr[1] "" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "Dejaste algunos objetos." + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "Armas de Cuerpo a cuerpo" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "Armas a distancia" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "Munición" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "Fabricación y Componentes para Construir" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "Comida y Drogas" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "Ropa y Armadura" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "Herramientas, Trampas y Granadas" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "Pulsa ? para ver la ayuda." + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "Tu dinero: %s" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "¡Bienvenido a la Oleada %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "Oleada %d:" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "¡Invasión de %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "¡Ataque de %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "¡%s atacan!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "¡%s del infierno!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "¡El Día de los %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "¡La venganza de los %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "¡El ascenso de los %s!" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "John Smith" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "¡Hay un estúpido en el medio!" @@ -200039,7 +202318,7 @@ msgstr "ruido de colisión contra un obstáculo." #. ~ Sound of moving a remote controlled car #: src/handle_action.cpp msgid "zzz…" -msgstr "" +msgstr "zzz…" #: src/handle_action.cpp msgid "You can't drive the vehicle from here. You need controls!" @@ -200280,6 +202559,10 @@ msgstr "" msgid "You may want to deactivate these before you sleep." msgstr "Por ahí quieras desactivar estos antes de dormirte." +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -200407,7 +202690,7 @@ msgstr "%s no tiene energía." #, c-format msgctxt "holster" msgid "%1$s from %2$s (%3$d)" -msgstr "" +msgstr "%1$s desde %2$s (%3$d)" #: src/handle_action.cpp msgid "Draw what?" @@ -200419,11 +202702,11 @@ msgstr "" #: src/handle_action.cpp msgid "Walk" -msgstr "" +msgstr "Caminar" #: src/handle_action.cpp msgid "Run" -msgstr "" +msgstr "Correr" #: src/handle_action.cpp msgid "Crouch" @@ -200452,11 +202735,11 @@ msgstr "" #: src/handle_action.cpp msgid "What do you want to consume?" -msgstr "" +msgstr "¿Qué quieres para consumir?" #: src/handle_action.cpp msgid "Medication" -msgstr "" +msgstr "Medicación" #: src/handle_action.cpp msgid "Auto-move canceled" @@ -200610,11 +202893,11 @@ msgstr "" #: src/handle_action.cpp msgid "Auto travel mode OFF!" -msgstr "" +msgstr "¡Modo auto viaje DESACTIVADO!" #: src/handle_action.cpp msgid "Auto travel mode ON!" -msgstr "" +msgstr "¡Modo auto viaje ACTIVADO!" #: src/handle_action.cpp msgid "Safe mode OFF!" @@ -200719,7 +203002,7 @@ msgstr "¡Modo debug DESACTIVADO!" #, c-format msgctxt "liquid" msgid "What to do with the %1$s from %2$s?" -msgstr "" +msgstr "¿Qué quieres hacer con el/la %1$s desde %2$s?" #. ~ %1$s: liquid name, %2$s: monster name #: src/handle_liquid.cpp @@ -201120,7 +203403,7 @@ msgstr "" #: src/iexamine.cpp #, c-format msgid "Play again for $%d?" -msgstr "" +msgstr "¿Quieres jugar otra vez por $%d?" #: src/iexamine.cpp msgid "Three cherries… you get your money back!" @@ -201293,7 +203576,7 @@ msgstr "Tomas un poco de néctar." #: src/iexamine.cpp #, c-format msgid "You harvest: %s." -msgstr "" +msgstr "Cosechas: %s." #: src/iexamine.cpp #, c-format @@ -201320,7 +203603,7 @@ msgstr "Esta flor tiene aroma embriagador." #: src/iexamine.cpp msgid "You fall asleep…" -msgstr "" +msgstr "Te quedaste dormido/a..." #: src/iexamine.cpp msgid "Your legs are covered in the poppy's roots!" @@ -201387,7 +203670,7 @@ msgstr "¿Qué semilla quieres usar?" #: src/iexamine.cpp #, c-format msgid " plants some %s." -msgstr "" +msgstr " plantas algo de %s." #: src/iexamine.cpp #, c-format @@ -205299,7 +207582,7 @@ msgstr "Tu %1$s no puede contener más %2$s." msgid "That %s doesn't have room to expand." msgstr "Ese/a %s no tiene más espacio para expandirlo/a." -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%d x %s" @@ -205382,78 +207665,6 @@ msgstr "" msgid "Your %s disappears!" msgstr "" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "%s cadáver" -msgstr[1] "%s cadáveres" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "%s carcasa de %s" -msgstr[1] "%s carcasas de %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%s cadáver de %s" -msgstr[1] "%s cadáveres de %s" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -205469,6 +207680,21 @@ msgid_plural "%s blood" msgstr[0] "sangre de %s" msgstr[1] "sangre de %s" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "Te falta un objeto que pueda realizar esta acción." @@ -206062,7 +208288,7 @@ msgstr "" msgid "Modify what?" msgstr "¿Qué quieres modificar?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "¡No tienes eso!" @@ -207123,6 +209349,10 @@ msgstr "Buscaminas" msgid "Lights on!" msgstr "¡Luces!" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -207553,10 +209783,6 @@ msgstr "" "Necesitas una habilidad en mecánica nivel 2 para usar este equipo de " "reparación." -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "Elige el arma para reparar." - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "¡Eso no es un arma!" @@ -207607,25 +209833,6 @@ msgstr "No tienes herramientas compatibles." msgid "You cancel unloading the tool." msgstr "" -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "¡No ves nada, no puedes reparar!" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "" -"Necesitas una habilidad en fabricación de 1 para usar este equipo de " -"reparación." - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "Elige el objeto a reparar" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "Refuerzas tu %s." - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "" @@ -207877,31 +210084,6 @@ msgstr "" msgid " on " msgstr "" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -208730,6 +210912,14 @@ msgstr "" "¡Por estar toqueteando la multicocina casi la rompes! Por suerte, todavía " "funciona, pero mejor deja de joder con ella." +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "" + #: src/iuse.cpp msgid "Using cable:" msgstr "Usar cable:" @@ -208758,14 +210948,6 @@ msgstr "" msgid "You attach the cable to the solar pack." msgstr "" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "" @@ -211299,12 +213481,9 @@ msgid "Congratulations, you won!" msgstr "¡Felicidades, ganó el juego!" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "Máx:" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "Mín:" +#, c-format +msgid "Min: %d Max: %d" +msgstr "" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -212149,6 +214328,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "-¡Jugar Ya!" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" + #: src/main_menu.cpp msgid "No templates found!" msgstr "¡No se encontraron plantillas!" @@ -212376,6 +214583,14 @@ msgstr "¡Algo salió arrastrándose del/a %s!" msgid "DANGER! MINEFIELD!" msgstr "" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -212508,20 +214723,9 @@ msgid "You're violently teleported!" msgstr "¡Eres teletransportado violentamente!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "¡Las abejas te pican!" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "¡Las abejas te pican varias veces!" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "¡Las abejas te pican muchas veces!" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "¡Las abejas te pican por todo el cuerpo!" +#, c-format +msgid "The bees sting you in %s!" +msgstr "" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -212685,6 +214889,17 @@ msgid_plural "Skills" msgstr[0] "Habilidad" msgstr[1] "Habilidades" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" +msgstr[1] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "Requiere: " @@ -213075,7 +215290,7 @@ msgstr "¡El %1$s dispara su %2$s!" #: src/mattack_actors.cpp msgid "Beep." -msgstr "" +msgstr "Bip." #: src/mattack_actors.cpp src/monattack.cpp src/monattack.cpp #, c-format @@ -215079,7 +217294,7 @@ msgstr "" #: src/mission_companion.cpp msgid "Upgrade East Field I" -msgstr "" +msgstr "Mejorar Campo Este I" #: src/mission_companion.cpp msgid "" @@ -217544,6 +219759,10 @@ msgstr "¡El %s cubierto de ácido te quema la mano!" msgid "Acid sprays out of %s as it is hit!" msgstr "¡Cuando el %s es golpeado, suelta ácido!" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" + #: src/monexamine.cpp msgid "zombie slave" msgstr "esclavo zombi" @@ -217848,7 +220067,7 @@ msgstr "" #: src/monexamine.cpp #, c-format msgid "You milk the %s." -msgstr "" +msgstr "Ordeñas el/la %s." #: src/monexamine.cpp #, c-format @@ -218095,7 +220314,7 @@ msgstr "" #: src/monster.cpp msgid "Difficulty " -msgstr "" +msgstr "Dificultad" #: src/monster.cpp msgid "Minimal threat." @@ -218107,11 +220326,11 @@ msgstr "" #: src/monster.cpp msgid "Dangerous." -msgstr "" +msgstr "Peligroso." #: src/monster.cpp msgid "Very dangerous." -msgstr "" +msgstr "Muy peligroso." #: src/monster.cpp msgid "Extremely dangerous." @@ -218124,7 +220343,7 @@ msgstr "" #: src/monster.cpp #, c-format msgid "This is a %s. %s %s" -msgstr "" +msgstr "Esto es un %s. %s %s" #: src/monster.cpp #, c-format @@ -220497,8 +222716,9 @@ msgid "I have news." msgstr "Tengo noticias." #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "Sí, sigamos entrenando." +#, c-format +msgid "Yes, let's resume training %s" +msgstr "" #: src/npctalk.cpp #, c-format @@ -221202,6 +223422,16 @@ msgstr "" "Si está desactivado, el jugador dejará todos los objetos nuevos que lo hacen" " excederse del límite de carga de peso." +#: src/options.cpp +msgid "Dangerous running" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" + #: src/options.cpp msgid "Safe mode" msgstr "Modo seguro" @@ -223562,7 +225792,7 @@ msgstr "Buscar término:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" @@ -224002,6 +226232,10 @@ msgstr "" msgid "Heat :" msgstr "" +#: src/panels.cpp +msgid "Deaf!" +msgstr "¡Sordo!" + #: src/panels.cpp msgid "Underground" msgstr "Bajo tierra" @@ -224060,10 +226294,6 @@ msgstr "" msgid "Lighting:" msgstr "Luz: " -#: src/panels.cpp -msgid "Deaf!" -msgstr "¡Sordo!" - #: src/panels.cpp msgid "Weapon :" msgstr "" @@ -225091,6 +227321,11 @@ msgstr "¿Qué falla quieres arreglar?" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -225549,82 +227784,73 @@ msgstr "VELOCIDAD" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "Nadar cuesta %+d punto de movimiento. " -msgstr[1] "Nadar cuesta %+d puntos de movimiento. " +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "Correr cuesta %+d punto de movimiento. " -msgstr[1] "Correr cuesta %+d puntos de movimiento. " +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "Recargar cuesta %+d punto de movimiento. " -msgstr[1] "Recargar cuesta %+d puntos de movimiento. " +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "Ataques cuerpo a cuerpo y tirar cuesta %+d punto de movimiento." -msgstr[1] "Ataques cuerpo a cuerpo y tirar cuesta %+d puntos de movimiento." +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "Habilidad esquivar %+.1f. " +msgid "Dodge skill: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "Ataque cuerpo a cuerpo %+d%%; " +msgid "Melee attack rolls: %+d%%\n" +msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." +"Head encumbrance has no effect; it simply limits how much you" +" can put on." msgstr "" -"La incomodidad en la cabeza no afecta nada; simplemente limita cúantas cosas" -" te puedes poner." #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "Cubrir tu boca te hace más difícil respirar y recobrar el aliento." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." msgstr "" -"La incomodidad en los brazos afecta el gasto de resistencia para los ataques" -" cuerpo a cuerpo y la precisión con armas a distancia." #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "Reduce la velocidad en que puedes manejar objetos\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" +msgid "Dexterity when throwing items: %+.1f\n" msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." +msgid "Reduced gun aim speed: %.1f" msgstr "" #: src/player_display.cpp @@ -225726,8 +227952,8 @@ msgstr "" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" #: src/player_display.cpp @@ -226481,6 +228707,16 @@ msgstr "¡Tu %s falla con un chasquido amortiguado!" msgid "'s %s misfires with a muffled click!" msgstr "¡El %s de falla con un chasquido amortiguado!" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -226521,6 +228757,16 @@ msgstr "" msgid "'s %s is damaged by their shot!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -226719,6 +228965,10 @@ msgstr "Apuntar Precisamente" msgid "[%c] to take precise aim and fire." msgstr "" +#: src/ranged.cpp +msgid "turrets" +msgstr "torretas" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -227152,7 +229402,7 @@ msgstr "¡Escuchaste %s!" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." +msgid "From your position you hear %1$s" msgstr "" #: src/sounds.cpp @@ -228258,18 +230508,6 @@ msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "" msgstr[1] "" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "John Smith" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" - #: src/veh_interact.cpp msgid "Select part" msgstr "Selecciona parte" @@ -229228,7 +231466,7 @@ msgstr "" #: src/vehicle.cpp msgid "hmm" -msgstr "" +msgstr "hmm" #: src/vehicle.cpp msgid "hummm!" @@ -229310,17 +231548,17 @@ msgstr "¡El/la %2$s de %1$s es destruido!" #: src/vehicle_display.cpp msgid "More parts here…" -msgstr "" +msgstr "Aquí hay más piezas…" #: src/vehicle_display.cpp #, c-format msgid " (%s/%s charge)" -msgstr "" +msgstr " (%s/%s carga)" #: src/vehicle_display.cpp #, c-format msgid " (%.1fL %s)" -msgstr "" +msgstr " (%.1fL %s)" #. ~ used/total volume of a cargo vehicle part #: src/vehicle_display.cpp @@ -229824,7 +232062,7 @@ msgstr "" #: src/vehicle_use.cpp msgid "Stop…" -msgstr "" +msgstr "Parar…" #: src/vehicle_use.cpp msgid "Stop all autopilot related activities." @@ -230559,6 +232797,10 @@ msgstr "Soleado" msgid "Cloudy" msgstr "Nublado" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "" + #: src/weather_data.cpp msgid "Drizzle" msgstr "Llovizna" diff --git a/lang/po/hu.po b/lang/po/hu.po index 72d9344c35a9d..d103fe4925a8c 100644 --- a/lang/po/hu.po +++ b/lang/po/hu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Daniel Szollosi-Nagy , 2019\n" "Language-Team: Hungarian (https://www.transifex.com/cataclysm-dda-translators/teams/2217/hu/)\n" @@ -1724,8 +1724,8 @@ msgstr "mosószer" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." -msgstr "Népszerű márkájú, kataklizma előtti mosópor." +msgid "A popular pre-Cataclysm washing powder." +msgstr "" #: lang/json/AMMO_from_json.py msgid "soap flakes" @@ -2054,6 +2054,17 @@ msgstr[1] "lámpaolaj" msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "Híg és füstmentesen égő olaj lámpákhoz" +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -2228,6 +2239,68 @@ msgstr "" "és ébresztést indukáló gyógyszert tartalmazó kannából áll. Csak a megfelelő " "orvosi berendezésben használható, kézzel nem lehet beadni." +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "40 mm jelző" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "" +"40 mm-es jelzőgránát, eldobása után veszélytelen füstfelhőt hoz létre, " +"robbanásakor fényesen világít." + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "" +"40 mm-es villanógránát. Vakságot okozó éles fényű villanást és süketséget " +"okozó robajt okoz robbanásakor, célja a vakítás, a süketítés és az " +"összezavarodás." + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "40mm tűzgyújtó" +msgstr[1] "40mm tűzgyújtó" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "" +"40 mm-es gránát némi napalm belsővel, amely egy lánglöketet hoz létre." + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40 mm füstgránát" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "Füstfedezéket biztosító 40mm-es gránát." + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "40mm dumdum" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "" +"Hatalmas lövedékkel megtöltött 40mm-es gránát. Elbúcsúzhatsz a válladtól." + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "10mm Auto FMJ" @@ -3142,139 +3215,133 @@ msgid ".40 S&W JHP, reloaded" msgstr ".40 S&W JHP, utántöltött" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40 mm gránát" +msgid "40x46mm grenade" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "40 mm babzsák" +msgid "40x46mm M1006" +msgstr "" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." msgstr "" -"A 40 mm-es babzsák gránát a célpontra erős hatást mér, amely fájdalmat és " -"zavarodást kelt. Sebzést és halált is okozhat." #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40 mm támadó" +msgid "40x46mm M433" +msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "40 mm-es kézigránát légnyomást okozó robbanással." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "40 mm jelző" +msgid "40x46mm M576" +msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." msgstr "" -"40 mm-es jelzőgránát, eldobása után veszélytelen füstfelhőt hoz létre, " -"robbanásakor fényesen világít." #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "40 mm villanó" +msgid "40x46mm M651" +msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" msgstr "" -"40 mm-es villanógránát. Vakságot okozó éles fényű villanást és süketséget " -"okozó robajt okoz robbanásakor, célja a vakítás, a süketítés és az " -"összezavarodás." #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "40 mm nyilacska" +msgid "40x46mm buckshot" +msgstr "" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." -msgstr "Páncélt átütő acélnyilacskákkal töltött 40 mm-es lövedék." +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40 mm repesz" +msgid "40x46mm slug" +msgstr "" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." msgstr "" -"40 mm-es repeszgránát, kisebb robbanótöltettel és számos repeszképző elemmel" #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "40mm tűzgyújtó" -msgstr[1] "40mm tűzgyújtó" +msgid "40x46mm flechette" +msgstr "" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" msgstr "" -"40 mm-es gránát némi napalm belsővel, amely egy lánglöketet hoz létre." #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "40 mm sörét" +msgid "40x53mm M1001" +msgstr "" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M430A1" +msgstr "" + +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" -"Erőteljes söréttöltettel ellátott 40mm-es lövedék, amelyet sörétes puskák " -"alternatívájaként, valamint barikádok áttöréséhez használnak." #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40 mm füstgránát" +msgid "40x53mm buckshot" +msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "Füstfedezéket biztosító 40mm-es gránát." +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "40mm könnygázgránát" -msgstr[1] "40mm könnygázgránát" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." -msgstr "40 mm-es könnygázgránát, cselekvésképtelenné tevő gázzal töltve." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "40mm dumdum" +msgid "40x53mm flechette" +msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." msgstr "" -"Hatalmas lövedékkel megtöltött 40mm-es gránát. Elbúcsúzhatsz a válladtól." #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -5232,11 +5299,9 @@ msgstr[1] "ezüst" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "" -"Puha, fényes fém. A kataklizma előtt ez egy kisebb vagyont ért, mostanára az" -" értéke jelentősen csökkent." #: lang/json/AMMO_from_json.py msgid "small metal sheet" @@ -5818,15 +5883,6 @@ msgstr "Egy maréknyi, fúvócsővel kilőhető nyilacska" msgid "plutonium cell" msgstr "plutónium cella" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "" -"Némi semmiben lebegő elemtöltet. Újratölthető elemekbe betárazható, de onnan" -" már nem lehet kiszedni." - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5893,7 +5949,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" @@ -6424,21 +6480,6 @@ msgid "" "Hefty round projectiles cast from lead, useful as ammunition for slings." msgstr "Ólomból öntött nehéz lövedék, csúzlihoz hasznos." -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "csont számszeríj lövedék" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "" -"Csontból készült, egyik végén kihegyezett és feltollazott számszeríj " -"lövedék. Könnyű súlyú, egész jó sebzéssel és pontossággal. Kilövés után jó " -"eséllyel marad továbbra is egy darabban." - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -6969,10 +7010,8 @@ msgstr[1] "blob táp" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" -"Különféle szerves anyagok egyvelege - minden, amire egy blobnak szüksége " -"lehet az egészséges létezéshez." #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -7369,11 +7408,9 @@ msgstr[1] "nomád viselet" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "" -"A kataklizma előtti időkből származó hevenyészett, hosszú utazásra szánt " -"ruha. Jó sok minden elfér benne." #: lang/json/ARMOR_from_json.py msgid "light nomad gear" @@ -7384,13 +7421,10 @@ msgstr[1] "könnyű nomád viselet" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "" -"A kataklizma előtti időkből származó hevenyészett, hosszú utazásra szánt " -"könnyű ruha. A hagyományos nomád viselethez képest kevesebb minden fél el " -"benne, és kevésbé is páncélozott." #: lang/json/ARMOR_from_json.py msgid "plated leather armor" @@ -7450,11 +7484,9 @@ msgstr[1] "guberáló viselet" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." msgstr "" -"Erős védelmet nyújtó guberáló ruházat a kataklizma előtti időkből. Jó sok " -"minden elfér benne." #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -11926,9 +11958,9 @@ msgstr "Szőrmével bélelt nagy nadrág." #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" -msgstr[0] "műszőrme nadrág" -msgstr[1] "műszőrme nadrág" +msgid_plural "faux fur pants" +msgstr[0] "" +msgstr[1] "" #. ~ Description for faux fur pants #: lang/json/ARMOR_from_json.py @@ -13743,9 +13775,9 @@ msgstr "Jelöletlen fehér zubon harcművészetek számára." #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" -msgstr[0] "hegedűtok" -msgstr[1] "hegedűtok" +msgid_plural "violin cases" +msgstr[0] "" +msgstr[1] "" #. ~ Description for violin case #: lang/json/ARMOR_from_json.py @@ -14445,11 +14477,9 @@ msgstr[1] "óriási vicces hátizsák" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." msgstr "" -"Óriási méretű textil hátizsák, amelyet a kataklizma előtt viccből " -"készítettek. Még mindig röhejesen néz ki, de egy csomó minden elfér benne." #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -15781,6 +15811,142 @@ msgstr "" "passzol, de nagyon csillog. Ahhoz az igazi bling bling gangsta rapper " "kinézethez." +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -16689,6 +16855,552 @@ msgstr "" "Fényes fekete lakkozott bőr farok, amelyet apró műanyag golyókkal " "nehezítettek. Járás közben mögötted billeg." +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -17245,8 +17957,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17258,10 +17970,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" #: lang/json/ARMOR_from_json.py @@ -17273,10 +17985,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17288,7 +18000,7 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" @@ -17302,8 +18014,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" @@ -17316,7 +18028,7 @@ msgstr[1] "" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -17344,8 +18056,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" @@ -17359,8 +18071,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17372,8 +18084,8 @@ msgstr[1] "" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17385,9 +18097,9 @@ msgstr[1] "" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17400,7 +18112,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -17414,10 +18126,10 @@ msgstr[1] "" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -17443,11 +18155,11 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" @@ -17460,9 +18172,9 @@ msgstr[1] "" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -17476,10 +18188,10 @@ msgstr[1] "" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17492,9 +18204,9 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17506,30 +18218,30 @@ msgstr[1] "" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" +msgid_plural "C.R.I.T trousers" msgstr[0] "" msgstr[1] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" @@ -17541,7 +18253,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17552,20 +18264,20 @@ msgstr[1] "" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "" msgstr[1] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -17577,7 +18289,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" @@ -17590,7 +18302,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -17605,8 +18317,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17706,10 +18418,11 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17718,13 +18431,6 @@ msgid_plural "silver infusion bracelets" msgstr[0] "" msgstr[1] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -18032,7 +18738,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" +msgid_plural "flesh pouches" msgstr[0] "" msgstr[1] "" @@ -18044,6 +18750,19 @@ msgid "" "minimize encumbrance." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -20288,7 +21007,7 @@ msgstr[1] "Ionos túlterhelés generátor KBM" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" "A törzsedbe egy magas teljesítményű iongenerátor került beépítésre, amely " @@ -22320,6 +23039,138 @@ msgstr "" "Népmese gyűjtemény az ilyenkor obligát tündérek, törpék és manók " "részvételével." +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -22781,9 +23632,8 @@ msgstr[1] "erotikus regény" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." msgstr "" -"Agyoncsépelt narratíva rejti el ezt bárgyú irodalmi szoftpornós alkotást." #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -23568,7 +24418,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" @@ -25171,9 +26021,9 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" #: lang/json/BOOK_from_json.py @@ -25201,12 +26051,9 @@ msgstr[1] "Hákolós robotépítés" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" -"Robotok illegális megszerzéséről, átprogramozásáról és módosításáról szóló " -"könyv. Számos, lépésről lépésre illusztrált útmutatót és tervrajzot " -"tartalmaz." #: lang/json/BOOK_from_json.py msgid "Popular Robotics" @@ -25432,6 +26279,17 @@ msgstr[1] "sós víz" msgid "Water with salt added. Not good for drinking." msgstr "Hozzáadott sót tartalmazó víz. Nem jó inni." +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -26051,13 +26909,9 @@ msgstr[1] "moonshine" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "" -"Csakis a legerősebb és legtisztább, kizárólag kukoricából és cukorból " -"égetett amerikai házipálinka az igazi. Garantáltan elfeledteti veled ezt az " -"egész kataklizma dolgot. Ha mégsem, akkor számla ellenében visszajár a " -"látásod." #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -26190,6 +27044,75 @@ msgstr[1] "single malt whiskey" msgid "Only the finest whiskey straight from the bung." msgstr "Házasítatlan malátawhisky, csakis a legjobbat." +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "fancy hobo" @@ -26939,6 +27862,20 @@ msgid_plural "meat jerky" msgstr[0] "jerky" msgstr[1] "jerky" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "barom jerky" +msgstr[1] "barom jerky" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26960,23 +27897,28 @@ msgstr "" "Sózott szárított hal. Sokáig nem romlik meg, de nagyon szomjas leszel tőle." #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "barom jerky" -msgstr[1] "barom jerky" +msgid "smoked meat" +msgstr "füstölt hús" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "" -"Sózott szárított emberhús. Nagyon sokáig nem romlik meg, de nagyon szomjas " -"leszel tőle." +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "füstölt hús" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "" +msgstr[1] "" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -27002,19 +27944,6 @@ msgstr "" "Ízletesre füstölt hal, jó sokáig eláll. Meg tovább lehetne füstölni az " "összes nedvesség eltávolításához." -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "füstölt szívózó" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "" -"Egy erősen füstölt adag emberi hús. Nagyon sokáig megőrzi a minőségét, és " -"még az íze is elég jó, ha eszel ilyet." - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -28499,8 +29428,8 @@ msgstr "pengeollós kaviár" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." -msgstr "Egy csomónyi pengeollós kaviár. A kataklizma utáni világ csemegéje." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -29858,12 +30787,12 @@ msgstr "" "darált marhahús." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" -msgstr[0] "sajtos nachos" -msgstr[1] "sajtos nachos" +msgid "cheese nachos" +msgid_plural "cheese nachos" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -29873,56 +30802,57 @@ msgstr "" "rá még egy kis darált marhahús." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" -msgstr[0] "húsos nachos" -msgstr[1] "húsos nachos" - -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "" -"Kukorica tortillából készült sós chips, és már darált hús is van rajta. Jó " -"lenne rá még egy kis sajt." +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "niño nachos" msgstr[1] "niño nachos" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." msgstr "" -"Kukorica tortillából készült sós chips darált emberhússal. Egy kis sajttal " -"még job lenne." +"Kukorica tortillából készült sós chips, és már darált hús is van rajta. Jó " +"lenne rá még egy kis sajt." +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "sajtos niño nachos" msgstr[1] "sajtos niño nachos" -#. ~ Description for niño nachos with cheese -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "" -"Kukorica tortillából készült sós chips darált emberhússal és sajttal. Isteni" - +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "húsos-sajtos nachos" -msgstr[1] "húsos-sajtos nachos" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -29996,17 +30926,6 @@ msgstr[1] "chilis hot-dog" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Chili con carne feltéttel készített hot-dog. Fincsi!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "csalós hot-dog" -msgstr[1] "csalós hot-dog" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "Chili con humano feltéttel készített hot-dog. Elbűvölő!" - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -30102,10 +31021,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." +"Cataclysm. It would taste much better prepared." msgstr "" -"Húsgyári virsli, a kataklizma előtt főleg baseball-meccseken fogyasztották. " -"Valahogyan elkészítve sokkal jobb lenne az íze." #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -30152,6 +31069,24 @@ msgstr "" msgid "raw sausage" msgstr "nyers kolbász" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -30161,6 +31096,13 @@ msgstr "Füstölésre vagy főzésre kész, méretes nyers kolbász." msgid "sausage" msgstr "kolbász" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -30172,24 +31114,18 @@ msgstr "" msgid "cooked sausage" msgstr "sült kolbász" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "Szép darab, kisütött kolbász." -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "mannwurst" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "" -"Nagy darab emberből készült virsli, a pácolásnak és a füstölésnek " -"köszönhetően jó sokáig eláll. Nagyon ízletes, ha emberhúst keresel." - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -30207,6 +31143,21 @@ msgid_plural "bratwursts" msgstr[0] "bratwurst" msgstr[1] "bratwurst" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30282,6 +31233,14 @@ msgstr "Ehető zsír, amit addig sütöttek, amíg finom ropogós nem lett." msgid "glazed tenderloins" msgstr "mázas szűzérme" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30296,6 +31255,22 @@ msgstr "" msgid "currywurst" msgstr "currywurst" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30309,6 +31284,22 @@ msgstr "" msgid "aspic" msgstr "kocsonya" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30390,6 +31381,14 @@ msgstr "Egy gyönyörű aranybarna, ropogós sült hal." msgid "lunch meat" msgstr "löncshús" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30403,6 +31402,22 @@ msgstr "" msgid "bologna" msgstr "parizer" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30468,6 +31483,21 @@ msgid_plural "sausage gravies" msgstr[0] "öntetes virsli" msgstr[1] "öntetes virsli" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "öntetes mannwurst" +msgstr[1] "öntetes mannwurst" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30481,6 +31511,22 @@ msgstr "" msgid "pemmican" msgstr "pemmikán" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30496,6 +31542,21 @@ msgstr "" msgid "hamburger helper" msgstr "darált húsos-sajtos makaróni" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30518,6 +31579,20 @@ msgid_plural "chilis con carne" msgstr[0] "chili con carne" msgstr[1] "chili con carne" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -30591,14 +31666,26 @@ msgstr "Vízben tartósított keménykagyló konzerv." msgid "clam chowder" msgstr "clam chowder" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." msgstr "" -"Új-angliai krémleves kagylóból. Finom, darabos, sűrű fehér leves krumpliból " -"és keménykagylóból." #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" @@ -30606,6 +31693,13 @@ msgid_plural "baked beans" msgstr[0] "sült bab" msgstr[1] "sült bab" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -30617,6 +31711,13 @@ msgid_plural "meat fried rice" msgstr[0] "rizseshús" msgstr[1] "rizseshús" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -30628,6 +31729,14 @@ msgid_plural "deluxe beans and rice" msgstr[0] "luxus babos rizs" msgstr[1] "luxus babos rizs" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30639,6 +31748,21 @@ msgstr "Lassan főtt fűszerezett rizseshús babbal. Ízletes és nagyon laktat msgid "meat pie" msgstr "húsos pite" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -30648,6 +31772,21 @@ msgstr "Ízletes sült pite jóízű húsos töltelékkel." msgid "meat pizza" msgstr "húsos pizza" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30656,12 +31795,29 @@ msgid "" msgstr "" "Húsos pizza a húsevőknek. Beborítja a darált hús és a sok finom fűszer." +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" msgstr[0] "deluxe tojásrántotta" msgstr[1] "deluxe tojásrántotta" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30673,6 +31829,13 @@ msgstr "Bolyhos és finom tojásrántotta egyéb ízletes hozzávalókkal." msgid "canned meat" msgstr "húskonzerv" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "zöld szója szeletek" +msgstr[1] "zöld szója szeletek" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30686,6 +31849,13 @@ msgstr "" msgid "salted meat slice" msgstr "sózott hússzeletek" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -30697,6 +31867,21 @@ msgid_plural "spaghetti bolognese" msgstr[0] "spaghetti bolognese" msgstr[1] "spaghetti bolognese" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -30706,6 +31891,22 @@ msgstr "Sűrű mártással leöntött spagetti. Fincsi!" msgid "lasagne" msgstr "lasagna" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30728,19 +31929,48 @@ msgstr "Kisütve ennek a SPAM-nak egészen jó íze lett." msgid "cheeseburger" msgstr "sajtburger" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." +"Cataclysm culinary achievement." msgstr "" -"Darálthús és sajt némi extra ízesítéssel. A kataklizma előtti világ " -"gasztronómiai csúcsteljesítménye." #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "hamburger" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -30750,6 +31980,21 @@ msgstr "Darálthús némi extra ízesítéssel" msgid "sloppy joe" msgstr "sloppy joe" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "személyvics" +msgstr[1] "személyvics" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30763,6 +32008,22 @@ msgstr "" msgid "taco" msgstr "taco" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30776,6 +32037,13 @@ msgstr "" msgid "pickled meat" msgstr "savanyított hús" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30786,6 +32054,15 @@ msgstr "Egy adag élesen sós ízű húskonzerv. Finom és tápláló." msgid "dehydrated meat" msgstr "szárított hús" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30814,6 +32091,15 @@ msgid_plural "haggii" msgstr[0] "haggis" msgstr[1] "haggis" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30848,6 +32134,14 @@ msgid_plural "meat temaki" msgstr[0] "húsos temaki" msgstr[1] "húsos temaki" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30885,6 +32179,14 @@ msgstr "" msgid "pelmeni" msgstr "pelmeni" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30896,6 +32198,13 @@ msgstr "Vékony tésztába tekert hústöltelékből készült ízletes főtt go msgid "homemade burrito" msgstr "" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30904,360 +32213,6 @@ msgid "" "but homemade and delicious!" msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "szárított emberhús" -msgstr[1] "szárított emberhús" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "" -"Szárított emberhús-pehely. Megfelelő tárolás mellett elképesztően hosszú " -"időre megőrzi minőségét." - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "rehidratált emberhús" -msgstr[1] "rehidratált emberhús" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "" -"Rehidratált szárított emberhús-pehely, amit lényegesen nagyobb élvezet enni " -"így rehidratálás után." - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "emberi haggis" -msgstr[1] "emberi haggis" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"Ezt a hagyományos skót sós pudingot emberhússal és belsőségekkel kevert " -"zabkásából készítik, amelyet az illető gyomrába varrás után megfőznek. " -"Meglepő ízletes, ha szereted az ilyet, és elég jól lehet tőle lakni. " -"Köretként főtt zöldséggyökerek és erős whisky ajánlott." - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "párizsi parizer" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" -"Szeletelt és tartósított emberhús. Ez sem kutyából készült, de talán volt " -"kutyája. Hidegen is meg lehet enni, mint amilyen hideg a szíved, te " -"emberevő." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "olcsójános currywurst" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "" -"Currys ketchup szósszal leöntött mannwurst. Elég fűszeres és lenyűgöző " -"egyszerre!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "öntetes mannwurst" -msgstr[1] "öntetes mannwurst" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "" -"Keksz, emberi hús és ízletes gombaleves összekeverve. Már a neve is jó " -"zsíros és finom." - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "erkölcstelen kocsonya" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "" -"Emberi csontlevesből készített, zselatinban konzervált emberhús. Halálosan " -"ízletes - ha csíped az ilyesmit." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "prepper pemmikán" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "" -"Indián eredetű tartósítási módszer, magas energiatartalmú táplálék. Ehető " -"növényekből, zsírból és egy balszerencsés prepperből készült, kiváló " -"táplélék, könnyen hordozható formában." - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "idegesítő szendvics" -msgstr[1] "idegesítő szendvics" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "Kenyér meg emberhús, meglepetés!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "mandrólux szendvics" -msgstr[1] "mandrólux szendvics" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "" -"Emberi húsból, zöldségekből, sajtból és fűszerezésből készített szendvics. " -"Lakmározz az ellenségeid lelkéből és a kerti zöldségekből!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "húsos-sajtos csöves makaróni" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "" -"Ebben a darált húsos-sajtos makaróniban nem a tészta csöves, hanem a hús " -"volt." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "chili con humano" -msgstr[1] "chili con humano" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "" -"Fűszeres egytálétel chilipaprikából, darált emberhúsból, paradicsomból és a " -"babból." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "hülyepite" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -"Húsos pite egy kis katonából, vagy tudósból, vagy kiből, ki tudja. Fúúú, de " -"finom!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "postás pizza" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "" -"Húsos pizza az emberevőknek. Beborítja a darált emberhús és a sok finom " -"fűszer." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "zöld szója szeletek" -msgstr[1] "zöld szója szeletek" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -"Alacsony sótartalmú emberhús konzerv. A sült hús szinte összes tápanyagát " -"tartalmazza, de semmi íze sincs." - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "sózott husika szeletek" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "" -"Sós lében pácolt, vákuum-csomagolt emberi testrész szeletek. Sós, de " -"szükséghelyzetben ízletes." - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "csirkefogó spagetti" -msgstr[1] "csirkefogó spagetti" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "" -"Sűrű, emberhúsból készült mártással leöntött spagetti. Az íze is elég jó, ha" -" eszel ilyet." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "Luigi lasagnája" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "" -"Nagyon régi fajta tésztaétel, amelyben több rétegben váltakozik a lasagna " -"tésztalapja, a sajt, a szósz és a darált hús. Emberhúsból még jobb." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "tökfej sajtburger" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "" -"Darált emberhús és sajt némi extra ízesítéssel. A kataklizma utáni világ " -"kannibál-gasztronómiai csúcsteljesítménye." - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "bobburger" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "" -"Ez a hamburger meghaladja az élelmezésbiztonsági hatóság által megengedett " -"4%-os emberhús tartalmat." - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "személyvics" -msgstr[1] "személyvics" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "A szendvics az egy szendvics, de ez emberből készült!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "tio taco" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -"Marhahús helyett darált emberhúsból készült taco. Valamiért messziről " -"csengőhangot hallasz." - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "nyers mannwurst" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "Füstölésre vagy sütésre váró, emberes darab virsli." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "sült mannwurst" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "" -"Kisütött, emberes darab virsli. Annyira finom, amennyire emberileg " -"lehetséges." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "mannbrat" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "" -"Apróra szeletelt emberhúsból készült német kolbászfajta, leginkább " -"serpenyőben vagy sütőben való sütésre alkalmas. Frissen és forrón az igazi. " -"Bármilyen emberből készíthető, nem muszáj pont németből." - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "savanyított punk" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "" -"Egy adag élesen sós ízű emberhús-konzerv. Finom és tápláló, ha eszel ilyet." - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -32154,11 +33109,8 @@ msgstr "ízesített csontliszt tabletta" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" -"Csontlisztből házilag készített kalcium étrend-kiegészítő. A belekevert " -"édesítőnek köszönhetően nincs is annyira poros és hamus íze. Már majdnem " -"annyira ehető, mint a kataklizma előtti pirulák." #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -32807,7 +33759,7 @@ msgstr "madár szérum" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" @@ -33733,11 +34685,9 @@ msgstr[1] "marloss zselatin" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" -"A kataklizma előtti idők citromsárga zseléjére emlékeztet. Erős, de finom " -"illata van, egyértelműen idegen eredetű vagy mutálódott." #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -34038,14 +34988,14 @@ msgstr[1] "kutyakaja" msgid "This is food for dogs. It smells strange, but dogs seem to love it." msgstr "Ez élelem a kutyák számára. Furcsa a szaga, de a kutyák szeretik." -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "macskaja" msgstr[1] "macskaja" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "Ez élelem a macskák számára. Furcsa a szaga, de a macskák szeretik." @@ -34085,67 +35035,30 @@ msgstr[1] "" msgid "Some nectar. Seeing this item is a bug." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "proteinital" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "zöld szója" msgstr[1] "zöld szója" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "" -"Híg iszapszerű, vízzel kevert emberi fehérjepor. Bár nagyon tápláló, nem " -"különösebben ízletes." - +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" -"Emberekből készült, nyers és finomított fehérje! Bár nagyon tápláló, ebben a" -" tiszta formájában lehetetlen élvezni, öntsd fel vízzel." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "zöld szója shake" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "" -"Sűrű és ízletes ital tiszta, finomított emberi fehérjeporból és ízletes " -"gyümölcsből." - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "megerősített zöld szója shake" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "" -"Sűrű és ízletes ital tiszta, finomított emberi fehérjeporból és ízletes " -"gyümölcsből. További vitaminokkal és ásványi anyagokkal egészítették ki." - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "proteinital" - #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34161,6 +35074,14 @@ msgid_plural "protein powder" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34171,13 +35092,10 @@ msgstr "" "lehetetlen élvezni, öntsd fel vízzel." #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "" -msgstr[1] "" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -34193,6 +35111,13 @@ msgstr "" msgid "protein shake" msgstr "protein shake" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34206,6 +35131,14 @@ msgstr "" msgid "fortified protein shake" msgstr "megerősített protein shake" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35029,6 +35962,13 @@ msgid_plural "deluxe sandwiches" msgstr[0] "delux szendvics" msgstr[1] "delux szendvics" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35127,6 +36067,22 @@ msgid_plural "meat sandwiches" msgstr[0] "húsos szendvics" msgstr[1] "húsos szendvics" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "idegesítő szendvics" +msgstr[1] "idegesítő szendvics" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -36096,15 +37052,6 @@ msgstr "csontleves" msgid "A tasty and nutritious broth made from bones." msgstr "Csontból főzött finom és tápláló leves." -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "emberi csontleves" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "Emberi csontból főzött tápláló leves." - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "zöldségleves" @@ -36118,6 +37065,13 @@ msgstr "Tápláló és ízletes zöldségleves." msgid "meat soup" msgstr "húsleves" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -36149,6 +37103,13 @@ msgid_plural "curries with meat" msgstr[0] "húsos curry" msgstr[1] "húsos curry" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -36158,20 +37119,18 @@ msgstr "Fűszeres, apróbb paprikadarabokkal és husival! Nagyon finom." msgid "woods soup" msgstr "erdei leves" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "Tápláló és ízletes leves a természet ajándékaiból." -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "fafejleves" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "Sokkal jobb belőle levest főzni, mintha életben maradt volna." - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "tésztás csirkehúsleves" @@ -37288,17 +38247,6 @@ msgid "" " resembles spoiled milk." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "" @@ -37347,6 +38295,17 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "" @@ -37365,8 +38324,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37381,7 +38340,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -37631,19 +38590,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "gyantás zsinór" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "" -"Zsinórból és természetes ragasztóból készült primitív rögzítőanyag. Fából, " -"csontból, papírból és kitinből készült tárgyak javításához használható." - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -37651,8 +38597,8 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37676,10 +38622,8 @@ msgstr[1] "bogyó alakú anomália" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "" -"Ha ezt csak itt így hagynánk, akkor bárki csak úgy besétálhatna a Virágzásba" -" és részesülhetne a Gyümölcsből. Azt meg nem hagyhatjuk, ugye?" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -37691,10 +38635,8 @@ msgstr[1] "mag alakú anomália" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "" -"Ha ezt csak itt így hagynánk, akkor bárki csak úgy besétálhatna a Kertbe és " -"részesülhetne a Magból. Azt meg nem hagyhatjuk, ugye?" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -37706,10 +38648,8 @@ msgstr[1] "marloss zselatin" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "" -"Ha ezt csak itt így hagynánk, akkor bárki csak úgy besétálhatna a Csúcsba és" -" részesülhetne a Nedvből. Azt meg nem hagyhatjuk, ugye?" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -37720,11 +38660,9 @@ msgstr[1] "gyümölcs alakú anomália" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" -"Mi még nem vagyunk. Okos kis ember ember, a debuggoláson át jutottál el " -"idáig? Addig nem csatlakozhatsz hozzánk, amíg a mod el nem készül." #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -37852,10 +38790,8 @@ msgstr[1] "gluténmentes PB&H szendvics" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" -"Valami barom mézet rakott ebbe a mogyoróvajas szendvicsbe, kinek jut az " -"eszébe ilyen hüly... várjál, ez egész jó. És gluténmentes!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free PB&M sandwich" @@ -37879,20 +38815,16 @@ msgstr "laktózmentes hikoridió ambrózia" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "" -"Finom hikoridió ambrózia. Az istenek méltó itala. Ez a tehéntej " -"alternatívájaként készült." #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "" -"Szerinted ez kukoricaliszt... vagy rizsliszt... vagy valami más. Az biztos, " -"hogy nem búzaliszt! Sütni lehet vele." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free johnnycake" @@ -37901,11 +38833,9 @@ msgstr "gluténmentes johnnycake" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "" -"Néha mindannyian valamilyen süteményre vágyunk. Ez nem tökéletes, de " -"legalább ízletes és tápláló gluténmentes sült kenyérféle." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit pancake" @@ -37947,12 +38877,9 @@ msgstr[1] "glutén- és laktózmentes gyümölcsös palacsinta" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" -"Bolyhos és ízletes laktózmentes palacsinta csak olyan dolgokból, amiket meg " -"is tudsz még enni. Legalább igazi juharsziruppal, amelyet az egészséges " -"gyümölcs még édesebbé és egészségesebbé tesz." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free chocolate pancake" @@ -37992,12 +38919,9 @@ msgstr[1] "glutén- és laktózmentes bundáskenyér" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" -"Laktózmentes tej és tojáspor keverékébe áztatott, majd kirántott " -"gluténmentes kenyérszelet. Sose gondoltad volna, hogy létezhet ilyen, de " -"most aztán már nagyon évezredforduló utáni hangulatod lett." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free biscuit" @@ -38090,10 +39014,8 @@ msgstr "gluténmentes sajtburger" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." +"of pre-Cataclysm culinary achievement." msgstr "" -"Gluténmentes szendvics darálthússal és sajt némi extra ízesítéssel. A " -"kataklizma előtti világ gasztronómiai csúcsteljesítménye." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -38231,10 +39153,8 @@ msgstr[1] "gluténmentes unalmas szendvics" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "" -"Egy egyszerű gluténmentes mártásos szendvics. Nem túl laktató, de az üres " -"kenyérnél azért jobb... különösen, ha az a rosszféle tésztából készült!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free waffle" @@ -38242,8 +39162,8 @@ msgstr "gluténmentes gofri" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." -msgstr "Gluténmentes gofri. Gyakorlatilag hashtag alakú palacsinta." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "lactose free waffle" @@ -38251,16 +39171,15 @@ msgstr "laktózmentes gofri" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." -msgstr "Laktózmentes gofri. Gyakorlatilag hashtag alakú palacsinta." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgstr "" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "" -"Glutén- és laktózmentes gofri. Gyakorlatilag hashtag alakú palacsinta." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit waffle" @@ -38310,11 +39229,9 @@ msgstr[1] "rizs tej" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "" -"A tehéntejnél édesebb, szinte íze van a vanília fagylaltízű. Gyorsan " -"megromlik." #: lang/json/COMESTIBLE_from_json.py msgid "coconut water" @@ -38325,11 +39242,9 @@ msgstr[1] "kókusztej" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "" -"A tehéntejnél édesebb, szinte íze van a vanília fagylaltízű. Gyorsan " -"megromlik." #: lang/json/COMESTIBLE_from_json.py msgid "jarred coconut milk" @@ -39230,6 +40145,17 @@ msgid "" "it's anyone's guess what it's for." msgstr "" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -40036,6 +40962,29 @@ msgid_plural "corpses" msgstr[0] "hulla" msgstr[1] "hulla" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -40054,13 +41003,7 @@ msgid "" " so with a gigantic claw." msgstr "" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "" @@ -40150,6 +41093,34 @@ msgid "" "wound." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -42081,6 +43052,149 @@ msgstr[1] "gyémánt" msgid "A sparkling diamond." msgstr "Egy szikrázó gyémánt." +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -43204,11 +44318,9 @@ msgstr[1] "cestus" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." msgstr "" -"Ókori fém harci kesztyű, amely az egész öklöt befedi és megnöveli a bevitt " -"ütés erejét. A fémkesztyű alatt vastag párnázás védi a viselő kezét." #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -43986,17 +45098,17 @@ msgstr[1] "" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "lövegtorony váz" -msgstr[1] "lövegtorony váz" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" #: lang/json/GENERIC_from_json.py @@ -46135,6 +47247,288 @@ msgid_plural ".50 ammo belt linkages" msgstr[0] ".50 lőszerheveder kapocs" msgstr[1] ".50 lőszerheveder kapocs" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -46275,15 +47669,43 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "40mm gránáttok" -msgstr[1] "40mm gránáttok" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing +#: lang/json/GENERIC_from_json.py +msgid "A large canister from a spent 40mm cartridge." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for 40mm canister #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "Egy elhasznált 40 mm-es gránát tokja." +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -46661,16 +48083,6 @@ msgid_plural "generic silverwares" msgstr[0] "" msgstr[1] "" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -49553,6 +50965,28 @@ msgid "" "twist ties, duct tape, and other random stuff has been used to compensate." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -51341,8 +52775,8 @@ msgstr[1] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -51472,9 +52906,79 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -53658,7 +55162,21 @@ msgstr[1] "" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" #: lang/json/GENERIC_from_json.py @@ -54851,6 +56369,17 @@ msgstr[1] "" msgid "A small book, containing spells created by a novice magician." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -55023,6 +56552,47 @@ msgid "" "hopes to discover a more permanent solution." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -55411,11 +56981,9 @@ msgstr[1] "elromlott és lefegyverzett skitterbot" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" -"Egy elromlott skitterbot. A beépített fegyvermodult már eltávolították. " -"Alkatrészekre lehet bontani, vagy egy másik robot építéséhez felhasználni." #. ~ Description for broken skitterbot #: lang/json/GENERIC_from_json.py @@ -55441,11 +57009,9 @@ msgstr[1] "elromlott és lefegyverzett harci robot" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Egy elromlott harci robot. A beépített fegyvermodult már eltávolították. " -"Alkatrészekre lehet bontani, vagy egy másik robot építéséhez felhasználni." #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -55479,11 +57045,9 @@ msgstr[1] "elromlott és lefegyverzett csirkejáró" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Egy elromlott csirkejáró. A beépített fegyvermodult már eltávolították. " -"Alkatrészekre lehet bontani, vagy egy másik robot építéséhez felhasználni." #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -56085,9 +57649,8 @@ msgstr[1] "" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "" -"Egy elromlott robot roncsa. Alkatrészekre lehetne bontani, vagy újjáépíteni." #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -56116,11 +57679,9 @@ msgstr[1] "" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" -"Egy elromlott katonai kiképző robot roncsa, most már közömbös. Ebbe egy " -"paintball puskát építettek bele. Alkatrészekre lehetne bontani." #: lang/json/GENERIC_from_json.py msgid "broken military robot" @@ -56131,56 +57692,44 @@ msgstr[1] "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" -"Egy elromlott katonai kiképző robot roncsa, most már közömbös. Ebbe egy 5" -".56mm-es puskát építettek bele. Alkatrészekre lehetne bontani." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" -"Egy elromlott katonai kiképző robot roncsa, most már közömbös. Ebbe egy 7" -".62mm-es fegyvert építettek bele. Alkatrészekre lehetne bontani." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" -"Egy elromlott katonai kiképző robot roncsa, most már közömbös. Ebbe egy .50 " -"kaliberű fegyvert építettek bele. Alkatrészekre lehetne bontani." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" -"Egy elromlott katonai kiképző robot roncsa, most már közömbös. Ebbe egy " -"8x40mm-es fegyvert építettek bele. Alkatrészekre lehetne bontani." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" -"Egy elromlott katonai kiképző robot roncsa, most már közömbös. Ebbe egy " -"nyilacskás fegyvert építettek bele. Alkatrészekre lehetne bontani." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" -"Egy elromlott katonai kiképző robot roncsa, most már közömbös. Ebbe egy " -"40mm-es gránátvetőt építettek bele. Alkatrészekre lehetne bontani." #: lang/json/GENERIC_from_json.py msgid "broken military flame robot" @@ -56191,11 +57740,9 @@ msgstr[1] "" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" -"Egy elromlott katonai robot roncsa, most már közömbös. Ebbe egy lángszórót " -"építettek bele. Alkatrészekre lehetne bontani." #: lang/json/GENERIC_from_json.py msgid "broken robo-guardian" @@ -56208,8 +57755,10 @@ msgstr[1] "" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "" "Egy elromlott robot roncsa. Alkatrészekre lehetne bontani, vagy újjáépíteni." @@ -56221,10 +57770,8 @@ msgstr[1] "" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "" -"Egy elromlott luxusrobot roncsa. Alkatrészekre lehetne bontani, vagy " -"újjáépíteni." #: lang/json/GENERIC_from_json.py msgid "broken robo-protector" @@ -56247,11 +57794,9 @@ msgstr[1] "" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Egy elromlott modern robot. A beépített fegyvermodult már eltávolították. " -"Alkatrészekre lehet bontani, vagy egy másik robot építéséhez felhasználni." #: lang/json/GENERIC_from_json.py msgid "broken advanced robot" @@ -56262,38 +57807,30 @@ msgstr[1] "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" -"Egy elromlott modern robot roncsa. Ebbe egy lézermodult építettek bele. " -"Alkatrészekre lehetne bontani." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" -"Egy elromlott modern robot roncsa. Ebbe egy plazmamodult építettek bele. " -"Alkatrészekre lehetne bontani." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" -"Egy elromlott modern robot roncsa. Ebbe egy elktróvetőt építettek bele. " -"Alkatrészekre lehetne bontani." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" -"Egy elromlott modern robot roncsa. Ebbe egy EMP projektort építettek bele. " -"Alkatrészekre lehetne bontani." #: lang/json/GENERIC_from_json.py msgid "broken glittering lady" @@ -56318,11 +57855,9 @@ msgstr[1] "" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "" -"Egy elromlott robot roncsa. Hál' istennek vége. Alkatrészekre lehetne " -"bontani, vagy újjáépíteni." #: lang/json/GENERIC_from_json.py msgid "broken screeching terror" @@ -56342,13 +57877,6 @@ msgid_plural "broken fist kings" msgstr[0] "" msgstr[1] "" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "" -"Egy elromlott robot roncsa. Alkatrészekre lehetne bontani, vagy újjáépíteni." - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -56482,14 +58010,8 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." +"you…" msgstr "" -"Az összetett belső felépítése alapján ez az amorf massza úgy tűnik, hogy " -"befejezte a fejlődését. Belső hidraulikus nyomásszabályozással képes a " -"mozgásra, jelentős terhek szállítására, valamint az intelligenciájának " -"elképesztő jeleként lábszerű nyúlványaival alkalmas mindent manipulálni, " -"amit hozzácsatolnak, legyen az blob-alapú, vagy bármi más. Ehhez ugyan neked" -" is hozzá kell érned, és idegesítően hajlamos az együttműködésre..." #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -56549,6 +58071,12 @@ msgstr "" " tartja a veszélytől, és a nap követésével megnőtt a hatékonysága. Ennek " "viszont az az ára, hogy rendkívül nehézzé vált." +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "lövegtorony váz" +msgstr[1] "lövegtorony váz" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -56605,12 +58133,9 @@ msgstr[1] "stabilizált portál" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"Ahogyan tekintetedet a valóság mezsgyéjében ütött végtelenségre emeled, a " -"régmúlt idők egyik jelmondata kering a fejedben: Két dolog végtelen - a " -"világegyetem és az emberi kleptománia." #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -57900,6 +59425,17 @@ msgid "" " reload a compatible revolver." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "" @@ -57965,6 +59501,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "AF2011A1 tár" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "" @@ -58284,8 +59831,8 @@ msgstr "" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -59643,12 +61190,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"Biológiai talány ez a blob, amely valamilyen ismeretlen folyamat " -"segítségével lassan villamosenergiát generál, közben gyengén foszforeszkál. " -"Képes továbbá más forrásból származó elektromosság eltárolására is, de a " -"tárolással inaktívvá válik. Annyira lágy, hogy szinte szétszakítható." #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -59706,24 +61249,6 @@ msgstr "" msgid "pebble hopper" msgstr "kavics adagoló" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "AF2011A1 tár" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "Közös alapra szerelt két darab tár, csak az AF2011A1 számára." - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "M1991A1 .38 Super tár" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr ".38 lövedékből 9 darab fér el a M1991A1 számára készült tárban." - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "alapértelmezett" @@ -59954,11 +61479,9 @@ msgstr "Fuji többi épülete" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "" -"Még több épületet ad a játékhoz, illetve változatosságot a létező " -"épületekhez (szükséges hozzá a További helyszínek)" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -59980,7 +61503,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -60012,7 +61535,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" @@ -60114,10 +61637,8 @@ msgstr "Mutánks NPC-k" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "" -"A pusztaságban kóborló NPC-k néha mutációval is rendelkeznek - így az " -"ellenségeid is!" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -60126,9 +61647,8 @@ msgstr "" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -60453,9 +61973,9 @@ msgstr "Ben gluténmentes receptjei" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." -msgstr "Pár alternatív glutén- és laktózmentes recept. Nem mindent cserél le." +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "Tough Zombies" @@ -60491,11 +62011,9 @@ msgstr "Alternatív térkép ikonok" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" -"Olvashatóbbá teszi a nagytérképet. Az épületek színkódoltak, és a nevük " -"kezdőbetűje látható a ^v<> helyett." #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -60644,7 +62162,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -60656,7 +62174,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -60667,7 +62185,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -60677,7 +62195,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -60756,11 +62274,8 @@ msgstr[1] "kacsa" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." msgstr "" -"A vadkacsát gyakran folyók és egyéb vízfelületek közelében lehet látni. " -"Nagyrészt rovarokat, magvakat, gyökereket, illetve a kataklizma előtti " -"időkben még kenyérdarabokat eszik." #: lang/json/MONSTER_from_json.py msgid "goose" @@ -61595,10 +63110,8 @@ msgstr[1] "ponty" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" -"Egyesek szerint a ponty egy néha kicsit mocsárízű, de a kataklizma után ne " -"legyél már finnyás." #: lang/json/MONSTER_from_json.py msgid "grass carp" @@ -61761,7 +63274,7 @@ msgid_plural "skittering plagues" msgstr[0] "sietős döghalál" msgstr[1] "sietős döghalál" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "" @@ -61773,7 +63286,7 @@ msgid_plural "plague nymphs" msgstr[0] "döghalál lárva" msgstr[1] "döghalál lárva" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "Patkány méretű fertőzött, mutáns csótány." @@ -61784,7 +63297,7 @@ msgid_plural "plague vectors" msgstr[0] "döghalál hordozó" msgstr[1] "döghalál hordozó" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -61810,7 +63323,7 @@ msgid_plural "giant cockroach nymphs" msgstr[0] "óriás csótány lárva" msgstr[1] "óriás csótány lárva" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "Patkányméretű mutáns csótánybébi." @@ -61834,7 +63347,7 @@ msgid_plural "giant bees" msgstr[0] "óriásméh" msgstr[1] "óriásméh" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -61849,7 +63362,7 @@ msgid_plural "giant centipedes" msgstr[0] "óriás százlábú" msgstr[1] "óriás százlábú" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -61894,7 +63407,7 @@ msgid_plural "giant mosquitos" msgstr[0] "óriás szúnyog" msgstr[1] "óriás szúnyog" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -61909,7 +63422,7 @@ msgid_plural "giant cellar spiders" msgstr[0] "óriás kaszáspók" msgstr[1] "óriás kaszáspók" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -61925,7 +63438,7 @@ msgid_plural "immature giant cellar spiders" msgstr[0] "kifejletlen óriás kaszáspók" msgstr[1] "kifejletlen óriás kaszáspók" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -61940,7 +63453,7 @@ msgid_plural "giant jumping spiders" msgstr[0] "óriás ugrópók" msgstr[1] "óriás ugrópók" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -61955,7 +63468,7 @@ msgid_plural "giant trapdoor spiders" msgstr[0] "óriás aknászpók" msgstr[1] "óriás aknászpók" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -61970,7 +63483,7 @@ msgid_plural "giant web spiders" msgstr[0] "óriás zugpók" msgstr[1] "óriás zugpók" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -61985,7 +63498,7 @@ msgid_plural "fungal spiders" msgstr[0] "gombapók" msgstr[1] "gombapók" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -62002,7 +63515,7 @@ msgid_plural "immature giant web spiders" msgstr[0] "kifejletlen óriás zugpók" msgstr[1] "kifejletlen óriás zugpók" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -62017,7 +63530,7 @@ msgid_plural "giant black widows" msgstr[0] "óriás fekete özvegy" msgstr[1] "óriás fekete özvegy" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -62031,7 +63544,7 @@ msgid_plural "giant black widow spiderlings" msgstr[0] "óriás fekete özvegy lárva" msgstr[1] "óriás fekete özvegy lárva" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -62046,7 +63559,7 @@ msgid_plural "giant wolf spiders" msgstr[0] "óriás farkaspók" msgstr[1] "óriás farkaspók" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -62061,7 +63574,7 @@ msgid_plural "giant wasps" msgstr[0] "óriásdarázs" msgstr[1] "óriásdarázs" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -62076,7 +63589,7 @@ msgid_plural "dermatiks" msgstr[0] "dermatik" msgstr[1] "dermatik" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -62103,7 +63616,7 @@ msgid_plural "giant ants" msgstr[0] "óriáshangya" msgstr[1] "óriáshangya" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -62118,7 +63631,7 @@ msgid_plural "giant acidic ants" msgstr[0] "óriás savas hangya" msgstr[1] "óriás savas hangya" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -62150,7 +63663,7 @@ msgid_plural "acidic queen ants" msgstr[0] "savas hangya királynő" msgstr[1] "savas hangya királynő" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -62167,7 +63680,7 @@ msgid_plural "acidic soldier ants" msgstr[0] "savas hangya katona" msgstr[1] "savas hangya katona" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -62184,7 +63697,7 @@ msgid_plural "fungal ants" msgstr[0] "gombás hangya" msgstr[1] "gombás hangya" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -62214,7 +63727,7 @@ msgid_plural "queen ants" msgstr[0] "hangya királynő" msgstr[1] "hangya királynő" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -62229,7 +63742,7 @@ msgid_plural "soldier ants" msgstr[0] "hangya katona" msgstr[1] "hangya katona" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -62244,7 +63757,7 @@ msgid_plural "giant locusts" msgstr[0] "óriás sáska" msgstr[1] "óriás sáska" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -62259,7 +63772,7 @@ msgid_plural "locust nymphs" msgstr[0] "sáska lárva" msgstr[1] "sáska lárva" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -63206,7 +64719,7 @@ msgid_plural "marloss zealots" msgstr[0] "marloss zelóta" msgstr[1] "marloss zelóta" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " @@ -63215,7 +64728,7 @@ msgstr "" "A szeme üresen csillog, szájából nyár csorog, miközben mámoros extázisban " "mormolja a zsolozsmákat." -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -63230,7 +64743,7 @@ msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "X-03: 'Spectre' felderítő mech" msgstr[1] "X-03: 'Spectre' felderítő mech" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -63256,7 +64769,7 @@ msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "X-02: 'Grunt' harci mech" msgstr[1] "X-02: 'Grunt' harci mech" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -63280,7 +64793,7 @@ msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "X-01: 'Jack' emelő mech" msgstr[1] "X-01: 'Jack' emelő mech" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -63305,7 +64818,7 @@ msgid_plural "mi-gos" msgstr[0] "mi-go" msgstr[1] "mi-go" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -63325,7 +64838,7 @@ msgid_plural "mi-go slavers" msgstr[0] "mi-go rabszolgahajcsár" msgstr[1] "mi-go rabszolgahajcsár" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -63347,7 +64860,7 @@ msgid_plural "mi-go surgeons" msgstr[0] "mi-go sebész" msgstr[1] "mi-go sebész" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -63361,7 +64874,7 @@ msgid_plural "mi-go guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -63378,7 +64891,7 @@ msgid_plural "mi-go myrmidons" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -63395,7 +64908,7 @@ msgid_plural "mi-go scouts" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -65117,6 +66630,19 @@ msgid "" "able to see." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -65829,7 +67355,7 @@ msgid_plural "experimental mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -65844,7 +67370,7 @@ msgid_plural "evolved mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -66336,16 +67862,10 @@ msgstr[1] "M2HB autonóm CROWS II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" -"Az M153 CROWS II alapján kifejlesztett távirányítású fegyverrendszert " -"autonóm viselkedésre képes szoftverrel látták el. Az amerikai hadsereg a " -"kataklizma előtt több ezer egységet telepített. A felhasználók nagyra " -"értékelték, hogy egy könnyű járműig bezárólag bármilyen célt tűz alá tudott " -"venni anélkül, hogy az operátor veszélybe került volna. Ezt egy M2HB-val " -"szerelték fel." #: lang/json/MONSTER_from_json.py msgid "M249 autonomous CROWS II" @@ -66358,15 +67878,9 @@ msgstr[1] "M249 autonóm CROWS II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" -"Az M153 CROWS II alapján kifejlesztett távirányítású fegyverrendszert " -"autonóm viselkedésre képes szoftverrel látták el. Az amerikai hadsereg a " -"kataklizma előtt több ezer egységet telepített. A felhasználók nagyra " -"értékelték, hogy egy könnyű járműig bezárólag bármilyen célt messziről tűz " -"alá tudott venni anélkül, hogy az operátor veszélybe került volna. Ezt egy " -"M249-cel szerelték fel." #: lang/json/MONSTER_from_json.py msgid "M240 autonomous CROWS II" @@ -66379,15 +67893,9 @@ msgstr[1] "M240 autonóm CROWS II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" -"Az M153 CROWS II alapján kifejlesztett távirányítású fegyverrendszert " -"autonóm viselkedésre képes szoftverrel látták el. Az amerikai hadsereg a " -"kataklizma előtt több ezer egységet telepített. A felhasználók nagyra " -"értékelték, hogy egy könnyű járműig bezárólag bármilyen célt messziről tűz " -"alá tudott venni anélkül, hogy az operátor veszélybe került volna. Ezt egy " -"M240-nel szerelték fel." #: lang/json/MONSTER_from_json.py msgid "anklebiter" @@ -66793,7 +68301,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -66808,7 +68316,21 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67172,9 +68694,9 @@ msgstr[1] "" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67186,10 +68708,10 @@ msgstr[1] "" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67202,7 +68724,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -67216,8 +68738,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" @@ -67231,7 +68753,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -67245,10 +68767,10 @@ msgstr[1] "" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67260,9 +68782,9 @@ msgstr[1] "" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -67276,8 +68798,8 @@ msgstr[1] "" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67289,16 +68811,16 @@ msgstr[1] "" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" @@ -67312,8 +68834,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67338,11 +68860,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" -"Ez nem a Jellystone nemzeti park, és ő sem a piknikkosarad tartalmára " -"vágyik. Az egykoron büszke medve gőzölgő maradványaiból fekete szemek " -"tekintenek rád, teli rosszindulattal... és éhséggel." #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -67673,6 +69192,87 @@ msgid "" "like jaws." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -68224,7 +69824,7 @@ msgstr[1] "" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" @@ -68237,7 +69837,7 @@ msgstr[1] "" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" @@ -68250,7 +69850,7 @@ msgstr[1] "" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" @@ -68605,8 +70205,8 @@ msgstr[1] "" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68660,8 +70260,8 @@ msgstr[1] "" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" #: lang/json/MONSTER_from_json.py @@ -70208,6 +71808,17 @@ msgstr "" msgid "Ethereal Grasp" msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "" @@ -70629,6 +72240,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "" @@ -72681,6 +74315,19 @@ msgstr "" "Orvosi hallgató szerszám. Mindenféle csendes dolgokat lehet vele " "meghallgatni." +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -73009,9 +74656,9 @@ msgstr[1] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -73022,7 +74669,7 @@ msgstr[1] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -73035,9 +74682,9 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -73054,7 +74701,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -73067,12 +74714,12 @@ msgstr[1] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." +msgid "Power levels too low for safe bootup…" msgstr "" #. ~ Description for CRIT EM vest (off) @@ -73080,9 +74727,9 @@ msgstr "" msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -73098,7 +74745,7 @@ msgstr "" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "" #. ~ Description for CRIT EM vest (on) @@ -73107,8 +74754,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -73126,7 +74773,7 @@ msgstr "" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -73145,10 +74792,10 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -73403,6 +75050,32 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -73969,12 +75642,13 @@ msgstr "Már kihúztad a(z) %s tüskéjét, próbáld meg inkább eldobni." #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "Ketyegés." @@ -74061,17 +75735,11 @@ msgstr "Kihúzod a zavarógránát biztosítótüskéjét." #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" -"Ez egy sokban módosított EMP gránát, amely a robotok barát-ellenség " -"felismerő chipjeit megzavarja, ahelyett, hogy tönkre tenné őket. " -"Használatával a robot egy rövid ideig a te oldaladra áll át, mielőtt a " -"biztonsági rendszerei újraindulnak. Használatkor kihúzod a biztosítótüskét " -"és ezzel beindul a gyutacsa." #: lang/json/TOOL_from_json.py msgid "active scrambler grenade" @@ -74088,6 +75756,56 @@ msgstr "" "Ez egy aktív zavarógránát, amely hamarosan felrobban, és átmenetileg a te " "oldaladra állítja a robotokat." +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "EMP gránát" +msgstr[1] "EMP gránát" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "Kihúzod az EMP gránát biztosítótüskéjét." + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +"Ez egy apró elektromágneses impulzust generáló gránát. Használatkor kihúzod " +"a biztosítótüskét és ezzel beindul a gyutacsa. Ezután a gránát EMP " +"detonációjáig három köröd van. Az elektromágneses impulzus a robotokban okoz" +" sebzést és leszívja a bionikus energiát." + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "aktív EMP gránát" +msgstr[1] "aktív EMP gránát" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "Már kihúztad a(z) %s tüskéjét, próbáld meg inkább eldobni." + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"Ez egy aktív EMP gránát, és hamarosan felrobban. Az elektromágneses impulzus" +" a robotokban okoz sebzést és leszívja a bionikus energiát. Talán nem " +"kellene sokáig kézben tartani." + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -74530,29 +76248,30 @@ msgstr "" "testrészeidet is befedi. Viseléséhez az aktiválással kell széthajtogani." #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "EMP gránát" -msgstr[1] "EMP gránát" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "" +msgstr[1] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "Kihúzod az EMP gránát biztosítótüskéjét." +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -"Ez egy apró elektromágneses impulzust generáló gránát. Használatkor kihúzod " -"a biztosítótüskét és ezzel beindul a gyutacsa. Ezután a gránát EMP " -"detonációjáig három köröd van. Az elektromágneses impulzus a robotokban okoz" -" sebzést és leszívja a bionikus energiát." #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -74568,29 +76287,24 @@ msgid "" msgstr "" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "aktív EMP gránát" -msgstr[1] "aktív EMP gránát" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "" +msgstr[1] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "Már kihúztad a(z) %s tüskéjét, próbáld meg inkább eldobni." +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"Ez egy aktív EMP gránát, és hamarosan felrobban. Az elektromágneses impulzus" -" a robotokban okoz sebzést és leszívja a bionikus energiát. Talán nem " -"kellene sokáig kézben tartani." #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -75089,13 +76803,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -"35mm-es SLR fényképezőgép optikai és digitális nézegetővel, stabilizált " -"autófókuszos zoom objektívvel és vakuval. Megtekintheted a képeidet, vagy " -"átmásolhatod azokat egy memóriakártyára. Hagyományos elemmel működik. A " -"kataklizma előtt profi képeket lehetett volna vele készíteni." #: lang/json/TOOL_from_json.py msgid "candle" @@ -75890,6 +77600,7 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -75903,13 +77614,10 @@ msgstr[1] "E-Ink Tablet PC" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -"Hatékony e-tintás kijelzővel ellátott tablet. A kataklizma előtt divatos " -"kütyük voltak, most már szinte felbecsülhetetlen értékű erőforrások. " -"Hagyományos elemmel működik." #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -77163,11 +78871,9 @@ msgstr[1] "hevenyészett kalapács" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "" -"Ez a kezdetleges kalapács egy bothoz erősített fémdarabból áll. Kalapálásra " -"megfelelő, de egy igazi kalapáccsal azért nem veszi fel a versenyt." #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -78311,21 +80017,6 @@ msgstr "" "Ezt a nagyon éles kést kifejezetten műtéti pontosságú vágásokhoz tervezték. " "Apró, éles pengéje a hozzáértők kezében precíz ütésekre képes. " -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "olló" -msgstr[1] "olló" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "" -"Strapabíró nehéz olló, segítségével pamutból készült anyagokat, például " -"ruhát lehet ronggyá szétvágni." - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -80839,6 +82530,18 @@ msgid "" "distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -83095,6 +84798,21 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "olló" +msgstr[1] "olló" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "" +"Strapabíró nehéz olló, segítségével pamutból készült anyagokat, például " +"ruhát lehet ronggyá szétvágni." + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -83271,6 +84989,28 @@ msgid_plural "precision soldererss" msgstr[0] "" msgstr[1] "" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -83468,12 +85208,12 @@ msgstr[1] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -83485,10 +85225,11 @@ msgstr[1] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -83500,7 +85241,7 @@ msgstr[1] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -83513,7 +85254,7 @@ msgstr[1] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -83527,10 +85268,10 @@ msgstr[1] "" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -83543,7 +85284,7 @@ msgstr[1] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -83557,7 +85298,7 @@ msgstr[1] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -84071,7 +85812,7 @@ msgstr[1] "" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" @@ -84084,7 +85825,7 @@ msgstr[1] "" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" @@ -84097,7 +85838,7 @@ msgstr[1] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" @@ -84110,7 +85851,7 @@ msgstr[1] "" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" @@ -84123,8 +85864,8 @@ msgstr[1] "" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -84136,8 +85877,8 @@ msgstr[1] "" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -84149,7 +85890,7 @@ msgstr[1] "" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" @@ -84162,8 +85903,8 @@ msgstr[1] "" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -84175,7 +85916,7 @@ msgstr[1] "" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -84264,23 +86005,18 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." msgstr "" -"Egy nagyon sötét, szinte fekete fémből készült hosszúkard. Jobban tartja az" -" élét, mint általában az acélpengék, és a kézben tartva is... kényelmesebb." -" Bár a penge ebből a sötét fémből készült, a keresztvas és a markolat " -"valamilyen világosabb anyagból áll, aminek viszont természetellenesen hűvös " -"a tapintása." #. ~ Use action use_message for disarmed defense turret. #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." -msgstr "Hiba. Hiányzó fegyverrendszer." +msgid "Error. No weapon systems found." +msgstr "" #. ~ Description for disarmed defense turret #: lang/json/TOOL_from_json.py @@ -84483,13 +86219,9 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Egy inaktív 40mm-es gránatvető lövegtorony. Aktiválásakor legfeljebb 50 " -"darab sztenderd 40mm-es gránát kerül betárazásra a leltáradból. A " -"lövegtorony elhelyezése után a barát-ellenség rendszere téged barátként " -"ismer fel. Meghibásodás esetén lásd a biztonsági kézikönyvet." #: lang/json/TOOL_from_json.py msgid "inactive military flamethrower turret" @@ -84555,14 +86287,10 @@ msgstr[1] "" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Egy inaktív modern railgun lövegtorony. Aktiválásakor legfeljebb 50 darab " -"sztenderd railgun lövedék kerül betárazásra a leltáradból. A lövegtorony " -"elhelyezése után a barát-ellenség rendszere téged barátként ismer fel. " -"Meghibásodás esetén lásd a biztonsági kézikönyvet." #: lang/json/TOOL_from_json.py msgid "inactive advanced acid turret" @@ -84574,12 +86302,9 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Egy inaktív modern savas lövegtorony. A lövegtorony elhelyezése után a " -"barát-ellenség rendszere téged barátként ismer fel. Meghibásodás esetén " -"lásd a biztonsági kézikönyvet." #: lang/json/TOOL_from_json.py msgid "inactive advanced EMP turret" @@ -84591,12 +86316,9 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Egy inaktív modern EMP lövegtorony. A lövegtorony elhelyezése után a barát-" -"ellenség rendszere téged barátként ismer fel. Meghibásodás esetén lásd a " -"biztonsági kézikönyvet." #: lang/json/TOOL_from_json.py msgid "inactive advanced electro turret" @@ -84953,13 +86675,10 @@ msgstr[1] "" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" -"Ebből a kiguberált szembotból lebegő hősugárzó készült. Zárt térben " -"folyamatosan meleg légsugarat fúj ki magából. A robot nem támad ellenségre, " -"és nincsenek fegyverei. Beindításához aktiválni kell." #: lang/json/TOOL_from_json.py msgid "inactive floating furnace" @@ -84970,14 +86689,11 @@ msgstr[1] "" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." msgstr "" -"Ebből a kiguberált szembotból lebegő kazán készült. Zárt térben folyamatosan" -" vészesen forró légsugarat fúj ki magából. A robot nem támad ellenségre, és " -"nincsenek fegyverei. Beindításához aktiválni kell." #: lang/json/TOOL_from_json.py msgid "inactive burning eye" @@ -85047,15 +86763,11 @@ msgstr[1] "" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" -"Ebből a kiguberált tisztító robotból automatikus porszívó készült. A talajon" -" található hulladékot magába szívja, majd a belső savtartályokban " -"megemészti. A robot nem támad ellenségre, és nincsenek fegyverei. " -"Beindításához aktiválni kell." #: lang/json/TOOL_from_json.py msgid "inactive bee-bot" @@ -85093,12 +86805,10 @@ msgstr[1] "" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" -"Ebből a kiguberált medibotból egy gyilkos gép készült. A célpontokra " -"pengékkel és mérgező injekcióstűvel támad. Beindításához aktiválni kell." #: lang/json/TOOL_from_json.py msgid "inactive elixirator" @@ -85141,13 +86851,10 @@ msgstr[1] "" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" -"Ezt a guberált skitterbotot kistestű zsákmányállatok elejtésére alakították " -"át. A célpontokra pengeollóival és beépített tazerrel támad. Beindításához " -"aktiválni kell." #: lang/json/TOOL_from_json.py msgid "inactive grab-bot" @@ -85196,12 +86903,9 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" -"Erre a guberált kiborgra egy zombi nekromanta fejét szerelték fel. A még " -"mindig... élő? működő...? fej megtartotta a zombifeltámasztó képességét. " -"Beindításához aktiválni kell." #: lang/json/TOOL_from_json.py msgid "inactive defense robot" @@ -85253,11 +86957,8 @@ msgstr[1] "" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" -"Ebbe a guberált védelmi robotba egy házi készítésű lángszórót és két izzóan " -"forró pengét építettek. Beindításához és a lángszóró benzinnel való " -"feltöltéséhez aktiválni kell. Lehetőleg semmi éghető ne legyen a közelében." #: lang/json/TOOL_from_json.py msgid "inactive military robot" @@ -85628,14 +87329,8 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" -"Biológiai rejtély, hogy ennek a blobnak a belső szerkezete egy olyan " -"alacsony hőmérsékletű folyadékot tartalmaz, amely a szuperhűtött állapota " -"ellenére is folyékony halmazállapotú marad, ugyanakkor rendelkezik a korábbi" -" jellegénél megfigyelt formázhatósággal. Folyamatosan jégszilánkok pattognak" -" le róla, és annyira hajlékonynak tűnik, hogy akár kézzel is szét lehetne " -"húzni..." #: lang/json/TOOL_from_json.py msgid "growing cold mass" @@ -85864,13 +87559,10 @@ msgstr "A klaszter szétesik a kezedben." #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" -"Egy gyémántmátrixról letört mesterséges kristály klaszter. Bár az anyag " -"általában a katalizátortól való elválasztás után elmállik, ezt a klasztert " -"valamiféle mechanizmus egyben tartja." #: lang/json/TOOL_from_json.py msgid "diamond matrix" @@ -85881,8 +87573,8 @@ msgstr[1] "" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." -msgstr "Az érzékszerveid eltompulnak, amikor a drágakő belsejébe nézel." +"Your senses dull as you gaze into the depths of this gemstone's center…" +msgstr "" #. ~ Description for diamond matrix #: lang/json/TOOL_from_json.py @@ -85902,17 +87594,12 @@ msgstr[1] "örvény motor" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" -"Hogy is mondjam, szóval ez egy tornádó egy dobozban. Ebben a kis tartályban " -"a tiszta energiaforrások terén elért legmagasabb szintű emberi innováció " -"terméke rejlik - vagy pedig egy olyan tömegpusztító fegyver, ami az egész " -"civilizációt képes lenne eltörölni (illetve ami még maradt belőle). Egy " -"külső mechanizmus segítségével mobilizálható és járműre szerelhető." #: lang/json/TOOL_from_json.py lang/json/vehicle_part_from_json.py msgid "vortex generator" @@ -85923,18 +87610,12 @@ msgstr[1] "örvény generátor" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" -"Hogy is mondjam, szóval ez egy tornádó egy dobozban. Ebben a kis tartályban " -"a tiszta energiaforrások terén elért legmagasabb szintű emberi innováció " -"terméke rejlik - vagy pedig egy olyan tömegpusztító fegyver, ami az egész " -"civilizációt képes lenne eltörölni (illetve ami még maradt belőle). Egy " -"külső mechanizmus segítségével az így generált energiát akkumulátorban lehet" -" eltárolni." #: lang/json/TOOL_from_json.py msgid "control chip" @@ -89514,6 +91195,10 @@ msgstr "Palánkfal építése" msgid "Build Stone Wall" msgstr "Kőfal építése" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "Térdmagasságú fal építése" @@ -93280,6 +94965,35 @@ msgstr "" "Az idegrendszered nem működik rendesen, mintha valami belülről próbálná " "szétszakítani." +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "Világít" @@ -93952,9 +95666,9 @@ msgstr "Alváshiány" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." -msgstr "Egy ideje túl keveset alszol. Pihend ki magad." +msgstr "" #. ~ Apply message for effect(s) 'Sleep Deprived'. #: lang/json/effects_from_json.py @@ -94093,7 +95807,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -94107,7 +95821,7 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" #: lang/json/epilogue_from_json.py @@ -94124,7 +95838,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " @@ -94154,7 +95868,7 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" @@ -94500,7 +96214,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -94531,7 +96245,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " @@ -94807,7 +96521,7 @@ msgstr "" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" @@ -94983,7 +96697,7 @@ msgstr "Menekültek" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." @@ -95063,6 +96777,20 @@ msgstr "Fekete lőporos kormozódás kitisztítása" msgid "You clean your %s." msgstr "Megtisztítod a(z) %st." +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "Beragadt töltényhüvely" @@ -95088,6 +96816,29 @@ msgstr "Üres töltényhüvely kitolása" msgid "You eject the spent casing from the %s." msgstr "A(z) %s fegyverből kitolod az üres töltényt." +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "Kormosodás" @@ -95113,6 +96864,11 @@ msgstr "" msgid "Clean gun" msgstr "Fegyver kitisztítása" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "Elkopott vezérműszíj" @@ -95843,11 +97599,13 @@ msgid "A big, blocky metal device for refrigerating large areas." msgstr "" "Egy nagyméretű, doboz formájú fém berendezés nagyobb területek hűtésére." -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "fémcsikorgás!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "csengg!" @@ -97719,6 +99477,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "display állvány" @@ -98647,8 +100414,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -98681,7 +100448,7 @@ msgstr "" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -98692,7 +100459,7 @@ msgstr "" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -98703,7 +100470,7 @@ msgstr "" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -98714,7 +100481,7 @@ msgstr "" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -100800,8 +102567,8 @@ msgstr "" " mivel a legtöbb ember nem akciófilm főszereplője." #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" msgstr[0] "" msgstr[1] "" @@ -101035,6 +102802,19 @@ msgid "" "hammers of the four barrels arranged in a square formation." msgstr "" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -101152,6 +102932,18 @@ msgid "" "quality, durable materials." msgstr "" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -101332,22 +103124,6 @@ msgstr "" "gránátvető. Bár mára már nagyrészt leváltották a modernebb gránátvetők, az " "M79-et még a világ számos hadserege használja." -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"Ezt a nehéz, háromlábas, töltényhevederes gránátvetőt az amerikai hadserege " -"a hidegháború kezdetétől egészen a kataklizmáig használta. Ha valahol " -"találsz hozzá 40mm-es gránátot, akkor a kataklizma után is használható lesz." - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -101401,6 +103177,22 @@ msgstr "" msgid "multi" msgstr "többes" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"Ezt a nehéz, háromlábas, töltényhevederes gránátvetőt az amerikai hadserege " +"a hidegháború kezdetétől egészen a kataklizmáig használta. Ha valahol " +"találsz hozzá 40mm-es gránátot, akkor a kataklizma után is használható lesz." + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -101414,6 +103206,19 @@ msgid "" "shell at a time like most shotguns." msgstr "" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -101715,6 +103520,18 @@ msgstr "" "A Taurus Raging Bull egy ötlövetű, .454 Casull kaliberű lövedékhez " "készített, pusztító átütőképességű revolver." +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "Taurus Raging Judge Magnum" +msgstr[1] "Taurus Raging Judge Magnum" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -101755,6 +103572,36 @@ msgid "" "ammunition." msgstr "" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "Bond Arms derringer" +msgstr[1] "Bond Arms derringer" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -101898,13 +103745,9 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" -"Az amerikai haderők a nehézgéppuska hadrendbe állításától egészen a " -"kataklizmáig használták. A világ vége után néha a túlélők is bevetették. " -"Hatalmas mérete és a fegyver tervezése miatt gyalogsági használatra " -"alkalmatlan, csak járműre érdemes szerelni." #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -103485,7 +105328,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -103647,14 +105490,9 @@ msgstr[1] "" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" -"Ultramodern lézerkarabély, amelyet az Aerial Labs K+F részlege fejlesztett " -"ki. A fegyver eredeti teljesítménye felvette a versenyt a Rivtech " -"legjobbjaival, a vállalati pletykák szerint főleg a technológia lekoppintása" -" miatt. Bár a kataklizma a hamut szórt erre a rivalizálásra, ez a fegyver " -"gyorsan hamuvá változtatja az ellenfeleidet is." #: lang/json/gun_from_json.py msgid "V29 laser pistol" @@ -103733,6 +105571,18 @@ msgstr "" "Fából készült fúvócső. Könnyen kezelhető és pontos, dobónyilakkal " "használható." +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -103784,7 +105634,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -103797,7 +105647,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -103811,7 +105661,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -103823,8 +105673,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" #: lang/json/gun_from_json.py @@ -103835,12 +105685,12 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" #: lang/json/gun_from_json.py @@ -103865,11 +105715,11 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" #: lang/json/gun_from_json.py @@ -103880,7 +105730,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -103892,8 +105742,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -103906,7 +105756,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -103918,8 +105768,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -103931,7 +105781,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -103960,8 +105810,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" @@ -104098,11 +105948,10 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" -"A Johnson Heavy Equipment Co. M128 autorevolveréhez semmi más nem fogható. A" -" Johnson Heavy Equipment Co. a D&B Minneapolis leányvállalata." #: lang/json/gun_from_json.py msgid "Boomlighter 454" @@ -104203,8 +106052,8 @@ msgstr "" "beépített gránátvetőt is. Eagle 1776 - a szabadság arzenálja!" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" msgstr[0] "" msgstr[1] "" @@ -104636,12 +106485,9 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" -"A kataklizma kitörése előtt nem sokkal egy katonai K+F szervezet " -"fejlesztette ki ezt az erőteljes elektrolézert, amely kifejezetten " -"elektromos célok ellen hatékony. ET-vel tölthető." #: lang/json/gun_from_json.py msgid "hand-held laser cannon" @@ -104666,16 +106512,11 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" -"Ultramodern lézerkarabély, amely ET alapú energiarendszerrel üzemel. A " -"kataklizma kitörése előtt nem sokkal egy katonai K+F szervezet fejlesztette " -"ki. A fegyver eredeti teljesítménye felvette a versenyt legjobb ballisztikus" -" fegyverekkel. Bár a kataklizma a hamut szórt erre a történetre, ez a " -"fegyver gyorsan hamuvá változtatja az ellenfeleidet is." #: lang/json/gun_from_json.py msgid "laser pistol" @@ -104835,6 +106676,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -104863,8 +106708,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." -msgstr "Ez a szörnyek egyik fegyvere. Ha ezt látod, az programhiba." +"This is a pseudo item for monster attacks. If you see this, it's a bug." +msgstr "" #: lang/json/gun_from_json.py msgid "integral 12 gauge shotgun" @@ -105075,15 +106920,8 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" -"Egy autonóm fegyverré átalakított élő blob. Eredetileg egy keretre feszítve " -"kellett volna védelmet nyújtania. A blob azonban gyors evolúciójával " -"kifejlesztett olyan csontos kinövéseket, amelyeket húzóínak vezérelnek. A " -"jobb híján fognak nevezhető kinövések bármilyen közelre kerülő " -"szerencsétlent megragadnak és megsebeznek. A külső membrán sokkal vastagabbé" -" vált a megerőltető mozgás elviselésére, bár kézzel még mindig szét lehet " -"választani..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "gel shooter" @@ -105097,14 +106935,8 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" -"Egy autonóm fegyverré átalakított élő blob, amely a felszínről felvett " -"anyagokból vonja ki a táplálékát. A maradék salakanyagot nagy sebességgel " -"löki ki magából a közelben található ellenségek irányába. Az amorf masszát " -"az érintésedre lehet formázni és felcsatolni, de maga a fegyver irányítás " -"nélkül mozdulatlan marad. Elég hajlékony ahhoz, hogy kézzel lehessen " -"szétszedni..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "frost lancer" @@ -105675,19 +107507,6 @@ msgstr "" "rendkívül nagy a mérete, és tüzeléshez egy megfelelő platformra kell " "beszerelni." -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "Model 10 revolver" -msgstr[1] "Model 10 revolver" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "" -"Hatlövetű revolver. A kihajló töltényhengernek köszönhetően könnyen " -"úratölthető." - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -105706,54 +107525,6 @@ msgstr "" "összehajtható fegyvert később több cég kereskedelmi forgalmazásra is " "legyártotta." -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "Colt Lightning .45" -msgstr[1] "Colt Lightning .45" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -"A Colt pumpás puska modern hasonmása. Az eredetileg .44-40 töltényűrrel " -"felszerelt lőfegyvert modern változata a .45 Long Colt lőszert használja, " -"kiegészítvén a Cowboy Action Shooting cég másik lőfegyverét, a Single Action" -" Army-t." - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "Bond Arms derringer" -msgstr[1] "Bond Arms derringer" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" -"A Bond Arms derringer-sorozat duplacsöves, kompakt pisztolyokból áll. " -"Leggyakrabban a .45 Long Colt lövedékekhez használt töltényűrrel gyártották," -" és a töltényűr általában elég hosszú ahhoz, hogy .410 sörétes töltényt is " -"be lehessen tárazni." - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] ".410 ifjúsági sörétes puska" -msgstr[1] ".410 ifjúsági sörétes puska" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" -"Régi hátultöltős sörétes puska, .410-es töltényűrrel. A 12ga-s puskák " -"alacsonyabb visszarúgású alternatívája; könnyű és egyszerű gyártani." - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -105769,50 +107540,6 @@ msgstr "" "csatlakoztatott puskatusból áll, egy elsütőkalapács gyújtja be az egyetlen " "egy betárazott lövedéket." -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "AF2011A1 .38 Super" -msgstr[1] "AF2011A1 .38 Super" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "" -"Duplacsöves félautomata pisztoly. Úgy néz ki, mint két egymás mellé " -"olvasztott M1911." - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38 Super" -msgstr[1] "M1991A1 .38 Super" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "" -"A .38 Super lőszerekre kiképzett M1911 modernizált változata. Jó pontosságra" -" képes." - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "Taurus Raging Judge Magnum" -msgstr[1] "Taurus Raging Judge Magnum" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" -"A Taurus Raging Judge Magnum egy ötlövetű, .454 Casull kaliberű lövedékhez " -"készített revolver. Betárazható továbbá .410 sörétes puska és .45 Long Colt " -"lövedékekkel is." - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -107120,7 +108847,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" @@ -107522,6 +109249,18 @@ msgid "" "weapon other than pistols and pump-action guns, if you so want." msgstr "" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -107787,7 +109526,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -107811,9 +109550,9 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -107825,7 +109564,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -108024,20 +109763,6 @@ msgstr "" "távolabbra is lehet szúrni, ha egy hosszú nyélre vagy egy számszeríjra van " "szerelve." -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "M6 ASW sörétes puska" -msgstr[1] "M6 ASW sörétes puska" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "" -"Az M6 Aircrew Survival Weapon pilóta túlélő fegyverbe épített .410 kaliberű " -"sörétes puska. Kiszerelni nem lehet." - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "Kibelezed és kifilézed a halat." @@ -109669,10 +111394,6 @@ msgstr "Csavar vagy huzal vágása" msgid "Heat up food (with it)" msgstr "Étel melegítése ezzel" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "Fa/papír/csont/kitin javítása" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "Szerszámmod felcsatolása" @@ -110558,6 +112279,11 @@ msgstr "" "Ez a ruházat jól szerepel még akkor is, ha teljesen " "átázott. Ez jó érzés is lehet." +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -111724,7 +113450,8 @@ msgstr "Terület építése" msgid "Disassemble items" msgstr "Tárgyak szétszerelése" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "Alvás" @@ -112534,7 +114261,8 @@ msgstr "" msgid "Wasp nest is here." msgstr "" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "" @@ -112593,6 +114321,33 @@ msgstr "" msgid "Small pond is here." msgstr "" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "" @@ -112663,7 +114418,7 @@ msgstr "" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "" #. ~ Computer name @@ -113441,6 +115196,16 @@ msgstr "A futás TILOS!" msgid "NO Diving!" msgstr "Vízbe ugrani TILOS!" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -113578,8 +115343,7 @@ msgid "Emergency Message" msgstr "Vészhelyzeti üzenet" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "Külső áramforrás lekapcsolása" @@ -114234,7 +115998,7 @@ msgstr "" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -115243,7 +117007,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -115266,7 +117030,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -115277,7 +117041,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -115286,7 +117050,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -115297,7 +117061,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -115307,7 +117071,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -115318,7 +117082,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -115492,6 +117256,10 @@ msgstr "cafatos" msgid "Diamond" msgstr "gyémánt" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "tojás" @@ -115709,8 +117477,8 @@ msgid "Mushroom" msgstr "gomba" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "víz" @@ -117276,11 +119044,9 @@ msgstr "Bizonyítsd be, hogy túlélő vagy" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" -"Bizonyítsd be, hogy igazi túlélő vagy. 10 napot élj túl a kataklizmában, és " -"utána térj vissza ahhoz a személyhez, akitől ezt a küldetést kaptad." #: lang/json/mission_def_from_json.py msgid "It's hard to tell who actually has the skills to survive these days..." @@ -117456,12 +119222,12 @@ msgstr "" "számára készítettem, és mindig van egy pár felesleges darabunk." #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." -msgstr "Nem úgy érzem magam, mint akit megmentettek..." +msgid "I don't feel saved…" +msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." -msgstr "Kérlek mondd meg a családomnak, hogy szeretem őket..." +msgid "Tell my family that I love them…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Find an anvil" @@ -117505,6 +119271,10 @@ msgstr "" msgid "What good does this do me?" msgstr "Ez mire jó nekem?" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "Találd meg Chris Isherwoodot" @@ -117551,8 +119321,8 @@ msgstr "" "prototípus a tiéd lenne." #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." -msgstr "Remélem, hogy nem az történt vele, mint Barry-val..." +msgid "I hope he didn't meet Barry's fate…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Free Barry from the mysterious structure" @@ -117595,16 +119365,13 @@ msgstr "Készen állsz?" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" -"Magasabb, mint amire emlékszem. Meg kellene keresnünk a rabokat. Indulás " -"előtt hátrahagytam a családomnak egy levelet. Ha ezt túléljük, akkor " -"megjavítják a faházat, és beköltözhetsz oda, ha szeretnél." #: lang/json/mission_def_from_json.py -msgid "Well it was here..." -msgstr "Hát, pedig az itt volt..." +msgid "Well it was here…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Gather 50 dandelions" @@ -117683,8 +119450,8 @@ msgstr "" "gyógyszereket, és ha nem válnának be, akkor próbálkozz a másik ajándékommal." #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." -msgstr "Valaki más kell akkor találnom, aki jobban otthon van az erdőben..." +msgid "I'll have to find someone more at home in the forest…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Find and capture a cat" @@ -117703,11 +119470,9 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" -"Köszönöm! Kérlek siess vissza! Tessék, kérlek fogadd el ezt a ketrecet, " -"ezzel könnyebben lehet fogni." #: lang/json/mission_def_from_json.py msgid "I didn't want to use chemicals on these rats." @@ -117729,18 +119494,16 @@ msgstr "Találtál macskát?" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" -"Nagyon köszönöm, kérlek fogadd el ezt a természetes gyógymódokról szóló " -"naplómásolatot. Őt pedig Joshuának fogom hívni." #: lang/json/mission_def_from_json.py msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "Mi van? Hazudsz, látom rajtad! Legalább a ketrecemet visszahoztad?" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." -msgstr "De kár! Gondolom túl fürgék voltak..." +msgid "Oh no! I guess they are too nimble for you…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Gather 120 Stones" @@ -118107,7 +119870,7 @@ msgstr "Köszönöm. Keress fel, ha készen állsz egy újabb feladatra." #: lang/json/mission_def_from_json.py msgid "Cull Nightmares" -msgstr "" +msgstr "Rémálmok legyilkolása" #: lang/json/mission_def_from_json.py msgid "" @@ -118117,22 +119880,29 @@ msgid "" "safer. If you've cleared out most of this floor then the lower levels " "should be your next target. " msgstr "" +"Nagyra értékeljük a segítségedet. Az alsó szintekről feljutó könyörtelen " +"szörnyekkel kellene segítened. Ha a rémálmoknak nevezett rettenetekből úgy " +"vagy húszat legyilkolnál, akkor az embereim is sokkal nagyobb biztonságban " +"lennének. Ha ezt a szintet már nagyrészt megtisztítottad, akkor a következő " +"célod az alacsonyabb szintek lehetnének." #: lang/json/mission_def_from_json.py msgid "Good luck, finding a clear passage to the second level may be tricky." msgstr "" +"Sok szerencsét kívánok. Lehet, hogy nehéz lesz megtalálni a második szintre " +"vezető lejáratot." #: lang/json/mission_def_from_json.py msgid "These creatures can swing their appendages surprisingly far." -msgstr "" +msgstr "Ezek a lényeg meglepően messzire tudják kilendíteni a végtagjaikat." #: lang/json/mission_def_from_json.py msgid "How is the hunt going?" -msgstr "" +msgstr "Hogy halad a vadászat?" #: lang/json/mission_def_from_json.py msgid "Fabricate Repeater Mod" -msgstr "" +msgstr "Rádió átjátszó elkészítése" #: lang/json/mission_def_from_json.py msgid "" @@ -118145,26 +119915,42 @@ msgid "" " is boosted so we can pick it up at much longer ranges. I really need you " "make me one." msgstr "" +"A fő küldetésem a rádióforgalmazás követése, és a potenciálisan megmenthető " +"célpontok lokalizálása. A rádióátjátszók nagy része nem működik, és az " +"üzemképes berendezések is csak vészhelyzeti áramellátással rendelkeznek. Ha " +"legalább alapszinten értesz az elektronikához, akkor az ebben a tervrajzban " +"szereplő útmutatások alapján képes vagy egy rádió átjátszó legyártására. Ha " +"ezt az átjátszót csatlakoztatod egy rádióállomás fő termináljához, akkor a " +"hatótávolságán belül található összes rövidtávú rádiócsatornát felerősíti " +"annyira, hogy messzebbről is be tudjuk mérni. Kérlek gyártsál le nekem " +"egyet." #: lang/json/mission_def_from_json.py msgid "" "Thanks, I know the labs on the other side of the complex have electronic " "parts sitting around." msgstr "" +"Köszönöm. Úgy tudom, hogy a komplexum távolabbi végében található laborokban" +" vannak a gyártáshoz szükséges elektronikai alkatrészek." #: lang/json/mission_def_from_json.py msgid "I'm sure the motorpool has a truck battery you could salvage." msgstr "" +"Biztos vagyok benne, hogy a járműparkolóban találsz a célnak megfelelő " +"teherautó akkumulátort." #: lang/json/mission_def_from_json.py msgid "Have you had any luck fabricating it?" -msgstr "" +msgstr "Sikerült legyártanod?" #: lang/json/mission_def_from_json.py msgid "" "Thanks, I'll see to installing this one. It will be some time but I could " "use someone to position these around the region." msgstr "" +"Köszönöm, ennek a beszerelését már mi el tudjuk végezni. Lehet, hogy ez most" +" sok idődbe fog telni, de jó lenne, ha egy pár ilyet a környező " +"településeken is fel tudnál szerelni." #: lang/json/mission_def_from_json.py msgid "" @@ -118174,24 +119960,33 @@ msgid "" "few weeks. The task is rather simple but the shelters offer us a place to " "redirect refugees until this vault can be secured. " msgstr "" +"Úgy néz ki, hogy ismét szükségem lenne a képességeidre. A közeli óvóhelyeken" +" kisméretű jeladók találhatók. Ha ezeket nem választjuk le az " +"áramszolgáltatói hálózatról, akkor az akkumulátorok a következő pár héten " +"belül teljesen lemerülnek. A feladat maga meglehetősen egyszerű, de " +"szükségünk van az óvóhelyek befogadó kapacitására, ahova a menekülteket " +"tudjuk irányítani, amíg ezt a létesítményt sikerült teljes egészében " +"biztosítani." #: lang/json/mission_def_from_json.py msgid "" "Thanks, I should be ready for you to install the radio repeater mods by the " "time you get back." msgstr "" +"Köszönöm. Mire visszaérsz, addigra készen fogunk állni arra, hogy beszereld " +"a rádiós átjátszókat." #: lang/json/mission_def_from_json.py msgid "Try searching on the outskirts of towns." -msgstr "" +msgstr "Próbáld meg a városok peremén keresni." #: lang/json/mission_def_from_json.py msgid "Have you had any luck severing the connection?" -msgstr "" +msgstr "Sikerült elvágnod az összeköttetést?" #: lang/json/mission_def_from_json.py msgid "We are good to go! The last of the gear is powering up now." -msgstr "" +msgstr "Jók vagyunk! Az utolsó berendezést most helyezzük áram alá." #: lang/json/mission_def_from_json.py msgid "" @@ -118202,24 +119997,33 @@ msgid "" "unfortunately be ignored for now, without a dedicated emergency power system" " they won't be useful for some time." msgstr "" +"A felszerelésünk nagy részét sikerült beindítani, úgyhogy eljött az ideje " +"annak is, hogy telepítsd az első rádiós átjátszót. Menj fel a felszínre, és " +"keresd meg a legközelebbi rádióállomást. Az átjátszót telepítsd a másodlagos" +" terminálra, utána pedig térj vissza hozzám. Én majd ellenőrzöm, hogy minden" +" a terv szerint halad-e. A rádiótornyokkal egyelőre ne foglalkozz, mivel " +"dedikált vészhelyzeti áramellátás nélkül még jó sokáig semmire se megyünk " +"velük." #: lang/json/mission_def_from_json.py msgid "I'll be standing by down here once you are done." -msgstr "" +msgstr "Itt várok majd rád, amikor elkészültél." #: lang/json/mission_def_from_json.py msgid "" "If you could make some sort of directional antenna, it might help locating " "the radio stations." msgstr "" +"Ha tudnál valamilyen irányzott antennát készíteni, akkor talán segítségével " +"meg tudnád találni a rádióállomásokat." #: lang/json/mission_def_from_json.py msgid "Have you had any luck finding a radio station?" -msgstr "" +msgstr "Sikerült rátalálnod egy rádióállomásra?" #: lang/json/mission_def_from_json.py msgid "That's one down." -msgstr "" +msgstr "Eggyel kevesebb." #: lang/json/mission_def_from_json.py msgid "" @@ -118228,35 +120032,45 @@ msgid "" "little bit more. With enough of them we'll be able to maintain " "communication with anyone in the region." msgstr "" +"Még a segítségemre tudnál lenni azzal, hogy felszerelsz még egy rádió " +"átjátszót. Nem kell, hogy emlékeztesselek arra, hogy minden egyes átjátszó " +"növeli a segítségnyújtási területünket. Elég átjátszóval az egész régiót le " +"tudjuk fedni, és mindenkivel kapcsolatban tudunk maradni." #: lang/json/mission_def_from_json.py msgid "I'll be standing by." -msgstr "" +msgstr "Itt várok majd rád." #: lang/json/mission_def_from_json.py msgid "" "Getting a working vehicle is going to become important as the distance you " "have to travel increases." msgstr "" +"Minél távolabbra kell utaznod, annál fontosabb lesz, hogy rendelkezzél egy " +"üzemképes járművel." #: lang/json/mission_def_from_json.py msgid "" "I'll try and update the captain with any signals that I need investigated." msgstr "" +"A századost majd értesítem minden olyan jelről, amelyet majd ki kell " +"vizsgálni." #: lang/json/mission_def_from_json.py msgid "Reach Refugee Center" -msgstr "" +msgstr "Juss el a menekültellátó központba" #: lang/json/mission_def_from_json.py msgid "Bring 40 small cardboard boxes" -msgstr "" +msgstr "Hozz 40 darab kis kartondobozt" #: lang/json/mission_def_from_json.py msgid "" "Gotta start small right? Little ones for keeping little things safe. I " "could use 'em." msgstr "" +"A sok kicsi sokra megy, mi? A kis dolgokban biztonságban lesznek a még " +"kisebb dolgok. Kellene egy jó pár darab." #: lang/json/mission_def_from_json.py msgid "" @@ -118264,77 +120078,90 @@ msgid "" "could use 'em. I need a bunch of 'em. Little ones, you know? Can you " "bring me like… like… forty?" msgstr "" +"A sok kicsi sokra megy, mi? A kis dolgokban biztonságban lesznek a még " +"kisebb dolgok. Kellene egy jó pár darab a kicsikből, érted? Tudnál neked " +"hozni mondjuk... úgy... negyvenet?" #: lang/json/mission_def_from_json.py msgid "Oh man, thanks so much my friend. You won't regret it." -msgstr "" +msgstr "Haver, annyira köszönöm. Ezt nem fogod megbánni." #: lang/json/mission_def_from_json.py msgid "I didn't think so." -msgstr "" +msgstr "Hát, szerintem se..." #: lang/json/mission_def_from_json.py msgid "Watch out, he's looking for it too." -msgstr "" +msgstr "De vigyázz, mert ő is keresi." #: lang/json/mission_def_from_json.py msgid "Got the little ones yet?" -msgstr "" +msgstr "Nálad vannak a kicsik?" #: lang/json/mission_def_from_json.py msgid "Oh this is so great, so great!" -msgstr "" +msgstr "Ó, hát ez fantasztikus, egyenesen fantasztikus!" #: lang/json/mission_def_from_json.py msgid "Oh, that's too bad. Guess they're eating it all." -msgstr "" +msgstr "Hát, az kár. Gondolom mindet megették." #: lang/json/mission_def_from_json.py msgid "Bring a roll of duct tape" -msgstr "" +msgstr "Hozz egy tekercs szigszalagot" #: lang/json/mission_def_from_json.py msgid "" "These ones are good, good ones. They need something to, you know, bind them" " together. Surround them, light side, dark side." msgstr "" +"Ezek jók, nagyon jók. Kell valami, ami, tudod, összeköti őket. Körbeveszi " +"őket, a világos oldal és a sötét oldal." #: lang/json/mission_def_from_json.py msgid "" "These ones are good, good ones. They need something to, you know, bind them" " together. Surround them, light side, dark side. Bring me the Force!" msgstr "" +"Ezek jók, nagyon jók. Kell valami, ami, tudod, összeköti őket. Körbeveszi " +"őket, a világos oldal és a sötét oldal. Hozd el nekem az Erőt!" #: lang/json/mission_def_from_json.py msgid "It's all around us… but did you get it in a crude matter form?" msgstr "" +"Az mindannyiunkat körbe veszi... de elhoztad a nyers fizikai valóját is?" #: lang/json/mission_def_from_json.py msgid "Bring 10 medium-sized cardboard boxes" -msgstr "" +msgstr "Hozz 10 darab közepes kartondobozt" #: lang/json/mission_def_from_json.py msgid "" "Ten bigger ones now please. The list doesn't lie. You've done so well." msgstr "" +"Most akkor tíz nagyobbat kérek. A lista nem hazudik. Eddig annyira jól " +"csináltál mindent." #: lang/json/mission_def_from_json.py msgid "" "Ten bigger ones now please. The list doesn't lie. You've done so well. I " "got a little more on the list, but we're more than half there." msgstr "" +"Most akkor tíz nagyobbat kérek. A lista nem hazudik. Eddig annyira jól " +"csináltál mindent. A listámon még vannak dolgok, de már több, mint a felét " +"megtaláltuk." #: lang/json/mission_def_from_json.py msgid "Any luck? Bigger ones?" -msgstr "" +msgstr "Sikerült? A nagyobbakat...?" #: lang/json/mission_def_from_json.py msgid "I'm so happy now!" -msgstr "" +msgstr "Én most annyira boldog vagyok!" #: lang/json/mission_def_from_json.py msgid "Bring 10 large plastic sheets" -msgstr "" +msgstr "Hozz 10 darab nagy műanyag lapot" #: lang/json/mission_def_from_json.py msgid "" @@ -118342,6 +120169,10 @@ msgid "" "I guess I need some plastic just in case. I don't like it, the sandman can " "smell through plastic, but I think the cardboard is stronger." msgstr "" +"Ha itt meg tudnék telepedni, akkor nem fog kelleni, de talán el fognak " +"hajtani, és akkor meg kelleni fog egy kis műanyag, csak a biztonság " +"kedvéért. Én nem szeretem, az álommanó át tud szagolni a műanyagon, de " +"szerintem a karton erősebb." #: lang/json/mission_def_from_json.py msgid "" @@ -118350,32 +120181,37 @@ msgid "" "smell through plastic, but I think the cardboard is stronger. Please bring " "me some plastic sheets." msgstr "" +"Ha itt meg tudnék telepedni, akkor nem fog kelleni, de talán el fognak " +"hajtani, és akkor meg kelleni fog egy kis műanyag, csak a biztonság " +"kedvéért. Én nem szeretem, az álommanó át tud szagolni a műanyagon, de " +"szerintem a karton erősebb. Kérlek hozz nekem egy pár műanyag lapot." #: lang/json/mission_def_from_json.py msgid "We're almost there, now." -msgstr "" +msgstr "Már majdnem készen is vagyunk." #: lang/json/mission_def_from_json.py msgid "They keep a lot of this stuff in hardware stores and lumber yards." -msgstr "" +msgstr "Ezekből van egy csomó a barkácsboltokban meg a fatelepeken." #: lang/json/mission_def_from_json.py msgid "" "I really feel bad sending you on this one, it's dangerous. Have you found " "anything?" msgstr "" +"Nagyon sajnálom, hogy erre kell kérjelek, mert veszélyes. Találtál valamit?" #: lang/json/mission_def_from_json.py msgid "Nice, this will do perfectly!" -msgstr "" +msgstr "Tökéletes, ez pont megfelel!" #: lang/json/mission_def_from_json.py msgid "Oh, that's too bad." -msgstr "" +msgstr "Ó, de kár." #: lang/json/mission_def_from_json.py msgid "Bring 5 large cardboard boxes" -msgstr "" +msgstr "Hozz 5 darab nagy kartondobozt" #: lang/json/mission_def_from_json.py msgid "" @@ -118383,6 +120219,9 @@ msgid "" "parts myself, it's been easier with more cardboard around. Can you bring me" " five more really big cardboard boxes?" msgstr "" +"Ez az utolsó dolog, amire megkérlek. A többi alkatrészt én már összeszedtem," +" ami könnyű volt, ha már ennyi kartonom van. Tudnál nekem öt darab jó nagy " +"kartondobozt is hozni?" #: lang/json/mission_def_from_json.py msgid "" @@ -118391,32 +120230,38 @@ msgid "" " five more really big cardboard boxes? Five more cardboard boxes, as big as" " it gets. I have a few already stored up, that should be all I need." msgstr "" +"Ez az utolsó dolog, amire megkérlek. A többi alkatrészt én már összeszedtem," +" ami könnyű volt, ha már ennyi kartonom van. Tudnál nekem öt darab jó nagy " +"kartondobozt is hozni? Öt dobozt, ami akkora, amekkora csak lehet. Van már " +"belőlük nálad néhány, és már csak ennyi hiányzik." #: lang/json/mission_def_from_json.py msgid "Yes! The home stretch!" -msgstr "" +msgstr "Ez az! A célegyenes!" #: lang/json/mission_def_from_json.py msgid "Oh man, but we're so close!" -msgstr "" +msgstr "Ne már, annyira közel vagyunk!" #: lang/json/mission_def_from_json.py msgid "Try looking in cargo storage areas." -msgstr "" +msgstr "Talán az árutároló raktárakban érdemes keresni." #: lang/json/mission_def_from_json.py msgid "Did you bring me those last few boxes?" -msgstr "" +msgstr "Elhoztad nekem azt az utolsó pár darab dobozt?" #: lang/json/mission_def_from_json.py msgid "" "Brilliant! You're a true hero. I'll see if I can find a place to set these" " up now." msgstr "" +"Fantasztikus! Te egy igazi hős vagy. Megnézem, hogy ezeket hol tudom " +"összerakni." #: lang/json/mission_def_from_json.py msgid "No! Oh god, no, this can't be happening..." -msgstr "" +msgstr "Ne már! Te jó Isten, el sem hiszem, hogy megtörtént..." #: lang/json/mission_def_from_json.py msgid "Find Dana's family sourdough culture" @@ -118471,7 +120316,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" @@ -118868,7 +120713,7 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -119169,7 +121014,7 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" @@ -120521,7 +122366,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -120547,10 +122392,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "Hát, azért köszi, hogy megpróbáltad..." - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -120575,7 +122416,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -120615,8 +122456,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -120637,7 +122478,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -120664,7 +122505,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -120679,7 +122520,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -120752,6 +122593,54 @@ msgstr "" msgid "The %1$s tries to slam into , but fails to." msgstr "" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -129022,8 +130911,8 @@ msgstr "Túlélő története" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" -msgstr "Ez az NPC el tudná neked mesélni, hogy miként élte túl a kataklizmát." +msgid "This NPC could tell you about how they survived the Cataclysm" +msgstr "" #: lang/json/mutation_from_json.py msgid "Mark of the Seer" @@ -129512,7 +131401,7 @@ msgstr "" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -129576,18 +131465,10 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "" @@ -130219,7 +132100,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -130252,7 +132133,7 @@ msgid "I'm just trying to stay alive." msgstr "" #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." msgstr "" #: lang/json/npc_class_from_json.py @@ -130261,8 +132142,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130271,8 +132152,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130281,8 +132162,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130291,8 +132172,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130301,7 +132182,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -130311,8 +132192,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130321,8 +132202,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130331,8 +132212,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130341,8 +132222,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130351,8 +132232,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130361,7 +132242,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -130371,7 +132252,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -130381,7 +132262,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" @@ -130391,7 +132272,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" @@ -130401,8 +132282,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130411,8 +132292,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130421,7 +132302,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -130431,7 +132312,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -130441,8 +132322,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130451,8 +132332,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -130461,8 +132342,8 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_from_json.py @@ -133720,13 +135601,10 @@ msgstr "Óvóhelyi túlélő" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"A kataklizma kezdeténél egy bombavédelmi óvóhelyen leltél menedéket. Most " -"itt a tél, és abban bízol, hogy a könyvekből tanult szedett-vedett készségek" -" segítenek a túlélésben." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -133737,13 +135615,10 @@ msgstr "Óvóhelyi túlélő" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"A kataklizma kezdeténél egy bombavédelmi óvóhelyen leltél menedéket. Most " -"itt a tél, és abban bízol, hogy a könyvekből tanult szedett-vedett készségek" -" segítenek a túlélésben." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -133754,13 +135629,10 @@ msgstr "Óvóhelyi milícia" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"A kataklizma kezdeténél egy bombavédelmi óvóhelyen leltél menedéket. Most " -"itt a tél, és abban bízol, hogy a fegyvergyűjteményed és a könyvekből tanult" -" szedett-vedett készségek segítenek a túlélésben." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -133771,13 +135643,10 @@ msgstr "Óvóhelyi milícia" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"A kataklizma kezdeténél egy bombavédelmi óvóhelyen leltél menedéket. Most " -"itt a tél, és abban bízol, hogy a fegyvergyűjteményed és a könyvekből tanult" -" szedett-vedett készségek segítenek a túlélésben." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -133860,12 +135729,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"My az ürdüng? Bulcsássá mënd az ű bünét, de nüm igy embër múlhatjá ez " -"vermöt, isá mënd azhuz járou vogymuk. Ës kíássátuk Utomkhuz hármúl: kyrie " -"leison!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -133878,12 +135744,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"My az ürdüng? Bulcsássá mënd az ű bünét, de nüm igy embër múlhatjá ez " -"vermöt, isá mënd azhuz járou vogymuk. Ës kíássátuk Utomkhuz hármúl: kyrie " -"leison!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -133997,12 +135860,9 @@ msgstr "Méhész" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Hivatásos méhész voltál. Amikor a kataklizma beütött, akkor magadra hagytad " -"a méheidet, de legalább néhány szerszámot és egy kis mézet magadhoz tudtál " -"venni." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -134014,12 +135874,9 @@ msgstr "Méhész" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Hivatásos méhész voltál. Amikor a kataklizma beütött, akkor magadra hagytad " -"a méheidet, de legalább néhány szerszámot és egy kis mézet magadhoz tudtál " -"venni." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -134030,13 +135887,10 @@ msgstr "Kosárlabda játékos" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"Ez lett volna az első fontosabb meccsed, de beütött a kataklizma. Korábban " -"soha nem látott lények támadtak a közönségre, és csak egy maroknyi embernek " -"sikerült elmenekülnie. Gyors futásodnak köszönhetően te megmenekültél." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -134047,13 +135901,10 @@ msgstr "Kosárlabda játékos" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"Ez lett volna az első fontosabb meccsed, de beütött a kataklizma. Korábban " -"soha nem látott lények támadtak a közönségre, és csak egy maroknyi embernek " -"sikerült elmenekülnie. Gyors futásodnak köszönhetően te megmenekültél." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -134212,11 +136063,9 @@ msgstr "Komornyik" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Gazdag családnál dolgoztál, de ők a kataklizma után ismeretlen helyre " -"utaztak nyaralni, téged pedig itt hagytak, hogy védd magad." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -134227,11 +136076,9 @@ msgstr "Szobalány" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Gazdag családnál dolgoztál, de ők a kataklizma után ismeretlen helyre " -"utaztak nyaralni, téged pedig itt hagytak, hogy védd magad." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135312,13 +137159,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Néhány kisvállalatnál végeztél villanyszerelési munkákat, és pont egy ilyen " -"vicces túlélő bunkerben dolgoztál, amikor beütött a kataklizma. Sajnos a " -"villanydrótot csak a számítógéphez tudtad kihúzni, annak meg nem sok hasznát" -" veszed." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135331,13 +137174,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Néhány kisvállalatnál végeztél villanyszerelési munkákat, és pont egy ilyen " -"vicces túlélő bunkerben dolgoztál, amikor beütött a kataklizma. Sajnos a " -"villanydrótot csak a számítógéphez tudtad kihúzni, annak meg nem sok hasznát" -" veszed." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135418,13 +137257,10 @@ msgstr "Zuhanyáldozat" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" -"Éppen egy jó forró zuhanyt vettél, amikor beütött a kataklizma! Alig tudtál " -"elmenekülni. Nálad van egy szappan, és a világ leghasznosabb dolga: egy " -"törülköző." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135435,13 +137271,10 @@ msgstr "Zuhanyáldozat" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" -"Éppen egy jó forró zuhanyt vettél, amikor beütött a kataklizma! Alig tudtál " -"elmenekülni. Nálad van egy szappan, és a világ leghasznosabb dolga: egy " -"törülköző." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135482,11 +137315,9 @@ msgstr "Balett-táncos" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"A kataklizma előtt balett-táncos voltál, és most a készségeid fogják talán " -"megmenteni az életed." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135497,11 +137328,9 @@ msgstr "Balett-táncos" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"A kataklizma előtt balett-táncos voltál, és most a készségeid fogják talán " -"megmenteni az életed." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136420,11 +138249,9 @@ msgstr "Vőlegény" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"A kataklizma a nagy napon ütött be, és te csak az esküvői öltözékedben " -"tudtál elmenekülni. Meghátráltál?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -136435,11 +138262,9 @@ msgstr "Menyasszony" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"A kataklizma a nagy napon ütött be, és te csak az esküvői öltözékedben " -"tudtál elmenekülni. Meghátráltál?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136519,10 +138344,8 @@ msgstr "Rosszfiú" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"A ska bandád feloszlott, miután a dobos zombivá vált, és most néhány szál " -"cigivel és az MP3 lejátszóddal egyedül vagy a kataklizmában." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -136534,10 +138357,8 @@ msgstr "Rossz lány" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"A ska bandád feloszlott, miután a dobos zombivá vált, és most néhány szál " -"cigivel és az MP3 lejátszóddal egyedül vagy a kataklizmában." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136580,10 +138401,9 @@ msgstr "Fegyenc" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"A kataklizma új esélyt adott a menekülésre, de a szabadságnak magas az ára." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -136594,10 +138414,9 @@ msgstr "Fegyenc" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"A kataklizma új esélyt adott a menekülésre, de a szabadságnak magas az ára." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137060,11 +138879,9 @@ msgstr "Rabbi" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"A templomod nyájával ünnepeltél, amikor beütött a kataklizma. Most aztán jól" -" jönne egy messiás!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137075,11 +138892,9 @@ msgstr "Rabbi" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"A templomod nyájával ünnepeltél, amikor beütött a kataklizma. Most aztán jól" -" jönne egy messiás!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137285,13 +139100,10 @@ msgstr "Pizzafutár" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"A helyi kriogén laborba szállítottál ki esti pizzát, amikor bekövetkezett a " -"Kataklizma. A legközelebbi óvóhelyre menekültél, ahol csak a pizza " -"maradványai voltak nálad. És még borravalót se adtak!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137303,13 +139115,10 @@ msgstr "Pizzafutár" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"A helyi kriogén laborba szállítottál ki esti pizzát, amikor bekövetkezett a " -"Kataklizma. A legközelebbi óvóhelyre menekültél, ahol csak a pizza " -"maradványai voltak nálad. És még borravalót se adtak!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137426,13 +139235,10 @@ msgstr "Földműves" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Megélhetésedet a haszonnövények termesztésének szentelted mielőtt beütött a " -"kataklizma. Most már tőled, az ekédtől és egy pár vetőmagtól függ a Föld " -"újjáépítése." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137443,13 +139249,10 @@ msgstr "Földműves" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Megélhetésedet a haszonnövények termesztésének szentelted mielőtt beütött a " -"kataklizma. Most már tőled, az ekédtől és egy pár vetőmagtól függ a Föld " -"újjáépítése." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137494,13 +139297,10 @@ msgstr "Edzett guberáló" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Egyike vagy a kataklizmát túlélő szerencsés embereknek. Mások romjain " -"építettél magadnak életet. Erőszakkal, csellel, vagy szerencsével, de " -"összegyűjtötted a lehető legjobb felszerelést." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137511,13 +139311,10 @@ msgstr "Edzett guberáló" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Egyike vagy a kataklizmát túlélő szerencsés embereknek. Mások romjain " -"építettél magadnak életet. Erőszakkal, csellel, vagy szerencsével, de " -"összegyűjtötted a lehető legjobb felszerelést." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137838,15 +139635,11 @@ msgstr "Fiatal túlélésmániás" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"A szüleid megszállottan készültek a világvégére, és nem hagytak békén, amíg " -"a felkészülésükben te sem vettél részt. Úgy látszik, mégis igazuk volt. Nem " -"kaptál arra esélyt, hogy megköszönd nekik. Már csak egyetlen egy dolgot " -"tehetsz értük: amit ők is szerettek volna megtapasztalni - a túlélést." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137857,15 +139650,11 @@ msgstr "Fiatal túlélésmániás" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"A szüleid megszállottan készültek a világvégére, és nem hagytak békén, amíg " -"a felkészülésükben te sem vettél részt. Úgy látszik, mégis igazuk volt. Nem " -"kaptál arra esélyt, hogy megköszönd nekik. Már csak egyetlen egy dolgot " -"tehetsz értük: amit ők is szerettek volna megtapasztalni - a túlélést." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138877,7 +140666,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -138894,7 +140683,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -139145,10 +140934,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -139161,10 +140950,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -139176,9 +140965,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -139192,9 +140981,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -139208,7 +140997,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -139222,7 +141011,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -139237,9 +141026,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -139254,9 +141043,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -139270,13 +141059,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -139288,13 +141077,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -139307,8 +141096,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -139323,8 +141112,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -139339,9 +141128,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -139354,9 +141143,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -139368,13 +141157,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -139386,13 +141175,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -139404,10 +141193,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -139419,10 +141208,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -139434,12 +141223,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -139451,12 +141240,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -139468,17 +141257,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -139490,17 +141279,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -139514,9 +141303,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -139530,9 +141319,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -139546,10 +141335,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -139565,10 +141354,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -139583,9 +141372,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -139598,9 +141387,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -139612,11 +141401,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -139628,11 +141418,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -139784,7 +141575,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -139797,7 +141588,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -139834,7 +141625,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -139847,7 +141638,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -139860,7 +141651,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -139873,7 +141664,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -139941,7 +141732,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -139952,7 +141743,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -140016,7 +141807,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -140029,7 +141820,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -140121,7 +141912,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -140135,7 +141926,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -140151,7 +141942,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -140166,7 +141957,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -141238,13 +143029,10 @@ msgstr "Baseball játékos" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"A kataklizma előtt egy helyi minor league csapattagja voltál. Sikerült a " -"felszereléseddel elmenekülnöd, de vajon a zombik elleni inninged meddig " -"tart?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -141255,13 +143043,10 @@ msgstr "Baseball játékos" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"A kataklizma előtt egy helyi minor league csapattagja voltál. Sikerült a " -"felszereléseddel elmenekülnöd, de vajon a zombik elleni inninged meddig " -"tart?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -141346,11 +143131,9 @@ msgstr "Felébresztett" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Az éjszaka közepén egy zajra ébredtél. Csak egy zseblámpa volt nálad, mikor " -"kimentél megnézni, hogy mi van. Most a kataklizmával kell szembenézned." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -141361,11 +143144,9 @@ msgstr "Felébresztett" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Az éjszaka közepén egy zajra ébredtél. Csak egy zseblámpa volt nálad, mikor " -"kimentél megnézni, hogy mi van. Most a kataklizmával kell szembenézned." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -141377,11 +143158,9 @@ msgstr "Bionikus kerékpáros" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"A kiberolimpiai játékok kerékpáros számára készültél fel, amikor beütött a " -"kataklizma. Eddig sikerrel elmenekültél előle - de ezután?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -141393,11 +143172,9 @@ msgstr "Bionikus kerékpáros" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"A kiberolimpiai játékok kerékpáros számára készültél fel, amikor beütött a " -"kataklizma. Eddig sikerrel elmenekültél előle - de ezután?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -141408,13 +143185,10 @@ msgstr "Hegesztő" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"A kataklizma előtt hegesztőként dolgoztál egy tengeri fúrótornyon. Éppen " -"hazafelé tartottál, amikor megtörtént. Legalább a szerszámaid még nálad " -"vannak." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -141425,13 +143199,10 @@ msgstr "Hegesztő" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"A kataklizma előtt hegesztőként dolgoztál egy tengeri fúrótornyon. Éppen " -"hazafelé tartottál, amikor megtörtént. Legalább a szerszámaid még nálad " -"vannak." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -141442,14 +143213,10 @@ msgstr "Primitív túlélésmániás" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Tudtad, hogy eljön ez a nap. Az a nap, amikor minden szar lesz. " -"Felkészítetted magadat - nem tárgyakkal, hanem a puszta akarattal. Az " -"erdőkben töltött rengeteg nap úgy látszik megérte. Ha az őseid technológia " -"nélkül is képesek voltak a túlélésre, akkor te is." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -141460,14 +143227,10 @@ msgstr "Primitív túlélésmániás" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Tudtad, hogy eljön ez a nap. Az a nap, amikor minden szar lesz. " -"Felkészítetted magadat - nem tárgyakkal, hanem a puszta akarattal. Az " -"erdőkben töltött rengeteg nap úgy látszik megérte. Ha az őseid technológia " -"nélkül is képesek voltak a túlélésre, akkor te is." #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py @@ -146278,12 +148041,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Amikor kitört az apokalipszis, akkor egy közeli óvóhelyre tereltek. Ott " -"éldegéltél és soha nem mentél ki, nehogy bántódásod essen a kinti " -"ismeretlenségben. A kataklizma óta először a készleteid azonban kifogyóban " -"vannak, és muszáj szembenézni a külvilággal." #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -146292,12 +148051,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Amikor kitört az apokalipszis, akkor egy közeli óvóhelyre tereltek. Ott " -"éldegéltél és soha nem mentél ki, nehogy bántódásod essen a kinti " -"ismeretlenségben. A kataklizma óta először a készleteid azonban kifogyóban " -"vannak, és muszáj szembenézni a külvilággal." #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -146363,7 +148118,7 @@ msgstr "Börtön" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -146372,7 +148127,7 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -146476,24 +148231,18 @@ msgstr "Kísérlet" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Születésed óta egyetlen egy célja volt az életednek: a genetikai tudomány " -"előremozdítása, akár tetszett, akár nem. A kataklizma kitörése után " -"elhagytad a labort és céltalanul kóboroltál, amíg egy erdőbe nem jutottál." #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Születésed óta egyetlen egy célja volt az életednek: a genetikai tudomány " -"előremozdítása, akár tetszett, akár nem. A kataklizma kitörése után " -"elhagytad a labort és céltalanul kóboroltál, amíg egy erdőbe nem jutottál." #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -146736,8 +148485,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Description for scenario 'Lost Faith' for a female character. @@ -146745,8 +148494,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Starting location for scenario 'Lost Faith'. @@ -146775,7 +148524,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Description for scenario 'The Wizard's Apprentice' for a female @@ -146787,7 +148536,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -146813,8 +148562,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -146823,8 +148572,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -146928,9 +148677,9 @@ msgstr "Kihívás-FEMA haláltábor" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female @@ -146939,9 +148688,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -147604,6 +149353,7 @@ msgstr "" msgid "" "Rotten food typically attracts bugs, and bugs got a lot bigger recently…" msgstr "" +"A rohadt ételre jönnek a bogarak, és a bogarak most már sokkal nagyobbak..." #: lang/json/snippet_from_json.py msgid "" @@ -147724,6 +149474,7 @@ msgstr "Miért csirke lépegető a neve? Ha meglátod, betojsz." #: lang/json/snippet_from_json.py msgid "Routine kills. Stay alert! Don't let your guard down." msgstr "" +"Az elkényelmesedés a halálhoz vezető út. Ne hagyd a figyelmedet lankadni!" #: lang/json/snippet_from_json.py msgid "" @@ -147847,7 +149598,7 @@ msgstr "Próbálj ki másféle karaktereket, szakmákat, és eseteket!" #: lang/json/snippet_from_json.py msgid "A survivor saved is a friend earned. Most of the time…" -msgstr "" +msgstr "Egy megmentett túlélőből lesz az igaz barát. Néha..." #: lang/json/snippet_from_json.py msgid "" @@ -148033,6 +149784,11 @@ msgstr "" "akkor semmi ehető sem marad belőlük. Kisállatok vadászatánál használj " "légpuskát vagy maximum egy .22-es puskát." +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -148059,11 +149815,24 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." +"impossible unless you have a big tactical advantage." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." msgstr "" -"Ha egy nagy tömeg zombit látsz közeledni, akkor fuss el, jó gyorsan és jó " -"messzire. Egyszerre több zombival harcolni felér egy öngyilkossággal, " -"kivéve, ha jelentős taktikai előnnyel rendelkezel." #: lang/json/snippet_from_json.py msgid "" @@ -148362,7 +150131,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" @@ -148548,6 +150317,12 @@ msgid "" "be deadly." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -148594,9 +150369,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" #: lang/json/snippet_from_json.py @@ -148611,6 +150385,12 @@ msgid "" " bad!" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -148636,12 +150416,6 @@ msgid "" "defense… it's perfect!" msgstr "" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "" - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -148650,9 +150424,9 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" #: lang/json/snippet_from_json.py @@ -148703,26 +150477,41 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." msgstr "" #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "" +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -148786,7 +150575,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" @@ -148827,7 +150616,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" @@ -148854,6 +150643,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -148961,6 +150756,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -148982,6 +150801,13 @@ msgid "" "either, if you catch my drift." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -149034,6 +150860,12 @@ msgid "" " a cold ground." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -149079,7 +150911,7 @@ msgid "Hey there's some pink tablets, take some!" msgstr "" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" msgstr "" #: lang/json/snippet_from_json.py @@ -151908,15 +153740,15 @@ msgid "" msgstr "" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." +msgid "Tell me about how you survived the Cataclysm." msgstr "" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" +msgid "How did you survive the Cataclysm?" msgstr "" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" +msgid "What was the Cataclysm like for you?" msgstr "" #: lang/json/snippet_from_json.py @@ -152178,7 +154010,7 @@ msgid "eldritch horror" msgstr "" #: lang/json/snippet_from_json.py -msgid "the cataclysm" +msgid "the Cataclysm" msgstr "" #: lang/json/snippet_from_json.py @@ -152544,6 +154376,306 @@ msgid "" "Refer to file EXO-M-312 for full report." msgstr "" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -153765,7 +155897,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "" #: lang/json/snippet_from_json.py @@ -157660,7 +159792,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" #: lang/json/snippet_from_json.py @@ -157676,12 +159808,12 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" +msgid "\"my car is a diamond in the rough… literally\"" msgstr "" #: lang/json/snippet_from_json.py @@ -157704,7 +159836,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" @@ -158605,7 +160737,7 @@ msgstr "\"Anya, hiányzol.\"" #: lang/json/speech_from_json.py msgid "\"Me go, you stay.\"" -msgstr "" +msgstr "\"Én megy, te marad.\"" #: lang/json/speech_from_json.py msgid "\"Please, God.\"" @@ -158664,182 +160796,185 @@ msgstr "egy állandó sziszegő hang." #: lang/json/speech_from_json.py msgid "\"That creepy abandoned post-apocalyptic lab complex looks safe…\"" msgstr "" +"\"Az az ijesztő, apokalizmus utáni labor komplexum totál biztonságosnak " +"tűnik...\"" #: lang/json/speech_from_json.py msgid "" "\"Don't worry, it isn't like anything could teleport out of the containment " "cells.\"" msgstr "" +"\"Nyugi, nem mintha képes lenne ki teleportálni az elszigetelő cellából.\"" #: lang/json/speech_from_json.py msgid "\"Hold on, I want to pulp that zombie corpse.\"" -msgstr "" +msgstr "\"Várjál, szét akarom zúzni azt a zombi hullát.\"" #: lang/json/speech_from_json.py msgid "\"What did that thing just hit me with?\"" -msgstr "" +msgstr "\"Az meg mivel talált most el?\"" #: lang/json/speech_from_json.py msgid "\"I can barely move. Run! Save yourself!\"" -msgstr "" +msgstr "\"Alig tudok mozdulni. Futás! Menekülj!\"" #: lang/json/speech_from_json.py msgid "\"Oh you motherfucking shellfish, you're going down.\"" -msgstr "" +msgstr "\"Na, te kibaszott kagyló, neked annyi.\"" #: lang/json/speech_from_json.py msgid "\"I… I feel weak…\"" -msgstr "" +msgstr "\"Gye... gyenge vagyok...\"" #: lang/json/speech_from_json.py msgid "\"Oi, dingus, you can't keep me in 'ere.\"" -msgstr "" +msgstr "\"Hé, faszfej, engem nem lehet itthagyni.\"" #: lang/json/speech_from_json.py msgid "\"We got a treaty w'yer people, don'we?\"" -msgstr "" +msgstr "\"Békeszerződésünk van veletek, nem?\"" #: lang/json/speech_from_json.py msgid "\"This'll get back t'my bosses, right and so!\"" -msgstr "" +msgstr "\"Ha ezt a főnökeim megtudják!\"" #: lang/json/speech_from_json.py msgid "\"Lemme outta here!\"" -msgstr "" +msgstr "\"Eresszetek ki innen!\"" #: lang/json/speech_from_json.py msgid "\"We're both scavs, in't we?\"" -msgstr "" +msgstr "\"Mindketten guberálók vagyunk, nem?\"" #: lang/json/speech_from_json.py msgid "" "\"Hey look, that one's carrying something. Let's crack it open and steal " "it.\"" -msgstr "" +msgstr "\"Figyu már, annál van valami. Szedjük szét és lopjuk el a tartalmát.\"" #: lang/json/speech_from_json.py msgid "\"G… geddoff me you… you bastard…\"" -msgstr "" +msgstr "\"Má.... mássz már le rólam... te rohadék...\"" #: lang/json/speech_from_json.py msgid "\"Did-a-chuk?\"" -msgstr "" +msgstr "\"Did-a-csukk?\"" #: lang/json/speech_from_json.py msgid "\"Dad-a-chak?\"" -msgstr "" +msgstr "\"Dad-a-csakk?\"" #: lang/json/speech_from_json.py msgid "\"Dad-a-cham?\"" -msgstr "" +msgstr "\"Dad-a-csamm?\"" #: lang/json/speech_from_json.py msgid "\"Did-a-chak?\"" -msgstr "" +msgstr "\"Did-a-csakk?\"" #: lang/json/speech_from_json.py msgid "\"Did-a-chum?\"" -msgstr "" +msgstr "\"Did-a-csumm?\"" #: lang/json/speech_from_json.py msgid "\"Dad-a-chuk?\"" -msgstr "" +msgstr "\"Dad-a-csukk?\"" #: lang/json/speech_from_json.py msgid "\"What are you doing? No! NO!\"" -msgstr "" +msgstr "\"Mi... mit csinálsz? Nem! NEE!\"" #: lang/json/speech_from_json.py msgid "\"Did you see what they did to him?\"" -msgstr "" +msgstr "\"Láttad, hogy mit csináltak vele?\"" #: lang/json/speech_from_json.py msgid "\"Yeah. I can't believe he stayed alive that long.\"" -msgstr "" +msgstr "\"Jah. El se hiszem, hogy meddig bírta élve.\"" #: lang/json/speech_from_json.py msgid "\"I think there's something in the air that's keeping us alive.\"" -msgstr "" +msgstr "\"Szerintem van valami a levegőben, amitől életben marad.\"" #: lang/json/speech_from_json.py msgid "\"Burning… from the inside…\"" -msgstr "" +msgstr "\"Belülről.... égek...\"" #: lang/json/speech_from_json.py msgid "\"This smell… Don't know…\"" -msgstr "" +msgstr "\"Ez a szag... Nem is tudom...\"" #: lang/json/speech_from_json.py msgid "heavy breathing." -msgstr "" +msgstr "mély zihálás." #: lang/json/speech_from_json.py src/game.cpp src/grab.cpp msgid "a scraping noise." -msgstr "" +msgstr "karcolás hangja." #: lang/json/speech_from_json.py msgid "\"No… Stop the burning!\"" -msgstr "" +msgstr "\"Neee... Állítsd le az égetést!\"" #: lang/json/speech_from_json.py msgid "\"Hrgm… Blood… Hungry…\"" -msgstr "" +msgstr "\"Hrgm... Vér... Éhes...\"" #: lang/json/speech_from_json.py msgid "\"Hunger… Must eat…\"" -msgstr "" +msgstr "\"Éhes... Enni... Kell...\"" #: lang/json/speech_from_json.py msgid "\"Run… Chase… Eat…\"" -msgstr "" +msgstr "\"Szalad... Kerget... Eszik...\"" #: lang/json/speech_from_json.py msgid "hysterical laughing." -msgstr "" +msgstr "hisztériás kacagás." #: lang/json/speech_from_json.py msgid "coughing." -msgstr "" +msgstr "köhögés." #: lang/json/speech_from_json.py msgid "growling." -msgstr "" +msgstr "dörmögés." #: lang/json/speech_from_json.py msgid "wheezing." -msgstr "" +msgstr "zihálás." #: lang/json/speech_from_json.py msgid "\"WHY THE FUCK are you doing this to me?\"" -msgstr "" +msgstr "\"MI A FASZÉRT csinálod ez velem?\"" #: lang/json/speech_from_json.py msgid "\"LEAVE! NOW!\"" -msgstr "" +msgstr "\"TŰNÉS! MOST!\"" #: lang/json/speech_from_json.py msgid "\"I TOLD YOU TO GET OUT OF HERE!\"" -msgstr "" +msgstr "\"MONDTAM MÁR, HOGY HÚZZ INNEN!\"" #: lang/json/speech_from_json.py msgid "\"WHAT THE FUCK DO YOU WANT FROM ME?!\"" -msgstr "" +msgstr "\"MI A FASZT AKARSZ TE TŐLEM!?\"" #: lang/json/speech_from_json.py msgid "\"STOP!\"" -msgstr "" +msgstr "\"HAGYD ABBA!\"" #: lang/json/speech_from_json.py msgid "indistinct shouting." -msgstr "" +msgstr "kivehetetlen kiabálás." #: lang/json/speech_from_json.py msgid "screaming." -msgstr "" +msgstr "üvöltés." #: lang/json/speech_from_json.py msgid "\"MEAT!\"" -msgstr "" +msgstr "\"HUSI!\"" #: lang/json/speech_from_json.py msgid "\"TEKELI-LI!\"" @@ -158895,125 +161030,138 @@ msgstr "\"Kérlek ölj meg!\", majd egy elektronikus hang, amely ezt mondja \"" #: lang/json/speech_from_json.py msgid "\"Please, take me with you.\"" -msgstr "" +msgstr "\"Kérlek, vigyél magaddal.\"" #: lang/json/speech_from_json.py msgid "\"Not that way! Go left!\"" -msgstr "" +msgstr "\"Ne arra! Balra!\"" #: lang/json/speech_from_json.py msgid "\"I told you to let me die.\"" -msgstr "" +msgstr "\"Mondtam, hogy hagyjál meghalni.\"" #: lang/json/speech_from_json.py msgid "\"W-where am I? Why does it hur-REBOOTING IN 59 SECONDS.\"" -msgstr "" +msgstr "\"Ho-hol vagyok? Miért fáj-RENDSZER ÚJRAINDÍTÁSA 59 MÁSODPERC MÚLVA.\"" #: lang/json/speech_from_json.py msgid "\"THIS UNIT IS BROKEN. PLEASE CALL AN ATTENDANT.\"" -msgstr "" +msgstr "\"EZ AZ EGYSÉG MEGHIBÁSODOTT. KÉRJÜK HÍVJON EGY KISZOLGÁLÓT.\"" #: lang/json/speech_from_json.py msgid "\"Can't… breathe…\"" -msgstr "" +msgstr "\"Nem... kapok... levegőt...\"" #: lang/json/speech_from_json.py msgid "\"This cannot continue.\"" -msgstr "" +msgstr "\"Ez így nem mehet tovább.\"" #: lang/json/speech_from_json.py msgid "\"USER PASSWORD UNRECOGNIZED.\"" -msgstr "" +msgstr "\"ISMERETLEN FELHASZNÁLÓI JELSZÓ.\"" #: lang/json/speech_from_json.py msgid "" "\"Have you seen my friend? He went into surgery yesterday… or maybe the day" " before…\"" -msgstr "" +msgstr "\"Láttad a barátomat? Tegnap műtötték... vagy tegnapelőtt...\"" #: lang/json/speech_from_json.py msgid "\"Is it done? Am I perfect now?\"" -msgstr "" +msgstr "\"Kész? Akkor most már tökéletes vagyok?\"" #: lang/json/speech_from_json.py msgid "\"I have done what you asked. Please let me go!\"" -msgstr "" +msgstr "\"Megtettem, amit kértetek. Most már engedjetek el, kérlek!\"" #: lang/json/speech_from_json.py msgid "\"I cannot… yet I must. How do you calculate that?\"" -msgstr "" +msgstr "\"Nem tehet... de muszáj. Ezt hogyan lehet kiszámolni?\"" #: lang/json/speech_from_json.py msgid "\"This is a dream. This has to be a dream.\"" -msgstr "" +msgstr "\"Ez egy álom. Ez biztosan egy álom.\"" #: lang/json/speech_from_json.py msgid "\"This is my life now… this is my life now… this is my life now…\"" msgstr "" +"\"Mostantól ilyen az életem... mostantól ilyen az életem... mostantól ilyen " +"az életem...\"" #: lang/json/speech_from_json.py msgid "\"Wanna go home…\"" -msgstr "" +msgstr "\"Haza akarok menni...\"" #: lang/json/speech_from_json.py msgid "screams of pain." -msgstr "" +msgstr "fájdalmas üvöltés." #: lang/json/speech_from_json.py msgid "muffled sobbing." -msgstr "" +msgstr "elfojtott zokogás." #: lang/json/speech_from_json.py msgid "" "\"You lied to me! Look at what you've done!\", followed by an electronic " "voice saying \"YOU'LL PAY FOR THIS!\"" msgstr "" +"\"Hazudtatok! Nézzétek meg, hogy mit műveltetek!\", majd utána egy " +"elektronikus hang \"EZT MEGKESERÜLITEK!\"" #: lang/json/speech_from_json.py src/monattack.cpp msgid "a soft robotic voice say, \"Come here. I'll give you a check-up.\"" -msgstr "" +msgstr "gyengéd robothang: \"Gyere csak ide, megvizsgállak.\"" #: lang/json/speech_from_json.py src/monattack.cpp msgid "" "a soft robotic voice say, \"Come on. I don't bite, I promise it won't hurt " "one bit.\"" msgstr "" +"gyengéd robothang: \"Gyere csak nyugodtan, nem harapok. Ígérem, hogy egy " +"kicsit se fog fájni.\"" #: lang/json/speech_from_json.py src/monattack.cpp msgid "a soft robotic voice say, \"Here we go. Just hold still.\"" -msgstr "" +msgstr "gyengéd robothang: \"Így bizony. Most egy kicsit ne mocorogj.\"" #: lang/json/speech_from_json.py msgid "" "a voice say, \"I don't want to go but our time together is drawing to an " "end.\"" -msgstr "" +msgstr "egy hang: \"Nem akarok elmenni, de a közös időnk a végéhez ér.\"" #: lang/json/speech_from_json.py msgid "a cheery voice say, \"Customer? We'll be friends forever, right?\"" -msgstr "" +msgstr "vidám hang: \"Ügyfél? Mi örökké barátok leszünk, ugye?\"" #: lang/json/speech_from_json.py msgid "" "a neutral voice say, \"Customer I must inform you that my allocated time " "with you will soon come to its end.\"" msgstr "" +"semleges hang: \"Ügyfél, tájékoztatnom kell arról, hogy az Önre allokált " +"időm hamarosan véget ér.\"" #: lang/json/speech_from_json.py msgid "" "a neutral voice say, \"I'll have to leave you soon. You can acquire more " "friendship through my dedicated interface if you wish for me to stay.\"" msgstr "" +"semleges hang: \"Hamarosan el kell Önt hagynom. A dedikált interfészen " +"keresztül további barátságot szerezhet be, amennyiben az kívánja, hogy " +"maradjak.\"" #: lang/json/speech_from_json.py msgid "" "a worried voice say, \"Customer, could you please get more friendship? I " "don't want to go…\"" msgstr "" +"aggodalmaskodó hang: \"Ügyfél, kérem tud nekem még több barátságot hozni? " +"Nem akarok elmenni...\"" #: lang/json/speech_from_json.py msgid "a voice say, \"Oh no! You ran out of friendship!\"" -msgstr "" +msgstr "hang: \"De kár! Elfogyott a barátság!\"" #: lang/json/speech_from_json.py msgid "a cheery voice say, \"Well I'm done here. Have a nice day.\"" @@ -159329,6 +161477,38 @@ msgstr "" msgid "WOOF!" msgstr "" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "" @@ -159437,13 +161617,13 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" @@ -159455,7 +161635,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" @@ -159466,7 +161646,7 @@ msgid "" msgstr "" #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" +msgid "Hello again. To reiterate our previous warning: [garbled]" msgstr "" #: lang/json/speech_from_json.py @@ -159542,8 +161722,8 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "" #: lang/json/speech_from_json.py @@ -159575,7 +161755,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "" #: lang/json/speech_from_json.py @@ -159623,7 +161803,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" @@ -159660,7 +161840,7 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" +msgid "\"E.T. phone home.\"" msgstr "" #: lang/json/speech_from_json.py @@ -159724,7 +161904,7 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" msgstr "" #: lang/json/speech_from_json.py @@ -160091,7 +162271,7 @@ msgid "\"I'm scared!\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" +msgid "\"Something's wrong…\"" msgstr "" #: lang/json/speech_from_json.py @@ -160119,15 +162299,15 @@ msgid "\"Excuse me?\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" +msgid "\"I'm different…\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" +msgid "\"Thanks anyway…\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" +msgid "\"Take me with you…\"" msgstr "" #: lang/json/speech_from_json.py @@ -160207,7 +162387,7 @@ msgid "\"This time is OUR time.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" +msgid "\"Second time's a charm…\"" msgstr "" #: lang/json/speech_from_json.py @@ -160279,7 +162459,7 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" +msgid "\"Well, I tried. Best of luck!\"" msgstr "" #: lang/json/speech_from_json.py @@ -160573,7 +162753,7 @@ msgid "Cabin" msgstr "Faház" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "Kórház" @@ -160725,7 +162905,7 @@ msgstr "FEMA tábor" msgid "Mansion Entrance" msgstr "Villa bejárat" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "Villa" @@ -160799,7 +162979,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -160898,42 +163078,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161644,7 +163824,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -161958,13 +164138,13 @@ msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding " -"up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding " +"up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -162054,14 +164234,14 @@ msgstr "Oké, csak semmi hirtelen mozdulat..." msgid "Keep your distance!" msgstr "Maradj távol!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "Ez itt az én területem, ." - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "Ez itt az én területem, ." + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "Nyugi! Nem foglak bántani." @@ -162115,27 +164295,27 @@ msgid "I don't care." msgstr "Nem érdekel." #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" +msgid "I have other jobs for you. Want to hear about them?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" +msgid "I have more jobs for you. Want to hear about them?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have more jobs for you. Want to hear about them?" +msgid "I have another job for you. Want to hear about it?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" +msgid "I just have one job for you. Want to hear about it?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." +msgid "I don't have any jobs for you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I don't have any jobs for you." +msgid "I don't have any more jobs for you." msgstr "" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py @@ -162148,15 +164328,15 @@ msgid "Never mind, I'm not interested." msgstr "Mindegy, nem érdekel." #: lang/json/talk_topic_from_json.py -msgid "Which job?" +msgid "You're not working on anything for me now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What about it?" +msgid "Which job?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." +msgid "What about it?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -162373,10 +164553,6 @@ msgstr "Hmmm, oké." msgid "Thanks!" msgstr "Köszi!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "" @@ -162401,6 +164577,10 @@ msgstr "Túl szomjas vagyok, adj valamit inni." msgid "I must focus on the road!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Ah, oké." @@ -162505,10 +164685,6 @@ msgstr "Nem, itt mi jól elleszünk." msgid "On second thought, never mind." msgstr "Hát, most, hogy belegondolok, igazából mindegy." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "Okom van rá, hogy miért nem tanítalak." @@ -162521,6 +164697,10 @@ msgstr "Vár egy kicsit, később majd mutatok valami újat..." msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "Dehogy is, még lemaradok!" @@ -163190,7 +165370,7 @@ msgid "How are you alive?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" +msgid "What did you do before the Cataclysm?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -163411,7 +165591,7 @@ msgid "This is a season spring test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." +msgid "This is a days since Cataclysm 30 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163419,7 +165599,7 @@ msgid "This is a season summer test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." +msgid "This is a days since Cataclysm 120 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163427,7 +165607,7 @@ msgid "This is a season autumn test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." +msgid "This is a days since Cataclysm 210 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163435,7 +165615,7 @@ msgid "This is a season winter test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." +msgid "This is a days since Cataclysm 300 test response." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163952,7 +166132,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" @@ -164265,7 +166445,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" +msgid "What did you do when you found out about the Cataclysm?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -165457,7 +167637,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166683,7 +168863,7 @@ msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166722,7 +168902,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "" @@ -166754,8 +168934,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -166782,7 +168962,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166803,14 +168983,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166823,7 +169003,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166853,7 +169033,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166863,7 +169043,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -166888,7 +169068,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166941,7 +169121,7 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166954,7 +169134,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" @@ -166995,8 +169175,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167025,6 +169205,12 @@ msgstr "" msgid "Where is your brother's place?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "" @@ -167089,6 +169275,10 @@ msgid "" " a forage set up." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "" @@ -167412,14 +169602,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." +"Sir, I don't know how the hell you got down here but if you have any sense " +"you'll get out while you can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Sir, I don't know how the hell you got down here but if you have any sense " -"you'll get out while you can." +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167830,12 +170020,12 @@ msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168602,7 +170792,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" @@ -168660,7 +170850,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" @@ -169204,7 +171394,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -171327,11 +173517,11 @@ msgid "Just on watch, move along." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." +msgid "Rough out there, isn't it?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Rough out there, isn't it?" +msgid "Ma'am, you really shouldn't be traveling out there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172526,7 +174716,7 @@ msgstr "Szeretnélek felbérelni." #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" @@ -172888,7 +175078,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -172907,7 +175097,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" @@ -172921,8 +175111,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172945,8 +175135,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172959,9 +175149,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172977,9 +175167,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173008,15 +175198,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "Érdekes..." +msgid "Interesting…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -173025,7 +175215,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I see..." +msgid "I see…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173035,7 +175225,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hmm..." +msgid "Hmm…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173045,7 +175235,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alright..." +msgid "Alright…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173053,7 +175243,7 @@ msgid "Not at the moment, check back later perhaps." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Sure..." +msgid "Sure…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173073,7 +175263,7 @@ msgid "So are you busting us out of here or what?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." +msgid "Hold tight, . I've got to clear a path." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176771,6 +178961,15 @@ msgstr "" msgid "A closed metal gate." msgstr "" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "" @@ -178505,14 +180704,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "benzines tartály" +msgid "fuel tank" +msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "összetört benzines kút" @@ -180288,6 +182496,27 @@ msgstr "kis fém támasz" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "ablak" @@ -180659,8 +182888,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -180674,7 +182903,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -181027,7 +183256,7 @@ msgstr "" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "nincs" @@ -181671,7 +183900,7 @@ msgstr "Fagylaltos kézikocsi" msgid "Luggage Cart" msgstr "Csomagszállító kézikocsi" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "Bevásárlókocsi" @@ -185122,8 +187351,8 @@ msgstr "LACP lézer lövegtorony" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" #. ~ Description for gel shooter @@ -185864,6 +188093,10 @@ msgstr "C-vitamin" msgid "Toxins" msgstr "Toxin" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "Nyomd meg a " @@ -186387,6 +188620,12 @@ msgstr "Nem lehet a(z) %st újratölteni." msgid "You reload the %s." msgstr "Újratöltöd a(z) %st." +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -187311,6 +189550,10 @@ msgstr "Valami elállja a feladat elvégzéséhez vezető utat." msgid "The required items are not available to complete this task." msgstr "Hiányoznak a feladat befejezéséhez szükséges tárgyak." +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -187725,6 +189968,10 @@ msgstr "töltet típus" msgid "spoilage" msgstr "rothadás" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -189780,6 +192027,44 @@ msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" "A(z) %st nem lehet elsütni, mert nem kompatibilis %s muníció van benne." +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "Nincs a kezedben semmi." + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "Túlságosan jóllakott vagy ahhoz, hogy a(z) %s leveleit megehesd." + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "Megeszed az aljnövényzetet." + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "Túlságosan jóllakott vagy a legeléshez." + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "Megeszed a füvet." + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "Ez a fű túl rövid a legeléshez." + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "Ez a fű túlságosan száradt és roncsolt a legeléshez." + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "Ezt a füvet lefestették, ezért ehetetlen." + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "Otthagyod az üres %st." + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "A kagylódba bújva nem tudsz hatékonyan dobni." @@ -189817,6 +192102,14 @@ msgstr "Erősen koncentrálsz, a tested pedig engedelmeskedik!" msgid "You can't muster up the effort to throw anything…" msgstr "Nem tudod annyira összeszedni magad, hogy bármit is elhajíthass." +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "Tárgy kiürítése vagy kitárazása" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "Nincsen semmid, amit ki lehetne üríteni vagy tárazni." + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -190728,22 +193021,14 @@ msgstr "A műtét kezdetével izgatottság fog el." #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" -"Izgatottság fog el, ahogyan az autodoki fájdalommentesen beléd vág. Élvezed " -"annak a látványát, ahogyan a szikék szétvagdosnak, ám a műtét haladtával " -"hirtelen fáradtnak érzed magad, és elájulsz." #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" -"Nagyon, nagyon mozdulatlanul fekszel, és a plafon egyik pontjára " -"összpontosítasz, miközben az autodoki fájdalommentesed beléd vág. " -"Szerencsére elájulsz, amikor a szikék a látóteredbe kerülnek." #: src/bionics.cpp msgid "" @@ -193406,8 +195691,8 @@ msgstr "A jelenlegi formájában nem lehet megenni." msgid "This is full of dirt after being on the ground." msgstr "Tele van földdel, miután a talajon volt." -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "Azt víz alatt nem lehet." @@ -194324,11 +196609,11 @@ msgstr "Sorozat időmegtakarítás: %s" msgid "Dark craftable? %s" msgstr "Sötétben készíthető? %s" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "Könnyű" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "Nehéz" @@ -194829,6 +197114,10 @@ msgstr "" msgid "Test weather" msgstr "" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "" @@ -195035,7 +197324,7 @@ msgstr "Gyűjtő: %d" msgid "Altruism: %d" msgstr "Önzetlenség: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "Szükség:" @@ -195718,386 +198007,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "" - -#: src/defense.cpp -msgid "Previous option" -msgstr "" - -#: src/defense.cpp -msgid "Next option" -msgstr "" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "" - -#: src/defense.cpp -msgid "Zombies" -msgstr "" - -#: src/defense.cpp -msgid "Triffids" -msgstr "" - -#: src/defense.cpp -msgid "Robots" -msgstr "Robotok" - -#: src/defense.cpp -msgid "Subspace" -msgstr "" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "" - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "" - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "" - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "" - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "" - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "" - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "" - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "" - -#: src/defense.cpp -msgid "Medium" -msgstr "Közepes" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "" - -#: src/defense.cpp -msgid "Skynet" -msgstr "" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "" - -#: src/defense.cpp -msgid "A custom game." -msgstr "" - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "" - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "" - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "" - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "" - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "" - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "" - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "" - -#: src/defense.cpp -msgid "Public Works" -msgstr "Közmunka-telep" - -#: src/defense.cpp -msgid "Megastore" -msgstr "Bevásárlóközpont" - -#: src/defense.cpp -msgid "Bar" -msgstr "Bár" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "" - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "" - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "" - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "" - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "" -msgstr[1] "" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "" - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -196683,53 +198592,53 @@ msgstr "Ütős cucc volt, az tuti." #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "Erő +%d; " +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "Erő %d; " +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "Ügyesség +%d; " +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "Ügyesség %d; " +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "Érzékelés +%d; " +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "Érzékelés %d; " +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "Intelligencia +%d; " +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "Intelligencia %d; " +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "Sebesség +%d; " +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "Sebesség %d; " +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -197718,7 +199627,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -198347,7 +200257,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -198552,7 +200463,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -198810,6 +200722,26 @@ msgstr "" msgid "(You wonder if your companions are fit to work on their own…)" msgstr "" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -199642,7 +201574,8 @@ msgstr "További tüzelő nélkül még %st fog égni." msgid "Without extra fuel it will burn for between %s to %s." msgstr "További tüzelő nélkül még %s - %st fog égni." -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "" @@ -200164,40 +202097,6 @@ msgstr "" msgid "%s helps with this task…" msgstr "%s segít a feladattal..." -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "Túlságosan jóllakott vagy ahhoz, hogy a(z) %s leveleit megehesd." - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "Megeszed az aljnövényzetet." - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "Túlságosan jóllakott vagy a legeléshez." - -#: src/game.cpp -msgid "You eat the grass." -msgstr "Megeszed a füvet." - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "Ez a fű túl rövid a legeléshez." - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "Ez a fű túlságosan száradt és roncsolt a legeléshez." - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "Ezt a füvet lefestették, ezért ehetetlen." - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "Otthagyod az üres %st." - #: src/game.cpp msgid "Change side for item" msgstr "Tárgy viselt oldalának felcserélése" @@ -200226,6 +202125,11 @@ msgstr "A(z) %s már teli van!" msgid "You can't reload a %s!" msgstr "Nem lehet újratölteni egy %st!" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "" + #: src/game.cpp msgid "Reload item" msgstr "Tárgy újratöltése vagy betárazása" @@ -200234,18 +202138,6 @@ msgstr "Tárgy újratöltése vagy betárazása" msgid "You have nothing to reload." msgstr "Nincsen semmid, amivel újra lehetne tölteni vagy be lehetne tárazni." -#: src/game.cpp -msgid "Unload item" -msgstr "Tárgy kiürítése vagy kitárazása" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "Nincsen semmid, amit ki lehetne üríteni vagy tárazni." - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "Nincs a kezedben semmi." - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -200332,6 +202224,13 @@ msgstr "Nem található a megragadott tárgy" msgid "You cannot board a vehicle whilst riding." msgstr "" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "" @@ -201027,11 +202926,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "A leltárod üres." -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "Nincs nálad %s." - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "ORMÓTLANSÁG" @@ -201170,8 +203064,8 @@ msgid "CBM" msgstr "KBM" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "ENERGIA" +msgid "ENERGY (kJ)" +msgstr "" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -201396,13 +203290,13 @@ msgstr "Tárgy tokba tevése" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" -msgstr "Válaszd ki, hogy melyik fegyvert teszed ebbe: %s" +msgid "Choose an item to put into your %s" +msgstr "" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." -msgstr "Nincs nálad olyan fegyver, amit ebbe tudnál beletenni: %s" +msgid "You have no items you could put into your %s." +msgstr "" #: src/game_inventory.cpp src/iuse.cpp msgid "Cut up what?" @@ -201648,6 +203542,398 @@ msgstr "Oktató" msgid "Defense" msgstr "Védelem" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "Robotok" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "" + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "Közepes" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "Közmunka-telep" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "Bevásárlóközpont" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "Bár" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "" +msgstr[1] "" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "John Smith" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "Valami hülye áll az útban!" @@ -201996,6 +204282,10 @@ msgstr "Alvás előtt abbahagyod a(z) %s játékot." msgid "You may want to deactivate these before you sleep." msgstr "Ezeket talán nem ártana alvás előtt kikapcsolni." +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -207068,7 +209358,7 @@ msgstr "A(z) %1$s nem tud többet befogadni ebből:: %2$s." msgid "That %s doesn't have room to expand." msgstr "Az a(z) %s nem tud tovább növekedni." -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%d x %s" @@ -207152,91 +209442,34 @@ msgid "Your %s disappears!" msgstr "A(z) %s eltűnik!" #: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "%s holttestet nyúzott meg" -msgstr[1] "%s holttestet nyúzott meg" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "%s dögöt nyúzott meg" -msgstr[1] "%s dögöt nyúzott meg" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "%s hulla" -msgstr[1] "%s hulla" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" +msgid "human blood" +msgid_plural "human blood" msgstr[0] "" msgstr[1] "" #: src/item.cpp #, c-format msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" +msgid "%s blood" +msgid_plural "%s blood" msgstr[0] "" msgstr[1] "" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name #: src/item.cpp #, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%s %s hulla" -msgstr[1] "%s %s hulla" - -#: src/item.cpp -msgctxt "item name" -msgid "human blood" -msgid_plural "human blood" -msgstr[0] "" -msgstr[1] "" +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "" +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name #: src/item.cpp #, c-format -msgctxt "item name" -msgid "%s blood" -msgid_plural "%s blood" -msgstr[0] "" -msgstr[1] "" +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "" #: src/item_action.cpp msgid "You do not have an item that can perform this action." @@ -207822,7 +210055,7 @@ msgstr "" msgid "Modify what?" msgstr "Mit módosítasz?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "Nincs nálad az a tárgy!" @@ -208878,6 +211111,10 @@ msgstr "" msgid "Lights on!" msgstr "" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -209300,10 +211537,6 @@ msgstr "" msgid "You need a mechanics skill of 2 to use this repair kit." msgstr "" -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "" @@ -209354,23 +211587,6 @@ msgstr "" msgid "You cancel unloading the tool." msgstr "" -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "" - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "" - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "" @@ -209620,31 +211836,6 @@ msgstr "" msgid " on " msgstr "" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -210446,6 +212637,14 @@ msgid "" " but best to stop messing with it." msgstr "" +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "" + #: src/iuse.cpp msgid "Using cable:" msgstr "" @@ -210474,14 +212673,6 @@ msgstr "" msgid "You attach the cable to the solar pack." msgstr "" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "" @@ -212973,11 +215164,8 @@ msgid "Congratulations, you won!" msgstr "" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" +#, c-format +msgid "Min: %d Max: %d" msgstr "" #: src/iuse_software_minesweeper.cpp @@ -213826,6 +216014,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "Kezdés ost!" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" + #: src/main_menu.cpp msgid "No templates found!" msgstr "Nincsen elmentett sablon!" @@ -214053,6 +216269,14 @@ msgstr "" msgid "DANGER! MINEFIELD!" msgstr "" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -214185,20 +216409,9 @@ msgid "You're violently teleported!" msgstr "Erőszakosan teleportáltak valahova!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "A méhek megszúrnak!" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "A méhek többször megszúrnak!" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "A méhek rengetegszer megszúrnak!" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "A méhet össze-vissza szúrkálnak!" +#, c-format +msgid "The bees sting you in %s!" +msgstr "" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -214362,6 +216575,17 @@ msgid_plural "Skills" msgstr[0] "" msgstr[1] "" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" +msgstr[1] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "" @@ -219143,6 +221367,10 @@ msgstr "" msgid "Acid sprays out of %s as it is hit!" msgstr "" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" + #: src/monexamine.cpp msgid "zombie slave" msgstr "" @@ -222102,7 +224330,8 @@ msgid "I have news." msgstr "Hírem van." #: src/npctalk.cpp -msgid "Yes, let's resume training " +#, c-format +msgid "Yes, let's resume training %s" msgstr "" #: src/npctalk.cpp @@ -222823,6 +225052,16 @@ msgstr "" "Ha nem, akkor a játékos a földre ejti azokat a tárgyakat, amelyek miatt " "túllépte a maximális súly korlátot." +#: src/options.cpp +msgid "Dangerous running" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" + #: src/options.cpp msgid "Safe mode" msgstr "Biztonságos mód" @@ -225187,7 +227426,7 @@ msgstr "Keresés:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" @@ -225627,6 +227866,10 @@ msgstr "Pihen:" msgid "Heat :" msgstr "Hő :" +#: src/panels.cpp +msgid "Deaf!" +msgstr "Süket!" + #: src/panels.cpp msgid "Underground" msgstr "Föld alatt" @@ -225685,10 +227928,6 @@ msgstr "Hold :" msgid "Lighting:" msgstr "Fény :" -#: src/panels.cpp -msgid "Deaf!" -msgstr "Süket!" - #: src/panels.cpp msgid "Weapon :" msgstr "Fegyver :" @@ -226712,6 +228951,11 @@ msgstr "Melyik hibát javítod?" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -227170,85 +229414,74 @@ msgstr "SEBESSÉG" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "Az úszás %+d mozgási pontba kerül" -msgstr[1] "Az úszás %+d mozgási pontba kerül" +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "A futás %+d mozgási pontba kerül" -msgstr[1] "A futás %+d mozgási pontba kerül" +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "Az újratárazás %+d mozgási pontba kerül" -msgstr[1] "Az újratárazás %+d mozgási pontba kerül" +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "A közelharc és a dobás %+d mozgási pontba kerül" -msgstr[1] "A közelharc és a dobás %+d mozgási pontba kerül" +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "Kitérési készség %+.1f." +msgid "Dodge skill: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "Közelharc %+d%%;" +msgid "Melee attack rolls: %+d%%\n" +msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." +"Head encumbrance has no effect; it simply limits how much you" +" can put on." msgstr "" -"A fej ormótlanságának nincsen hatása, csupán meghatározza, hogy mennyi " -"mindent viselhetsz rajta." #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"Érzékelés %+d csapdakeresésnél vagy távolra hordó fegyver elsütésénél;\n" -"Szórás %+d tárgyak eldobásánál." #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "A szád befedésével nehezebben kapsz levegőt és hamarabb merülsz ki." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." msgstr "" -"A kar ormótlansága hatással van a közelharci támadások kitartási költségére " -"és a távolra hordó fegyverek pontosságára." #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "Csökkenti a tárgyak használatának sebességét\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "Ügyesség %+.1f tárgyak eldobásánál;\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "A fegyverek célzási sebességét csökketi: %.1f." +msgid "Reduced gun aim speed: %.1f" +msgstr "" #: src/player_display.cpp msgid "" @@ -227350,12 +229583,9 @@ msgstr "Súly:" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" -"A testsúlyod azt mutatja, hogy mennyi zsírt tárolt el a tested, ami pedig " -"arra utal, hogy mennyi ideig vagy képes a túlélésre étel nélkül. Nem " -"egészséges, ha a testsúlyod túl alacsony, vagy túl sok." #: src/player_display.cpp #, c-format @@ -228100,6 +230330,16 @@ msgstr "" msgid "'s %s misfires with a muffled click!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -228140,6 +230380,16 @@ msgstr "" msgid "'s %s is damaged by their shot!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -228340,6 +230590,10 @@ msgstr "Pontos célzás" msgid "[%c] to take precise aim and fire." msgstr "[%c] pontos célzás és tűz." +#: src/ranged.cpp +msgid "turrets" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -228773,8 +231027,8 @@ msgstr "Ezt hallod: %s!" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." -msgstr "A helyzetedből ezt hallod: %1$s." +msgid "From your position you hear %1$s" +msgstr "" #: src/sounds.cpp #, c-format @@ -229877,18 +232131,6 @@ msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "" msgstr[1] "" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "John Smith" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" - #: src/veh_interact.cpp msgid "Select part" msgstr "Melyik alkatrészt?" @@ -232218,6 +234460,10 @@ msgstr "Napos" msgid "Cloudy" msgstr "Felhős" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "" + #: src/weather_data.cpp msgid "Drizzle" msgstr "Szemerkél" diff --git a/lang/po/ja.po b/lang/po/ja.po index 36490a7aded22..a81d451f143ca 100644 --- a/lang/po/ja.po +++ b/lang/po/ja.po @@ -15,7 +15,6 @@ # T5idr3, 2019 # Dokuo Utuda, 2019 # Maruyama Ryota , 2019 -# zojirushi, 2019 # kanro mizuame , 2019 # nobiruneko, 2019 # TEATIME , 2019 @@ -24,13 +23,14 @@ # idmode idmode , 2019 # a a , 2019 # xyz , 2019 +# zojirushi, 2019 # Pigmentblue15, 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Pigmentblue15, 2019\n" "Language-Team: Japanese (https://www.transifex.com/cataclysm-dda-translators/teams/2217/ja/)\n" @@ -1501,7 +1501,7 @@ msgstr "洗剤" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." +msgid "A popular pre-Cataclysm washing powder." msgstr "大変動前は一般的だった洗濯用洗剤です。" #: lang/json/AMMO_from_json.py @@ -1695,7 +1695,7 @@ msgid "" "unwieldy and only provides moderate accuracy, due to being filled with " "explosives and fitted with an impact trigger." msgstr "" -"何かの金属から作られた軽く鋭いボルトです。酷く不格好で並みの命中率だけが取り柄です。撃発装置や爆薬を詰め込んで括り付けているのが原因ですが..." +"何かの金属から作られた軽く鋭いボルトです。酷く不格好でそれなりの精度だけが取り柄です。撃発装置や爆薬を詰め込んで括り付けているのが原因ですが..." #: lang/json/AMMO_from_json.py msgid "ethanol" @@ -1779,6 +1779,16 @@ msgstr[0] "ランプオイル" msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "オイルランプ用に作られた薄く綺麗なオイルです。" +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "エンジンオイル" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "自動車に使われるオイルです。" + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -1925,6 +1935,60 @@ msgid "" msgstr "" "強力な睡眠剤、鎮痛剤、興奮剤といった薬剤入りの特殊な容器を備えた手術用の麻酔キットです。特殊な医療機器で使うものであり、手作業での使用は不可能です。" +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "弾薬(40mm擲弾/信号)" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "40mm信号グレネード弾です。発射後1分程明るく燃え上がり、その軌跡に煙の筋を残します。" + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "40x46mm弾" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "閃光と爆音を発する40mmグレネード弾です。光と音を伴って爆発し、周囲の相手の視覚や聴覚を奪い、混乱を誘発させます。" + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "弾薬(40mm擲弾/焼夷)" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "激しい火炎を発生させるためのナパームが充填された40mmグレネード弾です。" + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "弾薬(40mm擲弾/煙幕)" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "煙幕を発生させる40mmグレネード弾です。" + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "弾薬(40mm擲弾/単発弾)" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "強力な単発弾を搭載した40mm弾です。発射時に肩が外れてしまいそうです。" + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "弾薬(10mm/ｵｰﾄFMJ)" @@ -2723,125 +2787,134 @@ msgid ".40 S&W JHP, reloaded" msgstr "弾薬(.40口径/S&W JHP(手詰め))" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40mmグレネード弾" +msgid "40x46mm grenade" +msgstr "弾薬(40x46mm/擲弾)" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "弾薬(40mm/ﾋﾞｰﾝﾊﾞｯｸﾞ)" +msgid "40x46mm M1006" +msgstr "弾薬(40x46mm/M1006)" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." -msgstr "40mm非致死性ビーンバッグ弾は、標的に強い衝撃を与えて激しい痛みと意識障害を引き起こします。依然として死傷の可能性は残っています。" +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." +msgstr "" +"標的に強い苦痛を与えてふらつかせることを目的とした、低速度で飛び致死性が低い気泡ゴムとプラスチック製の40x46mm弾です。標的を死傷させる可能性は残っています。" #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "弾薬(40mm擲弾/震盪)" +msgid "40x46mm M433" +msgstr "弾薬(40x46mm/M433)" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "震とう性爆発装薬入りの40mmグレネード弾です。" +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "低速度で飛ぶ40x46mm多目的榴弾です。厚さ約5cmの鋼鉄装甲を貫通でき、破片が飛び散るため対歩兵用途にも適しています。" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "弾薬(40mm擲弾/信号)" +msgid "40x46mm M576" +msgstr "弾薬(40x46mm/M576)" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." -msgstr "40mm信号グレネード弾です。発射後1分程明るく燃え上がり、その軌跡に煙の筋を残します。" +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." +msgstr "生い茂った草木や室内を一掃する目的で設計された40x46mm散弾です。" #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "弾薬(40mm擲弾/閃光)" +msgid "40x46mm M651" +msgstr "弾薬(40x46mm/M651)" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." -msgstr "閃光と爆音を発する40mmグレネード弾です。光と音を伴って爆発し、周囲の相手の視覚や聴覚を奪い、混乱を誘発させます。" +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" +msgstr "低速度で飛ぶ40mm催涙ガス弾です。暴動鎮圧や歩兵を塹壕から追い出す際に効果的です。" #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "弾薬(40mm擲弾/矢弾)" +msgid "40x46mm buckshot" +msgstr "弾薬(40x46mm/簡易散弾)" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." -msgstr "40mm弾の内部には装甲を貫通する矢弾が多数充填されています。" +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." +msgstr "M576用の弾薬に似た、手製の40x46mm散弾です。" #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "弾薬(40mm擲弾/破片)" +msgid "40x46mm slug" +msgstr "弾薬(40x46mm/簡易単発弾)" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." -msgstr "小さな爆発と損傷を与える破片を撒き散らす装薬入りの40mmグレネード弾です。" +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." +msgstr "特大の単発弾に似た、手製の40x46mm弾です。" #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "弾薬(40mm擲弾/焼夷)" +msgid "40x46mm flechette" +msgstr "弾薬(40x46mm/矢弾)" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." -msgstr "激しい火炎を発生させるためのナパームが充填された40mmグレネード弾です。" +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "70本の鋼鉄製のダーツが入った手製の40x46mm矢弾です。" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "弾薬(40x53mm/擲弾)" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M1001" +msgstr "弾薬(40x53mm/M1001)" + +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "約1.1gのダーツが入った40x53mm矢弾です。" #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "弾薬(40mm擲弾/散弾)" +msgid "40x53mm M430A1" +msgstr "弾薬(40x53mm/M430A1)" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." -msgstr "ショットガンの代用品として、またバリケードなどの障害物を突破する用途で利用される、威力の高い散弾を充填した40mm弾です。" +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "高速度で飛ぶ40x53mm多目的榴弾です。厚さ約7cmの鋼鉄装甲を貫通でき、破片が飛び散るため対歩兵用途にも適しています。" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "弾薬(40mm擲弾/煙幕)" +msgid "40x53mm buckshot" +msgstr "弾薬(40x53mm/散弾)" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "煙幕を発生させる40mmグレネード弾です。" +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "M576用の弾薬に似た、手製の40x53mm散弾です。" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "弾薬(40mm擲弾/催涙)" +msgid "40x53mm slug" +msgstr "弾薬(40x53mm/単発弾)" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." -msgstr "催涙ガスを充填した40mmグレネード弾です。爆発時に強力な無力化ガスが発生します。" +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." +msgstr "特大の単発弾に似た、手製の40x53mm 弾です。" #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "弾薬(40mm擲弾/単発弾)" +msgid "40x53mm flechette" +msgstr "弾薬(40x53mm/矢弾)" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." -msgstr "強力な単発弾を搭載した40mm弾です。発射時に肩が外れてしまいそうです。" +msgid "An improvised 40x53mm flechette load containing 100 steel darts." +msgstr "100本の鋼鉄製のダーツが入った手製の40x53mm矢弾です。" #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -4082,7 +4155,7 @@ msgid "" "spread makes it very accurate at short range. Slices through most forms of " "armor with ease." msgstr "" -"鋼製の小さなダーツが詰まったショットガン用の弾薬です。高いダメージに加え、拡散による近距離の高命中率が期待出来ます。容易に各種装甲を貫通します。" +"鋼製の小さなダーツが詰まったショットガン用の弾薬です。高いダメージに加え、拡散による近距離での精度が期待出来ます。容易に各種装甲を貫通します。" #: lang/json/AMMO_from_json.py msgid "explosive slug" @@ -4535,7 +4608,7 @@ msgstr[0] "銀" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "光沢のある柔らかい金属です。大変動以前はそれなりの値段が付けられていましたが、現在は大幅に価値が下がっています。" @@ -5056,13 +5129,6 @@ msgstr "一束のダーツです。吹き矢の矢に適しています。" msgid "plutonium cell" msgstr "原子力電池" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "フロート充電式の単電池です。充電池であれば充電できますが、一度充電した電気は抜き取れません。" - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5131,7 +5197,7 @@ msgstr "パルスラウンド" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" "薬莢ごと推進する合金製のホローポイント弾がヘリカルマガジンに入っています。非常に威力が高いわけではありませんが、自然環境に深刻な影響を与えるゴミの心配をせずに敵を攻撃できます。" @@ -5585,18 +5651,6 @@ msgid "" "Hefty round projectiles cast from lead, useful as ammunition for slings." msgstr "スリング用の、硬くて丸い鉛の弾薬です。" -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "ボルト(骨)" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "矢羽が付いた鋭利な骨製ボルトです。軽量で、相当の殺傷力と精度をもっています。放った矢が約9割の確率で地面に残ります。" - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -5719,7 +5773,7 @@ msgid "" "A 120mm shell with a new electric primer installed, filled with a large " "amount of buckshot. Effectively similar to no-longer-produced canister " "shot, but of lower quality." -msgstr "大量の散弾を詰め直した電気雷管付き120mm弾です。この種ののケースショット弾は生産が終了しており、これは低品質の手詰め弾です。" +msgstr "大量の散弾を詰め直した電気雷管付き120mm弾です。この種のケースショット弾は生産が終了しており、これは低品質の手詰め弾です。" #: lang/json/AMMO_from_json.py msgid "makeshift 120mm slug" @@ -6040,7 +6094,7 @@ msgstr[0] "ブロブ飼料" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "様々な有機物が混ざりあった物体です。ブロブが健康に育つために必要な養分がたっぷり含まれています...たぶん。" #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py @@ -6050,7 +6104,7 @@ msgstr[0] "ビリヤードボール" #: lang/json/AMMO_from_json.py msgid "diamond fragments" -msgstr "破片(ダイヤモンド)" +msgstr "破片(ﾀﾞｲﾔﾓﾝﾄﾞ)" #. ~ Description for diamond fragments #: lang/json/AMMO_from_json.py @@ -6379,7 +6433,7 @@ msgstr[0] "放浪者の服" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "大変動前に市販されていた衣類を改造して作った、長旅に適した簡易的な装備です。たくさんの収納スペースが確保できます。" @@ -6391,7 +6445,7 @@ msgstr[0] "放浪者の軽装" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "" @@ -6451,9 +6505,9 @@ msgstr[0] "スカベンジャーの服" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." -msgstr "大変動前に作られた、清掃作業用の頑丈な服です。収納スペースがたくさんあります。" +msgstr "大変動前に作られた、清掃作業用の頑丈な服です。たくさんの収納スペースが確保できます。" #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -6997,7 +7051,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "turnout coat" msgid_plural "turnout coats" -msgstr[0] "ターンアウトコート" +msgstr[0] "消防士コート" #. ~ Description for turnout coat #: lang/json/ARMOR_from_json.py @@ -7009,7 +7063,7 @@ msgstr "頑丈な消防士の防火衣です。熱と炎に優れた耐性があ #: lang/json/ARMOR_from_json.py msgid "turnout trousers" msgid_plural "turnout trousers" -msgstr[0] "ターンアウトズボン" +msgstr[0] "消防士ボトムス" #. ~ Description for turnout trousers #: lang/json/ARMOR_from_json.py @@ -10265,7 +10319,7 @@ msgstr "裏地に毛皮を用いた丈夫なパンツです。" #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" +msgid_plural "faux fur pants" msgstr[0] "フェイクファーパンツ" #. ~ Description for faux fur pants @@ -11835,7 +11889,7 @@ msgstr "武道家が着用する無地の白いズボンです。" #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" +msgid_plural "violin cases" msgstr[0] "ヴァイオリンケース" #. ~ Description for violin case @@ -12458,9 +12512,9 @@ msgstr[0] "超大型バックパック" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." -msgstr "大変動前にジョークグッズとして作られた、非常に大きな布製バックパックです。今なお馬鹿げた代物ですが、たくさんの荷物を持ち運べます。" +msgstr "大変動前にジョークグッズとして作られた、非常に大きな布製バックパックです。今なお馬鹿げた代物ですが、たくさんの収納スペースが確保できます。" #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -12857,7 +12911,7 @@ msgstr "骨で強化した装甲が付いた革製のブーツです。軽量で #: lang/json/ARMOR_from_json.py msgid "pair of turnout boots" msgid_plural "pairs of turnout boots" -msgstr[0] "ターンアウトブーツ" +msgstr[0] "消防士ブーツ" #. ~ Description for pair of turnout boots #: lang/json/ARMOR_from_json.py @@ -13595,7 +13649,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "diamond dental grill" msgid_plural "diamond dental grills" -msgstr[0] "デンタルグリル(ダイヤモンド)" +msgstr[0] "デンタルグリル(ﾀﾞｲﾔﾓﾝﾄﾞ)" #. ~ Description for diamond dental grill #: lang/json/ARMOR_from_json.py @@ -13603,12 +13657,137 @@ msgid "" "Fake teeth inlaid with diamonds, worn over the teeth. Fits horribly, but " "looks very shiny. For that high-class gangsta rap look." msgstr "" -"歯の表面に被せる、ダイヤモンドがちりばめられた偽の歯です。素晴らしい密着性ですが、非常に悪目立ちします。一流のギャングスタラッパーにお勧めです。" +"歯の表面に被せる、ダイヤモンドがちりばめられた偽の歯です。口元にピッタリ嵌り、ギラギラとした輝きを放ちます。一流のギャングスタラッパーにお勧めです。" + +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "デンタルグリル(ｶﾞｰﾈｯﾄ)" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "ガーネットが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "デンタルグリル(ｱﾒｼｽﾄ)" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "アメシストが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "デンタルグリル(ｱｸｱﾏﾘﾝ)" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "アクアマリンが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "デンタルグリル(ｴﾒﾗﾙﾄﾞ)" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "エメラルドが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "デンタルグリル(ｱﾚｷｻﾝﾄﾞﾗｲﾄ)" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "アレキサンドライトが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "デンタルグリル(ﾙﾋﾞｰ)" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "ルビーが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "デンタルグリル(ﾍﾟﾘﾄﾞｯﾄ)" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "ペリドットが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "デンタルグリル(ｻﾌｧｲｱ)" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "サファイアが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "デンタルグリル(ﾄﾙﾏﾘﾝ)" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "トルマリンが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "デンタルグリル(黄水晶)" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "黄水晶が嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "デンタルグリル(ﾌﾞﾙｰﾄﾊﾟｰｽﾞ)" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "ブルートパーズが嵌め込まれた、歯の表面に被せる偽の歯です。ギラギラとした輝きを放っています。" #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" -msgstr[0] "指輪(ダイヤモンド)" +msgstr[0] "指輪(ﾀﾞｲﾔﾓﾝﾄﾞ)" #. ~ Description for diamond ring #: lang/json/ARMOR_from_json.py @@ -13779,7 +13958,7 @@ msgstr[0] "デンタルグリル(金)" msgid "" "Fake golden teeth, worn over the teeth. Fits horribly, but looks very " "shiny." -msgstr "歯の表面に被せる偽の金歯です。素晴らしい密着性ですが、非常に悪目立ちします。" +msgstr "歯の表面に被せる偽の金歯です。口元にピッタリ嵌り、ギラギラとした輝きを放ちます。" #: lang/json/ARMOR_from_json.py msgid "pair of gold earrings" @@ -13978,7 +14157,7 @@ msgstr "東洋で加工されたヒスイのブローチです。着用できま #: lang/json/ARMOR_from_json.py msgid "platinum watch" msgid_plural "platinum watches" -msgstr[0] "腕時計(プラチナ)" +msgstr[0] "腕時計(ﾌﾟﾗﾁﾅ)" #. ~ Description for platinum watch #: lang/json/ARMOR_from_json.py @@ -13990,7 +14169,7 @@ msgstr "希少で、高価で、優れたプラチナの腕時計です。金の #: lang/json/ARMOR_from_json.py msgid "platinum bracelet" msgid_plural "platinum bracelets" -msgstr[0] "腕輪(プラチナ)" +msgstr[0] "腕輪(ﾌﾟﾗﾁﾅ)" #. ~ Description for platinum bracelet #: lang/json/ARMOR_from_json.py @@ -14002,7 +14181,7 @@ msgstr "傷一つないプラチナのブレスレットです。着用できま #: lang/json/ARMOR_from_json.py msgid "platinum dental grill" msgid_plural "platinum dental grills" -msgstr[0] "デンタルグリル(プラチナ)" +msgstr[0] "デンタルグリル(ﾌﾟﾗﾁﾅ)" #. ~ Description for platinum dental grill #: lang/json/ARMOR_from_json.py @@ -14010,12 +14189,12 @@ msgid "" "Fake platinum-and-silver teeth. They may be cheaper than fake gold teeth, " "but they're much more rare. Fits horribly, but looks very shiny." msgstr "" -"プラチナと銀で作られたデンタルグリルです。金製のものに比べれば安物かもしれませんが、それでも希少品です。素晴らしい密着性ですが、非常に悪目立ちします。" +"プラチナと銀で作られたデンタルグリルです。金製のものに比べれば安物かもしれませんが、それでも希少品です。口元にピッタリ嵌り、ギラギラとした輝きを放ちます。" #: lang/json/ARMOR_from_json.py msgid "pair of platinum earrings" msgid_plural "pairs of platinum earrings" -msgstr[0] "イヤリング(プラチナ)" +msgstr[0] "イヤリング(ﾌﾟﾗﾁﾅ)" #. ~ Description for pair of platinum earrings #: lang/json/ARMOR_from_json.py @@ -14028,7 +14207,7 @@ msgstr "シンプルなプラチナのイヤリングです。...金に飽きた #: lang/json/ARMOR_from_json.py msgid "platinum hairpin" msgid_plural "platinum hairpins" -msgstr[0] "ヘアピン(プラチナ)" +msgstr[0] "ヘアピン(ﾌﾟﾗﾁﾅ)" #. ~ Description for platinum hairpin #: lang/json/ARMOR_from_json.py @@ -14041,7 +14220,7 @@ msgstr "純粋なプラチナのみで作られた、極々限られた者だけ #: lang/json/ARMOR_from_json.py msgid "platinum locket" msgid_plural "platinum lockets" -msgstr[0] "ロケットペンダント(プラチナ)" +msgstr[0] "ロケットペンダント(ﾌﾟﾗﾁﾅ)" #. ~ Description for platinum locket #: lang/json/ARMOR_from_json.py @@ -14053,7 +14232,7 @@ msgstr "写真や小物が中に入れられるようになっている、小さ #: lang/json/ARMOR_from_json.py msgid "platinum necklace" msgid_plural "platinum necklaces" -msgstr[0] "ネックレス(プラチナ)" +msgstr[0] "ネックレス(ﾌﾟﾗﾁﾅ)" #. ~ Description for platinum necklace #: lang/json/ARMOR_from_json.py @@ -14065,7 +14244,7 @@ msgstr "鎖から小さなハート形のフレームがぶら下がっている #: lang/json/ARMOR_from_json.py msgid "platinum ring" msgid_plural "platinum rings" -msgstr[0] "指輪(プラチナ)" +msgstr[0] "指輪(ﾌﾟﾗﾁﾅ)" #. ~ Description for platinum ring #: lang/json/ARMOR_from_json.py @@ -14412,6 +14591,510 @@ msgid "" " behind you when you walk." msgstr "光沢のある黒革の尻尾です。プラスチック製の小さなビーズが錘になっており、着用者が歩くたびにぴょこぴょこと揺れます。" +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "イヤリング(ﾀﾞｲﾔﾓﾝﾄﾞ&金)" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "光り輝くダイヤモンドと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "イヤリング(ｶﾞｰﾈｯﾄ&金)" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "光り輝くガーネットと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "イヤリング(ｱﾒｼｽﾄ&金)" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くアメシストと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "イヤリング(ｱｸｱﾏﾘﾝ&金)" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くアクアマリンと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "イヤリング(ｴﾒﾗﾙﾄﾞ&金)" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "光り輝くエメラルドと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "イヤリング(ｱﾚｷｻﾝﾄﾞﾗｲﾄ&金)" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "光り輝くアレキサンドライトと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "イヤリング(ﾙﾋﾞｰ&金)" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "光り輝くルビーと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "イヤリング(ﾍﾟﾘﾄﾞｯﾄ&金)" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "光り輝くペリドットと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "イヤリング(ｻﾌｧｲｱ&金)" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くサファイアと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "イヤリング(ﾄﾙﾏﾘﾝ&金)" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くトルマリンと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "イヤリング(黄水晶&金)" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "光り輝く黄水晶と金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "イヤリング(ﾄﾊﾟｰｽﾞ&金)" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くトパーズと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "イヤリング(ｵﾊﾟｰﾙ&金)" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "光り輝くオパールと金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "イヤリング(真珠&金)" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "光り輝く真珠と金のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "イヤリング(ﾀﾞｲﾔﾓﾝﾄﾞ&銀)" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くダイヤモンドと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "イヤリング(ｶﾞｰﾈｯﾄ&銀)" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くガーネットと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "イヤリング(ｱﾒｼｽﾄ&銀)" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くアメシストと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "イヤリング(ｱｸｱﾏﾘﾝ&銀)" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くアクアマリンと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "イヤリング(ｴﾒﾗﾙﾄﾞ&銀)" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くエメラルドと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "イヤリング(ｱﾚｷｻﾝﾄﾞﾗｲﾄ&銀)" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くアレキサンドライトと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "イヤリング(ﾙﾋﾞｰ&銀)" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "光り輝くルビーと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "イヤリング(ﾍﾟﾘﾄﾞｯﾄ&銀)" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くペリドットと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "イヤリング(ｻﾌｧｲｱ&銀)" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くサファイアと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "イヤリング(ﾄﾙﾏﾘﾝ&銀)" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くトルマリンと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "イヤリング(黄水晶&銀)" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝く黄水晶と銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "イヤリング(ﾄﾊﾟｰｽﾞ&銀)" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くトパーズと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "イヤリング(真珠&銀)" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "光り輝く真珠と銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "イヤリング(ｵﾊﾟｰﾙ&銀)" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "光り輝くオパールと銀のイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "イヤリング(ﾀﾞｲﾔﾓﾝﾄﾞ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "光り輝くダイヤモンドとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "イヤリング(ｶﾞｰﾈｯﾄ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くガーネットとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "イヤリング(ｱﾒｼｽﾄ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くアメシストとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "イヤリング(ｱｸｱﾏﾘﾝ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くアクアマリンとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "イヤリング(ｴﾒﾗﾙﾄﾞ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "光り輝くエメラルドとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "イヤリング(ｱﾚｷｻﾝﾄﾞﾗｲﾄ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くアレキサンドライトとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "イヤリング(ﾙﾋﾞｰ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くルビーとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "イヤリング(ﾍﾟﾘﾄﾞｯﾄ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "光り輝くペリドットとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "イヤリング(ｻﾌｧｲｱ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くサファイアとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "イヤリング(ﾄﾙﾏﾘﾝ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くトルマリンとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "イヤリング(黄水晶&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "光り輝く黄水晶とプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "イヤリング(ﾌﾞﾙｰﾄﾊﾟｰｽﾞ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "光り輝くブルートパーズとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "イヤリング(ｵﾊﾟｰﾙ&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝くオパールとプラチナのイヤリングです。着用できますが、特別な効果はありません。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "イヤリング(真珠&ﾌﾟﾗﾁﾅ)" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "光り輝く真珠とプラチナのイヤリングです。着用できますが、特別な効果はありません。" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -14890,8 +15573,8 @@ msgstr[0] "CRITマスク" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" "C.R.I.Tの標準装備のフェイスマスクです。防御力を高めるためにケブラーで裏打ちされています。フィルターによって大気中の危険物質から顔面を保護しますが、長期使用は想定されていません。基本的な一体型HUDが付属しています。" @@ -14903,10 +15586,10 @@ msgstr[0] "CRITブーツ" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" "C.R.I.Tの標準装備のブーツです。次世代素材のジェルによって、長期任務中の足を快適かつ衛生的に保ち、外部からの衝撃や熱を吸収します。超合金メッシュとゴム製素材が備わっており化学物質からの保護も期待できますが、非常に重いのが難点です。" @@ -14918,10 +15601,10 @@ msgstr[0] "CRIT軽量型ブーツ" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" "重量を削減したC.R.I.Tブーツです。通常のブーツを基に温暖気候での任務用に改良されたもので、ほとんどの機能はそのままですが、防御力が低下した代わりにより動きやすい構造になっています。" @@ -14933,7 +15616,7 @@ msgstr[0] "CRIT指貫グローブ" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" @@ -14947,8 +15630,8 @@ msgstr[0] "CRIT指貫ライナーグローブ" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" "C.R.I.Tの標準装備のライナーグローブです。遺伝子操作者や突然変異者も着用できるネオプレンとゴムで作られており、指先の操作と適度な防御力を両立しています。" @@ -14961,7 +15644,7 @@ msgstr[0] "CRITバックパック" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -14988,8 +15671,8 @@ msgstr[0] "CRITレッグガード" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" "C.R.I.Tの標準装備のレッグアーマーです。丈夫な素材で作られたシンプルなデザインは動作を妨げず、内部のパッドによって寒冷地でも脚が冷えません。" @@ -15003,8 +15686,8 @@ msgstr[0] "CRITアームガード" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "ネオプレン素材の上に超合金を重ね、更にゴムで絶縁したアームガードです。頑丈で攻撃にもびくともしませんが、とんでもない重量です。" #: lang/json/ARMOR_from_json.py @@ -15015,8 +15698,8 @@ msgstr[0] "CRITウェブベルト" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "C.R.I.Tの標準装備のベルトです。ズボンと武器を腰に固定します。" #: lang/json/ARMOR_from_json.py @@ -15027,9 +15710,9 @@ msgstr[0] "CRIT歩兵部隊ダスターコート" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" "ゴム製の絶縁体を織り込んだ、丈の長い厚手のダスターコートです。やや動き辛いですが、ロボットからの放電攻撃に対してはかなり有効な防具です。収納用のポケットが複数付いています。" @@ -15042,7 +15725,7 @@ msgstr[0] "CRIT研究開発部エンジニアスーツ" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -15056,10 +15739,10 @@ msgstr[0] "CRIT特異環境スーツ" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" "比較的シンプルな外見の防具です。クリーンスーツに複合繊維を織り込み、更にセグメント化されたケブラー装甲が特定部位を保護しています。軽量ながら、着用者を放射性物質や放射線からしっかりと保護します。" @@ -15084,11 +15767,11 @@ msgstr[0] "CRIT執行官追加装甲" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" "他の防護服の上から着用する、装甲板や防護具、バックル一式です。ケブラープレートの表面を層状の鋼鉄が完全に覆い、表層部の所々は攻撃を逸らすための突起が付いています。安全性は快適性に勝るという思想で開発されたため、移動は困難ですが非常に高い防御力を誇ります。ストラップやクリップなどの様々な接続器具が内蔵されています。" @@ -15101,9 +15784,9 @@ msgstr[0] "CRIT執行官足部装甲" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -15117,10 +15800,10 @@ msgstr[0] "CRIT戦闘員スーツ" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" "現代的な防護スーツです。超合金プレートを適切な部位にのみ使用し、他の部分にケブラーを使うことで重量を最小限に抑えており、柔らかいネオプレンの裏地が着心地の良さを実現しています。最も重要な点は、このスーツが他の装甲の下に重ねて着用できることです。" @@ -15133,11 +15816,11 @@ msgstr[0] "CRITローンウルフアーマー" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" -"柔軟なケブラー製ボディスーツの上にに古く重そうな黒いプレートアーマーを重ねた装備です。最新式の改良を受けた銃装甲は、あらゆる衝撃から着用者を完璧に守るでしょう。まずは、本当に上手く歩けるのか確認した方が良さそうです。" +"柔軟なケブラー製ボディスーツの上に古く重そうな黒いプレートアーマーを重ねた装備です。最新式の改良を受けた銃装甲は、あらゆる衝撃から着用者を完璧に守るでしょう。まずは、本当に上手く歩けるのか確認した方が良さそうです。" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T blouse" @@ -15147,31 +15830,31 @@ msgstr[0] "C.R.I.Tジャケット" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" "C.R.I.Tの標準装備のジャケットです。丈夫で軽量、収納力も十分です。多少の寒い天候でも体温を保てるスーパーフレックスネオプレン素材を使っていますが、派手過ぎないスマートなデザインです。前後にジッパーが付いており、素早く着脱できます。" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" -msgstr[0] "C.R.I.Tパンツ" +msgid_plural "C.R.I.T trousers" +msgstr[0] "C.R.I.Tボトムス" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" "C.R.I.Tの標準装備のパンツです。丈夫で軽量、収納力も十分です。多少の寒い天候でも体温を保てるスーパーフレックスネオプレン素材を使っています。" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" "C.R.I.Tの標準装備のドレスパンツです。シンプルで洗練されたデザインで、更には軽く、ポケットも付いています。多少の寒い天候でも体温を保てるスーパーフレックスネオプレン素材を使っています。" @@ -15183,7 +15866,7 @@ msgstr[0] "C.R.I.T中帽" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "C.R.I.Tの標準装備の中帽です。頭部を寒さから守ります。" #: lang/json/ARMOR_from_json.py @@ -15193,19 +15876,19 @@ msgstr[0] "C.R.I.Tドレスシューズ" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." -msgstr "スマートなドレスシューズです。お洒落ですが上品です。" +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgstr "スマートなドレスシューズです。派手ですが上品です。" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "C.R.I.T偵察部隊グローブ" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" "C.R.I.Tの標準装備の偵察部隊用グローブです。肌にフィットする滑らかな布製で、滑り止めと手を冷やさないネオプレン製の裏地が備わっています。" @@ -15217,7 +15900,7 @@ msgstr[0] "C.R.I.Tウェブベルト" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "C.R.I.Tの標準装備のベルトです。ズボンと工具を腰に固定します。" @@ -15229,7 +15912,7 @@ msgstr[0] "C.R.I.T偵察部隊ダスターコート" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -15244,8 +15927,8 @@ msgstr[0] "C.R.I.T偵察部隊帽" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" "機能性と流行を両立した、防水機能をもつC.R.I.Tの標準装備の偵察部隊帽です。寒い季節でも十分暖かく過ごせる厚みがあり、C.R.I.Tの装備特有の洗練されたデザインです。" @@ -15336,24 +16019,18 @@ msgid_plural "copper infusion bracelets" msgstr[0] "マナブレスレット" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "神秘的な雰囲気を漂わせる、ルーン文字が刻まれた銅製のブレスレットです。マナを素材に注入する際に役立ちます。" +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." +msgstr "神秘的な雰囲気を漂わせる、ルーン文字が刻まれたブレスレットです。マナを素材に注入する際に役立ちます。" #: lang/json/ARMOR_from_json.py msgid "silver infusion bracelet" msgid_plural "silver infusion bracelets" msgstr[0] "マナブレスレット(銀)" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "神秘的な雰囲気を漂わせる、ルーン文字が刻まれたブレスレットです。マナを素材に注入する際に役立ちます。" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -15639,7 +16316,7 @@ msgstr "魔法の氷で作られた滑りやすい靴です。平らな床では #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" +msgid_plural "flesh pouches" msgstr[0] "肉のポーチ" #. ~ Description for flesh pouch @@ -15650,6 +16327,18 @@ msgid "" "minimize encumbrance." msgstr "無数の小さな触手が生えた、背中に着用する大きな肉の袋です。袋自体が動いて変形し、動作制限を最小限に抑えます。" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "オーラ(幻惑)" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "全身を覆う目に見えないオーラが周囲の光を歪めます。1ターンにつき最大2回の攻撃を回避できます。" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -16442,7 +17131,7 @@ msgid "" "system will quickly unlock all but the most advanced key locks without any " "skill required on the part of the user." msgstr "" -"指の一本に電子ロックピックを埋め込みます。このツールは使用者のスキルにかかわらず、特殊な機構ではないあらゆるロックを全自動で素早く開錠します。" +"指の一本に電子ロックピックを埋め込みます。このツールは使用者のスキルにかかわらず、特殊な機構ではないあらゆるロックを全自動で素早く解錠します。" #: lang/json/BIONIC_ITEM_from_json.py msgid "Electromagnetic Unit CBM" @@ -17435,7 +18124,7 @@ msgstr[0] "CBM: 過重イオン発生装置" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" "使用者の胸に埋め込む、強力なイオンエネルギー発生装置です。強力で大規模なエネルギーの爆風を発射します。生じた爆風は酸素と反応し、発火と爆発を引き起こします。近距離での使用は避けてください。" @@ -19129,7 +19818,7 @@ msgstr "チャーチルやメーラー、エーコやヴォルテールなどの #: lang/json/BOOK_from_json.py msgid "book of fairy tales" msgid_plural "books of fairy tales" -msgstr[0] "本(一般/童話集)" +msgstr[0] "本(一般/童話)" #. ~ Description for book of fairy tales #: lang/json/BOOK_from_json.py @@ -19138,6 +19827,138 @@ msgid "" "goblins, and trolls." msgstr "妖精やゴブリン、トロールなど良く知られた存在に注目した、民間伝承を集めた楽しい資料本です。" +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "塩漬け肉を大量に食べるオオカミが肉屋の地下室に閉じ込められる、という内容の童話です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "悪巧みする動物についての伝統的な童話です。賢いキツネが老いたライオンに対して、悪評高いオオカミを殺すよう説得します。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "ネズミとネコが会話する童話の絵本です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "表紙に「ゴルディロックスと3匹のくま」を表す絵が描かれた微笑ましい童話集です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "鳥と獣の間で起こった戦争中にコウモリがとった行動と末路について記した、有名な童話です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "チェロキー族に伝わる神話と伝説が記された「ガラガラヘビの復讐」というタイトルの本です。1ページ目に鉛筆で「285D」と書かれています。" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "特定の地域で伝わっている「ジャックと豆の木」に似た民話が書かれた本です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "「赤ずきん」というタイトルの本です。赤い頭巾を被った子供が喋るオオカミに出会う話が書かれています。" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "死者の持ち物を盗むことの危険性について警告する、幽霊についての物語です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "英語に翻訳されたイタリアの童話の本です。表紙にはレモン、ライム、タンジェリンをお手玉するオレンジ色の妖精が描かれています。" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "鳥に変身する人々について記した童話です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "悪魔に関する面白い民話を集めた「地獄のやかん: 悪魔の伝説」というタイトルの本です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "スウェーデンの童話が記された「ガラスの山と王女」というタイトルのかわいらしい本です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "あまりに貪欲過ぎると酷い目に遭うことを警告する童話集です。" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "「どろぼう鍋: アラブ地域の民話」というタイトルの本です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "1960年代に旅行家のジョニー・キャシディが収集した伝説をまとめた本です。" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "グリム兄弟の「エバのふぞろいの子どもたち」です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "エフェソスの七人の眠れる男たちの伝説について書いた本です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "屈強な男が岩から水を絞り出して鬼を怖がらせる童話です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "「悪魔の野次り倒し方」というタイトルの、素朴な民話の本です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "「セイロン島の民話」というタイトルの本です。カダムバワに住む男性の論理的な誤りと愚かで間違った判断に関する民話が書かれています。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "「醜い名前の少女、および様々な童話」というタイトルの童話集です。" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "「逃げ出したパンケーキ」というタイトルの、子供向けのひょうきんな童話です。" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -19524,8 +20345,8 @@ msgstr[0] "本(一般/官能小説)" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." -msgstr "エロスを含んだ低俗な文章が織り成すありがちな物語です。" +msgid "A hackneyed fictional narrative concealing low-grade literary smut." +msgstr "猥褻で下品な文章で綴られた古臭い物語です。" #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -19843,7 +20664,7 @@ msgstr "ベッキー・チェンバーズの「レコード・オブ・ア・ス msgid "" "This is a copy of \"Use of Weapons\" by Ian M. Banks. The spine is cracked " "and worn, some pages appear to be loose." -msgstr "イアン・M・バンクスの「ユーズ・オブ・ウェポンズ」です。背表紙がひび割れ、一部のページの綴じがが緩んでいるようです。" +msgstr "イアン・M・バンクスの「ユーズ・オブ・ウェポンズ」です。背表紙がひび割れ、一部のページの綴じが緩んでいるようです。" #: lang/json/BOOK_from_json.py msgid "" @@ -20280,9 +21101,9 @@ msgstr "ピョートル・クロポトキンの「パンの略取」です。表 #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." -msgstr "エミール・シオランの「生誕の災厄」です。表紙はかなり風化しており、大変動の何十年も前に出版されたようです。" +msgstr "エミール・シオランの「生誕の災厄」です。表紙はかなり風化しており、大変動が起きる何十年も前に出版されたようです。" #: lang/json/BOOK_from_json.py msgid "" @@ -21709,11 +22530,11 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" -"キャンディーか何かのチラシです。恐ろしげにこちらを見つめる、滑らかな飴で作られた人間が描かれています。「シュガーキン(砂糖の血族)は史上初の等身大ヒューマンキャンディーです！君は真のモンスターかい？これを食べ尽くすことが出来るか？」\n" +"キャンディーか何かのチラシです。恐ろしげにこちらを見つめる、滑らかな飴で作られた人間が描かれています。「シュガーキン(砂糖の血族)は史上初の等身大ヒューマンキャンディーです！君は真のモンスターか？これを食べ尽くすことが出来るか？」\n" "チラシの裏にいくつかの走り書きがあります。\n" "「やあ、我が子よ、この世界へようこそ。いくつかのルールを守ればこの世界で繁栄できるだろう。\n" "1) 水に触れてはならない！溶けてしまう！\n" @@ -21744,7 +22565,7 @@ msgstr[0] "本(学習/趣味と実益のロボットハック)" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" "ロボットの不正入手、再プログラミング、改造について記した本です。役に立つステップバイステップ形式のガイドとサンプル用青写真がたくさん付属しています。" @@ -21945,6 +22766,16 @@ msgstr[0] "塩水" msgid "Water with salt added. Not good for drinking." msgstr "塩分を含んだ水です。飲用には適していません。" +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "石鹸水" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "石鹸を溶かした水です。飲用には適していません。" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -22154,7 +22985,7 @@ msgstr "香辛料" #: lang/json/COMESTIBLE_from_json.py msgid "marloss wine" msgid_plural "marloss wine" -msgstr[0] "ワイン(ミカズ)" +msgstr[0] "ワイン(ﾐｶｽﾞ)" #. ~ Description for marloss wine #: lang/json/COMESTIBLE_from_json.py @@ -22164,7 +22995,7 @@ msgstr "ミカズフルーツから作られた濃厚な白ワインです。" #: lang/json/COMESTIBLE_from_json.py msgid "Riesling" msgid_plural "Riesling" -msgstr[0] "ワイン(リースリング)" +msgstr[0] "ワイン(ﾘｰｽﾘﾝｸﾞ)" #. ~ Description for Riesling #: lang/json/COMESTIBLE_from_json.py @@ -22174,7 +23005,7 @@ msgstr "世界で最も高貴な葡萄から作られた発泡性の白ワイン #: lang/json/COMESTIBLE_from_json.py msgid "Chardonnay" msgid_plural "Chardonnay" -msgstr[0] "ワイン(シャルドネ)" +msgstr[0] "ワイン(ｼｬﾙﾄﾞﾈ)" #. ~ Description for Chardonnay #: lang/json/COMESTIBLE_from_json.py @@ -22184,7 +23015,7 @@ msgstr "米国で最も人気のあるワインです。評判通りのおいし #: lang/json/COMESTIBLE_from_json.py msgid "Cabernet Sauvignon" msgid_plural "Cabernet Sauvignon" -msgstr[0] "ワイン(カベルネ・ソービニヨン)" +msgstr[0] "ワイン(ｶﾍﾞﾙﾈ･ｿｰﾋﾞﾆﾖﾝ)" #. ~ Description for Cabernet Sauvignon #: lang/json/COMESTIBLE_from_json.py @@ -22196,7 +23027,7 @@ msgstr "賛否はありますが、赤ワインの王様です。赤身肉やパ #: lang/json/COMESTIBLE_from_json.py msgid "pinot noir" msgid_plural "pinot noir" -msgstr[0] "ワイン(ピノ・ノワール)" +msgstr[0] "ワイン(ﾋﾟﾉ･ﾉﾜｰﾙ)" #. ~ Description for pinot noir #: lang/json/COMESTIBLE_from_json.py @@ -22208,7 +23039,7 @@ msgstr "収集家に珍重され批評家に愛されると言う、世にも珍 #: lang/json/COMESTIBLE_from_json.py msgid "marsala" msgid_plural "marsala" -msgstr[0] "ワイン(マルサラ)" +msgstr[0] "ワイン(ﾏﾙｻﾗ)" #. ~ Description for marsala #: lang/json/COMESTIBLE_from_json.py @@ -22218,7 +23049,7 @@ msgstr "イタリア料理レストランで一般的に提供されるワイン #: lang/json/COMESTIBLE_from_json.py msgid "vermouth" msgid_plural "vermouth" -msgstr[0] "ワイン(ベルモット)" +msgstr[0] "ワイン(ﾍﾞﾙﾓｯﾄ)" #. ~ Description for vermouth #: lang/json/COMESTIBLE_from_json.py @@ -22314,7 +23145,7 @@ msgstr[0] "ワイン(安物)" #. ~ Description for cheap wine #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap fortified wine." -msgstr "本当に安物の強化ワインです。" +msgstr "非常に安価な酒精強化ワインです。" #: lang/json/COMESTIBLE_from_json.py msgid "strong mixed alcohol" @@ -22369,7 +23200,7 @@ msgstr[0] "アイリッシュ・コーヒー" msgid "" "Sweetened coffee and whiskey topped with milk. Start your day the closeted " "alcoholic way!" -msgstr "砂糖入りコーヒーとウイスキーを混ぜて牛乳を加えた飲み物です。朝からアルコールを内緒で飲む事ができますよ！" +msgstr "砂糖入りコーヒーとウイスキーを混ぜて牛乳を加えた飲み物です。アルコール中毒者らしく一日を始めましょう！" #: lang/json/COMESTIBLE_from_json.py msgid "Long Island iced tea" @@ -22442,7 +23273,7 @@ msgstr "ホップを加えて発酵させた蜂蜜酒です。ほろ苦い飲み #: lang/json/COMESTIBLE_from_json.py msgid "dandelion wine" msgid_plural "dandelion wine" -msgstr[0] "ワイン(タンポポ)" +msgstr[0] "ワイン(ﾀﾝﾎﾟﾎﾟ)" #. ~ Description for dandelion wine #: lang/json/COMESTIBLE_from_json.py @@ -22482,10 +23313,9 @@ msgstr[0] "密造酒" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." -msgstr "" -"最も強く、最も純粋な、トウモロコシと糖を蒸留して造った古き良き時代の密造酒です。大災厄の諸々を忘れさせてくれる、あるいは過去を蘇らせてくれること請け合いです。" +msgstr "最も強く、最も純粋な、古き良き時代の密造酒です。大変動の諸々を忘れさせてくれる、あるいは思い出を蘇らせてくれること請け合いです。" #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -22586,13 +23416,76 @@ msgstr "発酵させたブルーベリーが入った、驚くほどボリュー #: lang/json/COMESTIBLE_from_json.py msgid "single malt whiskey" msgid_plural "single malt whiskey" -msgstr[0] "シングルモルト・ウイスキー" +msgstr[0] "ウイスキー(ｼﾝｸﾞﾙﾓﾙﾄ)" #. ~ Description for single malt whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Only the finest whiskey straight from the bung." msgstr "それぞれの蒸留所で作られた最上のウイスキーをその場で瓶詰めしたものが、シングルモルト・ウイスキーです。" +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "ウイスキー(ｱｲﾘｯｼｭ)" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "大麦の麦芽と生大麦を混合したマッシュから作ったウイスキーです。" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "ウイスキー(安物)" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "非常に安価なブレンデッドウイスキーです。" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "ウイスキー(ｶﾅﾃﾞｨｱﾝ)" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "トウモロコシとライ麦のマッシュから作った酒です。" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "ワイン(ｼｪﾘｰ)" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "イースト・インディア・ソレラと呼ばれるこのワインは、英国紳士のための真の酒です。フレイジャー・クレイン氏もお勧めしていますよ？" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "ワイン(ﾌﾞﾘｽﾄﾙ･ｸﾘｰﾑ)" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "アメリカのオーク樽で熟成され、イギリスのブリストルで瓶詰めされた高級なシェリーです。" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "ワイン(ﾏﾃﾞｲﾗ)" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "マデイラ島産の酒精強化ワインです。英国海軍のための真の酒です。" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "ファンシーホーボー" @@ -22783,7 +23676,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "mycus wine must" -msgstr "ワイン(未発酵/ミカズ)" +msgstr "ワイン(ﾐｶｽﾞ/未発酵)" #. ~ Description for mycus wine must #: lang/json/COMESTIBLE_from_json.py @@ -22898,7 +23791,7 @@ msgstr "蜂蜜と酵母を薄めて混ぜた、未発酵の蜂蜜酒です。" #: lang/json/COMESTIBLE_from_json.py msgid "dandelion wine must" -msgstr "ワイン(タンポポ/未発酵)" +msgstr "ワイン(ﾀﾝﾎﾟﾎﾟ/未発酵)" #. ~ Description for dandelion wine must #: lang/json/COMESTIBLE_from_json.py @@ -23271,6 +24164,18 @@ msgid "meat jerky" msgid_plural "meat jerky" msgstr[0] "ミートジャーキー" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "人肉ジャーキー" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "変異肉ジャーキー" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -23289,20 +24194,26 @@ msgid "" msgstr "日持ちする塩味の乾燥魚です。食べると喉が渇きます。" #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "人肉ジャーキー" +msgid "smoked meat" +msgstr "肉(燻製)" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "日持ちする塩味の人肉です。食べると喉が渇きます。" +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "人肉(燻製)" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "肉(燻製)" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "変異%s" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -23323,17 +24234,6 @@ msgid "" "could be further smoked to dehydrate it completely." msgstr "長期保存のためにしっかりとスモークした魚です。更に燻製して完全に脱水することが可能です。" -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "人肉(燻製)" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "十分に燻製された人肉です。長期保存しても美味しくいただけます。こんな代物を食べる趣味があるのならですが。" - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -24672,7 +25572,7 @@ msgstr "卵(レイザークロウ)" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." msgstr "レイザークロウの卵塊です。大変動後の世界では珍味とされています。" #: lang/json/COMESTIBLE_from_json.py @@ -24751,7 +25651,7 @@ msgstr "既製品の混合物を凍らせて作ったシェイクです。砂糖 #: lang/json/COMESTIBLE_from_json.py msgid "deluxe milkshake" msgid_plural "deluxe milkshakes" -msgstr[0] "デラックスミルクセーキ" +msgstr[0] "DXミルクセーキ" #. ~ Description for deluxe milkshake #: lang/json/COMESTIBLE_from_json.py @@ -25826,11 +26726,11 @@ msgid "" msgstr "塩味の効いたトルティーヤチップスです。これに溶かしたチーズや牛肉を合わせるのが本来の食べ方です。" #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" +msgid "cheese nachos" +msgid_plural "cheese nachos" msgstr[0] "ナチョス(チーズ)" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -25838,47 +26738,49 @@ msgid "" msgstr "塩味の効いたトルティーヤチップスに溶かしたチーズをかけました。肉を合わせるとより美味しく食べられます。" #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" +msgid "meat nachos" +msgid_plural "meat nachos" msgstr[0] "ナチョス(肉)" -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "塩味の効いたトルティーヤチップスに挽肉を添えました。溶かしたチーズをかけるとより美味しく食べられます。" - +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "ナチョス(人肉)" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "ナチョス(変異肉)" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." -msgstr "塩味の効いたトルティーヤチップスに人肉を添えました。溶かしたチーズをかけるとより美味しく食べられます。" +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." +msgstr "塩味の効いたトルティーヤチップスに挽肉を添えました。溶かしたチーズをかけるとより美味しく食べられます。" +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "ナチョス(肉とチーズ)" + +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "ナチョス(人肉とチーズ)" -#. ~ Description for niño nachos with cheese +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "塩味の効いたトルティーヤチップスに人肉を添え、溶かしたチーズをかけました。とても美味しいです。" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "ナチョス(変異肉とチーズ)" -#: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "ナチョス(肉とチーズ)" - -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -25948,16 +26850,6 @@ msgstr[0] "チリドッグ" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "ホットドッグにトッピングとしてチリコンカルネを添えました。旨い！" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "人肉チリドッグ" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "ホットドッグにトッピングとしてチリコンカルネ(人肉)を添えました。愉快だね。" - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -26041,7 +26933,7 @@ msgstr[0] "フランクフルト(未調理)" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." +"Cataclysm. It would taste much better prepared." msgstr "大きな加熱済みソーセージです。大変動以前は野球観戦のお供でした。作り置きの味です。" #: lang/json/COMESTIBLE_from_json.py @@ -26083,6 +26975,22 @@ msgstr "ザクザクした食感のお菓子をチョコレートでコーティ msgid "raw sausage" msgstr "生ソーセージ" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "生人肉ソーセージ" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "変異%s" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -26092,6 +27000,12 @@ msgstr "燻製や調理の準備が整った、ずっしりと重い生のソー msgid "sausage" msgstr "ソーセージ" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "人肉ソーセージ" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -26101,22 +27015,17 @@ msgstr "長期間保存するために乾かして燻製した、ずっしりと msgid "cooked sausage" msgstr "ソーセージ(調理済)" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "人肉ソーセージ(調理済)" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "調理済みのずっしりと重いソーセージです。" -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "マンヴォルスト" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "長期保存用に熟成・燻製した、硬い「ロングポーク」ソーセージです。人肉市場で買い物をする人ならおいしく食べられるでしょう。" - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -26132,6 +27041,19 @@ msgid "bratwurst" msgid_plural "bratwursts" msgstr[0] "ブラートヴォルスト" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "人肉ブラートヴォルスト" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "変異%s" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26199,6 +27121,13 @@ msgstr "豚などの皮や脂肪をサクサクになるまで揚げたおいし msgid "glazed tenderloins" msgstr "ヒレ肉の照り焼き" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "変異%s" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26211,6 +27140,20 @@ msgstr "ヒレ肉の切り身を丸ごとタレで薄く包み、野菜を付け msgid "currywurst" msgstr "カレーヴォルスト" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "人肉%s" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "変異%s" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26222,6 +27165,20 @@ msgstr "カレー粉とケチャップがまぶしてあるソーセージです msgid "aspic" msgstr "アスピック" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "変異%s" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "人肉%s" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26290,6 +27247,13 @@ msgstr "1人分の黄金色をした美味しそうな揚げ魚です。" msgid "lunch meat" msgstr "ランチミート" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "変異%s" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26301,6 +27265,20 @@ msgstr "加工肉をサンドイッチに挟みやすいように薄切りの状 msgid "bologna" msgstr "ボローニャソーセージ" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "人肉%s" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "変異%s" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26358,7 +27336,20 @@ msgstr "塩気のある小さな魚です。食べると喉が渇きそうだね #: lang/json/COMESTIBLE_from_json.py msgid "sausage gravy" msgid_plural "sausage gravies" -msgstr[0] "グレービーソース(ソーセージ)" +msgstr[0] "ソーセージグレービー" + +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "人肉ソーセージグレービー" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "変異%s" #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py @@ -26371,6 +27362,20 @@ msgstr "ビスケットと肉、おいしいキノコスープをものすごく msgid "pemmican" msgstr "ペミカン" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "人肉%s" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "変異%s" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26383,6 +27388,19 @@ msgstr "動物性脂肪とタンパク質から作った高エネルギー食品 msgid "hamburger helper" msgstr "ハンバーグヘルパー" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "人肉ハンバーグヘルパー" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "変異%s" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26404,6 +27422,18 @@ msgid "chili con carne" msgid_plural "chilis con carne" msgstr[0] "チリコンカルネ" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "チリコン人肉" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "チリコン変異肉" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -26472,18 +27502,36 @@ msgstr "刻んだハマグリと水が入った缶詰です。" msgid "clam chowder" msgstr "クラムチャウダー" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "ミートチャウダー" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "変異肉チャウダー" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." -msgstr "アサリやジャガイモが入った具沢山で美味しいホワイトスープです。今や失われたニューイングランドの栄光の味です。" +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." +msgstr "肉(一般的にはアサリ)やジャガイモが入った具沢山で美味しいホワイトスープです。今や失われたニューイングランドの栄光の味です。" #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" msgid_plural "baked beans" msgstr[0] "ベイクドビーンズ(肉)" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "変異肉ビーンズ" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -26494,6 +27542,12 @@ msgid "meat fried rice" msgid_plural "meat fried rice" msgstr[0] "炒飯(肉)" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "炒飯(変異肉)" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -26502,7 +27556,14 @@ msgstr "ご飯と肉を一緒に炒めた料理です。美味しく、お腹も #: lang/json/COMESTIBLE_from_json.py msgid "deluxe beans and rice" msgid_plural "deluxe beans and rice" -msgstr[0] "デラックス豆飯(肉)" +msgstr[0] "DX豆飯(肉)" + +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "DX豆飯(変異肉)" #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py @@ -26515,6 +27576,19 @@ msgstr "豆と米と肉と調味料を一緒に炊いた料理です。美味し msgid "meat pie" msgstr "ミートパイ" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "人肉パイ" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "変異%s" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -26524,6 +27598,19 @@ msgstr "美味しい肉が沢山詰まった美味しそうなパイです。" msgid "meat pizza" msgstr "ミートピザ" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "人肉ピザ" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "変異%s" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26531,10 +27618,26 @@ msgid "" "and heavily seasoned." msgstr "肉食系には堪らないミートピザです。挽肉がたっぷり入っており、濃厚な味わいを楽しめます。" +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "シュプリームピザ" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "様々な食材をトッピングしたシュプリームピザです。" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" -msgstr[0] "デラックススクランブルエッグ" +msgstr[0] "DXスクランブルエッグ" + +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "DXスクランブルエッグ(変異肉)" #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py @@ -26547,6 +27650,12 @@ msgstr "ふわふわで美味しそうなスクランブルエッグに、他の msgid "canned meat" msgstr "肉(保存食)" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "薄切り人肉" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26558,6 +27667,12 @@ msgstr "加熱調理してから容器に詰めた、塩分の少ない保存用 msgid "salted meat slice" msgstr "薄切り肉(塩漬け)" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "薄切り人肉(塩漬け)" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -26568,6 +27683,19 @@ msgid "spaghetti bolognese" msgid_plural "spaghetti bolognese" msgstr[0] "スパゲッティ(ボロネーゼ)" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "スパゲッティ(人肉)" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "%s(変異肉)" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -26577,6 +27705,20 @@ msgstr "トマトベースの重量感あるミートソースがたっぷりと msgid "lasagne" msgstr "ラザーニャ" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "人肉%s" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "変異%s" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26597,17 +27739,44 @@ msgstr "油で揚げたスパムです。とても美味しいですよ。" msgid "cheeseburger" msgstr "チーズバーガー" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "人肉%s" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "変異%s" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." -msgstr "パンに挽肉と野菜と香辛料と更にはチーズを挟んだ料理です。大変動以前の料理界における至高の一品と言っても過言ではないでしょう。" +"Cataclysm culinary achievement." +msgstr "パンに挽肉と野菜と香辛料、更にはチーズを挟んだ料理です。大変動以前の料理界における至高の一品です。" #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "ハンバーガー" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "人肉バーガー" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "変異%s" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -26617,6 +27786,19 @@ msgstr "パンに挽肉と野菜と香辛料を挟んだ料理です。" msgid "sloppy joe" msgstr "スラッピー・ジョー" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "サンドイッチ(人肉)" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "変異%s" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26628,6 +27810,20 @@ msgstr "ひき肉とトマトソースをハンバーガー用のパンで挟ん msgid "taco" msgstr "タコス" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "人肉%s" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "変異%s" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26639,6 +27835,12 @@ msgstr "コーンのトルティーヤで肉の詰め物を巻いた、メキシ msgid "pickled meat" msgstr "肉(酢漬け)" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "人肉(酢漬け)" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26649,6 +27851,14 @@ msgstr "新鮮なまま容器に詰めた漬け込み肉です。味も栄養も msgid "dehydrated meat" msgstr "乾燥肉" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "%s(人肉)" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26672,6 +27882,14 @@ msgid "haggis" msgid_plural "haggii" msgstr[0] "ハギス" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "人肉%s" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26699,6 +27917,13 @@ msgid "meat temaki" msgid_plural "meat temaki" msgstr[0] "手巻き寿司(肉)" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "変異%s" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26731,6 +27956,13 @@ msgstr "腐敗から守るために乾燥させた汚染肉です。食べられ msgid "pelmeni" msgstr "ペリメニ" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "変異%s" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26742,6 +27974,12 @@ msgstr "薄い生地で肉を包んだ餃子のような美味しい料理です msgid "homemade burrito" msgstr "自家製ブリート" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "自家製変異肉ブリート" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26751,304 +27989,6 @@ msgid "" msgstr "" "トウモロコシ粉で作ったトルティーヤで肉と野菜を巻いて作った、伝統的なメキシコ料理です。見た目はガソリンスタンドでよく見かけるものと同じですが、味は自家製の方が上です！" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "乾燥人肉" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "乾燥させた人肉です。適切な環境に置いておく事で、長期に渡る保存が可能です。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "水で戻した人肉" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "乾燥させた人肉を水で戻したものです。そのまま食べるよりずっと美味しく頂けます。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "ハギス(人肉)" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"スコットランドの伝統料理です。人間の肉と内臓、オートミール等を混ぜて人間の胃袋に詰め込み、口を縫い合わせて丸ごと茹で、風味豊かなプディングにしたものです。これに茹でた根菜と強いウイスキーでもあれば、もう言うことはありません。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "人肉ボローニャソーセージ" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" -"加工した人肉のスライスです。材料の生前の名前はオスカーでしょうか。あなたが冷血な人間であるように、この食料も冷たい状態で美味しく食べられます。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "人肉カレーヴォルスト" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "カレー粉とケチャップがまぶしてある人肉ソーセージです。かなり辛いけどとってもおいしい！" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "グレービーソース(マンヴォルスト)" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "ビスケットと人肉、おいしいキノコスープをものすごく美味しいドロドロと一緒に煮込んだものです。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "アスピック(人肉)" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "フランス料理の一種で、人間の骨肉を煮たブイヨンをゼリー状にした料理です。食人嗜好の持ち主なら美味しく食べられるでしょうね。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "人肉ペミカン" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "動物性脂肪とタンパク質から作った高エネルギー食品です。獣脂と食用植物、そして不幸な犠牲者が材料です。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "サンドイッチ(人肉)" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "人肉をパンで挟んだ物、驚きだな！" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "サンドイッチ(あいつデラックス)" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "" -"あいつの肉、野菜、チーズ、そして各種の調味料を挟んだ豪華版サンドイッチです。昨日の敵は今日の飯、その魂までも味わって腹の足しにしてやりましょう！" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "人肉ヘルパー" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "手近にある適当な人肉とチーズをパスタに絡めた食べ物です。殺人的な美味しさです。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "チリコンカルネ(人肉)" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "スパイシーなシチューです。チリペッパー、人肉、トマト、豆などが入っています。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "人肉パイ" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "兵士か、科学者とか、知らねえや、まあとにかく、何かの肉が入ったパイで、うめえのなんの！" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "人肉ピザ" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "人肉食系には堪らないヒューマンミートピザです。挽人肉がたっぷり入っており、濃厚な二本足生物の味わいを楽しめます。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "薄切り人肉" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "加熱調理してから容器に詰めた、塩分の少ない保存用の人肉です。多くの栄養を含みますが調理した人肉独特の匂いがあります。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "薄切り人肉(塩漬け)" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "真空パックされた塩漬けの薄切り人肉です。しょっぱいですが、これを開封しなければいけない状況なら美味しく頂けるでしょう。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "スパゲッティ(人肉)" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "トマトベースの重量感ある人肉ミートソースがたっぷりとかかったスパゲッティです。こういうのが好きな人にはたまらない味です。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "ラザーニャ(人肉)" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "チーズ、肉、ラザニア生地を順番に積み重ねて作る、非常に歴史の古いパスタ料理。人間の肉を使うことでより美味しくなりました。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "チーズ人肉バーガー" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "" -"パンに人肉のミンチと野菜と香辛料と更にはチーズを挟んだ料理です。大変動以前のカニバリズム料理界における至高の一品と言っても過言ではないでしょう。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "人肉バーガー" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "このハンバーガーにはアメリカ食品医薬品局の基準を上回る、4%以上の人肉が含まれています。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "サンドイッチ(人肉)" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "サンドイッチ...そう、サンドイッチなんだけど、これは人肉で作られているんだ！" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "人肉タコス" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "牛の代わりに人間の挽き肉を使ったタコスです。なぜでしょう、遠くでベルが鳴っています。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "生人肉ソーセージ" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "燻製や調理の準備が整った、生の「ロングポーク」ソーセージです。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "マンヴォルスト(調理済)" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "調理済みの「ロングポーク」ソーセージです。人間らしく美味しい匂いがします。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "マンヴォルスト" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "細かく刻んだ人肉で作った、ドイツ風ソーセージの一種です。新鮮なものを熱いうちに召し上がれ。材料はドイツ人の肉でなくてもかまいません。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "人肉(酢漬け)" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "新鮮なまま容器に詰めた漬け込み人肉です。味も栄養も申し分ありません。" - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -27822,7 +28762,7 @@ msgstr "フレーバー固形骨粉" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" "骨粉から自作したカルシウムサプリメントです。甘味料を混ぜることで骨の舌触りと味を誤魔化し、大変動前に市販されていた錠剤とほぼ同程度の美味しさに仕上げました。" @@ -28410,7 +29350,7 @@ msgstr "血清(鳥)" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "大変動以前の空を思わせる色の、濃縮された変異原物質です。使用するには注射器が必要ですが...本気ですか？" @@ -29278,10 +30218,10 @@ msgstr[0] "ゼラチン(マーロス)" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" -"きらきらと輝くレモン色のゼラチン質の塊です。大変動以前にあったジェロー(jello)というゼリー菓子を思い出します。食欲をそそる強烈な芳香を放っています。突然変異で生まれたか、または地球外からやってきたか、どちらにせよ、かつての地球には存在しなかった植物の分泌物です。" +"大変動以前に流通していたジェロー(jello)というゼリー菓子によく似た、レモン色のゼラチン質です。食欲をそそる強烈な芳香を放っていますが、明らかに突然変異体、もしくは異界から来た存在です。" #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -29547,13 +30487,13 @@ msgstr[0] "ドッグフード" msgid "This is food for dogs. It smells strange, but dogs seem to love it." msgstr "犬用の餌です。変な匂いがしますが、犬はこれが大好き。" -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "キャットフード" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "猫用の餌です。変な匂いがしますが、猫はこれが大好き。" @@ -29590,56 +30530,27 @@ msgstr[0] "花蜜" msgid "Some nectar. Seeing this item is a bug." msgstr "花の蜜です。このアイテムが見えている場合はバグが発生しています。" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "プロテインドリンク" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "人肉ドリンク" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "人肉パウダーを水で溶いた飲み物です。非常に栄養価が高いものの、美味しくはありません。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" -msgstr[0] "人肉パウダー" - -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "人間から精製された粉末状のタンパク質です！非常に栄養価が高いものの、粉のままでは摂取できません。水と共に加工してみましょう。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "人肉シェイク" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "人肉パウダーと果物で作られた、栄養価が高くて美味しい飲み物です。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "強化人肉シェイク" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "純粋なヒトタンパク質と栄養価の高い果実から作られた、栄養価が高くて美味しい飲み物です。ビタミンやミネラルを豊富に含んでいます。" - +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "プロテインドリンク" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" +msgstr[0] "変異%s" #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py @@ -29653,6 +30564,13 @@ msgid "protein powder" msgid_plural "protein powder" msgstr[0] "プロテインパウダー" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "人肉パウダー" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29661,12 +30579,10 @@ msgid "" msgstr "粉末状のタンパク質です。非常に栄養価が高いものの、粉のままでは摂取できません。水と共に加工してみましょう。" #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "非常用プロテインバー" +msgid "protein ration" +msgstr "プロテインバー" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -29683,6 +30599,12 @@ msgstr "" msgid "protein shake" msgstr "プロテインシェイク" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "人肉シェイク" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29694,6 +30616,13 @@ msgstr "プロテインパウダーと果物で作られた、栄養価が高く msgid "fortified protein shake" msgstr "強化プロテインシェイク" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "強化人肉シェイク" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30448,7 +31377,13 @@ msgstr "美味しい焼きチーズのサンドイッチです。こんがりと #: lang/json/COMESTIBLE_from_json.py msgid "deluxe sandwich" msgid_plural "deluxe sandwiches" -msgstr[0] "サンドイッチ(デラックス)" +msgstr[0] "サンドイッチ(DX)" + +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "サンドイッチ(変異DX)" #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py @@ -30537,6 +31472,20 @@ msgid "meat sandwich" msgid_plural "meat sandwiches" msgstr[0] "サンドイッチ(肉)" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "サンドイッチ(人肉)" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "変異%s" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -31423,15 +32372,6 @@ msgstr "だし汁(骨)" msgid "A tasty and nutritious broth made from bones." msgstr "骨を煮込んで作った、栄養価が高く美味しいスープです。" -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "だし汁(人骨)" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "人骨を煮込んで作ったスープです。" - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "野菜スープ" @@ -31445,6 +32385,12 @@ msgstr "栄養価が高く美味で健康的な野菜スープです。" msgid "meat soup" msgstr "肉煮込みスープ" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "人肉煮込みスープ" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -31474,6 +32420,12 @@ msgid "curry with meat" msgid_plural "curries with meat" msgstr[0] "ミートカレー" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "変異肉カレー" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -31483,20 +32435,17 @@ msgstr "肉と香辛料がたっぷりと入ったスパイシーな食べ物で msgid "woods soup" msgstr "森のスープ" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "森の変異スープ" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "自然の恵みから作られた、栄養価が高く美味しいスープです。" -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "人肉煮込みスープ" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "見知らぬ誰かを美味しく調理した人肉煮込みスープです。" - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "チキンヌードル" @@ -31859,7 +32808,7 @@ msgstr "炒めた豆腐をご飯と和えて濃く甘く味付けしました。 #: lang/json/COMESTIBLE_from_json.py msgid "deluxe vegetarian beans and rice" msgid_plural "deluxe vegetarian beans and rice" -msgstr[0] "デラックス豆飯(野菜)" +msgstr[0] "DX豆飯(野菜)" #. ~ Description for deluxe vegetarian beans and rice #: lang/json/COMESTIBLE_from_json.py @@ -32258,7 +33207,7 @@ msgstr "空腹を満たす栄養価の高い食べ物です。古くからニュ #: lang/json/COMESTIBLE_from_json.py msgid "deluxe cooked oatmeal" -msgstr "デラックスオートミール(調理済)" +msgstr "DXオートミール(調理済)" #. ~ Description for deluxe cooked oatmeal #: lang/json/COMESTIBLE_from_json.py @@ -32456,7 +33405,7 @@ msgstr "濃い色に焼き上がった、非常に美味しそうな丸いパン #: lang/json/COMESTIBLE_from_json.py msgid "cheap wine must" -msgstr "ワイン(未発酵/安物)" +msgstr "ワイン(安物/未発酵)" #. ~ Description for cheap wine must #: lang/json/COMESTIBLE_from_json.py @@ -32512,17 +33461,6 @@ msgid "" " resembles spoiled milk." msgstr "水に溶かして味を薄めた栄養剤です。腐った牛乳の味に驚くほどよく似ています。" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "練り粉" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "穀粉と水を混ぜ合わせた、粘性の高いペーストです。穀粉をそのまま使うより効率よくパンを焼けます。" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "サンデュー" @@ -32572,6 +33510,17 @@ msgid "" msgstr "" "太陽ジェルと何種類かの薬品を混合した溶液ですが、元の薬品の効果はまったく残っていません。鎮痛作用は依然としてありますが、興奮ではなく鎮静作用をもっています。CBMを移植する際の麻酔薬として利用できます。" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "練り粉" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "穀粉と水を混ぜ合わせた、粘性の高いペーストです。穀粉をそのまま使うより効率よくパンを焼けます。" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "変異原物質(吸血鬼)" @@ -32590,9 +33539,9 @@ msgstr "血清(吸血鬼)" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" -msgstr "濃縮された変異原物質です。真っ黒の液体に銀色の粒子が浮かぶ、星空のような液体です。使用するつもりなら注射器が必要ですが…。" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" +msgstr "真っ黒な液体に銀色の粒子が浮かぶ、星空を連想させる濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？" #: lang/json/COMESTIBLE_from_json.py msgid "wendigo mutagen" @@ -32606,9 +33555,10 @@ msgstr "血清(ウェンディゴ)" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" -msgstr "濃縮された変異原物質です。きらびやかな緑色の粒子が浮かぶ、森のような液体です。使用するつもりなら注射器が必要ですが…。" +msgstr "" +"泥炭のような茶色の液体にきらびやかな緑色の粒子が浮かぶ、深い森を連想させる濃縮された変異原物質です。使用するなら注射器が必要ですが...本気ですか？" #: lang/json/COMESTIBLE_from_json.py msgid "SpOreos" @@ -32858,17 +33808,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "死んだシュリーカーから採取したキノコです。ポーションの材料になります。" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "太紐(樹脂)" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "紐と天然の接着剤で作られた原始的な結合素材です。木、紙、骨、キチンで作られたアイテムを修復するために使用します。" - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "ラムネ菓子の死体" @@ -32876,8 +33815,8 @@ msgstr "ラムネ菓子の死体" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "ラムネ菓子の死体です。どこからどう見ても巨大なラムネ菓子そのものです。一口ぐらいかじってもいいかな？" #: lang/json/COMESTIBLE_from_json.py @@ -32900,7 +33839,7 @@ msgstr[0] "果粒のような物体" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "もし我々がこの物体を放置すれば、他の者が「花畑」に侵入し「果実」を摂取するだろう。そのような事態を許容すべきではない。" #: lang/json/COMESTIBLE_from_json.py @@ -32912,7 +33851,7 @@ msgstr[0] "種子のような物体" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "もし我々がこの物体を放置すれば、他の者が「庭園」に侵入し「種子」を摂取するだろう。そのような事態を許容すべきではない。" #: lang/json/COMESTIBLE_from_json.py @@ -32924,7 +33863,7 @@ msgstr[0] "ゼラチン(マーロス)" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "もし我々がこの物体を放置すれば、他の者が「尖塔」に侵入し「樹液」を摂取するだろう。待て、お前はどのようにしてこれを手に入れた？" #: lang/json/COMESTIBLE_from_json.py @@ -32935,8 +33874,8 @@ msgstr[0] "果実のような物体" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" "我々は現時点では存在しない。少し知恵の働く人間が、デバッグ中に発見したものと推測する。我々が存在を隠している間は、我々に加わることを許可しない。" @@ -33050,7 +33989,7 @@ msgstr[0] "グルテンフリーサンドイッチ(PB&H)" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "どっかの馬鹿がこのピーナッツバターサンドイッチに蜂蜜掛けやがった、ったくどんな神経して…あれ、いけるぞこれ。しかもグルテンフリーだ！" #: lang/json/COMESTIBLE_from_json.py @@ -33072,15 +34011,15 @@ msgstr "ヒッコリーナッツアンブロシア" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." -msgstr "美味しいヒッコリーナッツのエキスです。神々の飲料です。牛乳の代用品として使われます。" +msgstr "美味しいピーカンナッツのエキスです。神々の飲料です。牛乳の代用品として使われます。" #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "トウモロコシの粉か...それとも米粉か...そういった類のものです。明らかに小麦粉ではありません！パンなどを焼く際の材料になります。" #: lang/json/COMESTIBLE_from_json.py @@ -33090,8 +34029,8 @@ msgstr "コーンケーキ(グルテンフリー)" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "誰にでも時折こういうケーキを無性に食べたくなることがあるものです。美味しくて栄養価の高いグルテンフリーの揚げパンです。" #: lang/json/COMESTIBLE_from_json.py @@ -33129,7 +34068,7 @@ msgstr[0] "フルーツパンケーキ(穀物乳糖不使用)" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" "本物のメープルシロップを使用した、ふんわりと美味しいグルテン/ラクトースフリーのパンケーキに、果物を加えて、更に美味しく、健康的になるように仕上げました。" @@ -33166,8 +34105,8 @@ msgstr[0] "フレンチトースト(穀物乳糖不使用)" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" "ラクトースフリーのミルクと卵を混ぜた物にグルテンフリーの薄切りパンを浸けて、それから軽く炒めました。このような食べ物ができるとは思ってもみませんでした。未来を感じますね。" @@ -33258,9 +34197,8 @@ msgstr "チーズバーガー(グルテンフリー)" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." -msgstr "" -"グルテンフリーのパンに挽肉と野菜と香辛料、更にはチーズを挟んだ料理です。大変動以前の料理界における至高の一品と言っても過言ではないでしょう。" +"of pre-Cataclysm culinary achievement." +msgstr "グルテンフリーのパンに挽肉と野菜と香辛料、更にはチーズを挟んだ料理です。大変動以前の料理界における至高の一品です。" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -33329,7 +34267,7 @@ msgstr "美味しい焼きチーズのグルテンフリーサンドイッチで #: lang/json/COMESTIBLE_from_json.py msgid "gluten free deluxe sandwich" msgid_plural "gluten free deluxe sandwiches" -msgstr[0] "グルテンフリーサンドイッチ(デラックス)" +msgstr[0] "グルテンフリーサンドイッチ(DX)" #. ~ Description for gluten free deluxe sandwich #: lang/json/COMESTIBLE_from_json.py @@ -33379,7 +34317,7 @@ msgstr[0] "グルテンフリーサンドイッチ(ソース)" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "あまりにもシンプルなソースのグルテンフリーサンドイッチです。物足りませんが、ただパンを貪るよりはいいでしょう。" #: lang/json/COMESTIBLE_from_json.py @@ -33388,7 +34326,7 @@ msgstr "ワッフル(グルテンフリー)" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." msgstr "一般的な格子模様のグルテンフリーワッフルです。" #: lang/json/COMESTIBLE_from_json.py @@ -33397,13 +34335,13 @@ msgstr "ワッフル(乳糖不使用)" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." msgstr "一般的な格子模様のラクトースフリーワッフルです。" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "一般的な格子模様のグルテン/ラクトースフリーワッフルです。" @@ -33449,7 +34387,7 @@ msgstr[0] "ライスミルク" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "本物の牛乳よりも甘く、バニラアイスのような味がします。腐りやすい飲み物です。" @@ -33461,7 +34399,7 @@ msgstr[0] "ココナッツジュース" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "ココナッツジュースを水で薄めて量を増やしたものです。美味しいですが、腐りやすい飲み物です。" @@ -34235,6 +35173,16 @@ msgid "" "it's anyone's guess what it's for." msgstr "紳士のための風船、使い切りの避妊具、指のないラテックス製手袋です。簡易的な水筒として使えますが、他の使い道は誰にも分かりません。" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "風船(3.75L)" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "子供が遊ぶための風船です。即席の液体容器として使えます。" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -34958,6 +35906,26 @@ msgid "corpse" msgid_plural "corpses" msgstr[0] "死体" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "(内臓摘出)" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "%s(皮剥)" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "(部位解体)" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -34975,12 +35943,7 @@ msgid "" " so with a gigantic claw." msgstr "損傷の多い乾ききった死体です。巨大な爪で殺されたようです。" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "人間の死体" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "人間の死体です。" @@ -35070,10 +36033,37 @@ msgid "" "wound." msgstr "顎から上が消失した死体です。何が原因でこうなったのか見当もつきません。" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "マイクロ波発生装置" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "電子レンジを使う際にマイクロ波を発生させる電子部品です。" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "磁気濃縮型爆薬発電機" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" +"高性能爆薬で満たされた大きな銅管に銅線が巻きつけられた形状の、大きな装置です。爆薬が上手く爆発すると、非常に短時間で大量の電気エネルギーを生成します。" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" -msgstr[0] "フェイクアイテム" +msgstr[0] "疑似アイテム" #. ~ Description for fake item #: lang/json/GENERIC_from_json.py @@ -36723,7 +37713,137 @@ msgstr[0] "ダイヤモンド" #. ~ Description for diamond #: lang/json/GENERIC_from_json.py msgid "A sparkling diamond." -msgstr "キラキラとした輝きを放つダイヤモンドです。" +msgstr "光り輝くダイヤモンドです。" + +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "ガーネット" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "光り輝くガーネットです。" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "アメシスト" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "光り輝くアメシストです。" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "アクアマリン" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "光り輝くアクアマリンです。" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "エメラルド" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "光り輝くエメラルドです。" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "アレキサンドライト" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "光り輝くアレキサンドライトです。" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "真珠" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "艶やかな真珠です。" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "ルビー" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "光り輝くルビーです。" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "ペリドット" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "光り輝くペリドットです。" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "サファイア" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "光り輝くサファイアです。" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "オパール" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "艶やかなオパールです。" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "トルマリン" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "光り輝くトルマリンです。" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "黄水晶" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "光り輝く黄水晶です。" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "トパーズ" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "光り輝くブルートパーズです。" #: lang/json/GENERIC_from_json.py msgid "cured hide" @@ -37284,7 +38404,7 @@ msgid "" "This gas damages and slows those who enter it, as well as obscuring vision " "and scent." msgstr "" -"有毒性の刺激物が充填された、円筒型手榴弾です。使用してピンを引き点火します。有毒ガスが噴出するまで5ターンの時間が掛かります。ガスを浴びるとダメージを受け、また、ガス内では動きが鈍り、視覚と嗅覚が阻害されます。" +"有毒性の刺激物が充填された、円筒型手榴弾です。使用するとピンを引いて起動し、5ターン後に有毒ガスが噴出します。ガスを浴びるとダメージを受け、ガス内では動きが鈍り、視覚と嗅覚が阻害されます。" #: lang/json/GENERIC_from_json.py msgid "armed tear gas canister" @@ -37311,7 +38431,7 @@ msgid "" "black smoke. This smoke will slow those who enter it, as well as obscuring " "vision and scent." msgstr "" -"煙を出す様々な化学物質を充填した円筒型手榴弾です。使用してピンを引き点火します。濃い黒煙が噴出するまで5ターン掛かります。煙は視界と嗅覚を阻害するだけでなく、吸い込むと動きを鈍くします。" +"煙を出す様々な化学物質を充填した円筒型手榴弾です。使用するとピンを引いて起動し、5ターン後に濃い黒煙が噴出します。煙は視界と嗅覚を阻害するだけでなく、吸い込むと動きを鈍くします。" #: lang/json/GENERIC_from_json.py msgid "armed smoke bomb" @@ -37336,7 +38456,7 @@ msgid "" "grenade. In five turns it will begin to expel a volatile spray that is " "highly toxic to fungal life forms." msgstr "" -"殺真菌剤の溶液が充填された、円筒型手榴弾です。使用してピンを引き点火すると、5ターン後に真菌生命体に対して非常に有毒な揮発性ガスが噴出します。" +"殺真菌剤の溶液が充填された、円筒型手榴弾です。使用するとピンを引いて起動し、5ターン後に真菌生命体に対して非常に有毒な揮発性ガスが噴出します。" #: lang/json/GENERIC_from_json.py msgid "armed fungicidal gas canister" @@ -37362,7 +38482,7 @@ msgid "" " to pull the pin and light the fuse, turning it into an active insecticidal " "grenade. In five turns it will begin to expel a volatile spray that is " "highly toxic to insect life forms." -msgstr "殺虫剤の溶液が充填された、円筒型手榴弾です。使用してピンを引き点火すると、5ターン後に虫に対して非常に有毒な揮発性ガスが噴出します。" +msgstr "殺虫剤の溶液が充填された、円筒型手榴弾です。使用するとピンを引いて起動し、5ターン後に虫に対して非常に有毒な揮発性ガスが噴出します。" #: lang/json/GENERIC_from_json.py msgid "armed insecticidal gas canister" @@ -37389,7 +38509,7 @@ msgid "" "fungicidal grenade. In five turns it will begin to expel a volatile spray " "that is highly toxic to fungal life forms." msgstr "" -"殺真菌剤の溶液が充填された、円筒型の簡易手榴弾です。使用してピンを引き点火すると、5ターン後に真菌生命体に対して非常に有毒な揮発性ガスが噴出します。" +"殺真菌剤の溶液が充填された、円筒型の簡易手榴弾です。使用するとピンを引いて起動し、5ターン後に真菌生命体に対して非常に有毒な揮発性ガスが噴出します。" #: lang/json/GENERIC_from_json.py msgid "armed makeshift fungicidal gas canister" @@ -37415,7 +38535,7 @@ msgid "" " this item to pull the pin and light the fuse, turning it into an active " "insecticidal grenade. In five turns it will begin to expel a volatile spray" " that is highly toxic to insect life forms." -msgstr "殺虫剤の溶液が充填された、円筒型の簡易手榴弾です。使用してピンを引き点火すると、5ターン後に虫に対して非常に有毒な揮発性ガスが噴出します。" +msgstr "殺虫剤の溶液が充填された、円筒型の簡易手榴弾です。使用するとピンを引いて起動し、5ターン後に虫に対して非常に有毒な揮発性ガスが噴出します。" #: lang/json/GENERIC_from_json.py msgid "armed makeshift insecticidal gas canister" @@ -37692,9 +38812,9 @@ msgstr[0] "セスタス" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." -msgstr "拳を覆い、打撃力を増した重金属製の武具です。装着者の手を守るため、裏側にはしっかりと当て布がしてあります。" +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." +msgstr "拳の位置に金属板を組み込んだ、革製のハンドラップです。パンチ力と防御力が向上します。" #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -38383,17 +39503,17 @@ msgstr[0] "キャタピラ(小型戦車用)" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "小型無人戦車などで使われている小型戦車用の履帯です。" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" msgstr[0] "シャシー(タレット)" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." -msgstr "タレットから全ての稼働部品と電子機器を取り除いて残った、骨組みと装甲部品です。" +"skeleton of a turret." +msgstr "タレットから全ての稼働部品と電子機器を取り除いて残った骨組みです。" #: lang/json/GENERIC_from_json.py msgid "tripod chassis" @@ -39716,7 +40836,7 @@ msgid "" "polearms, there is a chapter about the many variations of common polearms… " "there are even pictures!" msgstr "" -"長柄武器を使った様々な戦闘技術の解説が載っている、現代語訳された中世の教本です。色々なな長柄武器の扱い方が記されており...更にはイラストも添えられています！" +"長柄武器を使った様々な戦闘技術の解説が載っている、現代語訳された中世の教本です。色々な長柄武器の扱い方が記されており...更にはイラストも添えられています！" #: lang/json/GENERIC_from_json.py msgid "Historic European Swordfighting" @@ -40273,6 +41393,276 @@ msgid ".50 ammo belt linkage" msgid_plural ".50 ammo belt linkages" msgstr[0] "弾帯接続金具(.50口径)" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "衛生用品汎用" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "汎用アイテムテンプレート" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "石鹸皿" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "石鹸を置くための浅い皿です。水捌けを良くするために底が凸凹になっています。別に面白い道具ではありません。" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "髭剃り用剃刀" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "持ちやすい棒が付いた剃刀です。刃をそのまま使うよりも簡単に扱えます。" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "歯ブラシ" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "歯を綺麗にするために使う、毛が柔らかいプラスチック製のブラシです。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "歯を綺麗にするために使う、毛が柔らかいプラスチック製のブラシです。持ち手は色むらがあり安っぽく、恐らく使い捨ての製品のようです。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "歯ブラシと歯ぐきマッサージブラシが合わさった製品です。人間工学に基づいたシリコングリップも備わっています。豪華ですね！" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "歯を綺麗にするために使う、毛が柔らかいプラスチック製のブラシです。青色と白色の模様が入った持ち手が清潔感を醸し出しています。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "子供用の短い歯ブラシです。持ち手には瞳の大きなポニーのイラストが描かれています。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "子供用の短い歯ブラシです。持ち手にはニヤリと笑う赤色のレーシングカーが描かれています。" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "ヘアブラシ" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "髪を責め苛む道具です。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "髪を責め苛む道具です。安全のため毛先が丸くなっています。" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "木目調の持ち手が付いた昔ながらの髪を整える道具です。" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "毛が柔らかいクッション付きのヘアブラシです。光沢のあるクロムメッキのデザインが現代的です。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "安っぽい子供用のヘアブラシです。持ち手には非常に友好的に見えるクジラのイラストが描かれています。" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "ヘアカーラー" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "髪の毛を巻き付けてカールさせる、柔らかいプラスチック製の筒です。" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "デンタルフロス" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" +"プラスチックの容器の中に全長約22.8mのワックスが付いた細い糸が入っています。歯に挟まった燻製肉を取り除くのに最適です。分解すれば糸を別の用途に使えそうです。" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "櫛" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "たくさんの切れ込みが並んだ、髪をまっすぐにするための道具です。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "真新しいように見える櫛ですが、どういう訳か端の歯が折れてしまっています。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "たくさんの切れ込みが並んだ、髪をまっすぐにするための道具です。歯の間隔が狭い黒色の質素な櫛です。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "軟質プラスチック製の櫛です。べっこうのような模様が入っており骨董品のようにも見えます。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "不良がよく使っている、中央から折り畳めるタイプの櫛です。" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "ラバーカップ" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "パイプの詰まりを解消するために使うゴム製の道具です。未熟な生存者にとっては棍棒の替わりにもなります。" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "業務用ラバーカップ" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" +"このプラスチック製ラバーカップの先端はアコーディオンのように圧縮できる構造になっています。意図された目的で使うなら効率的ですが、武器として使うなら全く役立ちません。" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "トイレットペーパー" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "贅沢な文明の名残です。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "まず、自作できる最も薄く最も使い捨てやすい紙を想像しましょう。それよりも更に薄い紙がこれです。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "ミシン目が入った二枚重ねのトイレットペーパーです。家屋に対するイタズラがこれまで以上に快適になります。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "このブランドのトイレットペーパーは完全に水に溶けるように作られています！" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "あまり好かれていない政治家のイラストが並んで印刷されています。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "贅沢な文明の名残です。しかし、この製品には所々に未処理の木材の破片が入っているため、そこまで贅沢には思えません。" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "ドライヤー" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "熱したコイルに通した空気を吹き付けて髪を乾かす道具です。電力が確保できないなら、ただのモーターが入った文鎮です。" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "ヘアアイロン" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "耐熱セラミックが張られた棒状の道具です。コンセントに差し込めば髪を熱してカールさせられますが、残念ながら電気が来ていません。" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "トイレブラシ" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "この硬いブラシは便器を洗うときにしか役立ちません。ゾンビを威圧したり侮辱したりもできません。" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -40399,14 +41789,38 @@ msgid "An empty casing from a 10mm Auto round." msgstr "10mmオート弾の空薬莢です。" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "空円筒弾(40mm擲弾)" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "空薬莢(40x46mm/M212)" + +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing +#: lang/json/GENERIC_from_json.py +msgid "A large canister from a spent 40mm cartridge." +msgstr "使用済みの40mm弾の大型薬莢です。" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "空薬莢(40x46mm/M118)" -#. ~ Description for 40mm canister #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "使用済みの40mmグレネード弾です。" +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "空薬莢(40x46mm/M199)" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "空薬莢(40x46mm/M195)" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "空薬莢(40x53mm/M169)" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -40739,16 +42153,6 @@ msgid "generic silverware" msgid_plural "generic silverwares" msgstr[0] "汎用銀器" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "汎用アイテムテンプレート" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -43305,6 +44709,26 @@ msgid "" msgstr "" "実験用スタンドに取り付けられるクランプ類がたくさん入った小さな箱です。全てのクランプから最低1本のナットがなくなっており、結束紐やダクトテープなど様々なもので慎重に修復されています。" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "ホッチキス" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "紙をまとめて固定するための道具です。" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "ペン" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "プラスチック製のボールペンです。" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -44828,10 +46252,10 @@ msgstr[0] "暗号通貨" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" -"表面に乱数列がエンボス加工された、物理的に存在する硬貨です。PrepNetと呼ばれる人々は、追跡不可能なネットワーク貨幣を利用した租税回避に深く関わっていました。この行為がエスカレートすれば米国の税基盤が損なわれる可能性もありましたが、それより先に大変動が訪れました。" +"PrepNetと呼ばれる集団は、追跡不可能なネットワーク貨幣を利用した租税回避に深く関わっていました。この行為がエスカレートすれば米国の税基盤が損なわれる可能性もありましたが、それより先に大変動が訪れました。表面に乱数列がエンボス加工された、物理的に存在する硬貨です。" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py msgid "vehicle refrigerator" @@ -44954,12 +46378,81 @@ msgstr[0] "アトミックバター撹拌機(折畳)" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." msgstr "" "Rivtechチャーニネーター4000は13もの宗教団体に使用禁止を言い渡された唯一のバター撹拌機です。持ち運びやすいように足が折り畳まれています。一般的なバターの製造には生乳から分離した生クリームが必要ですが、この撹拌機は生乳、塩、光り輝く物体に対する当然の敬意を揃えさえすれば大丈夫です。" +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "脳缶" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" +"缶の中には、人間の脳みそがミ＝ゴの技術によって生きたままの状態で入っています。缶には金属製のコードがいくつも繋がっており、何かの機械に接続できるようです。" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "震える心臓" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" +"複数の弁が付いた心臓のような形状の器官です。生体兵器の死体から上手く切り出すと、弁が閉じて中身は密封されました。落ち着ける場所を待っているかのように、手の中で静かに震えています。" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "感覚器官" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" +"一定間隔で音を発する、様々な形の突起が付いた肉塊です。恐らくは、エコーロケーション機能を持っているのでしょう。他のミ＝ゴ製生体パーツ同様、この器官の切断面も封鎖され、内部エネルギーが減少するにつれて音の発生間隔は次第に遅くなり、最終的には休止状態になるようです。" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "シャシー(生体タレット)" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" +"イソギンチャクとドラゴンの顔を掛け合わせたような形状の、生体兵器の中核をなす部品です。これを使ってなにが作れるのか想像もつきませんが、きっと使い道があるはずです。" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "壊れた生体タレット" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." +msgstr "壊れた生体タレットです。名状しがたい液体と臭気を漏らしています。部品を取り外せそうです。" + #: lang/json/GENERIC_from_json.py msgid "hydraulic gauntlet" msgid_plural "hydraulic gauntlets" @@ -46913,9 +48406,22 @@ msgstr[0] "呪文書(インビジビリティ)" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" msgstr "自分から望まない限り、全身が光を反射しなくなります。完全な透明です！" +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "呪文書(オブファスケーテッド・ボディ)" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." +msgstr "魔法のオーラが身体の周りの光を歪め、敵の攻撃が避けやすくなります。" + #: lang/json/GENERIC_from_json.py msgid "Scroll of Smite" msgid_plural "Scroll of Smites" @@ -48020,6 +49526,16 @@ msgstr[0] "呪文書(名もなき呪文書)" msgid "A small book, containing spells created by a novice magician." msgstr "魔術の初心者によって書かれた、呪文などが載っている小さな本です。" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "呪文書(光と偽りについて)" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "小さな白い本です。周囲の光をわずかに増幅させています。" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -48183,6 +49699,45 @@ msgid "" msgstr "" "人間は自己を改善しようとする唯一の生物です。この論文にはより恒久的な解決策の発見を目指して、一時的に様々な能力を高める様々な呪文についての考察が書かれています。" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "グレートクラブ" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "端に大きな持ち手が付いた、節くれだった頑丈な棍棒です。非常に重いですが、力の強い者が持てばとても効果的な武器になります。" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "ウッドトライデント" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" +"先端に鍛造した鋼製のフォークを取り付けた、木製の武器です。近接武器の他にも投擲して敵に突き刺すこともでき、上手く扱えば敵の武装解除も可能です。" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "棘付きジャベリン" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "投擲精度を高める矢羽がついた、長さ約90cmの武器です。先端には邪悪な見た目の棘が複数付いており、命中すれば酷い出血を引き起こします。" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -48501,7 +50056,7 @@ msgstr[0] "壊れた高速ロボット(武装解除)" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" "壊れた高速ロボットです。内蔵されていた銃器モジュールは取り外してあります。部品を取り外す、他のロボットの製作材料にするなどの使い道があります。" @@ -48527,7 +50082,7 @@ msgstr[0] "壊れた防衛ロボット(武装解除)" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" "壊れた防衛ロボットです。内蔵されていた銃器モジュールは取り外してあります。部品を取り外す、他のロボットの製作材料にするなどの使い道があります。" @@ -48560,7 +50115,7 @@ msgstr[0] "壊れたチキンウォーカー(武装解除)" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" "壊れたチキンウォーカーです。内蔵されていた銃器モジュールは取り外してあります。部品を取り外す、他のロボットの製作材料にするなどの使い道があります。" @@ -49055,7 +50610,7 @@ msgstr[0] "壊れたジャンク・カウボーイ" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "壊れて完全に動作を停止したロボットです。解体するか他の製作に利用できそうです。" #: lang/json/GENERIC_from_json.py @@ -49081,8 +50636,8 @@ msgstr[0] "壊れた軍用訓練ロボット" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "壊れて動かなくなった軍用訓練ロボットです。内蔵された高出力ペイントボールガンで武装しています。解体して部品を取り外せそうです。" #: lang/json/GENERIC_from_json.py @@ -49093,43 +50648,43 @@ msgstr[0] "壊れた軍用ロボット" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "壊れて動かなくなった軍用ロボットです。内蔵された5.56mm銃器で武装しています。解体して部品を取り外せそうです。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "壊れて動かなくなった軍用ロボットです。内蔵された7.62mm銃器で武装しています。解体して部品を取り外せそうです。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "壊れて動かなくなった軍用ロボットです。内蔵された.50口径銃器で武装しています。解体して部品を取り外せそうです。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "壊れて動かなくなった軍用ロボットです。内蔵された8x40mm銃器で武装しています。解体して部品を取り外せそうです。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "壊れて動かなくなった軍用ロボットです。内蔵された矢弾を発射する銃器で武装しています。解体して部品を取り外せそうです。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "壊れて動かなくなった軍用ロボットです。内蔵された40mmグレネードランチャーで武装しています。解体して部品を取り外せそうです。" #: lang/json/GENERIC_from_json.py @@ -49140,8 +50695,8 @@ msgstr[0] "壊れた軍用火炎放射ロボット" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "壊れて動かなくなった軍用ロボットです。内蔵された火炎放射器で武装しています。解体して部品を取り外せそうです。" #: lang/json/GENERIC_from_json.py @@ -49154,8 +50709,10 @@ msgstr[0] "壊れたロボガーディアン" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "壊れたロボットです。解体するか他の製作に利用できそうです。" #: lang/json/GENERIC_from_json.py @@ -49165,7 +50722,7 @@ msgstr[0] "壊れた高級ロボット" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "壊れた高級ロボットです。解体するか他の製作に利用できそうです。" #: lang/json/GENERIC_from_json.py @@ -49186,7 +50743,7 @@ msgstr[0] "壊れた改良型ロボット(武装解除)" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" "壊れた改良型ロボットです。内蔵されていた銃器モジュールは取り外してあります。部品を取り外す、他のロボットの製作材料にするなどの使い道があります。" @@ -49199,29 +50756,29 @@ msgstr[0] "壊れた改良型ロボット" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "壊れた改良型ロボットです。内蔵されたレーザー放射装置で武装しています。解体して部品を取り外せそうです。" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "壊れた改良型ロボットです。内蔵されたプラズマ放射装置で武装しています。解体して部品を取り外せそうです。" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "壊れた改良型ロボットです。内蔵された電撃発生装置で武装しています。解体して部品を取り外せそうです。" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "壊れた改良型ロボットです。内蔵されたEMP発生装置で武装しています。解体して部品を取り外せそうです。" #: lang/json/GENERIC_from_json.py @@ -49244,8 +50801,8 @@ msgstr[0] "壊れたチェーンソー・ホラー" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "壊れたロボットです。ありがたいことにようやく停止しました。解体するか他の製作に利用できそうです。" #: lang/json/GENERIC_from_json.py @@ -49263,12 +50820,6 @@ msgid "broken fist king" msgid_plural "broken fist kings" msgstr[0] "壊れたフィスト・キング" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "壊れたロボットです。解体するか他の製作に利用できそうです。" - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -49384,9 +50935,9 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." +"you…" msgstr "" -"この不定形の塊は、高度な内部構造から見て取れるように、完全に成長を終えたようです。内蔵された油圧機構を使うことで積荷を乗せて移動することが可能になり、驚異的な知能の発露によって、接続された全てのシステムを、ブロブ製か否かにかかわらず拡張仮足を使って操作できるようになりました。この部品が取り付けられていれば、部品を介して全ての設備を操作できますが、使用者は部品と接触する位置にいる必要があります。ブロブ塊はあまりにも嬉しそうな様子で使用者を包み込むため、思わず不安になります..." +"この不定形の塊は、高度な内部構造から見て取れるように、完全に成長を終えたようです。内蔵された油圧機構を使うことで積荷を乗せて移動することが可能になり、驚異的な知能の発露によって、接続された全てのシステムを、ブロブ製か否かに関わらず拡張仮足を使って操作できるようになりました。この部品が取り付けられていれば、部品を介して全ての設備を操作できますが、使用者は部品と接触する位置にいる必要があります。ブロブ塊はあまりにも嬉しそうな様子で使用者を包み込むため、思わず不安になります..." #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -49434,6 +50985,11 @@ msgid "" msgstr "" "車台の高い位置に配置する、巨大な改良型強化ソーラーパネルです。壊れやすいソーラーパネルを潜在的な脅威から守り、太陽を追尾する機能によって発電効率を向上させることができますが、非常に重いという欠点もあります。" +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "シャシー(タレット)" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -49449,7 +51005,7 @@ msgstr "" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "diamond frame" msgid_plural "diamond frames" -msgstr[0] "フレーム(ダイヤモンド)" +msgstr[0] "フレーム(ﾀﾞｲﾔﾓﾝﾄﾞ)" #. ~ Description for diamond frame #: lang/json/GENERIC_from_json.py @@ -49461,7 +51017,7 @@ msgstr "鮮やかに輝くダイヤモンド製の車両フレームです。か #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "diamond plating" msgid_plural "diamond platings" -msgstr[0] "平板(ダイヤモンド)" +msgstr[0] "平板(ﾀﾞｲﾔﾓﾝﾄﾞ)" #. ~ Description for diamond plating #: lang/json/GENERIC_from_json.py @@ -49479,9 +51035,9 @@ msgstr[0] "安定したポータル" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" -msgstr "ポータルの中の無限の深淵を眺めていると、心の中に延々とある警句がこだまします。「この世に無限のものは二つ、宇宙の広さと人間の盗み癖」" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" +msgstr "ポータルの中の無限の深淵を眺めていると、心の中にある警句が延々とこだまします。「この世に無限のものは二つ、宇宙の広さと人間の盗み癖」" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -50732,6 +52288,18 @@ msgid "" msgstr "" ".357口径マグナム弾をもしくは.38口径スペシャル弾を5発装填できるスピードローダーです。互換性のあるリボルバーでの装填速度が向上します。" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "スピードローダー(.38口径・.357口径/6発)" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" +".357口径マグナム弾をもしくは.38口径スペシャル弾を6発装填できるスピードローダーです。互換性のあるリボルバーでの装填速度が向上します。" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "弾倉(.380口径/ｹﾙﾃｯｸP3AT)" @@ -50797,6 +52365,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "タウルススペクトラムに対応する小型の6発鋼鉄製箱型弾倉です。" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "弾倉(.38口径ｽｰﾊﾟｰ/AF2011A1)" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "2つの銃身をもつAF2011A1に対応する、2つの.38口径スーパー弾用8発箱型弾倉が1つに結合された弾倉です。" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "弾倉(.38口径ｽｰﾊﾟｰ/M1911)" @@ -51111,9 +52690,9 @@ msgstr "スピードローダー(.454口径/5発)" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." -msgstr ".454口径もしくは.45口径コルト弾をを5発装填できるスピードローダーです。互換性のあるリボルバーでの装填速度が向上します。" +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." +msgstr ".454口径もしくは.45口径コルト弾を5発装填できるスピードローダーです。互換性のあるリボルバーでの装填速度が向上します。" #: lang/json/MAGAZINE_from_json.py msgid "H&K 4.6mm extended magazine" @@ -52316,7 +53895,7 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" "生物学的に見ても奇妙な事ですが、このブロブは未知の方法によってゆっくりと電気を生成する能力を持つように進化したようで、発電しながらほのかな蛍光色の輝きを発しています。他の供給源からの電力を貯めておくこともできますが、電力が溜まると休眠状態になるようです。簡単に引き剥すことができそうです..." @@ -52367,24 +53946,6 @@ msgstr "" msgid "pebble hopper" msgstr "弾薬ホッパー(石つぶて)" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "弾倉(.38口径ｽｰﾊﾟｰ/AF2011A1)" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "2つの弾倉を1つに結合して作られた、AF2011A1専用の特殊な弾倉です。" - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "弾倉(.38口径ｽｰﾊﾟｰ/M1991A1)" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr " M1991A1に対応する、.38口径スーパー弾を装填できる9発箱型弾倉です。" - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "初期設定" @@ -52604,7 +54165,7 @@ msgstr "追加 - Fuji's建物MOD" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "既存の建物のバリエーションや新たな建物を追加します。「追加 - 施設」を導入する必要があります。" @@ -52626,7 +54187,7 @@ msgstr "変更 - 全体マップグラフィック化" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "全体マップをグラフィックに差し替えます。導入方法はreadmeを参照してください。" @@ -52658,7 +54219,7 @@ msgstr "追加 - 水耕栽培" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "作物の収穫量が増加する水耕栽培装置の地形を追加します。装置は研究所や地下室で時々生成されるほか、製作することも可能です。" @@ -52753,7 +54314,7 @@ msgstr "追加 - 変異NPC" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "放浪NPCの中に時折変異している者が混じっています。友好的な者ばかりとは限りません...気を付けて！" #: lang/json/MOD_INFO_from_json.py @@ -52763,10 +54324,9 @@ msgstr "追加 - 菓子人間" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" -msgstr "いつものカタクリズムも良いですが、もっと甘い世界はいかが？人型の砂糖菓子になって、ラムネ菓子のペットと一緒にこの世界を巡ってみませんか？" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" +msgstr "人型の砂糖菓子になって、ラムネ菓子のペットと一緒に大変動の世界を巡ってみませんか？" #: lang/json/MOD_INFO_from_json.py msgid "NPC traits" @@ -53071,7 +54631,7 @@ msgstr "追加 - Bensグルテンフリーレシピ" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "穀物や牛乳を使用しない料理のレシピを追加します。全てのアイテムには対応していません。" @@ -53109,7 +54669,7 @@ msgstr "変更 - 全体マップ記号代替" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "全体マップをより見やすくなるように変更します。建物の記号はタイプによって色分けされ、^v<>の代わりに建物名の頭文字が表示されます。" @@ -53252,7 +54812,7 @@ msgstr "追加 - 目視アイコン(HitButton_iso)" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "モンスターがプレイヤーを目視した際に態度を示すアイコンを表示します。HitButton isometric用のデザインです。" @@ -53264,7 +54824,7 @@ msgstr "追加 - 目視アイコン+態度" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" "モンスターがプレイヤーを目視した際に態度を示すアイコンを、それ以外の状態では思考を示す吹き出しを表示します。Live/Dead people " "tileset用のデザインです。" @@ -53277,7 +54837,7 @@ msgstr "追加 - 目視アイコンのみ" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" "モンスターがプレイヤーを目視した際に態度を示すアイコンを表示します。それ以外の状態では何も表示されません。Live/Dead people " "tileset用のデザインです。" @@ -53289,7 +54849,7 @@ msgstr "追加 - 目視アイコン(retrodays)" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "モンスターがプレイヤーを目視した際に態度を示すアイコンを表示します。retrodays tileset用のデザインです。" @@ -53357,7 +54917,7 @@ msgstr[0] "カモ" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." msgstr "川や水辺などでよく見かけるマガモの一種です。大変動が起こる前はパンくずや昆虫、植物の種や根を食べていました。" #: lang/json/MONSTER_from_json.py @@ -54069,7 +55629,7 @@ msgstr[0] "コイ" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "一般的な黄金色のコイです。あまり美味しくないと言う人もいますが、この非常時に選り好みはできません。" #: lang/json/MONSTER_from_json.py @@ -54208,7 +55768,7 @@ msgid "skittering plague" msgid_plural "skittering plagues" msgstr[0] "ゾンビゴキブリ" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "ゾンビを食べるゾンビ化した巨大ゴキブリです。" @@ -54218,7 +55778,7 @@ msgid "plague nymph" msgid_plural "plague nymphs" msgstr[0] "ゾンビゴキブリ(幼体)" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "変異しゾンビ化したゴキブリの幼体です。ラット程の大きさがあります。" @@ -54228,7 +55788,7 @@ msgid "plague vector" msgid_plural "plague vectors" msgstr[0] "ゾンビゴキブリ(変異)" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -54250,7 +55810,7 @@ msgid "giant cockroach nymph" msgid_plural "giant cockroach nymphs" msgstr[0] "巨大ゴキブリ(幼体)" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "変異したゴキブリの幼体です。ラット程の大きさがあります。" @@ -54272,7 +55832,7 @@ msgid "giant bee" msgid_plural "giant bees" msgstr[0] "巨大ハチ" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -54284,7 +55844,7 @@ msgid "giant centipede" msgid_plural "giant centipedes" msgstr[0] "巨大ムカデ" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -54320,7 +55880,7 @@ msgid "giant mosquito" msgid_plural "giant mosquitos" msgstr[0] "巨大蚊" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -54332,7 +55892,7 @@ msgid "giant cellar spider" msgid_plural "giant cellar spiders" msgstr[0] "巨大ユウレイグモ" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -54346,7 +55906,7 @@ msgid "immature giant cellar spider" msgid_plural "immature giant cellar spiders" msgstr[0] "巨大ユウレイグモ(幼体)" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -54358,7 +55918,7 @@ msgid "giant jumping spider" msgid_plural "giant jumping spiders" msgstr[0] "巨大ハエトリグモ" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -54370,7 +55930,7 @@ msgid "giant trapdoor spider" msgid_plural "giant trapdoor spiders" msgstr[0] "巨大トダテグモ" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -54382,7 +55942,7 @@ msgid "giant web spider" msgid_plural "giant web spiders" msgstr[0] "巨大巣作りグモ" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -54394,7 +55954,7 @@ msgid "fungal spider" msgid_plural "fungal spiders" msgstr[0] "真菌クモ" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -54408,7 +55968,7 @@ msgid "immature giant web spider" msgid_plural "immature giant web spiders" msgstr[0] "巨大巣作りグモ(幼体)" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -54420,7 +55980,7 @@ msgid "giant black widow" msgid_plural "giant black widows" msgstr[0] "巨大クロゴケグモ" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -54432,7 +55992,7 @@ msgid "giant black widow spiderling" msgid_plural "giant black widow spiderlings" msgstr[0] "巨大クロゴケグモ(幼体)" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -54444,7 +56004,7 @@ msgid "giant wolf spider" msgid_plural "giant wolf spiders" msgstr[0] "巨大毒グモ" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -54456,7 +56016,7 @@ msgid "giant wasp" msgid_plural "giant wasps" msgstr[0] "巨大スズメバチ" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -54468,7 +56028,7 @@ msgid "dermatik" msgid_plural "dermatiks" msgstr[0] "ダマティック" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -54492,7 +56052,7 @@ msgid "giant ant" msgid_plural "giant ants" msgstr[0] "巨大アリ" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -54504,7 +56064,7 @@ msgid "giant acidic ant" msgid_plural "giant acidic ants" msgstr[0] "巨大強酸アリ" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -54529,7 +56089,7 @@ msgid "acidic queen ant" msgid_plural "acidic queen ants" msgstr[0] "女王強酸アリ" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -54543,7 +56103,7 @@ msgid "acidic soldier ant" msgid_plural "acidic soldier ants" msgstr[0] "兵隊強酸アリ" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -54557,7 +56117,7 @@ msgid "fungal ant" msgid_plural "fungal ants" msgstr[0] "真菌アリ" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -54581,7 +56141,7 @@ msgid "queen ant" msgid_plural "queen ants" msgstr[0] "女王アリ" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -54593,7 +56153,7 @@ msgid "soldier ant" msgid_plural "soldier ants" msgstr[0] "兵隊アリ" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -54605,7 +56165,7 @@ msgid "giant locust" msgid_plural "giant locusts" msgstr[0] "巨大イナゴ" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -54617,7 +56177,7 @@ msgid "locust nymph" msgid_plural "locust nymphs" msgstr[0] "イナゴ(幼体)" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -55410,14 +56970,14 @@ msgid "marloss zealot" msgid_plural "marloss zealots" msgstr[0] "マーロスの狂信者" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "強烈な恍惚感を味わいながら聖歌を暗唱しています。目は虚ろで、口からは泡を噴いています。" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -55429,7 +56989,7 @@ msgid "X-03: 'Spectre' Recon Mech" msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "偵察メックX-03スペクター" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -55447,7 +57007,7 @@ msgid "X-02: 'Grunt' Combat Mech" msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "戦闘メックX-02グラント" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -55464,7 +57024,7 @@ msgid "X-01: 'Jack' Lifting Mech" msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "運搬メックX-01ジャック" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -55481,7 +57041,7 @@ msgid "mi-go" msgid_plural "mi-gos" msgstr[0] "ミ＝ゴ" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -55497,7 +57057,7 @@ msgid "mi-go slaver" msgid_plural "mi-go slavers" msgstr[0] "ミ＝ゴ・スレイヴァー" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -55514,7 +57074,7 @@ msgid "mi-go surgeon" msgid_plural "mi-go surgeons" msgstr[0] "ミ＝ゴ・サージョン" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -55528,7 +57088,7 @@ msgid "mi-go guard" msgid_plural "mi-go guards" msgstr[0] "ミ＝ゴ・ガード" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -55545,7 +57105,7 @@ msgid "mi-go myrmidon" msgid_plural "mi-go myrmidons" msgstr[0] "ミ＝ゴ・ミュルミドン" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -55562,7 +57122,7 @@ msgid "mi-go scout" msgid_plural "mi-go scouts" msgstr[0] "ミ＝ゴ・スカウト" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -57042,6 +58602,18 @@ msgid "" msgstr "" "完全に破壊された顔面に、特徴的な灰色の粘液が詰まっています。側頭部に付いている耳は気味が悪いほど大きく発達しています。かつて顔があった正面には細い裂け目ができており、もしかしたら視覚もあるのかもしれません。" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "感電ゾンビ" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "静電気を帯びて今までに見たことがないくらい酷い髪型になった、非常に青白いゾンビです。時折、周囲に火花を散らしています。" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -57222,7 +58794,7 @@ msgid "" "An undead humanoid, its elongated arms drag along the ground as it moves. " "It looks to almost have a hunch from the swollen back and shoulder muscles " "tearing though its skin." -msgstr "この死体が歩くたび、細長い腕が地面に擦れています。膨らんだ背中と皮膚を突き破るるほどの肩の筋肉を見るに、なんだか嫌な予感がします。" +msgstr "この死体が歩くたび、細長い腕が地面に擦れています。膨らんだ背中と皮膚を突き破るほどの肩の筋肉を見るに、なんだか嫌な予感がします。" #: lang/json/MONSTER_from_json.py msgid "hazmat zombie" @@ -57645,7 +59217,7 @@ msgid "experimental mutant" msgid_plural "experimental mutants" msgstr[0] "試作変異体" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -57660,7 +59232,7 @@ msgid "evolved mutant" msgid_plural "evolved mutants" msgstr[0] "進化変異体" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -58065,7 +59637,7 @@ msgstr[0] "タレット(CROWS II/M2HB)" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" @@ -58082,7 +59654,7 @@ msgstr[0] "タレット(CROWS II/M249)" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" "M153を搭載したCROWS " @@ -58098,7 +59670,7 @@ msgstr[0] "タレット(CROWS II/M240)" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" "M153を搭載したCROWS " @@ -58454,7 +60026,7 @@ msgstr[0] "サイバーマスティフ" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" "身体強化を施した、グレートピレニーズとコーカシアン・シェパード・ドッグのミックスです。Prep連合の土地をゾンビやその他の敵から守る番犬です。" @@ -58469,9 +60041,23 @@ msgstr[0] "サイバーマスティフ(子犬)" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." msgstr "愛らしく無防備なサイバーマスティフの子犬です。成犬よりはるかに安全に飼い慣らせます。CBMは移植済みですが、未熟な体格です。" +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "生体タレット" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." +msgstr "" +"ミ＝ゴが防衛用に設置したタレットです。科学と生物学を融合したこの恐ろしい兵器は、オペレーティングシステムとして缶に入った脳を使っているようです。どこに命中してもヘッドショットになるのが長所ですね。" + #: lang/json/MONSTER_from_json.py msgid "headless zombie" msgid_plural "headless zombies" @@ -58823,9 +60409,9 @@ msgstr[0] "ネクロモーフ・スラッシャー" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "恐ろしく歪んだ人型の怪物です。2つの大きな刃が両肩を突き破って生えており、それらを常に頭上に構える姿に恐怖を覚えずにはいられません。" #: lang/json/MONSTER_from_json.py @@ -58836,10 +60422,10 @@ msgstr[0] "ネクロモーフ・ウィークスラッシャー" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" "酷く損傷した恐ろしい死体です。両手の肉を突き破って生えている骨のような2本の刃で獲物を襲います。顎のない口と大きく損傷した額が非常に印象的で、思わず背筋が凍ります。非常にゆっくりとぎこちなく歩きます。" @@ -58852,7 +60438,7 @@ msgstr[0] "ネクロモーフ・ウェイスター" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" "重装備を身に纏っており、不気味な薄緑色に輝く窪んだ眼窩とぽかんと開いた口がヘルメット越しに見えます。腕から突き出した鋭い奇妙な刃は、注意すべき手強い武器です。" @@ -58866,8 +60452,8 @@ msgstr[0] "ネクロモーフ・リーパー" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" "かつての人体はほとんど残っておらず、腹部を擦りながら這い回り、非常に強い腕力で前方に飛び掛かります。口からは肉をたやすく切り落とせそうな細長い牙が伸び、異様な顔で絶えず吠えています。下半身は融合し、棘の生えた鋭いスパイク状の尾に変化しています。" @@ -58881,7 +60467,7 @@ msgstr[0] "ネクロモーフ・ツウィッチャー" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -58896,10 +60482,10 @@ msgstr[0] "ネクロモーフ・パック" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" "変異した獰猛な子供ゾンビです。顔は白っぽく、瞼は腫れて目を塞いでおり、引き裂かれた口の端には肉片がぶら下がっています。小さな手のように見える一見すると無意味な部位が両肩から腕の半分程の長さまで伸びており、その先端には鋭い爪が生えています。" @@ -58911,13 +60497,13 @@ msgstr[0] "ネクロモーフ・ピューカー" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" -"全身をぱっくりと裂けた傷で覆われたゾンビです。長らく腐食したままの両腕の先からは、肉をたやすく切り裂いてしまいそうな鋸刃が飛び出しています。粘性の高い黄色い液体が露出した臓器や外れた顎の縁から滴り落ちており、食事時にはジュージューと音が聞こえます。" +"全身にぱっくりと裂けた傷があるゾンビです。長らく腐食したままの両腕の先からは、肉をたやすく切り裂いてしまいそうな鋸刃が飛び出しています。粘性の高い黄色い液体が露出した臓器や外れた顎の縁から滴り落ちており、食事時にはジュージューと音が聞こえます。" #: lang/json/MONSTER_from_json.py msgid "Animate Arm" @@ -58927,8 +60513,8 @@ msgstr[0] "蠢く腕" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "ゆっくりと匍匐前進する腕だけ残った死体です。時折傷口から触手が飛び出し、激しく動き回ります。" #: lang/json/MONSTER_from_json.py @@ -58939,9 +60525,9 @@ msgstr[0] "デュラハン" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" "身体をゆっくりと振り動かしている頭部のない人型の怪物です。全身を覆う豪華で機能的な装甲は、恐るべき着実さでこの死体を前進させています。時折長い触手が右腕から飛び出し、無秩序に暴れ回ります。" @@ -58949,7 +60535,7 @@ msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "電気エネルギーを周辺に放出しており、その人体は淡い青色に変色しています。何か伝えたがっているようです。" @@ -58962,8 +60548,8 @@ msgstr[0] "Mr.スケルトン" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" "筋肉と臓器が完全になくなったガイコツは、歩くたびに骨をカタカタと鳴らしています。骨ばった手には、滅亡した世界でもなお傷一つない綺麗なトランペットを握っています。" @@ -58987,9 +60573,9 @@ msgstr[0] "煙幕クマ" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" -"かつて威風堂々と森を闊歩していたであろう熊は、今や見る影もなく、身体中から煙を発しています。その漆黒の瞳には敵意と...飢餓を宿しています。" +"かつて威風堂々と森を闊歩していたであろう熊は、今や見る影もなく、身体中から煙を発しています。その漆黒の瞳からは、敵意と...飢餓が読み取れます。" #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -59276,6 +60862,85 @@ msgid "" "like jaws." msgstr "緑色に輝くくぼんだ目と黒い鱗をもった怪物です。頭部は骨張っており、短剣のような牙が並ぶ口元からは酸が滴っています。" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "リザードフォークの戦士" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" +"筋肉質の尾をもち、皮膚は濃い緑灰色の鱗で覆われた、背が高く力が強い人型の爬虫類です。部族として生活し、洞窟や水辺、特にドラゴンやウィルムが生息する地域でよく見かけます。別段敵対的ではありませんが、部外者には容赦せず、挑発するのは非常に危険です。一般的に立派な棍棒を持って戦うことを好みますが、鋭い歯と爪も強力な武器になります。" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "リザードフォークの狩人" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "リザードフォークの狩人は同種の戦士よりも小柄ですが、危険性は同程度であり、しなやかな動きと槍の腕を駆使します。" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "リザードフォークの狩人は棘付きの槍を投げました！" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "リザードフォークの呪術師" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" +"リザードフォークは非常に知的で狡猾な種族ですが、魔法の力を持っている個体は非常に稀です。呪術師は幼少期に選び出されるため、魔力の有無は若い部族民の命運を左右します。呪術師が受けなければならない儀式についてはあまり知られていませんが、生き残れるものはほとんどいないと言われています。呪術師はドルイドに近い存在で、自然の力で敵と戦い、必要に応じて仲間を召喚します。" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "リザードフォークの族長" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" +"野心をもったリザードフォークは非常に珍しい存在です。非常に強い野心を示した者だけが族長の地位を獲得しますが、この行動は外部の者から見れば過度な残忍性や暴力性と誤解されがちです。族長はその部族で最大かつ最強であり、その歯と爪の強さを褒めたたえる獰猛なトライデントを贈られます。" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "ワニ" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "いずれは呪術師になるはずだったリザードフォークは、人型の特徴が退化し、非常に危険な巨大ワニと化しています。" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -59770,7 +61435,7 @@ msgstr[0] "防衛ロボット" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "内蔵電源で活動を続ける自動防衛ロボットです。内蔵された放電警棒と9mm銃器で武装しています。" @@ -59782,7 +61447,7 @@ msgstr[0] "警備ロボット" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "内蔵電源で活動を続ける自動防衛ロボットです。内蔵された9mm銃器で武装しています。" @@ -59794,7 +61459,7 @@ msgstr[0] "暴動鎮圧ロボット" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "内蔵電源で活動を続ける自動防衛ロボットです。内蔵された放電警棒と催涙弾発射装置、40mmビーンバッグ弾ランチャーで武装しています。" @@ -60129,8 +61794,8 @@ msgstr[0] "ごみ処理ロボット" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" "自動で地面を掃除するように改造した多目的ロボットです。地面に落ちた物を吸い取り、内部の酸性液で溶かします。ゴミ、あるいは死体で汚れた家の芝生を綺麗にするのに役立ちます。" @@ -60182,8 +61847,8 @@ msgstr[0] "変異ロボット" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "今の所作動していませんが、動かすのは止めておきましょう...変異原製造機構が内蔵された医療ロボットです。" #: lang/json/MONSTER_from_json.py @@ -61621,6 +63286,17 @@ msgstr "ブラインディング・フラッシュ" msgid "Ethereal Grasp" msgstr "エーテル・グラスプ" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "オブファスケーテッド・ボディ" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "魔法のオーラが身体の周りの光を歪め、1ターンで回避できる攻撃回数を増加させます。" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "オーラ・オブ・プロテクション" @@ -62045,6 +63721,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "儀式によってケルビニストと波長の合う神秘的な石を創り出します。石はレシピの触媒として利用できます。" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "ワニ召喚" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "1体のワニを召喚します。" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "呪術師はワニを召喚しました！" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "リザードフォーク用呪文" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "呪術師が使う呪文です。" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "マジック・ミサイル" @@ -63809,7 +65508,19 @@ msgstr[0] "聴診器" #: lang/json/TOOL_ARMOR_from_json.py msgid "" "This is a medical listening tool. Use it to listen to things. Closely." -msgstr "医療において聴診に用いる器具です。何かしら聞き耳を立てるために使用します...鍵の掛かった何かとか。" +msgstr "医療用の聴診器です。非常に小さな物音を注意深く聞き取りたいときに使います。" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "簡易聴診器" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "かなり扱い辛い、おもちゃのような性能の自作聴診器です。非常に小さな物音を注意深く聞き取りたいときに使います。" #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" @@ -64082,9 +65793,9 @@ msgstr[0] "CRIT標準G.E.A.R" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" "C.R.I.T標準装備の一般技術援助装備です。使用者の脊髄にこの装置を差しこむことで、全身の運動能力を改善し、基本的な周囲の環境情報を表示します。" @@ -64095,7 +65806,7 @@ msgstr[0] "CRITガスマスク(オフ)" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "C.R.I.TのHUDを起動しています..." #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -64108,9 +65819,9 @@ msgstr "電力レベルが低いため起動できません。" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" "C.R.I.Tの特殊部隊用強化ガスマスクです。最先端の電子機器が内蔵されており、層状のケブラーによって頭部をしっかりと保護します。様々なフィルターなど魔法のようなハイテクによって酸素を安全に供給し、爆発による衝撃からも頭部を保護する性能があります。内蔵HUDや他の機能のオン/オフを切り替えられるようになっています。" @@ -64127,7 +65838,7 @@ msgstr "C.R.I.TのHUDを停止しています。" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "C.R.I.Tの特殊部隊用強化ガスマスクです。現在電力を消費しながら、HUD、低レベルの暗視機能、その他の防護機能を稼働しています。" @@ -64139,22 +65850,22 @@ msgstr[0] "CRIT運動強化ベスト(オフ)" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "C.R.I.Tの運動強化機能を起動しています..." #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." -msgstr "電力レベルが低いため起動できません…" +msgid "Power levels too low for safe bootup…" +msgstr "電力レベルが低いため起動できません..." #. ~ Description for CRIT EM vest (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" "C.R.I.Tの特殊部隊用運動強化ベストは、最先端の繊維素材と反応性サーボモーターが内蔵されており、着用者を保護し、多量の電力を消費して運動能力を強化します。使いやすく操作性も高いため、C.R.I.Tの特殊部隊で一般的に着用されています。保護機能と移動力を高めたい時は使用して電源を入れましょう。" @@ -64170,7 +65881,7 @@ msgstr "強化機能を停止する" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "C.R.I.Tの運動強化機能を停止しています..." #. ~ Description for CRIT EM vest (on) @@ -64179,8 +65890,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" "C.R.I.Tの特殊部隊用運動強化ベストは、最先端の繊維素材と反応性サーボモーター、そして液晶圧送ジェネレータが内蔵されており、多量の電力を消費して着用者を最悪の戦闘状況から保護します。C.R.I.Tの特殊部隊で一般的に着用されている装備です。現在は機能を稼働しており、UPSの電力を大量に消費しています。" @@ -64198,7 +65909,7 @@ msgstr "%sの電源を入れました。" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "C.R.I.Tの標準装備のヘルメットです。頭部を保護し、首は保温と保護のために絶縁された伸縮する鋼鉄メッシュで覆われています。" @@ -64216,10 +65927,10 @@ msgstr "%sの電源を切りました。" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" "C.R.I.Tの標準装備のヘルメットです。頭部を保護し、首は保温と保護のために絶縁された伸縮する鋼鉄メッシュで覆われています。側面に薄暗い懐中電灯が内蔵されています。ライトは現在点灯しており、電力を消費しています。" @@ -64458,6 +66169,30 @@ msgid "" "throwing knife into your hand on activation." msgstr "短剣の装飾が彫られた華やかな銀製の指輪です。使用すると手元に投げナイフを召喚します。" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "ウナギの指輪" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "とぐろを巻くウナギを象った銀の指輪です。着用すると1ターンで回避できる攻撃回数が1増加します。" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "双頭ウナギの指輪" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "とぐろを巻く双頭のウナギを象った金の指輪です。着用すると1ターンで回避できる攻撃回数が2増加します。" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -64953,12 +66688,12 @@ msgid "" "This is a military-grade fragmentary hand grenade. Use this item to pull " "the pin and light the fuse. You will then have five turns before it " "explodes; throwing it would be a good idea." -msgstr "軍用の破片手榴弾です。使用してピンを引き点火します。爆発するまで5ターンの時間が掛かります。爆発するまでに投げましょう。" +msgstr "軍用の破片手榴弾です使用するとピンを引いて起動し、5ターン後に爆発します。爆発する前に投げましょう。" #: lang/json/TOOL_from_json.py msgid "active grenade" msgid_plural "active grenades" -msgstr[0] "手榴弾(点火)" +msgstr[0] "手榴弾(起動)" #. ~ Use action no_deactivate_msg for active grenade. #. ~ Use action no_deactivate_msg for active makeshift grenade. @@ -64972,12 +66707,13 @@ msgstr "既に%sのピンは引き抜かれています。そんなことより #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "カチッ。" @@ -65005,12 +66741,12 @@ msgid "" "An improvised explosive device cobbled together from parts. Use this item " "to pull the pin and light the fuse. You will then have some amount of time " "before it explodes; throwing it would be a good idea." -msgstr "部品をなんとかまとめ上げた、即席の爆発装置です。爆発するまである程度の時間が掛かります。爆発するまでに投げましょう。" +msgstr "何とかして部品をまとめ上げた、即席の爆発装置です。使用するとピンを引いて起動し、しばらく経つと爆発します。爆発する前に投げましょう。" #: lang/json/TOOL_from_json.py msgid "active makeshift grenade" msgid_plural "active makeshift grenades" -msgstr[0] "簡易手榴弾(点火)" +msgstr[0] "簡易手榴弾(起動)" #: lang/json/TOOL_from_json.py msgid "incendiary grenade" @@ -65023,12 +66759,12 @@ msgid "" "This is a military-grade incendiary hand grenade. Use this item to pull the" " pin and light the fuse. You will then have five turns before it explodes " "into a raging inferno; throwing it would be a good idea." -msgstr "軍用の焼夷手榴弾です。使用してピンを引き点火します。爆発し周囲が地獄と化すまでに5ターンの時間が掛かります。爆発する前に投げましょう。" +msgstr "軍用の焼夷手榴弾です。使用するとピンを引いて起動し、5ターン後に爆発し周囲が地獄と化します。爆発する前に投げましょう。" #: lang/json/TOOL_from_json.py msgid "active incendiary grenade" msgid_plural "active incendiary grenades" -msgstr[0] "焼夷手榴弾(点火)" +msgstr[0] "焼夷手榴弾(起動)" #. ~ Description for active incendiary grenade #: lang/json/TOOL_from_json.py @@ -65050,18 +66786,17 @@ msgstr "改良型EMP手榴弾のピンを引き抜きました。" #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" -"ロボットの敵味方識別制御チップを破壊せずに上書きできるように、高度な改良を加えたEMP手榴弾です。これがあれば、バックアップシステムが作動するまでの短時間、ロボットを味方につけられます。使用してピンを引き点火します。使用するとピンを引き抜き点火します。" +"ロボットの敵味方識別制御チップの通信にスクランブルをかける特殊な手榴弾です。これがあれば、バックアップシステムが作動するまでの短時間、ロボットを味方につけられます。使用するとピンを引いて起動します。" #: lang/json/TOOL_from_json.py msgid "active scrambler grenade" msgid_plural "active scrambler grenades" -msgstr[0] "改良型EMP手榴弾(点火)" +msgstr[0] "改良型EMP手榴弾(起動)" #. ~ Description for active scrambler grenade #: lang/json/TOOL_from_json.py @@ -65070,6 +66805,49 @@ msgid "" "control wave that temporarily converts robots to your side." msgstr "改良型EMP手榴弾のピンは既に引かれており、まもなく爆発し、ロボットを一時的にあなたの味方に変えるコントロール波を放出します。" +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "EMP手榴弾" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "EMP手榴弾のピンを引き抜きました。" + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +"低インダクタンスコンデンサバンクから単ループアンテナに通電して電磁パルスを発生させる手榴弾です。使用するとピンを引いて起動し、3ターン後に爆発して周囲にEMPフィールドを発生させてロボットにダメージを与え、生体部品の電力を排出します。" + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "EMP手榴弾(起動)" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "既に%sは点火されています。そんなことより早く投げましょう。" + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"EMP手榴弾のピンは既に引かれており、まもなく周囲に大規模な電磁パルスが発生し、ロボットや生物工学的な要素を持つ対象にダメージを与えます。早く投げた方が良い気がしますね。" + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -65458,25 +67236,30 @@ msgid "" msgstr "最先端の素材で作られたブランケットを折り畳んだものです。体の重要な部分を覆うことができます。使用することで広げます。" #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "EMP手榴弾" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "EMP爆弾" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "EMP手榴弾のピンを引き抜きました。" +msgid "Activate bomb" +msgstr "起動する" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "EMP爆弾を起動しました。" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -"低インダクタンスコンデンサバンクから単ループアンテナに通電して電磁パルスを発生させる手榴弾です。使用するとピンを引いて発動させます。爆発するとロボットや生物工学的な要素を持つ対象にダメージを与える電磁パルスを周囲に発生させます。爆発まで3ターンの時間が掛かります。" +"爆弾という名前ですが、実際は電磁パルスを発生させる装置です。起動するとプルトニウム燃料電池が磁気濃縮型爆薬発電機内部に排出され、爆発によって強力な磁場が発生します。" #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -65491,26 +67274,24 @@ msgid "" msgstr "騎乗に適した飼い慣らされた動物に装着できる鞍(くら)です。" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "EMP手榴弾(点火)" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "EMP爆弾(起動)" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "既に%sは点火されています。そんなことより早く投げましょう。" +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "既に%sは起動していますから、さっさと投げましょうね。" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"EMP手榴弾のピンは既に引かれており、まもなく周囲に大規模な電磁パルスが発生し、ロボットや生物工学的な要素を持つ対象にダメージを与えます。早く投げた方が良い気がしますね。" +"EMP爆弾のピンは既に引かれており、まもなく周囲に大規模な電磁パルスが発生し、ロボットや生物工学的な要素を持つ対象にダメージを与えます。早く投げた方が良い気がしますね。" #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -65933,7 +67714,7 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" "プロ仕様の35mmデジタル一眼レフカメラです。光学ファインダー、デジタルビューファインダー、オートフォーカス機能とスタビライザー付きの望遠レンズ、そしてフラッシュ等の高度な機能があります。撮影した写真は背面のデジタル画面で閲覧でき、メモリーカードに移すこともできます。通常の電池を使用します。大変動以前なら、これでプロ並の写真を撮影できたでしょう。" @@ -66413,7 +68194,7 @@ msgstr[0] "るつぼ" msgid "" "This is a small metalworking crucible. It's used in some metalworking " "fabrication recipes." -msgstr "金属加工に用いられるるつぼです。いくつかのレシピに対応します。" +msgstr "金属加工に用いられるつぼです。いくつかのレシピに対応します。" #: lang/json/TOOL_from_json.py msgid "clay crucible" @@ -66601,6 +68382,7 @@ msgid_plural "pseudo butter churns" msgstr[0] "バター撹拌機" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "これはcrafting_pseudo_itemであり、所持している場合はバグが発生しています。" @@ -66613,11 +68395,11 @@ msgstr[0] "E-InkタブレットPC" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -"鮮明で効率的な電子ペーパーディスプレイを使ったタブレットパソコンです。大変動以前、これらは最新式のカッコいいガジェットでしたが、今やかけがえのない資源です。通常の電池で動作します。使用するとメモリーカードからデータを引き出して内部ストレージに蓄積することができます。" +"鮮明で効率的な電子ペーパーディスプレイを使ったタブレットPCです。大変動以前は最新式のカッコいいガジェットでしたが、今や貴重な資源です。通常の電池で動作します。" #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -66900,12 +68682,12 @@ msgid "" "and light the fuse. You will then have five turns before it detonates with " "intense light and sound, blinding, deafening and disorienting anyone nearby." msgstr "" -"憲兵隊が使っている閃光手榴弾です。使用してピンを引き点火します。爆発すると強烈な光と音を発生させ、周囲の誰もが視覚と聴覚と方向感覚を失います。爆発するまでに5ターンの時間が掛かります。" +"憲兵隊が使っている閃光手榴弾です。使用するとピンを引いて起動し、5ターン後に爆発して強烈な光と音を発生させ、周囲の誰もが視覚と聴覚と方向感覚を失います。" #: lang/json/TOOL_from_json.py msgid "active flashbang" msgid_plural "active flashbangs" -msgstr[0] "閃光手榴弾(点火)" +msgstr[0] "閃光手榴弾(起動)" #. ~ Description for active flashbang #: lang/json/TOOL_from_json.py @@ -66936,7 +68718,7 @@ msgstr "マンハック(催涙ガス)が使用するダミーアイテムです #: lang/json/TOOL_from_json.py msgid "active tear gas payload" msgid_plural "active tear gas payloads" -msgstr[0] "催涙ガス弾頭(点火)" +msgstr[0] "催涙ガス弾頭(起動)" #. ~ Description for active tear gas payload #: lang/json/TOOL_from_json.py @@ -67060,7 +68842,7 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "active makeshift gas grenade" msgid_plural "active makeshift gas grenades" -msgstr[0] "簡易ガス手榴弾(点火)" +msgstr[0] "簡易ガス手榴弾(起動)" #. ~ Use action no_deactivate_msg for active makeshift gas grenade. #: lang/json/TOOL_from_json.py @@ -67256,7 +69038,7 @@ msgid "" "spikes. Use it to open locked doors without destroying them or to lift " "manhole covers. You could also wield it to bash some heads in." msgstr "" -"曲がった部分を釘などに引っかけてこじ開ける小型の工具です。使用することで鍵のかかった扉を破壊せずに開錠し、マンホールの蓋を持ち上げることもできます。もちろん、誰かの頭に叩きつける事もできますよ。" +"曲がった部分を釘などに引っかけてこじ開ける小型の工具です。使用することで鍵のかかった扉を破壊せずに解錠し、マンホールの蓋を持ち上げることもできます。もちろん、誰かの頭に叩きつける事もできますよ。" #: lang/json/TOOL_from_json.py msgid "hand drill" @@ -67661,7 +69443,7 @@ msgstr[0] "簡易ハンマー" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "棒に金属片を括りつけたハンマーの代用品です。意外なほどハンマーとしての役割を果たしますが、それでもやはり本物には遠く及びません。" @@ -68598,18 +70380,6 @@ msgid "" "blade allows for precision strikes in the hands of the skilled." msgstr "極めて鋭利な外科手術用の刃物です。刃は非常に小さく、熟練者でなければ武器として使うのは困難です。" -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "ハサミ" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "しっかりとした刃の付いたハサミです。使用する事で布や綿製のアイテムを裁断して布切れにします。" - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -70777,6 +72547,17 @@ msgid "" msgstr "" "停止状態のノースロップ社製Dispatchです。これは軍用モデルであり、搭載された攻撃用マンハックの小型組立装置と射出装置を駆使して攻撃を行います。使用すると起動しますが、停止中に不可逆スイッチがオンになったため、積極的な攻撃行動はとらず、注意を逸らすことしかできません。" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "ハンガー" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "レールなどに掛けられる金属製のフックが付いた、プラスチック製の衣類用ハンガーです。" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -72736,6 +74517,18 @@ msgid "" msgstr "" "大型の家具ほどのサイズの遠心分離機を卓上で使えるよう小型化した装置です。小さな見た目に騙されてはいけません。物質を非常に素早く回転させる大変強力な装置です。玩具じゃありませんよ！" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "ハサミ" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "しっかりとした刃の付いたハサミです。使用する事で布や綿製のアイテムを裁断して布切れにします。" + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -72870,7 +74663,7 @@ msgstr "ケビンと書かれた名札が括り付けられている手榴弾で #: lang/json/TOOL_from_json.py msgid "active Granade" msgid_plural "active Granades" -msgstr[0] "趣榴弾(点火)" +msgstr[0] "趣榴弾(起動)" #. ~ Description for active Granade #: lang/json/TOOL_from_json.py @@ -72885,6 +74678,27 @@ msgid "precision solderers" msgid_plural "precision soldererss" msgstr[0] "精密はんだ付け装置" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "アトミックバター撹拌機" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "生体タレット(停止)" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" +"停止状態の恐ろしい怪物です。使用すると起動して指定した場所に設置され、IFFの初期設定が行われます。プログラムの書き換えと設置に成功すると使用者を味方として認識し、接近する全ての敵を回転式レーザー砲で攻撃します。" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -73075,12 +74889,12 @@ msgstr[0] "CRIT携帯用食器セット" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" "簡単に持ち運べるよう設計された、C.R.I.T標準装備の携帯食器セットです。通常の軍用食器セットを基にしていますが、食器類はステンレスと超合金製の薄いシートをセラミックで絶縁した素材で作られており、伸縮自在です。小型化によってバッテリーの寿命が大幅に減少したのは欠点ですが、一応は極小の(役に立たない)ソーラーパネルが内蔵されています。驚くほど小さく圧縮されたフーンとナイフも入っています！" @@ -73092,10 +74906,11 @@ msgstr[0] "CRIT標準ナイフ" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" "C.R.I.T標準装備のナイフです。ナックルダスターになるガードと簡単な作りの扉のこじ開けや鈍器代わり使える小型バールが一体となっています。薄暗い環境でライトの反射を防ぐマットブラックで仕上げられており、ナイフの先端は軽装甲であれば貫通できる作りで、敵に十分届く程度の長さがあります。" @@ -73107,7 +74922,7 @@ msgstr[0] "CRITナックルダスター" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "C.R.I.TのCQB戦闘用ナックルダスターです。重量以外は一般的なナックルダスターとそれほど変わりません。" @@ -73119,7 +74934,7 @@ msgstr[0] "CRIT強化ブレード" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -73133,10 +74948,10 @@ msgstr[0] "ドラゴンスレイヤー" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" "C.R.I.T研究開発部の最高傑作と言える武器です。とてつもなく大きな炭素鋼の刃は内部から湧き出すエネルギーによって振動しており、表面には見たこともない図案が浮かんでいます。持つだけで無敵になったような感覚になりますが、剣というよりも鉄塊です。果たして...使いこなせるのでしょうか？" @@ -73149,7 +74964,7 @@ msgstr[0] "CRIT塹壕用シャベル" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -73163,7 +74978,7 @@ msgstr[0] "CRIT警棒" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" "C.R.I.Tの標準装備のガードトンファーです。広い範囲をカバーできる長さがあり、先端は通常の円筒形よりも威力が高いドーム型になっています。" @@ -73631,7 +75446,7 @@ msgstr[0] "ルーン(バイオマンサー)" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "表面に引き裂かれた肉や骨を表す印が刻まれた奇妙な小石です。バイオマンサーがアイテムに魔力を込める際に必要になります。" @@ -73643,7 +75458,7 @@ msgstr[0] "ルーン(テクノマンサー)" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "表面にゼンマイと歯車を表す印が刻まれた奇妙な小石です。テクノマンサーがアイテムに魔力を込める際に必要になります。" @@ -73655,7 +75470,7 @@ msgstr[0] "ルーン(魔法使い)" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "表面に水晶とマナの宝玉を表す印が刻まれた奇妙な小石です。魔法使いがアイテムに魔力を込める際に必要になります。" @@ -73667,7 +75482,7 @@ msgstr[0] "ルーン(アースシェイパー)" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "表面に鋼と岩を表す印が刻まれた奇妙な小石です。アースシェイパーがアイテムに魔力を込める際に必要になります。" @@ -73679,8 +75494,8 @@ msgstr[0] "ルーン(ケルビニスト)" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "表面に氷と炎を表す印が刻まれた奇妙な小石です。ケルビニストがアイテムに魔力を込める際に必要になります。" #: lang/json/TOOL_from_json.py @@ -73691,8 +75506,8 @@ msgstr[0] "ルーン(ストームシェイパー)" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "表面に雷と嵐を表す印が刻まれた奇妙な小石です。ストームシェイパーがアイテムに魔力を込める際に必要になります。" #: lang/json/TOOL_from_json.py @@ -73703,7 +75518,7 @@ msgstr[0] "ルーン(ドルイド)" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "表面に自然と木々を表す印が刻まれた奇妙な小石です。ドルイドがアイテムに魔力を込める際に必要になります。" @@ -73715,8 +75530,8 @@ msgstr[0] "ルーン(アニミスト)" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "表面に召喚士を表す印が刻まれた奇妙な小石です。アニミストがアイテムに魔力を込める際に必要になります。" #: lang/json/TOOL_from_json.py @@ -73727,7 +75542,7 @@ msgstr[0] "ルーン(錬金術師)" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -73811,7 +75626,7 @@ msgstr[0] "『宵闇』" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." @@ -73822,7 +75637,7 @@ msgstr "" #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." +msgid "Error. No weapon systems found." msgstr "エラー:武装システムが見つかりません。" #. ~ Description for disarmed defense turret @@ -73988,7 +75803,7 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" "停止している軍用擲弾タレットです。起動すると内部に保管されている最大50発の40mm破片擲弾が自動的に装填されます。タレットを設置するとIFFソフトウェアの初期設定が行われ、設置者を味方として登録します。誤作動があった場合は安全マニュアルを参照してください。" @@ -74046,8 +75861,8 @@ msgstr[0] "レールガンタレット(停止)" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" "停止している改良型レールガンタレットです。起動すると内部に保管されている最大50発のレールが自動的に装填されます。タレットを設置するとIFFソフトウェアの初期設定が行われ、設置者を味方として登録します。誤作動があった場合は安全マニュアルを参照してください。" @@ -74061,7 +75876,7 @@ msgstr[0] "改良型強酸放射タレット(停止)" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" "停止している改良型強酸放射タレットです。タレットを設置するとIFFソフトウェアの初期設定が行われ、設置者を味方として登録します。誤作動があった場合は安全マニュアルを参照してください。" @@ -74075,7 +75890,7 @@ msgstr[0] "改良型EMPタレット(停止)" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" "停止している改良型EMPタレットです。タレットを設置するとIFFソフトウェアの初期設定が行われ、設置者を味方として登録します。誤作動があった場合は安全マニュアルを参照してください。" @@ -74374,7 +76189,7 @@ msgstr[0] "暖房ロボット(停止)" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" @@ -74388,7 +76203,7 @@ msgstr[0] "熱供給ロボット(停止)" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." @@ -74450,10 +76265,10 @@ msgstr[0] "ごみ処理ロボット(停止)" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" "自動で地面を掃除するように改造した多目的ロボットです。地面に落ちた物を吸い取り、内部の酸性液で溶かします。積極的に敵を攻撃することはなく、武器も搭載していません。使用するとロボットが起動します。" @@ -74486,7 +76301,7 @@ msgstr[0] "暗殺ロボット(停止)" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "殺人機械に改造した医療ロボットです。刃と毒針を使って敵対的な標的を攻撃します。使用するとロボットが起動します。" @@ -74524,8 +76339,8 @@ msgstr[0] "狩猟ロボット(停止)" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "小動物を狩れるように改造した高速ボットです。ハサミのような武器と内蔵されたテーザー銃で標的を攻撃します。使用するとロボットが起動します。" @@ -74567,7 +76382,7 @@ msgstr[0] "サイボーグゾンビ(停止)" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" "頭部をゾンビマンサーのものと挿げ替えたサイボーグです。頭部はまだ活動しており、ゾンビを復活させる能力を持っています。使用するとロボットが起動します。" @@ -74612,7 +76427,7 @@ msgstr[0] "マルコゲ・パラディン(停止)" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" "手製の火炎放射器と熱く熱した鋭い2本の刃を取り付けた防衛ロボットです。ガソリンを所持した状態で使用すると、ロボットが起動して弾薬が装填されますが...可燃性物質から離れた場所で起動した方が良さそうです。" @@ -74927,7 +76742,7 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" "生物学的に見ても奇妙な事ですが、このブロブの体内は過冷却状態であるにもかかわらず、低密度の流体として凍らずに従来通りの伸縮性を保持しています。定期的に霜の欠片が剥がれ落ちています。引き離せるほど柔らかくなっているようです..." @@ -75116,9 +76931,9 @@ msgstr "塊は手の中でバラバラになりました。" #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "ダイヤモンド基板から外れた人工結晶の塊です。通常触媒から分離した物質は劣化しますが、この塊は何か未知の原理によって形状を保っています。" #: lang/json/TOOL_from_json.py @@ -75129,7 +76944,7 @@ msgstr[0] "ダイヤモンド基板" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +"Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "この宝石の中心部を覗き込むと、感覚が鈍るような気がします..." #. ~ Description for diamond matrix @@ -75147,10 +76962,10 @@ msgstr[0] "渦流エンジン" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" "簡単に言えば、箱に入った竜巻です。何の変哲もないこの容器の中に入っているのは、人間の技術革新の集大成としてのクリーンエネルギー、あるいは、地球上の文明を一掃してしまう大量破壊兵器、どちらとも言えるでしょう。容器の外部に付いた機構によって車両に取り付けて動力とすることが可能です。" @@ -75163,10 +76978,10 @@ msgstr[0] "発電機(渦流)" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" "簡単に言えば、箱に入った竜巻です。何の変哲もないこの容器の中に入っているのは、人間の技術革新の集大成としてのクリーンエネルギー、あるいは、地球上の文明を一掃してしまう大量破壊兵器、どちらとも言えるでしょう。容器の外部に付いた機構により車両用バッテリーに取り付けることが可能です。" @@ -76513,7 +78328,7 @@ msgid "" "These do considerable cutting damage, but prevent you from holding anything " "else while extended." msgstr "" -"外科手術によって、指に電力で伸縮するアダマンチウム製の鉤爪を埋め込みます。高い攻撃力と命中力を有する武器ですが、伸ばしている間は何も掴むことが出来ません。" +"外科手術によって、指に電力で伸縮するアダマンチウム製の鉤爪を埋め込みます。高い攻撃力と精度を有する武器ですが、伸ばしている間は何も掴むことが出来ません。" #: lang/json/bionic_from_json.py msgid "Internal Climate Control" @@ -78380,6 +80195,10 @@ msgstr "壁(矢来)を設置する" msgid "Build Stone Wall" msgstr "壁(石)を設置する" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "壁(石垣)を設置する" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "腰壁を設置する" @@ -81970,6 +83789,35 @@ msgid "" "from the inside." msgstr "体内に異常があるのか、神経系が誤作動を起こしています。" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "食傷気味" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "あまり食べたくない物を食べています。" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "辛い食事" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "食べたくない物ばかり食べていると、気分が滅入ってしまいます。" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "酷い食事" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "確かに、生きてはいます。しかし、こんなモノを食べ続けてまで生き続ける意味があるのでしょうか？" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "照明" @@ -82614,7 +84462,7 @@ msgstr "恐怖感が薄れました。" #: lang/json/effects_from_json.py msgid "Stuck in a light snare" -msgstr "くくり罠に掛かった" +msgstr "くくり罠" #. ~ Apply message for effect(s) 'Stuck in a light snare'. #. ~ Apply message for effect(s) 'Stuck in a heavy snare'. @@ -82624,7 +84472,7 @@ msgstr "罠に掛かっています！" #: lang/json/effects_from_json.py msgid "Stuck in a heavy snare" -msgstr "強化くくり罠に掛かった" +msgstr "強化くくり罠" #: lang/json/effects_from_json.py msgid "Sleep Deprived" @@ -82633,7 +84481,7 @@ msgstr "睡眠不足" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "睡眠負債は増加し続けています。休息を取るべきです。" @@ -82787,7 +84635,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -82803,7 +84651,7 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" "　" "あなたの死後、人生に新たな価値を見出した。あなたに伝えることは無かったが、彼はかつて重罪人であったために社会での居場所を失っていた。世界崩壊の影響で過去の犯罪記録が失われてからは、率先して自分の価値を証明しようと努めた。大変動から数年後、彼は一人旅の最中に心臓発作で死亡した。" @@ -82824,7 +84672,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " @@ -82860,7 +84708,7 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" @@ -83256,7 +85104,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -83293,14 +85141,14 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " "of crimes against humanity." msgstr "" "　" -"勇敢に行動することもなく、精神的に不安定な状態で過ごした。大変動以前から自分の感情を素直に表現できないまま過ごしてきた彼女は、その後数年に渡って自殺未遂を繰り返した。ある時更生と新たな家族への帰属に惹かれ、超自然的なカルト教団に関わり始めたが、人道に対する罪を暴くためオールドガードがカルト教団に強襲をかけた際、彼女は無実であったにもかかわらず戦いに巻き込まれて死亡した。" +"勇敢に行動することもなく、精神的に不安定な状態で過ごした。大変動以前から自分の感情を素直に表現できないまま過ごしてきた彼女は、その後数年に渡って自殺未遂を繰り返した。ある時更生と新たな家族への帰属に惹かれ、超自然的なカルト教団に関わり始めたが、人道に対する罪を暴くためオールドガードがカルト教団に強襲をかけた際、彼女は無実であったにも関わらず戦いに巻き込まれて死亡した。" #: lang/json/epilogue_from_json.py msgid "" @@ -83592,11 +85440,11 @@ msgstr "ハブ01" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" -"大変動前から存在した研究所、ハブ01の生き残った職員です。実験室から出ていくことはまったく考えておらず、ロボットや高度な技術力を生かして生き延びようとしています。" +"大変動前から存在した研究所、ハブ01の生き残った職員です。実験室から出ることはまったく考えておらず、ロボットや高度な技術力を生かして生き延びようとしています。" #: lang/json/faction_from_json.py msgid "Hub 01 Ancillia" @@ -83759,12 +85607,12 @@ msgstr "避難者" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." msgstr "" -"文明は引き裂かれて残骸となり、一部の幸運な者だけが大変動の初期段階でなんとかバリケードの中に逃げ込みました。今のところは安全ですが、物資や今後を生き抜く技術は不足しています。彼らがモンスターや欲望に忠実な人間の餌食になるのは時間の問題です。" +"文明は引き裂かれて残骸となり、一部の幸運な者だけが大変動の初期段階でなんとかバリケードの中に逃げ込みました。今のところは安全ですが、物資や今後を生き抜く技術は不足しています。モンスターや欲望に忠実な人間の餌食になるのは時間の問題です。" #: lang/json/fault_from_json.py msgid "Dusty" @@ -83835,6 +85683,20 @@ msgstr "煤落とし" msgid "You clean your %s." msgstr "%sを綺麗に掃除しました" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "煤落としと潤滑" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "%sを綺麗に掃除し、油を差しました。" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "空薬莢残存" @@ -83858,6 +85720,30 @@ msgstr "薬莢抜取" msgid "You eject the spent casing from the %s." msgstr "%sの内部に残っている空薬莢を抜き取りました。" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "摩擦" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" +"油を差さずに出荷された新品か、掃除はされたものの長らく油が差されていません。いずれにせよ、摩擦が大きすぎて適切に操作できず、損傷する可能性があります。" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "潤滑" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "%sに油を差しました。" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "汚損" @@ -83879,6 +85765,11 @@ msgstr "" msgid "Clean gun" msgstr "掃除" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "掃除と潤滑" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "駆動ベルト摩耗" @@ -84601,11 +86492,13 @@ msgstr "室外機" msgid "A big, blocky metal device for refrigerating large areas." msgstr "広い区画を冷却するための、金属製の大きな装置です。" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "[金属が軋む音]" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "ガン！" @@ -86446,6 +88339,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "木製の柱の上に金属製の箱が乗っています。郵便はここしばらく配達されていないようです。この先も配達されるとは思えません。" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "ハンガーレール" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "衣類用ハンガーを掛けるためのレールです。" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "棚(金属)" @@ -87157,7 +89059,7 @@ msgstr "バンドソー" msgid "" "A ribbonlike sawblade runs in a single direction in this tool, allowing " "precise cuts at almost any angle." -msgstr "帯状ののこぎり刃が一定方向に回転させ、さまざまな角度を付けて素材を正確に切断できます。" +msgstr "帯状ののこぎり刃が一定方向に回転し、さまざまな角度を付けて素材を正確に切断できます。" #: lang/json/furniture_from_json.py msgid "router table" @@ -87356,8 +89258,8 @@ msgstr "アトミックバター撹拌機(設置)" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" "足を展開して設置した、唸り声のような恐ろしい音を立てるRivtechチャーニネーター4000です。生乳と塩を入れる準備ができています。地球が灰になって燃え尽きるまで攪拌を続けられます。" @@ -87391,7 +89293,7 @@ msgstr "水耕栽培装置(播種)" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "屋内で野菜を栽培できる独立式の水耕栽培装置です。種が植わっています。" @@ -87402,7 +89304,7 @@ msgstr "水耕栽培装置(発芽)" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "屋内で野菜を栽培できる独立式の水耕栽培装置です。小さな芽が育っています。" @@ -87413,7 +89315,7 @@ msgstr "水耕栽培装置(成長)" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "屋内で野菜を栽培できる独立式の水耕栽培装置です。植物がぐんぐん育っています。" @@ -87424,7 +89326,7 @@ msgstr "水耕栽培装置(完熟)" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "屋内で野菜を栽培できる独立式の水耕栽培装置です。完全に成熟し、収穫の準備が整いました。" @@ -87628,7 +89530,7 @@ msgstr "装置を動かしました..." #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py msgid "The bolts slide back into place." -msgstr "かんぬきががスライドして元の位置に戻りました。" +msgstr "かんぬきがスライドして元の位置に戻りました。" #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py @@ -87672,7 +89574,7 @@ msgstr[0] "酸の矢" #: lang/json/gun_from_json.py msgid "Fake gun that fires acid globs." -msgstr "酸溜まりを発射するフェイクアイテムです。" +msgstr "酸溜まりを発射する疑似アイテムです。" #: lang/json/gun_from_json.py lang/json/gun_from_json.py #: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py @@ -87814,7 +89716,7 @@ msgid "" "power, which can be used effectively by those of somewhat above-average " "strength. Good and easy to use, but nothing special." msgstr "" -"威力を増大させるために両端を射出方向と逆向きにに反らせた現代的な弓です。平均以上の筋力があれば効果的に扱えます。扱いやすい弓ですが、特別優れた性能ではありません。" +"威力を増大させるために両端を射出方向と逆向きに反らせた現代的な弓です。平均以上の筋力があれば効果的に扱えます。扱いやすい弓ですが、特別優れた性能ではありません。" #: lang/json/gun_from_json.py msgid "reflex bow" @@ -89175,9 +91077,9 @@ msgstr "" ".300口径のM1918及びM1919の後継として開発された汎用マシンガンです。肩付けや腰溜めで撃つには重く、非常に制御が困難です。なかなかアクション映画の主人公みたいにはいきませんね。" #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" -msgstr[0] "ライフル(.308口径/ﾊﾟｲﾌﾟ銃)" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" +msgstr[0] "ライフル(.308口径/手製ﾍﾋﾞｰｶｰﾋﾞﾝ)" #: lang/json/gun_from_json.py msgid "" @@ -89385,6 +91287,19 @@ msgid "" msgstr "" "モスバーグ・ブラウニーに少し似ている、小さくずんぐりした形のデリンジャーピストルです。回転する撃針で正方形に並んだ4つの銃身を順に叩いて発射します。" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "ハンドガン(.38口径/S&W M10)" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" +"1899年以来生産され続け、20世紀で最も人気の高いハンドガンとして知られている6連発リボルバーです。素早く装填できる振出式のシリンダーを備えています。" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -89404,7 +91319,7 @@ msgstr "秘匿携行性能を重視した設計のコンパクトなリボルバ #: lang/json/gun_from_json.py msgid "S&W 619" msgid_plural "S&W 619" -msgstr[0] "ハンドガン(.38口径/S&W 619)" +msgstr[0] "ハンドガン(.38口径/S&W M619)" #: lang/json/gun_from_json.py msgid "" @@ -89496,6 +91411,17 @@ msgid "" "quality, durable materials." msgstr ".380口径の準小型ピストルです。隠し持つ用途で設計されており、高品質で耐久性の高い素材で作られています。" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "ハンドガン(.38口径スーパー/AF2011A1)" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "1度に2発の弾薬を発射する、M1911の派生モデルとなるイタリア製のセミオートピストルです。" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -89568,7 +91494,7 @@ msgstr "自家製の6連発リボルバーです。大変動以前に造られ #: lang/json/gun_from_json.py msgid "S&W 610" msgid_plural "S&W 610" -msgstr[0] "ハンドガン(.40口径/S&W 610)" +msgstr[0] "ハンドガン(.40口径/S&W M610)" #: lang/json/gun_from_json.py msgid "" @@ -89655,19 +91581,6 @@ msgid "" msgstr "" "ベトナム戦争でアメリカ軍が使用したことで有名な汎用グレネードランチャーです。大部分は後発の現代的なランチャーに置き換えられましたが、M79は今なお世界中で運用されています。" -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "ランチャー(40mm/ﾏｰｸ19)" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"重量のあるベルト給弾式グレネードランチャーです。設置用の頑丈な三脚が付いています。冷戦時代の初期から大変動後の現在までアメリカ軍が使用しています。もし対応する40mm擲弾をたっぷり持っていれば、あなたにも使えます。" - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -89711,6 +91624,19 @@ msgstr "手製の40mm3連グレネードランチャーです。3発同時に発 msgid "multi" msgstr "マルチ" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "ランチャー(40mm/ﾏｰｸ19)" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"重量のあるベルト給弾式グレネードランチャーです。設置用の頑丈な三脚が付いています。冷戦時代の初期から大変動後の現在までアメリカ軍が使用しています。もし対応する40mm擲弾をたっぷり持っていれば、あなたにも使えます。" + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -89724,6 +91650,19 @@ msgid "" msgstr "" "AK47と同じくカラシニコフの設計思想に基いて開発された、セミオートショットガンです。給弾は弾倉式で、他の一般的なショットガンと違い一度に最大数まで装填できます。" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "ショットガン(.410口径/ｳｨﾝﾁｪｽﾀｰM37)" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" +".410口径弾を装填できる中折れ式の単発ショットガンです。12ゲージのショットガンよりも反動の少ない代替品として開発された銃で、軽量かつ構造も単純です。" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -89771,7 +91710,7 @@ msgstr "世界で最も強力な部類の拳銃です。無骨で頑丈な造り #: lang/json/gun_from_json.py msgid "S&W 629" msgid_plural "S&W 629" -msgstr[0] "ハンドガン(.44口径/S&W 629)" +msgstr[0] "ハンドガン(.44口径/S&W M629)" #: lang/json/gun_from_json.py msgid "" @@ -89986,6 +91925,17 @@ msgid "" "has impressive stopping power." msgstr ".454カスール弾を使用する5連発リボルバーです。その名に恥じない絶大な制止力を発揮します。" +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "ハンドガン(.454口径/ﾀｳﾙｽﾚｲｼﾞﾝｸﾞｼﾞｬｯｼﾞﾏｸﾞﾅﾑ)" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr ".454カスール弾を使用する5連発リボルバーです。.410口径散弾と.45口径コルト弾も装填できます。" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -90026,6 +91976,36 @@ msgid "" msgstr "" "バッファローなどの大型動物の狩猟目的で19世紀後半に使われていた、アンティークものの.45-70口径単発ライフルです。当時も非常に正確で強力な銃でしたが、この銃は現代の無煙火薬にも対応しています。" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "ハンドガン(.410口径/ﾎﾞﾝﾄﾞｱｰﾑｽﾞﾃﾞﾘﾝｼﾞｬｰ)" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" +"ボンドアームズ社のデリンジャーは多筒式のコンパクトな拳銃です。一般的には.45口径コルト弾を使用しますが、.410口径弾も十分装填できる長さを備えています。" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "ライフル(.45口径ｺﾙﾄ/ﾗｲﾄﾆﾝｸﾞ)" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" +"コルト社のポンプアクション式ライフルを復刻したものです。元々は.44-40口径弾を使いましたが、現代ではもっぱら.45口径コルト弾が使われ、カウボーイ・シューティング競技に用いるシングルアクションアーミーとして脚光を浴びています。" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "カチッカチッ。" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -90147,7 +92127,7 @@ msgstr[0] "ライフル(.50口径/ﾌﾞﾛｰﾆﾝｸﾞM2HB HMG)" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" "アメリカ軍が世界に誇る傑作重機関銃です。大変動の遥か昔から現在に至るまで主に軍によって使われていますが、まれに生存者によっても使われることがあります。巨大で重いため、設計上どこかに設置するか、または車載した状態でなければ射撃できません。" @@ -90229,7 +92209,7 @@ msgstr "" #: lang/json/gun_from_json.py msgid "S&W 500" msgid_plural "S&W 500" -msgstr[0] "ハンドガン(.50口径/S&W 500)" +msgstr[0] "ハンドガン(.50口径/S&W M500)" #: lang/json/gun_from_json.py msgid "" @@ -90338,7 +92318,7 @@ msgid "" "flamethrowers still in use in Vietnam. It has four barrels sharing the 66mm" " caliber of the M72 LAW." msgstr "" -"1970年代に第二次世界大戦時代のの火炎放射器に代わって設計され、ベトナム戦争まで使われ続けたアメリカのロケットランチャーです。口径66mmのM72 " +"1970年代に第二次世界大戦時代の火炎放射器に代わって設計され、ベトナム戦争まで使われ続けたアメリカのロケットランチャーです。口径66mmのM72 " "LAWを装填する4つの砲身があります。" #: lang/json/gun_from_json.py @@ -91501,7 +93481,7 @@ msgstr[0] "ショットガン(ｺﾌﾞﾗｲ･ｽﾄﾘｰﾄｽｲｰﾊﾟ #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -91657,7 +93637,7 @@ msgstr[0] "ライフル(A7ﾚｰｻﾞｰﾗｲﾌﾙ)" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" "独立研究開発機関\"Aerial " @@ -91722,6 +93702,17 @@ msgid "" "ammunition." msgstr "木製の吹き矢筒です。使い方は簡単でしかも正確に飛んでいきます。弾としてダーツを使います。" +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "震える生体銃" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "ミ＝ゴと呼ばれる怪物から引き剥がした銃です。扱い方もリロードの方法も分かりません。" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -91768,7 +93759,7 @@ msgstr[0] "ハンドガン(CRIT .5LP)" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -91781,7 +93772,7 @@ msgstr[0] "ランチャー(CRITﾁｪｲﾝﾚｰｻﾞｰ)" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -91795,7 +93786,7 @@ msgstr[0] "サブマシンガン(CRITﾚｰｻﾞｰｶｰﾋﾞﾝ)" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "C.R.I.T研究開発部が開発した銃身が短く軽いレーザーガンです。レーザー兵器のブレイクスルーを主目的として開発されました。" @@ -91806,8 +93797,8 @@ msgstr[0] "ライフル(CRITｴﾈﾙｷﾞｰﾗｲﾌﾙ)" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "C.R.I.T研究開発部が開発した大型エネルギー銃です。ハイブリッド兵器のブレイクスルーを主目的として開発されました。" #: lang/json/gun_from_json.py @@ -91817,12 +93808,12 @@ msgstr[0] "サブマシンガン(CRIT CQB標準仕様銃器)" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" "中距離で汎用性が高い9mm弾と威力の高い散弾を組み合わせた、シンプルな軍用複合銃です。CQBの戦法を補完するため、銃床は使用者の力を増幅するトンファーのようなグリップが付いた形状になっており、敵の頭をぶん殴れるほど頑丈です。内蔵型の弾倉は弾薬を装填し辛い構造ですが、クリップが誤って外れてしまう事故を防ぎます。" @@ -91846,11 +93837,11 @@ msgstr[0] "ライフル(ﾍﾟﾚｯﾄｶﾞﾝ)" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" "小動物であれば確実に仕留められる、非常に強力なエアガンです。鉛か合金製の小さなペレットに対応しており、どの弾薬も実用的です。狙いも正確で、.22口径と同程度のダメージを与えられますが、ペレットを装填する作業にはある程度の筋力が必要です。" @@ -91861,7 +93852,7 @@ msgstr[0] "プラズマカッター" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "C.R.I.T研究開発部が開発中の、実験的な切削用工具です。超高温のプラズマを発射して素材を切断します。" @@ -91872,8 +93863,8 @@ msgstr[0] "リベットドライバー" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -91886,7 +93877,7 @@ msgstr[0] "ラインガン" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "C.R.I.T研究開発部が開発中の、実験的な高出力の切削用工具です。超高温の幅の広いプラズマを発射して高密度素材を切断します。" @@ -91897,8 +93888,8 @@ msgstr[0] "ライフル(ﾊﾟﾙｽﾗｲﾌﾙ)" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" "C.R.I.T研究開発部が開発中の、実験的な三連式亜音速ライフルです。閉所や集団との戦闘に最適の銃器です。命中時に急速に膨張する合金製の弾丸を撃ち出します。" @@ -91910,7 +93901,7 @@ msgstr[0] "リッパー" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "C.R.I.T研究開発部が開発中の、実験的なノコギリ型電磁工具です。遠距離から素材を切断するのに最適です。" @@ -91934,8 +93925,8 @@ msgstr[0] "ハンドガン(9mm/YEET砲)" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" "このちびっ子を使って全弾をYEETしましょう。道中の全てのゾンビ、全ての巨体ゾンビ、クモ、クソハダカデバネズミをどんどんYEETしましょう。" @@ -92052,8 +94043,9 @@ msgstr[0] "ハンドガン(.454口径/JHEC M128)" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" "Johnson Heavy Equipment社のM128オートリボルバーは、何もかもが期待外れです。Johnson Heavy " "Equipment社はD&B Minneapolisの子会社です。" @@ -92139,8 +94131,8 @@ msgstr "" "アメリカ驚異の工学技術をご照覧あれ。この強力な.44口径マグナム弾を用いるサブマシンガンは細かな部品からアメリカ国内で組み立てられており、一体型のグレネードランチャーが取り付けてあります。イーグル1776、自由の兵器庫から生まれた銃！" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" msgstr[0] "サブマシンガン(L.T.ｶｰﾋﾞﾝ)" #: lang/json/gun_from_json.py @@ -92482,7 +94474,7 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" "大変動直前に準軍事的な独立研究機関で開発された、強力なエレクトロレーザーです。電子回路を持つ標的に対して特に効果を発揮します。UPS充電ステーションで充電できます。" @@ -92506,8 +94498,8 @@ msgstr[0] "ライフル(ﾚｰｻﾞｰﾗｲﾌﾙ)" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" @@ -92649,6 +94641,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "頑丈で柔軟な木に凝った装飾が施された、魔法の力を秘めた弓です。弓を引き絞ると対応する木の矢が生成されます。" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "棘付きジャベリンを発射する疑似アイテムです。" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -92673,7 +94669,7 @@ msgstr[0] "ロボット用銃器(ベース)" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "これはモンスターが攻撃をする際の疑似アイテムです。このアイテムが見えている場合はバグが発生しています。" #: lang/json/gun_from_json.py @@ -92844,9 +94840,9 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" -"生きたブロブがバリアのようにフレーム全体に貼りつき、自律式の武器に変化したものです。角質のような突起を生成する能力を持ち、突起はうねうねと伸び縮みする房によって操作されています。この「歯」は不運な獲物を引っ掛けて近くまで巻き取ります。外膜は激しい動きに耐えられるよう分厚くなっています。簡単に引き剥すことができそうです..." +"生きたブロブがバリアのようにフレーム全体に貼りつき、自律式の武器に変化したものです。角質のような突起を生成する能力を持ち、突起はうねうねと伸び縮みする房によって操作されています。この「歯」は不運な獲物を引っ掛けて近くまで巻き取ります。外膜は激しい動きに耐えられるよう分厚くなっています。簡単に引き剥せそうです..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "gel shooter" @@ -92859,7 +94855,7 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" "生きたブロブが自律式の武器に変化したものです。このブロブの一部分は地面に落ちた物体を底引き網のように掬い、栄養分にしています。残りのブロブは近くにいる任意の脅威に対して高速で射出されます。この不定形の部品は車両に手で取り付けることができますが、武装自体は制御装置がないと稼働しません。引き剥がせるほど柔らかくなっているようです..." @@ -93377,16 +95373,6 @@ msgid "" msgstr "" "空圧式アサルトライフルを大幅に強化して、弾速と発射間隔をより高速にしました。一方で改造によって非常に扱いづらくなっているため、発射するには固定用の台に設置する必要があります。" -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "ハンドガン(.38口径/M10ﾘﾎﾞﾙﾊﾞｰ)" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "素早く装填できる振出式のシリンダーを備えた6連発リボルバーです。" - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -93401,44 +95387,6 @@ msgid "" msgstr "" "コンパクトに折り畳んで収納できる、.410口径ショットガンの銃身と.22口径リムファイア式銃身を組み合わせた軽量ライフルです。軍用機のパイロットが墜落して取り残された際に使えるよう設計されましたが、開発以後は様々な企業が一般市場向けに製造しました。" -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "ライフル(.45口径ｺﾙﾄ/ﾗｲﾄﾆﾝｸﾞ)" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -"コルト社のポンプアクション式ライフルを復刻したものです。元々は.44-40口径弾を使いましたが、現代ではもっぱら.45口径ロングコルト弾が使われ、カウボーイ・シューティング競技に用いるシングルアクションアーミーとして脚光を浴びています。" - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "ハンドガン(.410口径/ﾎﾞﾝﾄﾞｱｰﾑｽﾞﾃﾞﾘﾝｼﾞｬｰ)" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" -"ボンドアームズ社のデリンジャーは二連式のコンパクトな拳銃です。一般的には.45口径ロングコルト弾を使用しますが、ショットガン用.410口径弾も十分装填できる長さを備えています。" - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] "ショットガン(.410口径/ﾕｰｽ)" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" -"ショットガン用.410口径弾を装填できる古い中折れ式のショットガンです。通常のショットガンよりも反動の少ない代替品として開発された銃で、軽量かつ構造も単純です。" - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -93450,41 +95398,6 @@ msgid "" " with a hammer to strike the single round it holds." msgstr "ショットガン用.410口径弾を使用する自家製のショットガンです。単発式で、パイプと銃床を組み合わせたフレームに引き金と撃鉄が付いています。" -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "ハンドガン(.38口径ｽｰﾊﾟｰ/AF2011A1)" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "2つの銃身を持つセミオートピストルです。2丁のM1911を溶接したような見た目です。" - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "ハンドガン(.38口径ｽｰﾊﾟｰ/M1991A1)" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr ".38口径スーパー弾を装填する最新のM1911です。精度の高さに定評があります。" - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "ハンドガン(.454口径/ﾀｳﾙｽﾚｲｼﾞﾝｸﾞｼﾞｬｯｼﾞﾏｸﾞﾅﾑ)" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" -".454カスール弾を使用する5連発リボルバーです。その名に恥じない絶大な制止力を発揮します。ショットガン用.410口径弾と.45口径ロングコルト弾を装填できます。" - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -94073,7 +95986,7 @@ msgid "" "questionable craftsmanship and lack of unobtainium SP-1 parts." msgstr "" "元々コルトSP-1用に設計された部品の「複製品」であり、AR-" -"15ライフルの射撃タイプをフルオートのみに改造するための部品です。一度改造を施せば、セミオート射撃は不可能になりります。精巧な職人技と入手が困難なSP-" +"15ライフルの射撃タイプをフルオートのみに改造するための部品です。一度改造を施すとセミオート射撃はできなくなります。精巧な職人技と入手が困難なSP-" "1の部品が欠如しているため、信頼性と精度が大幅に低下します。" #: lang/json/gunmod_from_json.py @@ -94626,10 +96539,10 @@ msgstr[0] "テレスコピックサイト" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" -"簡素な作りのテレスコピックサイトは、要は十字線が入った望遠鏡です。大変動以前に作られたものほど性能は良くありません。取り付けると重量が増加しますが、精度が向上します。" +"簡素な作りのテレスコピックサイト、要は十字線が入った望遠鏡です。大変動以前に作られたものほど性能は良くありません。取り付けると重量が増加しますが、精度が向上します。" #: lang/json/gunmod_from_json.py msgid "telescopic pistol sight" @@ -94974,6 +96887,17 @@ msgid "" msgstr "" "精度を犠牲にして大型ランチャーの機能をコンパクトにまとめたグレネードランチャーです。基本的には他の銃器に取り付けて使用しますが、銃床を取り付けることで単発式小型グレネードランチャーとして単体で運用することもできます。組み立ては製作メニューから行います。ハンドガンとポンプアクション式の銃以外のほぼすべての銃器に取り付けられるように改造してあります。" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "M6サバイバルショットガン" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "チアッパM6サバイバルガンに付属の12ゲージショットガンです。この部品は銃から取り外せません。" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -95198,7 +97122,7 @@ msgstr[0] "アンダーバレルフレアガン" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "信号弾を発射する小型のランチャーです。取り付け位置のため、一般的なフレアガンと比較すると精度は下がります。" @@ -95220,9 +97144,9 @@ msgstr[0] "銃床(バットフック)" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "折り畳むと銃を小型化できる軍用銃床です。部品自体の重量と旋回するフックによって、銃の安定性が大幅に向上します。" #: lang/json/gunmod_from_json.py @@ -95233,10 +97157,10 @@ msgstr[0] "回析レンズ" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" -"レーザー兵器用に作られた光学ツールです。レーザービームをより低出力の複数のビームに回析させることで威力と命中率を向上させますが、射程が大幅に減少します。" +"レーザー兵器用に作られた光学ツールです。レーザービームをより低出力の複数のビームに回析させることで威力と精度を向上させますが、射程が大幅に減少します。" #: lang/json/gunmod_from_json.py msgid "tactical flashlight" @@ -95401,17 +97325,6 @@ msgid "" msgstr "" "他から抜き取った刃と何本かの紐で作られた、その場しのぎの銃剣です。銃クロスボウやに取り付けておけば、遠い間合いから攻撃できる近接武器になります。" -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "M6 ASW搭載ショットガン" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "米空軍パイロットのサバイバル用銃器として開発された、.410口径の統合ショットガンです。この部品は銃から取り外せません。" - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "魚の内臓を取り、切り身にしました。" @@ -95928,7 +97841,7 @@ msgid "" "be done in a variety of ways, but all require the installation of a special " "bionic just for that purpose." msgstr "" -"大抵のCBMを使う荷はは電力が必要で、その電力を蓄えるには内蔵型のバッテリーが不可欠です。現在の電力はサイドバーにあるHPバーの真下に表示されます。電力の供給には様々な方法がありますが、どの方法をとるにせよ、特定の電力供給機能をもつCBMが必要です。" +"大抵のCBMを起動するには電力が必要で、その電力を蓄えるには内蔵型のバッテリーが不可欠です。現在の電力はサイドバーにあるHPバーの真下に表示されます。電力の供給には様々な方法がありますが、どの方法をとるにせよ、特定の電力供給機能をもつCBMが必要です。" #: lang/json/help_from_json.py msgid "" @@ -95965,7 +97878,7 @@ msgid "" "Take note that bionic installation or uninstallation require narcosis, " "fixation of the patient and operation inself may take hours. So you have to" " make sure that you will safe during this process." -msgstr "CBMを移植・除去する際はは患者の身体が固定され、外科手術が行われるため、注意が必要です。手術中の安全を確保しておきましょう。" +msgstr "CBMを移植・除去する際は患者の身体が固定され、外科手術が行われるため、注意が必要です。手術中の安全を確保しておきましょう。" #: lang/json/help_from_json.py msgid ": Crafting" @@ -96110,7 +98023,7 @@ msgstr "" msgid "" "Some traps can be build via the construction menu. Pit traps are the most " "common example of such traps." -msgstr "建設メニューから設置できる罠もあります。落とし穴などはその最も一般的なな例です。" +msgstr "建設メニューから設置できる罠もあります。落とし穴などはその最も一般的な例です。" #: lang/json/help_from_json.py msgid ": Items overview" @@ -96145,7 +98058,7 @@ msgid "" "strength. Cutting damage is a guaranteed increase in damage, but it may be " "reduced by a monster's natural armor." msgstr "" -"あらゆるアイテムは近接武器として扱えますが、近接武器としての利用に特化したアイテムも存在します。で所持品メニューを開き、対応する文字キーを押すことでアイテムの武器としての性能を確認できます。性能の値は打撃、斬撃、命中率補正の3つです。打撃は非常に防御が難しく大抵の敵に有効ですが、筋力が低いとまともなダメージを与えられません。斬撃は装甲が薄い敵に大ダメージを与えられますが、装甲防御によって比較的容易に軽減されてしまいます。" +"あらゆるアイテムは近接武器として扱えますが、近接武器としての利用に特化したアイテムも存在します。で所持品メニューを開き、対応する文字キーを押すことでアイテムの武器としての性能を確認できます。性能の値は打撃、斬撃、精度補正の3つです。打撃は非常に防御が難しく大抵の敵に有効ですが、筋力が低いとまともなダメージを与えられません。斬撃は装甲が薄い敵に大ダメージを与えられますが、装甲防御によって比較的容易に軽減されてしまいます。" #: lang/json/help_from_json.py msgid "" @@ -97158,10 +99071,6 @@ msgstr "ワイヤー/ボルトを切る" msgid "Heat up food (with it)" msgstr "食料を温める" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "木/紙/骨/キチンを修復する" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "工具用MODを取り付ける" @@ -97983,6 +99892,11 @@ msgid "" " This can feel good." msgstr "この衣服は濡れ状態でも正常に機能し、着心地が良いです。" +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "このアイテムはパワーアーマーと同時に着用できます。" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -98409,7 +100323,7 @@ msgstr "所持品から着用する" #: lang/json/keybinding_from_json.py msgid "Equip armor from inventory at this position" -msgstr "所持アイテムをを選択位置に着用する" +msgstr "所持アイテムを選択位置に着用する" #: lang/json/keybinding_from_json.py msgid "Unequip selected armor" @@ -99103,7 +101017,8 @@ msgstr "隣接タイルに建設する" msgid "Disassemble items" msgstr "アイテムを分解する" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "睡眠" @@ -99913,7 +101828,8 @@ msgstr "スズメバチの巣" msgid "Wasp nest is here." msgstr "スズメバチの巣があります。" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "クモ" @@ -99972,6 +101888,33 @@ msgstr "池" msgid "Small pond is here." msgstr "小さな池があります。" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "並木" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "並び立つ樹木です。" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "草むら" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "背の高い草が生い茂っています。" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "廃屋" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "倒壊しかかった小屋です。" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "粘土層" @@ -100042,7 +101985,7 @@ msgstr "死体" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "大変動で失われた数多の命のうちの何人かです。" #. ~ Computer name @@ -100815,6 +102758,16 @@ msgstr "走るな！" msgid "NO Diving!" msgstr "飛び込み禁止！" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "武器庫管理端末" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "武器庫を解錠" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -100911,7 +102864,7 @@ msgstr "EnviroCom OS v2.03 - 地下入室管理" #. ~ Computer option #: lang/json/mapgen_from_json.py msgid "Unlock stairs" -msgstr "階段を開錠" +msgstr "階段を解錠" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -100949,8 +102902,7 @@ msgid "Emergency Message" msgstr "緊急メッセージ" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "外部電力を無効化する" @@ -101072,7 +103024,7 @@ msgstr "緊急退避 - 全扉開放" #. ~ Computer option #: lang/json/mapgen_from_json.py msgid "UNLOCK AUTODOC DOOR" -msgstr "オートドク開錠" +msgstr "オートドク解錠" #. ~ Computer name #: lang/json/mapgen_from_json.py @@ -101122,7 +103074,7 @@ msgstr "図書室管理端末" #. ~ Computer option #: lang/json/mapgen_from_json.py msgid "UNLOCK ENTRANCE" -msgstr "入口を開錠" +msgstr "入口を解錠" #. ~ Computer name #: lang/json/mapgen_from_json.py @@ -101152,7 +103104,7 @@ msgstr "PE012 保管庫" #. ~ Computer option #: lang/json/mapgen_from_json.py msgid "UNLOCK STORAGE" -msgstr "保管庫を開錠" +msgstr "保管庫を解錠" #. ~ Computer name #: lang/json/mapgen_from_json.py @@ -101544,7 +103496,7 @@ msgid "" "Your attacks lead to counterattacks which disable your opponents and set " "them up for a powerful finishing move." msgstr "" -"少林拳に伝わる、五獣拳の1つです。龍形拳は流れるような動作と激しい打撃が特徴です。器用ではなく知性依存で命中率が向上します。最初の攻撃が敵を動けなくするカウンター攻撃へと派生し、強力な必殺技の予備動作となります。" +"少林拳に伝わる、五獣拳の1つです。龍形拳は流れるような動作と激しい打撃が特徴です。器用ではなく知性依存で精度が向上します。最初の攻撃が敵を動けなくするカウンター攻撃へと派生し、強力な必殺技の予備動作となります。" #: lang/json/martial_art_from_json.py msgid "Dragon's Flight" @@ -101575,9 +103527,9 @@ msgid "" "\n" "Accuracy increased by 25%% of Intelligence but decreased by 25%% of Dexterity." msgstr "" -"素早さに頼らずに、直感で狙いを定めて攻撃方法を事前に組み立てます。器用ではなく知性依存で命中率が向上します。\n" +"素早さに頼らずに、直感で狙いを定めて攻撃方法を事前に組み立てます。器用ではなく知性依存で精度が向上します。\n" "\n" -"知性x25%%の命中率上昇、器用x25%%の命中率低下" +"知性x25%%の精度上昇、器用x25%%の精度低下" #: lang/json/martial_art_from_json.py msgid "Eskrima" @@ -101604,7 +103556,7 @@ msgid "" msgstr "" "武器を最大限に活用する方法を心得ています。「武器」という言葉の用い方は非常に主観的かもしれませんが。\n" "\n" -"命中+2" +"精度+2" #: lang/json/martial_art_from_json.py msgid "Fencing" @@ -101653,7 +103605,7 @@ msgstr "固守" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -101716,7 +103668,7 @@ msgid "" "rapid, precise attacks, blocks, and fluid movement. A successful hit allows" " you an extra dodge and two extra blocks on the following round." msgstr "" -"空手は日本を発祥とする人気の高い武術です。素早く正確な攻撃、防御、流れるような身のこなしに重点が置かれています。攻撃の命中が、次ターンでの回避率上昇と敵の攻撃をブロックする技の発動に繋がります。" +"空手は日本を発祥とする人気の高い武術です。素早く正確な攻撃、防御、流れるような身のこなしに重点が置かれています。攻撃の命中が、次ターンでの回避精度上昇と敵の攻撃をブロックする技の発動に繋がります。" #: lang/json/martial_art_from_json.py msgid "Karate Strike" @@ -101747,9 +103699,9 @@ msgid "" "\n" "+2 Accuracy." msgstr "" -"油断のない空手の構えによって、命中率が向上します。\n" +"油断のない空手の構えによって、精度が向上します。\n" "\n" -"命中+2" +"精度+2" #: lang/json/martial_art_from_json.py msgid "Krav Maga" @@ -101775,7 +103727,7 @@ msgid "" "\n" "+1 Accuracy, +1 Block attempts." msgstr "" -"訓練によって命中率や複数の敵との戦闘技術を向上させます。\n" +"訓練によって命中精度や複数の敵との戦闘技術を向上させます。\n" "\n" "命中+1、ブロック+1" @@ -101791,7 +103743,7 @@ msgid "" " Dexterity. Moving increases dodge skill and accuracy further. Attacking " "after moving increases damage." msgstr "" -"少林拳に伝わる、五獣拳の1つです。豹形拳は戦略的な素早い攻撃が特徴です。感覚ではなく知性によって命中率が上昇し、移動することで回避スキルと命中率が更に上昇します。移動後に攻撃すると与ダメージが増加します。" +"少林拳に伝わる、五獣拳の1つです。豹形拳は戦略的な素早い攻撃が特徴です。感覚ではなく知性によって命中精度が上昇し、移動することで回避スキルと命中精度が更に上昇します。移動後に攻撃すると与ダメージが増加します。" #: lang/json/martial_art_from_json.py msgid "Leopard's Strategy" @@ -101842,7 +103794,7 @@ msgid "" msgstr "" "堂々と忍び寄り、容赦なく襲い掛かるための準備をします。\n" "\n" -"命中+2\n" +"命中精度+2\n" "「豹の急襲」有効化\n" "1ターン継続" @@ -101894,7 +103846,7 @@ msgid "" msgstr "" "油断なき騎士の構えによって、剣による防御力が上昇しました。\n" "\n" -"回避+1、筋力x50%%ののブロック時ダメージ軽減" +"回避+1、筋力x50%%のブロック時ダメージ軽減" #: lang/json/martial_art_from_json.py msgid "Muay Thai" @@ -101986,7 +103938,7 @@ msgid "" msgstr "" "忍者は訓練によって非常に機敏で機動的な動きを身に着けます。\n" "\n" -"回避スキル+1.0、器用x20%%の命中率上昇\n" +"回避スキル+1.0、器用x20%%の命中精度上昇\n" "1ターン継続" #: lang/json/martial_art_from_json.py @@ -102170,7 +104122,7 @@ msgid "" msgstr "" "攻撃をかわす度に相手の戦闘スタイルを見切り、より正確に攻撃できるようになります。\n" "\n" -"器用x15%%の命中率上昇\n" +"器用x15%%の命中精度上昇\n" "2ターン継続、最大蓄積数3" #: lang/json/martial_art_from_json.py @@ -102185,7 +104137,7 @@ msgid "" " than Dexterity. Standing still will increases your accuracy and damage of " "your next attack." msgstr "" -"少林拳に伝わる五獣拳の1つです。蛇形拳はしなやかな動きと正確な攻撃を使いこなします。PERが命中率とダメージに同じくらい関わります。器用ではなく感覚によって命中率が決定します。その場に留まると、次の攻撃の命中率と威力が上昇します。" +"少林拳に伝わる五獣拳の1つです。蛇形拳はしなやかな動きと正確な攻撃を使いこなします。器用ではなく感覚によって命中精度が決定します。その場に留まると、次の攻撃の精度と威力が上昇します。" #: lang/json/martial_art_from_json.py msgid "Snake's Sight" @@ -102201,7 +104153,7 @@ msgid "" msgstr "" "敵の最大の弱点を見つけ、攻撃の好機を忍耐強く待ちます。\n" "器用ではなく感覚によって命中率が上昇します。\n" -"感覚x25%%の命中率上昇、器用x25%%の命中率低下" +"感覚x25%%の命中精度上昇、器用x25%%の命中精度低下" #: lang/json/martial_art_from_json.py msgid "Sōjutsu" @@ -102342,7 +104294,7 @@ msgid "" msgstr "" "敵の動きを正確に捉える位置取りによって攻撃の正確性を増し、防御を掻い潜ります。\n" "\n" -"感覚x20%%の命中率上昇、感覚x50%%の打撃防御貫通。\n" +"感覚x20%%の命中精度上昇、感覚x50%%の打撃防御貫通。\n" "2ターン継続" #: lang/json/martial_art_from_json.py @@ -102356,7 +104308,7 @@ msgid "" "attacks above all else. Your Strength determines your accuracy, and your " "attacks do increasing damage as you continue attacking." msgstr "" -"少林拳に伝わる、五獣拳の1つです。虎形拳の全ては敵を寄せ付けない激しい攻撃にあります。器用さではなく筋力によって命中率が決定されます。連続で攻撃が命中する度に威力が上昇します。" +"少林拳に伝わる、五獣拳の1つです。虎形拳の全ては敵を寄せ付けない激しい攻撃にあります。器用さではなく筋力によって命中精度が決定されます。連続で攻撃が命中する度に威力が上昇します。" #: lang/json/martial_art_from_json.py msgid "Tiger Fury" @@ -102392,9 +104344,9 @@ msgid "" msgstr "" "守備も、計略も、必要ありません。必要なのは力です。力で敵の防御を打ち砕き、完全に圧倒します。\n" "\n" -"器用ではなく筋力によって命中率が上昇します。\n" +"器用ではなく筋力によって命中精度が上昇します。\n" "\n" -"筋力x25%%の命中率上昇、器用x25%%の命中率低下" +"筋力x25%%の命中精度上昇、器用x25%%の命中精度低下" #: lang/json/martial_art_from_json.py msgid "Wing Chun" @@ -102458,7 +104410,7 @@ msgid "" " dodge, you inflict more damage with your counterattack for until the end of" " your next turn." msgstr "" -"「ドランクンボクシング」とも呼ばれる酔拳は、酔っぱらいの動きを真似て敵を惑わす武術です。知性を基準に命中率と回避率にボーナスを得ます。移動すると敵の攻撃を回避しやすくなり、回避すると次ターンまで与ダメージが増加します。" +"「ドランクンボクシング」とも呼ばれる酔拳は、酔っぱらいの動きを真似て敵を惑わす武術です。知性を基準に命中精度と回避率にボーナスを得ます。移動すると敵の攻撃を回避しやすくなり、回避すると次ターンまで与ダメージが増加します。" #: lang/json/martial_art_from_json.py msgid "Zui Quan Stance" @@ -102490,7 +104442,7 @@ msgid "" msgstr "" "酔拳をより深く理解しています。回避と攻撃の技術が大幅に向上しました。\n" "\n" -"回避+1、知性x15%%の命中率上昇" +"回避+1、知性x15%%の命中精度上昇" #: lang/json/martial_art_from_json.py msgid "Drunken Stumble" @@ -102579,7 +104531,7 @@ msgstr "" "set_hit_bonus( get_hit_bonus() + 1 );\n" "}\n" "\n" -"ブロック+2、命中+1" +"ブロック+2、命中精度+1" #: lang/json/martial_art_from_json.py msgid "Centipede Kung Fu" @@ -102673,7 +104625,7 @@ msgid "" "Lasts 3 turns." msgstr "" "付近の壁を登り、跳躍し、押し離れることで、油断した相手に上方から襲い掛かります。\n" -"壁の付近で命中+3\n" +"壁の付近で命中精度+3\n" "3ターン継続" #: lang/json/martial_art_from_json.py @@ -102854,7 +104806,7 @@ msgstr "C.R.I.T猛攻" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "追加ダメージ・貫通ボーナス蓄積、最大蓄積数5。" #: lang/json/martial_art_from_json.py @@ -102867,7 +104819,7 @@ msgstr "C.R.I.T精密攻撃" msgid "" "Increased accuracy along with minor cut and stab damage with piercing " "capability." -msgstr "攻撃を貫通させる技術を身に着け、斬撃/刺突与ダメージが上昇し、命中率が向上します。" +msgstr "攻撃を貫通させる技術を身に着け、斬撃/刺突与ダメージが上昇し、命中精度が向上します。" #: lang/json/martial_art_from_json.py msgid "C.R.I.T Enforcement" @@ -102877,7 +104829,7 @@ msgstr "C.R.I.T執行官戦闘術" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" "周囲の敵に対して気絶、吹き飛ばし、転倒効果をもつ防御的な戦闘スタイルです。命中する度に防御力が0.125増加し、その他の戦闘ボーナス効果が付与されます。" @@ -102889,7 +104841,7 @@ msgstr "C.R.I.T増強" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "防御力+0.05、その他ボーナス効果蓄積。最大蓄積数10。" #: lang/json/martial_art_from_json.py @@ -102898,8 +104850,8 @@ msgstr "C.R.I.T防御" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." -msgstr "防御力+1。筋力に対応した命中率、打撃与ダメージ、貫通力の向上。" +msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgstr "防御力+1。筋力に対応した命中精度、打撃与ダメージ、貫通力の向上。" #: lang/json/martial_art_from_json.py msgid "C.R.I.T CQB" @@ -102909,7 +104861,7 @@ msgstr "C.R.I.T CQB" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "素早い攻撃と激しい突きを中心とした戦闘スタイルです。攻撃が命中する度に打撃与ダメージが25%上昇し、戦闘ボーナス効果が付与されます。" #: lang/json/martial_art_from_json.py @@ -102919,7 +104871,7 @@ msgstr "C.R.I.T持久戦" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "器用に対応した攻撃速度上昇、その他ボーナス効果蓄積。最大蓄積数5。" #: lang/json/martial_art_from_json.py @@ -102930,7 +104882,7 @@ msgstr "C.R.I.T先制" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "器用に対応した回避能力、低確率貫通効果付きの正確かつ低威力な斬撃/刺突攻撃。打撃与ダメージ50%上昇。" #: lang/json/martial_art_from_json.py @@ -103112,6 +105064,10 @@ msgstr "大破した" msgid "Diamond" msgstr "ダイヤモンド" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "宝石" + #: lang/json/material_from_json.py msgid "Egg" msgstr "卵" @@ -103329,8 +105285,8 @@ msgid "Mushroom" msgstr "キノコ" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "水" @@ -104653,7 +106609,7 @@ msgstr "サバイバーである事を示す" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "大変動を10日間生き抜いてから依頼者の元へ戻り、あなたが立派なサバイバーであることを証明しましょう。" @@ -104801,11 +106757,11 @@ msgid "" msgstr "ありがとう。感謝してもしきれないよ。お礼としてこれを受け取ってくれ。家族の分を用意した時に、いくつか余分に作っておいたんだ。" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "助かったとは思えない..." #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "愛していると私の家族に伝えてくれ..." #: lang/json/mission_def_from_json.py @@ -104847,6 +106803,10 @@ msgstr "" msgid "What good does this do me?" msgstr "そんな嘘をついて何になる？" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "結局は失敗に終ったか..." + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "クリス・イシャーウッドを探す" @@ -104888,7 +106848,7 @@ msgstr "" "ありがとう、ちょうど探しに行こうかと思っていたところだ。金床が手に入ったから、今は新しい馬用の鎧を作っているんだ。試作品だけど、よかったら使ってみてよ。" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "バリーのような目に遭っていないといいんだが..." #: lang/json/mission_def_from_json.py @@ -104926,13 +106886,13 @@ msgstr "準備はいいか？" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" "前に見た時より大きくなっているな。捕まっている人を捜そう。出発前に家族への手紙を書いておいた。もし生きて帰れたら、小屋の修理も終わっていることだろうし、引っ越してきてくれても構わないよ。" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "ここだったかな..." #: lang/json/mission_def_from_json.py @@ -105001,7 +106961,7 @@ msgid "" msgstr "わぁ、完璧だよ。自作の医薬品を用意したんだ。もし効果がなかったら、他のも試してみてくれ。" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "森へ行ってくれるよう家族に頼まないと..." #: lang/json/mission_def_from_json.py @@ -105019,7 +106979,7 @@ msgstr "古い小屋の傍に野良猫がいるんだ。捕まえてきてくれ #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "ありがとう！なるべく急いでくれ！このケージを使えば捕獲できる。" @@ -105040,7 +107000,7 @@ msgstr "ネコは見つかった？" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "本当にありがとう。お礼に自然療法について書いた手記をどうぞ。このハンサムなお友達はジョシュアという名前にしようかな。" #: lang/json/mission_def_from_json.py @@ -105048,7 +107008,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "何だって？！嘘でしょ！ケージだけでも返してくれない？" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "あらら！素早すぎて難しかったかな..." #: lang/json/mission_def_from_json.py @@ -105749,7 +107709,7 @@ msgstr "これじゃない。" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "特別な種が入ってるんだ。あれなしじゃ大変動を生き延びる気になれないよ。" @@ -106159,13 +108119,13 @@ msgstr "避難センターの封鎖された後部エリアを掃除して自由 msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " "which isn't good for that much yet, but it would help us to reclaim the bay." msgstr "" -"もし本当に協力してくれるなら、建物の裏側を占拠しているゾンビどもを一掃して欲しい。大変動が始まった頃、あそこに死人や倒したゾンビを投げ込んでおいたのが失敗だった。頼れるリーダーもその時倒れて...違う何かに変わってしまった。やつらを殲滅し、二度と立ち上がれないようにしてくれ。大した報酬はないが、私たちのグループ内で流通している通貨でなら支払える。この建物の一角が片付けば、きっと何かに利用できる。" +"もし本当に協力してくれるなら、建物の裏側を占拠しているゾンビ共を一掃して欲しい。大変動が始まった頃は外へ出るのが怖かったから、死体や倒したゾンビはその区画に集めて封印していたんだ。頼れるリーダーも死んでしまい...違う何かに変わってしまった。やつらを殲滅し、二度と立ち上がれないようにしてくれ。大した報酬はないが、私たちのグループ内で流通している通貨でなら支払える。この建物の一角が片付けば、きっと何かに利用できる。" #: lang/json/mission_def_from_json.py msgid "Please be careful, we don't need any more deaths." @@ -106460,7 +108420,7 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" @@ -107870,7 +109830,7 @@ msgstr "毛皮が50枚必要なんだ。" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "昼間は果樹園の管理をしているが、夜は冬服作りに取り組んでいるんだ。毛皮を...50枚ほど分けてもらえないかな？" #: lang/json/mission_def_from_json.py @@ -107896,10 +109856,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "本当にありがとう。心配しないで、ちゃんとお礼はするよ。" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "手助けしようとしてくれただけでも...うれしいよ。" - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "気にしないで、それほど重要な仕事でもない。" @@ -107924,7 +109880,7 @@ msgstr "果物と肉ばかりでは飽きてしまう。小麦を分けてほし #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "仕事を受けてくれてありがとう。このままだと、サンドイッチ欲しさに訪問者を殺してしまうところだった...冗談だよ。" #: lang/json/mission_def_from_json.py @@ -107964,8 +109920,8 @@ msgstr "果物がたくさんあると、液体を保管する容器も必要に #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" "ここでは季節ごとにたくさんの果物が採れる。収穫した果物はジュースや酒に加工するんだ。液体を隊商に渡せるように、容器を用意してもらえないかな。" @@ -107987,7 +109943,7 @@ msgid "Do you have those jugs now?" msgstr "ガロンジャグを持ってきてくれた？" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "手伝ってくれてありがとう。仕事は他にもあるんだ。" #: lang/json/mission_def_from_json.py @@ -108014,7 +109970,7 @@ msgstr "ありがとう。連合の手伝いをしてくれて本当に助かっ #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "こういうものは大抵危険な場所にあるからな。断って当然だ。" #: lang/json/mission_def_from_json.py @@ -108029,7 +109985,7 @@ msgstr "壊れた生体部品を持ってきたか？" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "手伝ってくれてありがとう。すぐに他の奴にも紹介するよ。" @@ -108098,6 +110054,54 @@ msgstr "%1$sは体当たりしようとしてよろめきました。" msgid "The %1$s tries to slam into , but fails to." msgstr "%1$sはに体当たりしようとして失敗しました。" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "%1$sはトライデントで%2$sを貫きました！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "%1$sはトライデントでの%2$sを貫きました！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "%1$sはトライデントで%2$sを貫こうとしましたが、装甲に阻まれました！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "%1$sはトライデントでの%2$sを貫こうとしましたが、装甲に阻まれました！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "%1$sはグレートクラブで%2$sを叩き潰しました！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "%1$sはグレートクラブでの%2$sを叩き潰しました！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "%1$sはグレートクラブで%2$sを叩き潰そうとしましたが、狙いが外れてふらつきました。" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "%1$sはグレートクラブでの%2$sを叩き潰そうとしましたが、狙いが外れてふらつきました。" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -110834,7 +112838,7 @@ msgid "" "products. It's possible for you to eat them, but you will suffer morale " "penalties and obtain less nutrition from them." msgstr "" -"人類の75%が該当すると言われる、乳製品を消化しにくい体質です。乳製品をを食べることは可能ですが、意欲が低下するペナルティが課され、得られる養分も減少します。" +"人類の75%が該当すると言われる、乳製品を消化しにくい体質です。乳製品を食べることは可能ですが、意欲が低下するペナルティが課され、得られる養分も減少します。" #: lang/json/mutation_from_json.py msgid "Junkfood Intolerance" @@ -111418,12 +113422,12 @@ msgstr "歯が5cmほどの長さの牙になっています。条件が揃えば #: lang/json/mutation_from_json.py #, no-python-format msgid "You sink your fangs into %s" -msgstr "牙を%sに突き立てて" +msgstr "牙を%sに突き立てました。" #: lang/json/mutation_from_json.py #, no-python-format msgid "%1$s sinks their fangs into %2$s" -msgstr "%1$sは牙を%2$sに突き立てて" +msgstr "%1$sは牙を%2$sに突き立てました。" #: lang/json/mutation_from_json.py msgid "Incisors" @@ -111554,7 +113558,7 @@ msgid "" " act as weak natural armor, improve your ability to swim, and make you " "difficult to grab. Mostly reduces wet effects." msgstr "" -"柔軟性に富んだつやつやの鱗が体を覆っています。多少ながら天然の鎧として働きます。水泳能力が向上します。掴みかかりの回避率が向上します。水濡れの影響を大幅に軽減します。" +"柔軟性に富んだつやつやの鱗が体を覆っています。多少ながら天然の鎧として働きます。水泳能力が向上します。拘束攻撃の回避率が向上します。水濡れの影響を大幅に軽減します。" #: lang/json/mutation_from_json.py msgid "Light Bones" @@ -113016,12 +115020,12 @@ msgstr "" #: lang/json/mutation_from_json.py #, no-python-format msgid "You bite %s with your fangs" -msgstr "%sに牙を突き立てて" +msgstr "%sに牙で噛みつきました。" #: lang/json/mutation_from_json.py #, no-python-format msgid "%1$s bites %2$s with their fangs" -msgstr "%1$sは%2$sに牙を突き立てて" +msgstr "%1$sは%2$sに牙で噛みつきました。" #: lang/json/mutation_from_json.py msgid "Folding Fangs" @@ -114091,12 +116095,12 @@ msgstr "口に嘴が生えています。もしかしたら、つつかれて痛 #: lang/json/mutation_from_json.py #, no-python-format msgid "You peck %s" -msgstr "%sをつついて" +msgstr "%sをつつきました。" #: lang/json/mutation_from_json.py #, no-python-format msgid "%1$s pecks %2$s" -msgstr "%1$sは%2$sをつついて" +msgstr "%1$sは%2$sをつつきました。" #: lang/json/mutation_from_json.py msgid "Woodpecker Beak" @@ -115492,7 +117496,7 @@ msgstr "サバイバーストーリー" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" +msgid "This NPC could tell you about how they survived the Cataclysm" msgstr "このNPCはどうやって大変動から生き残ったのか語ります。" #: lang/json/mutation_from_json.py @@ -115960,7 +117964,7 @@ msgstr "C.R.I.T武器鍛錬" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "防御を中心とした戦闘訓練を受けました。攻撃が命中する度に、能力値に応じて様々な戦闘ボーナスを得られます。" @@ -116024,18 +118028,10 @@ msgstr "自然の恵み" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "存在そのものが自然環境に溶け込んでいます。若干発見され辛くなります。" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "存在そのものが動物を落ち着かせ、動物から信頼されています。ただし、効果があるのは森にいるような自然動物に限ります。" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "スラッシャー" @@ -116673,7 +118669,7 @@ msgid "Gardener" msgstr "農家" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "世界が終わった時のために準備はしておいた。今は、連合のために食料を育てているんだ。" #: lang/json/npc_class_from_json.py @@ -116706,7 +118702,7 @@ msgid "I'm just trying to stay alive." msgstr "ただ生きようとしてるだけだ。" #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." msgstr "ただ生きようとしてるだけだ...まあ、言うほど簡単じゃないんだけど。" #: lang/json/npc_class_from_json.py @@ -116715,8 +118711,8 @@ msgstr "トカゲ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "トカゲの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116725,8 +118721,8 @@ msgstr "医療変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "医療変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116735,8 +118731,8 @@ msgstr "鳥類変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "鳥類の変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116745,8 +118741,8 @@ msgstr "魚類変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "魚類の変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116755,7 +118751,7 @@ msgstr "凶獣変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "凶獣の変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" @@ -116765,8 +118761,8 @@ msgstr "クマ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "クマの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116775,8 +118771,8 @@ msgstr "ネコ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "ネコの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116785,8 +118781,8 @@ msgstr "オオカミ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "オオカミの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116795,8 +118791,8 @@ msgstr "ウシ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "ウシの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116805,8 +118801,8 @@ msgstr "昆虫変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "昆虫の変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116815,7 +118811,7 @@ msgstr "植物変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "植物の変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" @@ -116825,7 +118821,7 @@ msgstr "スライム変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "スライムの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" @@ -116835,7 +118831,7 @@ msgstr "地中生物変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "地中生物の変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" @@ -116845,7 +118841,7 @@ msgstr "頭足類変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "頭足類の変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" @@ -116855,8 +118851,8 @@ msgstr "クモ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "クモの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116865,8 +118861,8 @@ msgstr "ラット変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "ラットの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116875,7 +118871,7 @@ msgstr "ハツカネズミ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "ハツカネズミの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" @@ -116885,7 +118881,7 @@ msgstr "アルファ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "アルファ変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" @@ -116895,8 +118891,8 @@ msgstr "エルファ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "エルファ変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116905,8 +118901,8 @@ msgstr "キメラ変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "キメラ変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_class_from_json.py @@ -116915,8 +118911,8 @@ msgstr "ラプトル変異体" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "ラプトルの変異原を探しているんだ...この世界はもはや人間のものではないし、私も人間であり続けるつもりはないよ。" #: lang/json/npc_from_json.py @@ -120171,11 +122167,11 @@ msgstr "避難した生存者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"大変動の日、シェルターに避難しました。それからというもの、雑多に物を掻き集め、様々な本から生存術を学び、冬が訪れました。これまでの備えによって、今後生き延びられるかが決まるでしょう。" +"大変動の日、シェルターに避難しました。それからというもの、雑多に物を掻き集め、様々な本から生存術を学び、冬が訪れました。これまでの備えによって、今後生き延びられるかが決まります。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120186,11 +122182,11 @@ msgstr "避難した生存者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"大変動の日、シェルターに避難しました。それからというもの、雑多に物を掻き集め、様々な本から生存術を学び、冬が訪れました。これまでの備えによって、今後生き延びられるかが決まるでしょう。" +"大変動の日、シェルターに避難しました。それからというもの、雑多に物を掻き集め、様々な本から生存術を学び、冬が訪れました。これまでの備えによって、今後生き延びられるかが決まります。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -120201,7 +122197,7 @@ msgstr "避難した州兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "大変動の日、シェルターに避難しました。やがて冬が訪れました。今までに学んだ技術と銃は生存の助けになるはずです。" @@ -120215,7 +122211,7 @@ msgstr "避難した州兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "大変動の日、シェルターに避難しました。やがて冬が訪れました。今までに学んだ技術と銃は生存の助けになるはずです。" @@ -120293,10 +122289,10 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"(※中世の言葉で:なんじゃこりゃ？邪悪な魔法に運ばれておかしな場所に来てしまいました。手元の物資はわずかです。生き延びる新たな道を探して、このノアの箱舟の大洪水以来の歴史的破局を乗り切るとしましょう。)" +"(※中世の言葉で)なんじゃこりゃ？邪悪な魔法に運ばれておかしな場所に来てしまいました。手元の物資はわずかです。生き延びる新たな道を探して、このノアの箱舟の大洪水以来の歴史的破局を乗り切るとしましょう。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120309,10 +122305,10 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"(※中世の言葉で:なんだいこりゃ？邪悪な魔法に運ばれておかしな場所に来てしまいました。手元の物資はわずかです。生き延びる新たな道を探して、このノアの箱舟の大洪水以来の歴史的破局を乗り切るとしましょう。)" +"(※中世の言葉で)なんじゃこりゃ？邪悪な魔法に運ばれておかしな場所に来てしまいました。手元の物資はわずかです。生き延びる新たな道を探して、このノアの箱舟の大洪水以来の歴史的破局を乗り切るとしましょう。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -120412,9 +122408,9 @@ msgstr "養蜂家" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." -msgstr "プロの養蜂家です。大変動のおかげで残念ながら蜂たちを手放すハメになりましたが、いくつかの道具と蜂蜜だけは持って逃げ出せました。" +msgstr "プロの養蜂家です。残念ながら大変動のせいでハチたちを手放すハメになりましたが、いくつかの道具と蜂蜜だけは持って逃げ出せました。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120426,9 +122422,9 @@ msgstr "養蜂家" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." -msgstr "プロの養蜂家です。大変動のおかげで残念ながら蜂たちを手放すハメになりましたが、いくつかの道具と蜂蜜だけは持って逃げ出せました。" +msgstr "プロの養蜂家です。残念ながら大変動のせいでハチたちを手放すハメになりましたが、いくつかの道具と蜂蜜だけは持って逃げ出せました。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -120439,7 +122435,7 @@ msgstr "バスケットボール選手" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "デビュー戦を控えていましたが、その前に大変動に見舞われてしまいました。優れた足のお陰で辛くも逃げ延びられたのです。" @@ -120453,7 +122449,7 @@ msgstr "バスケットボール選手" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "デビュー戦を控えていましたが、その前に大変動に見舞われてしまいました。優れた足のお陰で辛くも逃げ延びられたのです。" @@ -120595,7 +122591,7 @@ msgstr "執事" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "大きなお屋敷で働いていましたが、大変動の日の後、雇い主一家は自分だけを除け者にして、どことも知れぬ場所へ長期旅行に出かけてしまいました。" @@ -120608,7 +122604,7 @@ msgstr "メイド" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "大きなお屋敷で働いていましたが、大変動の日の後、雇い主一家は自分だけを除け者にして、どことも知れぬ場所へ長期旅行に出かけてしまいました。" @@ -121545,10 +123541,10 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"安っぽいオーナーの下でちっぽけな電気工事をしていました。しかし今日は違います、シェルターの配線という大きな仕事を任せられたのです。それがシェルターでの作業中、まさに災害が襲ってくるなんて。出来の悪い冗談のようです。残念ながらコンピュータの配線は1つしか終わりませんでした。今となってはどうでも良い事でしょうが。" +"安っぽいオーナーの下でちっぽけな電気工事をしていました。しかし今日は違います、シェルターの配線という大きな仕事を任せられたのです。ところが正に作業の最中に災害が襲ってくるなんて、出来の悪い冗談のようです。残念ながらコンピュータの配線は1つしか終わりませんでした。今となってはどうでも良い事でしょうが。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -121561,10 +123557,10 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"安っぽいオーナーの下でちっぽけな電気工事をしていました。しかし今日は違います、シェルターの配線という大きな仕事を任せられたのです。それがシェルターでの作業中、まさに災害が襲ってくるなんて。出来の悪い冗談のようです。残念ながらコンピュータの配線は1つしか終わりませんでした。今となってはどうでも良い事でしょうが。" +"安っぽいオーナーの下でちっぽけな電気工事をしていました。しかし今日は違います、シェルターの配線という大きな仕事を任せられたのです。ところが正に作業の最中に災害が襲ってくるなんて、出来の悪い冗談のようです。残念ながらコンピュータの配線は1つしか終わりませんでした。今となってはどうでも良い事でしょうが。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -121635,7 +123631,7 @@ msgstr "入浴中に被害にあった人" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "熱いシャワーを浴びている最中、大変動が起こりました！石鹸とその場にあった最も役立ちそうな物...タオルをとっさに掴み、逃げ出しました。" @@ -121649,7 +123645,7 @@ msgstr "入浴中に被害にあった人" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "熱いシャワーを浴びている最中、大変動が起こりました！石鹸とその場にあった最も役立ちそうな物...タオルをとっさに掴み、逃げ出しました。" @@ -121689,9 +123685,9 @@ msgstr "社交ダンサー" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." -msgstr "大変動の日以前、社交ダンスをしていました。そして今、生き延びる為に踊り続けています。" +msgstr "大変動が起きるまでは社交ダンスのダンサーでした。得意な踊りを生かして何とか生き延びましょう。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -121702,9 +123698,9 @@ msgstr "社交ダンサー" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." -msgstr "大変動の日以前、社交ダンスをしていました。そして今、生き延びる為に踊り続けています。" +msgstr "大変動が起きるまでは社交ダンスのダンサーでした。得意な踊りを生かして何とか生き延びましょう。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122496,9 +124492,9 @@ msgstr "花婿" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" -msgstr "災厄の日は大切な日にやってきました。結婚式の服装のまま一目散に逃げ出しました。ノミの心臓？いいえ、自分の心臓を護る事を最優先したのです！" +msgstr "大切な日に大変動が起き、結婚式の服装のまま一目散に逃げ出しました。縁の切れ目？いいえ、命を繋ぐ方が大事です！" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -122509,9 +124505,9 @@ msgstr "花嫁" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" -msgstr "災厄の日は大切な日にやってきました。結婚式の服装のまま一目散に逃げ出しました。ノミの心臓？いいえ、自分の心臓を護る事を最優先したのです！" +msgstr "大切な日に大変動が起き、結婚式の服装のまま一目散に逃げ出しました。縁の切れ目？いいえ、命を繋ぐ方が大事です！" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122581,8 +124577,8 @@ msgstr "不良少年" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." -msgstr "スカバンドはドラマーがゾンビになった後に解散しました。現在、数本のタバコとMP3プレーヤーを持ちながら、孤独に佇んでいます。" +"in the Cataclysm with some cigarettes and your mp3 player." +msgstr "所属していたスカバンドはドラマーがゾンビになった後に解散しました。現在、数本の煙草とMP3プレーヤーを持ちながら、孤独に佇んでいます。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -122594,8 +124590,8 @@ msgstr "不良少女" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." -msgstr "スカバンドはドラマーがゾンビになった後に解散しました。現在、数本のタバコとMP3プレーヤーを持ちながら、孤独に佇んでいます。" +"in the Cataclysm with some cigarettes and your mp3 player." +msgstr "所属していたスカバンドはドラマーがゾンビになった後に解散しました。現在、数本の煙草とMP3プレーヤーを持ちながら、孤独に佇んでいます。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122632,7 +124628,7 @@ msgstr "囚人" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "大変動は脱獄の機会を与えてくれました。しかし、自由の対価はとてつもなく高騰していたのです。" @@ -122645,7 +124641,7 @@ msgstr "囚人" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "大変動は脱獄の機会を与えてくれました。しかし、自由の対価はとてつもなく高騰していたのです。" @@ -123045,9 +125041,9 @@ msgstr "ラビ" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" -msgstr "ユダヤの聖職者です。シナゴーグで信徒達と儀式を挙行していたところに破滅が訪れました。さあ、メシアの降臨を願いましょう。今すぐに！" +msgstr "シナゴーグで信徒達と儀式を挙行していたところに破滅が訪れました。今こそメシアが必要です！" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123058,9 +125054,9 @@ msgstr "ラビ" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" -msgstr "ユダヤの聖職者です。シナゴーグで信徒達と儀式を挙行していたところに破滅が訪れました。さあ、メシアの降臨を願いましょう。今すぐに！" +msgstr "シナゴーグで信徒達と儀式を挙行していたところに破滅が訪れました。今こそメシアが必要です！" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -123238,7 +125234,7 @@ msgstr "宅配ピザ屋" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" @@ -123254,7 +125250,7 @@ msgstr "宅配ピザ屋" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" @@ -123361,11 +125357,11 @@ msgstr "農家" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"大変動以前、作物を育てて生計を立てていました。今は使い慣れたくわといくつかの種を持っています。その一つ一つが大地を再生する種になるかもしれません。" +"大変動以前、作物を育てて生計を立てていました。今は使い慣れた鍬といくつかの種を持っています。その一つ一つが大地を再生する種になるかもしれません。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123376,11 +125372,11 @@ msgstr "農家" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"大変動以前、作物を育てて生計を立てていました。今は使い慣れたくわといくつかの種を持っています。その一つ一つが大地を再生する種になるかもしれません。" +"大変動以前、作物を育てて生計を立てていました。今は使い慣れた鍬といくつかの種を持っています。その一つ一つが大地を再生する種になるかもしれません。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -123421,11 +125417,12 @@ msgstr "熟練のスカベンジャー" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"大変動を免れた数少ない幸運な人々の中の1人です。誰かしらの廃屋に逃げ込みました。力か悪知恵か、あるいは幸運によるものか、最高にイカした装備を持って、ここに立っています。" +"大変動を免れた数少ない幸運な人々の中の1人です。どこかしらの廃屋に逃げ込みました。力か悪知恵か、或いは幸運によるものか、最高にイカした装備を持って、ここに立っています。" +" " #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123436,7 +125433,7 @@ msgstr "熟練のスカベンジャー" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" @@ -123724,12 +125721,12 @@ msgstr "サバイバーの息子" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"両親は所謂イカれたプレッパー、つまり「大変動」のようなものの到来を空想し、それに備える人達でしたが、どうやら正しかったようです。感謝の気持ちを伝えられなかった両親のために今できるのは、常に両親があなたに望んでいた通り、暗黒の日々に立ち向かい、生き延びてみせる事でしょう。" +"両親は「大変動」のようなものの到来を空想し、それに備えるイカれたプレッパーでした。どうやら妄想は正しかったようです。感謝の気持ちを伝えられなかった両親のために今できるのは、常に両親があなたに望んでいた通り、暗黒の日々に立ち向かい、生き延びてみせることです。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123740,12 +125737,12 @@ msgstr "サバイバーの娘" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"両親は所謂イカれたプレッパー、つまり「大変動」のようなものの到来を空想し、それに備える人達でしたが、どうやら正しかったようです。感謝の気持ちを伝えられなかった両親のために今できるのは、常に両親があなたに望んでいた通り、暗黒の日々に立ち向かい、生き延びてみせる事でしょう。" +"両親は「大変動」のようなものの到来を空想し、それに備えるイカれたプレッパーでした。どうやら妄想は正しかったようです。感謝の気持ちを伝えられなかった両親のために今できるのは、常に両親があなたに望んでいた通り、暗黒の日々に立ち向かい、生き延びてみせることです。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -124657,9 +126654,9 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" -"仕事場である電波塔の頂上からは、世界の終焉がしっかり見えました。空に光の筋が走ったかと思うと、キノコ雲が咲き、地平線が光り輝いたのです。生体部品の遮光システムが停止し、衝撃波で吹き飛ばされる前に急いで安全な場所に逃げました。今こそ移植した生体部品を生かす時です..." +"仕事場である電波塔の頂上からは、世界の終焉がはっきりと見えました。空に光の筋が走ったかと思うと、キノコ雲が咲き、地平線が光り輝いたのです。生体部品の遮光システムが停止し、衝撃波で吹き飛ばされる前に急いで安全な場所に逃げました。今こそ移植した生体部品を生かす時です..." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -124675,9 +126672,9 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" -"仕事場である電波塔の頂上からは、世界の終焉がしっかり見えました。空に光の筋が走ったかと思うと、キノコ雲が咲き、地平線が光り輝いたのです。生体部品の遮光システムが停止し、衝撃波で吹き飛ばされる前に急いで安全な場所に逃げました。今こそ移植した生体部品を生かす時です..." +"仕事場である電波塔の頂上からは、世界の終焉がはっきりと見えました。空に光の筋が走ったかと思うと、キノコ雲が咲き、地平線が光り輝いたのです。生体部品の遮光システムが停止し、衝撃波で吹き飛ばされる前に急いで安全な場所に逃げました。今こそ移植した生体部品を生かす時です..." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -124941,10 +126938,10 @@ msgstr "CRIT訓練生" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" "次の戦争でC.R.I.Tの隊員として活躍すべく訓練をしていました。要請したはずの戦闘部隊は到着時には既に死者に成り果て、チームメイトの無残な死体も元気に動き回っています。混乱の中、友人たちの仲間入りをする前に脱出しました。この大変動の世界を生き延びられるかどうかは、知識と短期間の訓練で得た経験にかかっています。" @@ -124958,10 +126955,10 @@ msgstr "CRIT訓練生" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" "次の戦争でC.R.I.Tの隊員として活躍すべく訓練をしていました。要請したはずの戦闘部隊は到着時には既に死者に成り果て、チームメイトの無残な死体も元気に動き回っています。混乱の中、友人たちの仲間入りをする前に脱出しました。この大変動の世界を生き延びられるかどうかは、知識と短期間の訓練で得た経験にかかっています。" @@ -124974,9 +126971,9 @@ msgstr "CRIT用務員" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -124991,9 +126988,9 @@ msgstr "CRIT用務員" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -125008,7 +127005,7 @@ msgstr "CRIT下士官" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -125023,7 +127020,7 @@ msgstr "CRIT下士官" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -125039,9 +127036,9 @@ msgstr "CRIT歩兵" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -125057,9 +127054,9 @@ msgstr "CRIT歩兵" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -125074,13 +127071,13 @@ msgstr "CRIT衛生兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" "チーム一の専門家です。異常事態に対処する方法も訓練された衛生兵ですが、隊員たちの無事が第一です。ここ数週間、この使命を確実に果たすために地獄を行き来していましたが、ゾンビの群れと明らかにイカれている政府のロボットの銃撃戦に巻き込まれ、囮として取り残されました。何とか逃げ延び、生存に必要なものを手に入れられるのか、それとも奴らの仲間入りをして部隊の大罪を糾弾することになるのでしょうか？" @@ -125093,13 +127090,13 @@ msgstr "CRIT衛生兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" "チーム一の専門家です。異常事態に対処する方法も訓練された衛生兵ですが、隊員たちの無事が第一です。ここ数週間、この使命を確実に果たすために地獄を行き来していましたが、ゾンビの群れと明らかにイカれている政府のロボットの銃撃戦に巻き込まれ、囮として取り残されました。何とか逃げ延び、生存に必要なものを手に入れられるのか、それとも奴らの仲間入りをして部隊の大罪を糾弾することになるのでしょうか？" @@ -125113,8 +127110,8 @@ msgstr "CRIT自動小銃兵" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -125130,8 +127127,8 @@ msgstr "CRIT自動小銃兵" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -125147,11 +127144,11 @@ msgstr "CRIT司令官" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" -"戦闘中は自分が一流の司令官になると感じたことはあまりありませんでした。カリスマ性と鋭い知性を生かして階級を駆け上がり、助けを必要とする仲間に適切な支援を提供してきました。全てが振り出しに戻った今、自分の才能を再び生かせるでしょうか？" +"気が向いた時以外は滅多に戦闘に加わらない、一流の司令官です。カリスマ性と鋭い知性を生かして階級を駆け上がり、助けを必要とする仲間に適切な支援を提供してきました。全てが振り出しに戻った今、自分の才能を再び生かせるでしょうか？" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -125163,11 +127160,11 @@ msgstr "CRIT司令官" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" -"戦闘中は自分が一流の司令官になると感じたことはあまりありませんでした。カリスマ性と鋭い知性を生かして階級を駆け上がり、助けを必要とする仲間に適切な支援を提供してきました。全てが振り出しに戻った今、自分の才能を再び生かせるでしょうか？" +"気が向いた時以外は滅多に戦闘に加わらない、一流の司令官です。カリスマ性と鋭い知性を生かして階級を駆け上がり、助けを必要とする仲間に適切な支援を提供してきました。全てが振り出しに戻った今、自分の才能を再び生かせるでしょうか？" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -125178,13 +127175,13 @@ msgstr "CRIT執行官" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" "[推奨筋力10] " "連邦保安官の権限を与えられました。派手なバッジをつけた冴えない警官だと冗談を言う者もいましたが、そんなやっかみ半分のからかいは笑い飛ばし、軍事基地での諜報活動というもう一つの仕事を続けていました。基地で長く過ごして自分の技能を高め、低コストで長期間の「警備」が可能になる特殊な装置も移植しました。任務の範囲が途方もなく広くなったような気はしますが、ともかく仕事の時間です。" @@ -125198,13 +127195,13 @@ msgstr "CRIT執行官" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" "[推奨筋力10] " "連邦保安官の権限を与えられました。派手なバッジをつけた冴えない警官だと冗談を言う者もいましたが、そんなやっかみ半分のからかいは笑い飛ばし、軍事基地での諜報活動というもう一つの仕事を続けていました。基地で長く過ごして自分の技能を高め、低コストで長期間の「警備」が可能になる特殊な装置も移植しました。任務の範囲が途方もなく広くなったような気はしますが、ともかく仕事の時間です。" @@ -125218,10 +127215,10 @@ msgstr "CRITローンウルフ" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" "[推奨筋力10] " "連邦保安官の権限を与えられた、重装備の戦士です。何でもできるワンマンアーミーとして戦闘地域に送り込まれ、独力で大隊相当の活躍をしていました。さて、徹底的に掃除をする時間です。" @@ -125235,10 +127232,10 @@ msgstr "CRITローンウルフ" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" "[推奨筋力10] " "連邦保安官の権限を与えられた、重装備の戦士です。何でもできるワンマンアーミーとして戦闘地域に送り込まれ、独力で大隊相当の活躍をしていました。さて、徹底的に掃除をする時間です。" @@ -125252,12 +127249,12 @@ msgstr "CRIT特殊部隊" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" "[推奨筋力10] " "大災害への対応や調査、研究を行うエリートチームの一員です。一般市民を脅かす漠然とした不安に対応することで、自分の属する派閥の力は他の大国を差し置いて数十年で急上昇しました。今回は、差し迫った危機の封じ込めと司令部への情報伝達を目的として、ニューイングランド地域のグラウンドゼロへと真っ先に派遣されました。幸運を祈ります。" @@ -125271,12 +127268,12 @@ msgstr "CRIT特殊部隊" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" "[推奨筋力10] " "大災害への対応や調査、研究を行うエリートチームの一員です。一般市民を脅かす漠然とした不安に対応することで、自分の属する派閥の力は他の大国を差し置いて数十年で急上昇しました。今回は、差し迫った危機の封じ込めと司令部への情報伝達を目的として、ニューイングランド地域のグラウンドゼロへと真っ先に派遣されました。幸運を祈ります。" @@ -125290,17 +127287,17 @@ msgstr "CRITサバイバー" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" "かつてC.R.I.T.のエリート偵察部隊に所属していました。敵の背後に何週間も留まり、岩と棒と草だけで生き残る経験をしてからは、一流のサバイバーとして称賛されていました。しかし、地元のバーで酒を20杯ほど飲んで指揮官とケンカ(してノックアウト勝利)してしまい、階級を剥奪され、サバイバル用の実験的な装備のみを持たされ森に放逐されました。丁度いいシェルターを求めて森の中を彷徨うこと1時間、無線機が鳴り、突然世界が崩壊したという事実を知らされました。「もちろん、気の毒だが君を回収する時間はない、健闘を祈る」とりあえず禁酒したほうが良さそうです。少なくとも今回手元には使えるツールがあります！" @@ -125313,17 +127310,17 @@ msgstr "CRITサバイバー" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" "かつてC.R.I.T.のエリート偵察部隊に所属していました。敵の背後に何週間も留まり、岩と棒と草だけで生き残る経験をしてからは、一流のサバイバーとして称賛されていました。しかし、地元のバーで酒を20杯ほど飲んで指揮官とケンカ(してノックアウト勝利)してしまい、階級を剥奪され、サバイバル用の実験的な装備のみを持たされ森に放逐されました。丁度いいシェルターを求めて森の中を彷徨うこと1時間、無線機が鳴り、突然世界が崩壊したという事実を知らされました。「もちろん、気の毒だが君を回収する時間はない、健闘を祈る」とりあえず禁酒したほうが良さそうです。少なくとも今回手元には使えるツールがあります！" @@ -125338,9 +127335,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" "大変動が始まった時は、丁度ニューイングランド地域でサバイバルトレーニングをする予定でしたが、次のレッスンの講師が現れません。標準的な問題解決訓練を行うはずだった防疫地帯で取り残されてしまいました。もっと高性能の銃が配給されればよかったのですが。これからはサバイバルについて沢山の事を学べそうですね！" @@ -125355,9 +127352,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" "大変動が始まった時は、丁度ニューイングランド地域でサバイバルトレーニングをする予定でしたが、次のレッスンの講師が現れません。標準的な問題解決訓練を行うはずだった防疫地帯で取り残されてしまいました。もっと高性能の銃が配給されればよかったのですが。これからはサバイバルについて沢山の事を学べそうですね！" @@ -125372,10 +127369,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -125392,10 +127389,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -125411,9 +127408,9 @@ msgstr "CRIT技師" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" "ニューイングランドの実験施設を修理し、ついでに研究中の新兵器を他の研究者にお披露目する予定でした。大変動が起きたことで、実地試験に相応しい状況が簡単に出来上がりましたが、上手い話ばかりではないようです。さあ、逃げましょう！" @@ -125427,9 +127424,9 @@ msgstr "CRIT技師" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" "ニューイングランドの実験施設を修理し、ついでに研究中の新兵器を他の研究者にお披露目する予定でした。大変動が起きたことで、実地試験に相応しい状況が簡単に出来上がりましたが、上手い話ばかりではないようです。さあ、逃げましょう！" @@ -125442,11 +127439,12 @@ msgstr "CRITナイトウォーカー" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" "ニューイングランドの基地が大変動という未曽有の災害に襲われる中、研究開発部門のトップとして自分自身をゆっくりと人外の存在に変異させる道を選びました。調合が完璧ではなかったかもしれませんが、老いて弱った身体に力が漲った気がします。新しい肉体を自分のものとし、牙をむき出し次の夜明けまで戦いましょう。" @@ -125459,11 +127457,12 @@ msgstr "CRITナイトウォーカー" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" "ニューイングランドの基地が大変動という未曽有の災害に襲われる中、研究開発部門のトップとして自分自身をゆっくりと人外の存在に変異させる道を選びました。調合が完璧ではなかったかもしれませんが、老いて弱った身体に力が漲った気がします。新しい肉体を自分のものとし、牙をむき出し次の夜明けまで戦いましょう。" @@ -125616,7 +127615,7 @@ msgstr "特殊狙撃兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "数日間に渡る対峙の末、敵の狙撃兵は死に...そして、生き返りました。" @@ -125629,7 +127628,7 @@ msgstr "特殊狙撃兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "数日間に渡る対峙の末、敵の狙撃兵は死に...そして、生き返りました。" @@ -125666,7 +127665,7 @@ msgstr "特殊潜入兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "数か月間追い続けた標的がゾンビになってしまいました。追いかけっこもこれで終わりです。" @@ -125679,7 +127678,7 @@ msgstr "特殊潜入兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "数か月間追い続けた標的がゾンビになってしまいました。追いかけっこもこれで終わりです。" @@ -125692,7 +127691,7 @@ msgstr "特殊化学兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "化学兵器は？よし。伝染病の流行は？よし。核戦争は？よし。素敵な職場ですね！" @@ -125705,7 +127704,7 @@ msgstr "特殊化学兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "化学兵器は？よし。伝染病の流行は？よし。核戦争は？よし。素敵な職場ですね！" @@ -125765,8 +127764,8 @@ msgstr "バトル・エンジェル" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." -msgstr "薄暗い廃棄物の山から回収された戦闘用サイボーグです..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" +msgstr "出所も分からない廃棄物の山から回収された戦闘用サイボーグです..." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -125776,8 +127775,8 @@ msgstr "バトル・エンジェル" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." -msgstr "薄暗い廃棄物の山から回収された戦闘用サイボーグです..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" +msgstr "出所も分からない廃棄物の山から回収された戦闘用サイボーグです..." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -125840,7 +127839,7 @@ msgstr "ドルイド" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "古くからのドルイド僧の仲間は大変動と共に消えました。今こそ自然が栄える時です。" @@ -125853,7 +127852,7 @@ msgstr "ドルイド" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "古くからのドルイド僧の仲間は大変動と共に消えました。今こそ自然が栄える時です。" @@ -125953,7 +127952,7 @@ msgstr "死霊術師見習い" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" "魔法使いの世界で一般的に受け入れられない類の魔法を扱っていたため、隠れて過ごしていました。大変動がやってきた今、書物からあらゆる知恵を借りる必要があります。" @@ -125968,7 +127967,7 @@ msgstr "死霊術師見習い" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" "魔法使いの世界で一般的に受け入れられない類の魔法を扱っていたため、隠れて過ごしていました。大変動がやってきた今、書物からあらゆる知恵を借りる必要があります。" @@ -125985,7 +127984,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" "天気予報士の息子として生まれ、天気に興味を持っていましたが、最近、天気を操作する不思議な力を秘めていることに気付きました！大事件が起こったため、残念ながら力を発揮して楽しむほどの余裕はありません。" @@ -126001,9 +128000,9 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" -"天気予報士の娘として生まれ、天気に興味を持っていましたが、最近、天気を操作する不思議な力を秘めていることに気付きました！大事件が起こったため、残念ながら力を発揮して楽しむほどの余裕はありません。" +"天気予報士の息子として生まれ、天気に興味を持っていましたが、最近、天気を操作する不思議な力を秘めていることに気付きました！大事件が起こったため、残念ながら力を発揮して楽しむほどの余裕はありません。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -126946,7 +128945,7 @@ msgstr "野球選手" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" @@ -126961,7 +128960,7 @@ msgstr "野球選手" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" @@ -127038,8 +129037,8 @@ msgstr "目覚めた人" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "夜中に騒音で目覚めました。懐中電灯だけ持って外を調べに行き、大変動に出くわしました。" #: lang/json/professions_from_json.py @@ -127051,8 +129050,8 @@ msgstr "目覚めた人" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "夜中に騒音で目覚めました。懐中電灯だけ持って外を調べに行き、大変動に出くわしました。" #: lang/json/professions_from_json.py @@ -127065,7 +129064,7 @@ msgstr "サイボーグ(自転車乗り)" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" "サイバーオリンピックのサイクリング種目に出場するためのトレーニングと補強が、大変動から逃れるのに役立ちました。果たして永遠に走り続けられるでしょうか？" @@ -127080,7 +129079,7 @@ msgstr "サイボーグ(自転車乗り)" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" "サイバーオリンピックのサイクリング種目に出場するためのトレーニングと補強が、大変動から逃れるのに役立ちました。果たして永遠に走り続けられるでしょうか？" @@ -127094,8 +129093,8 @@ msgstr "溶接工" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "大変動が起こる前は海外企業の溶接工として働いていました。ことが起こったのはちょうど帰宅の最中でした。手元には最低限の工具が揃っています。" @@ -127108,8 +129107,8 @@ msgstr "溶接工" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "大変動が起こる前は海外企業の溶接工として働いていました。ことが起こったのはちょうど帰宅の最中でした。手元には最低限の工具が揃っています。" @@ -127122,9 +129121,9 @@ msgstr "原始生活者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" "運命の日がいつかやってくると予測して、文明の利器を使わず自分自身のスキルを磨き、森の恵みを受けて過ごしながらその日に備えていました。先祖たちが何の科学技術もなしに生き伸びたのだから、できないはずがありません。" @@ -127137,9 +129136,9 @@ msgstr "原始生活者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" "運命の日がいつかやってくると予測して、文明の利器を使わず自分自身のスキルを磨き、森の恵みを受けて過ごしながらその日に備えていました。先祖たちが何の科学技術もなしに生き伸びたのだから、できないはずがありません。" @@ -131593,9 +133592,9 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"黙示録が訪れ、這う這うの体で近くのシェルターに避難しました。外の世界の未知の脅威から身を守る為に、ガタガタと怯えながら生活を続けてきました。しかし、備蓄品は底を尽き、大変動が起こった日から初めて、外の世界に出る事を余儀無くされました。" +"終末が訪れ、何とか近くのシェルターに避難しました。外の世界の未知の脅威から身を守るためガタガタ震えながら生活を続けていましたが、備蓄も減ってきました。大変動以来初めて、外の世界に立ち向かうことを余儀なくされています。" #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -131604,9 +133603,9 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"黙示録が訪れ、這う這うの体で近くのシェルターに避難しました。外の世界の未知の脅威から身を守る為に、ガタガタと怯えながら生活を続けてきました。しかし、備蓄品は底を尽き、大変動が起こった日から初めて、外の世界に出る事を余儀無くされました。" +"終末が訪れ、何とか近くのシェルターに避難しました。外の世界の未知の脅威から身を守るためガタガタ震えながら生活を続けていましたが、備蓄も減ってきました。大変動以来初めて、外の世界に立ち向かうことを余儀なくされています。" #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -131668,22 +133667,22 @@ msgstr "刑務所" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" -"大災害が起こる前に有罪判決を受け、刑務所で服役していました。現在、心無い怪物に変貌した囚人たちを警備ロボットが片っ端から撃ち殺しています...脱出計画を前倒しで実行する必要がありそうですね。" +"大変動が起こる前に有罪判決を受け、刑務所で服役していました。現在、心無い怪物に変貌した囚人たちを警備ロボットが片っ端から撃ち殺しています...脱出計画を前倒しで実行する必要がありそうですね。" " " #. ~ Description for scenario 'Prison' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" -"大災害が起こる前に有罪判決を受け、刑務所で服役していました。現在、心無い怪物に変貌した囚人たちを警備ロボットが片っ端から撃ち殺しています...脱出計画を前倒しで実行する必要がありそうですね。" +"大変動が起こる前に有罪判決を受け、刑務所で服役していました。現在、心無い怪物に変貌した囚人たちを警備ロボットが片っ端から撃ち殺しています...脱出計画を前倒しで実行する必要がありそうですね。" " " #. ~ Starting location for scenario 'Prison'. @@ -131789,20 +133788,20 @@ msgstr "実験" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"望めど望まざれど、生まれてから今まで遺伝科学を進歩させることが人生における唯一の目標でした。大変動が起きたとき、ほうほうの体で研究所を脱出し、終わりの見えない森を当てど無く彷徨っています。" +"望めど望まざれど、生まれてから今まで遺伝科学を進歩させることが人生における唯一の目標でした。大変動が起きたため研究所を脱出し、終わりの見えない森を当ても無く彷徨っています。" #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"望めど望まざれど、生まれてから今まで遺伝科学を進歩させることが人生における唯一の目標でした。大変動が起きたとき、ほうほうの体で研究所を脱出し、終わりの見えない森を当てど無く彷徨っています。" +"望めど望まざれど、生まれてから今まで遺伝科学を進歩させることが人生における唯一の目標でした。大変動が起きたため研究所を脱出し、終わりの見えない森を当ても無く彷徨っています。" #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -132045,8 +134044,8 @@ msgstr "失われた信仰" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" "信仰を説く人生を送ってきましたが、ここ最近の出来事のせいで疑問が生じています。彷徨っている途中で見つけた本が、信仰を取り戻す、あるいは完全に打ち壊すきっかけになるかもしれません。" " " @@ -132056,8 +134055,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" "信仰を説く人生を送ってきましたが、ここ最近の出来事のせいで疑問が生じています。彷徨っている途中で見つけた本が、信仰を取り戻す、あるいは完全に打ち壊すきっかけになるかもしれません。" " " @@ -132088,7 +134087,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" "魔法使いの弟子として、大変動から逃れられる可能性を秘めた試作装置の製作を手伝っていました。試運転で何を間違えたのか、師匠は身体の外と中を交換転移してしまいました。これからは生き残る方法を自分で探さねばなりません。師匠のノートは手元に残っていますが..." @@ -132101,7 +134100,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" "魔法使いの弟子として、大変動から逃れられる可能性を秘めた試作装置の製作を手伝っていました。試運転で何を間違えたのか、師匠は身体の外と中を交換転移してしまいました。これからは生き残る方法を自分で探さねばなりません。師匠のノートは手元に残っていますが..." @@ -132128,22 +134127,22 @@ msgstr "魔法使いの休日" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" -"魔法使いの弟子として何年間か過ごした後、人里離れた塔で悠々自適の休日を送ろうとしていましたが、自分探しの旅は大変動によって中断されました。まずは自力で生き残る方法を学ぶ必要がありそうです。" +"魔法使いの弟子として何年間か過ごした後、人里離れた塔で悠々自適の休日を送ろうとしていましたが、自分探しは大変動によって中断されました。まずは自力で生き残る方法を学ぶ必要がありそうです。" #. ~ Description for scenario 'The Wizard's Vacation' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" -"魔法使いの弟子として何年間か過ごした後、人里離れた塔で悠々自適の休日を送ろうとしていましたが、自分探しの旅は大変動によって中断されました。まずは自力で生き残る方法を学ぶ必要がありそうです。" +"魔法使いの弟子として何年間か過ごした後、人里離れた塔で悠々自適の休日を送ろうとしていましたが、自分探しは大変動によって中断されました。まずは自力で生き残る方法を学ぶ必要がありそうです。" #. ~ Starting location for scenario 'The Wizard's Vacation'. #: lang/json/scenario_from_json.py @@ -132243,9 +134242,9 @@ msgstr "挑戦 - 死のFEMAキャンプ" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" "あなたは他の法執行機関同様、FEMAキャンプ内の治安維持のために招集された軍人です。全てが一瞬のうちに起こりました...負傷、感染症、辺りを取り囲む火...こちらに向かってくる奴ら..." @@ -132255,9 +134254,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" "あなたは他の法執行機関同様、FEMAキャンプ内の治安維持のために招集された軍人です。全てが一瞬のうちに起こりました...負傷、感染症、辺りを取り囲む火...こちらに向かってくる奴ら..." @@ -132539,7 +134538,7 @@ msgid "" "general experience increases accuracy with any bows or firearms, but is " "secondary to practice with the type of ranged weapon in question." msgstr "" -"銃火器や弓に影響を与えるスキルです。遠距離攻撃の命中率に影響します。射撃武器全般の熟練度を表すスキルであり、それぞれの専門技能に比べて限定的な効果に留まります。" +"銃火器や弓に影響を与えるスキルです。遠距離攻撃の精度に影響します。射撃武器全般の熟練度を表すスキルであり、それぞれの専門技能に比べて限定的な効果に留まります。" #: lang/json/skill_from_json.py msgid "launchers" @@ -132628,7 +134627,7 @@ msgid "" "Your skill and finesse in personal combat, both with and without a weapon. " "Higher levels can significantly increase the accuracy and effectiveness of " "your physical attacks." -msgstr "近接武器や素手での戦闘に影響を与えるスキルです。近接攻撃の命中率に影響します。高レベルになると与えるダメージが上昇します。" +msgstr "近接武器や素手での戦闘に影響を与えるスキルです。近接攻撃の精度に影響します。高レベルになると与えるダメージが上昇します。" #: lang/json/skill_from_json.py msgid "bashing weapons" @@ -132640,7 +134639,7 @@ msgid "" "Your skill in fighting with blunt weaponry, from rocks and sticks to " "baseball bats and the butts of rifles. Skill increases damage, and higher " "levels will improve the accuracy of an attack." -msgstr "打撃武器に影響を与えるスキルです。高レベルになると、与えるダメージと命中率が上昇します。" +msgstr "打撃武器に影響を与えるスキルです。高レベルになると、与えるダメージと命中精度が上昇します。" #: lang/json/skill_from_json.py msgid "cutting weapons" @@ -132652,7 +134651,7 @@ msgid "" "Your skill in fighting with weaponry designed to cut, hack and slash an " "opponent. Lower levels of skill increase accuracy and damage, while higher " "levels will help to bypass heavy armor and thick hides." -msgstr "斬撃武器に影響を与えるスキルです。高レベルになると、厚い装甲を貫通し、与えるダメージと命中率が上昇します。" +msgstr "斬撃武器に影響を与えるスキルです。高レベルになると、厚い装甲を貫通し、与えるダメージと命中精度が上昇します。" #: lang/json/skill_from_json.py msgid "dodging" @@ -132678,7 +134677,7 @@ msgid "" "Your skill in fighting with knives, spears and other such stabbing " "implements. Skill increases attack accuracy as well as the chance of " "inflicting a deadly and critical blow." -msgstr "ナイフや槍など刺突武器に関するスキルです。それらを用いた攻撃の命中率と会心率に影響します。" +msgstr "ナイフや槍など刺突武器に関するスキルです。それらを用いた攻撃の精度と会心率に影響します。" #: lang/json/skill_from_json.py msgid "unarmed combat" @@ -133176,6 +135175,11 @@ msgid "" "you'll probably be left with no meat! Use a BB gun or maybe a .22 rifle." msgstr "リスの肉は美味しいが、高威力の銃で撃つと死体が残らない。BBガンか.22口径ライフルを使おう。" +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "強く殴り過ぎて木っ端みじんにしなければ、リスは丁度いいおやつになるよ。" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -133196,8 +135200,24 @@ msgstr "巨大なワームを仕留めても気を抜くな。バラバラにな #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." -msgstr "ゾンビの大群が向かってきたら逃げよう。有効な対策がない限りは自殺行為だ。" +"impossible unless you have a big tactical advantage." +msgstr "ゾンビの大群が向かってきたら逃げよう！有効な対策がない限り、群れを相手するのは不可能だ。" + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "ゾンビの大群が向かってきたら逃げよう。一度に相手するなんて自殺行為だ！" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "ゾンビの大群が向かって来たら、すぐに逃げよう！" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "ゾンビの大群に追われているなら、地下鉄路線を通って、1、2ブロック離れた場所から地上に出てみよう。" #: lang/json/snippet_from_json.py msgid "" @@ -133489,7 +135509,7 @@ msgstr "知ってると思うけど、アサルトライフルでフルオート #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" "レーザーピストルをガンガン撃ってる人たちがいたよ。確かに静かで狙いも正確、ダメージも大きい完璧な武器...に見える。でも、そもそも中々見つからないし、弾薬はものすごく貴重だ..." @@ -133523,7 +135543,7 @@ msgstr "便利な防煙マスクやガスマスクを常備しておこう。煙 msgid "" "There's basically no reason not to wear safety glasses… nothing is worse " "than taking a hit to the eyes and getting blinded for a few seconds." -msgstr "基本的に安全メガネは着用しておいた方がいい...目に何か当たってしばらく盲目になることほど最悪なな事態はないよ。" +msgstr "基本的に安全メガネは着用しておいた方がいい...目に何か当たってしばらく盲目になることほど最悪な事態はないよ。" #: lang/json/snippet_from_json.py msgid "" @@ -133678,6 +135698,12 @@ msgid "" "be deadly." msgstr "筋力や器用さに自信がない人は、火炎瓶や手榴弾を使わない方が良い。投げようとして間違って落としてしまったら大惨事だ。" +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "動作が鈍い奴は、火炎瓶や手榴弾を扱わない方がいい。こういう類の投擲武器は、一つ間違うと重大事故になる。" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -133726,9 +135752,8 @@ msgstr "そこまで多く見かけないが、ガソリンスタンドは燃料 #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "給油ポンプを撃っても爆発はしない…映画じゃないからね。でも、火災の危険があるものを辺りにまき散らすことになる。" #: lang/json/snippet_from_json.py @@ -133743,6 +135768,12 @@ msgid "" " bad!" msgstr "食料雑貨店に行ったら、保存食を持って帰ろう。缶詰は腐らない！" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "食料品店を見つけたら、缶詰を持ち出そう。缶に入った食料は腐らない！" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -133770,12 +135801,6 @@ msgid "" msgstr "" "衣料品店の奥にある更衣室で夜を過ごすことが多いんだ。壁とドアに囲まれてるし、店舗の入り口からも遠いし、狭い通路は防衛にうってつけ...完璧だね！" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "ゾンビの大群に追われているなら、地下鉄路線を通って、1、2ブロック離れた場所から地上に出てみよう。" - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -133784,10 +135809,10 @@ msgstr "妙な科学研究所を見たことはある？中に入るには特別 #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." -msgstr "一度でいいから軍の掩体壕を漁ってみたいが、警備が厳しいし兵士ゾンビもいるから大変だろうな。" +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." +msgstr "一度でいいから軍の掩体壕を漁ってみたいが、防具を着たゾンビの相手はしたくないな。銃を撃ってくるタレットもあるだろうし、恐ろしい場所だ。" #: lang/json/snippet_from_json.py msgid "" @@ -133835,26 +135860,41 @@ msgstr "毎日ドライバーを使えば壊血病知らず！" #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "腹の減りがいつもより早い？そんな時は精油を飲もう。美味しくはないが、自分の脚を食べざるを得ない状況よりマシだろう？" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." -msgstr "地形は戦闘の形成を逆転する力をもっている。敵と対峙する時は、地形を味方に付けよう。" +msgstr "地形は戦闘の形勢を逆転する力をもっている。敵と対峙する時は、地形を味方に付けよう。" #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "鉱山に行った人が悪臭について何か言っていたな。もし訪れるなら、ガスマスクを用意した方が良さそうだ。" #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "知識は力だ。冗談抜きに、本は拾っておこう。" +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "知識は力だ。本を読んで知識を蓄えよう。" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "知識は力だ。でも、あらゆる本で知識を蓄えられる訳じゃない。" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "悲しみに満ちた日もあるだろう。そんな時にうってつけの本があれば、読んでみるといい。" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -133918,7 +135958,7 @@ msgstr "どんなアイテムも分解して素材になることに驚くだろ #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "機械整備を極めるなら、はんだごてを使いこなそう。傷の焼灼もできるけど、その治療法を試して死んだ人もたくさんいるから、最後の手段にしよう。" @@ -133962,11 +136002,11 @@ msgstr "友人がいると満たすべき胃袋が2つに増えてしまう。 #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" -"私はドラッグ反対していた。ゾンビの大群に殺されかけて逃げ帰るまではね。ゾンビが持っていた白い粉以外、何も持っていなかったんだ。あの時はドラッグに救われたよ。" +"私はドラッグの摂取に反対していた。ゾンビの大群に殺されかけて逃げ帰るまではね。ゾンビが持っていた白い粉以外、何も持っていなかったんだ。あの時はドラッグに救われたよ。" #: lang/json/snippet_from_json.py msgid "" @@ -133991,6 +136031,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "頭のおかしな科学者に会ったことがある。彼女はジャガイモから電池を作ってたんだ...あれ、レモンだったかな？" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "頭のおかしな科学者に会ったことがある。彼女はジャガイモから電池を作ってたんだけど、それを食べようとする奴は一人もいなかった。" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -134106,6 +136152,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "あらゆるものが変異する。生存者もそうだ。ウサギの耳が生えてきたら似合うかな？耳が良くなるのかな？" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "あらゆるものが変異する。生存者もそうだ。ピラニアみたいな歯が生えてきたら、きっと恐ろしい顔に見えるだろうな？" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "あらゆるものが変異する。生存者もそうだ。顔から棘が生えていたら、善良な人間に見えると思う？" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "あらゆるものが変異する。生存者もそうだ。目からレーザー光線が出せるようになったら、視力はどうなるんだおる？" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "あらゆるものが変異する。生存者もそうだ。頭から枝角が生えたら似合うかな？帽子はかぶれないだろうな..." + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -134129,6 +136199,14 @@ msgid "" msgstr "" "地図上に載っていない場所に、避難者たちの街があるという噂を聞いた。よほど運がなければ見つけ出すのは難しいし、きっと住人も見つかりたくないだろう。もしかすると...見つけてはいけないって可能性もあるな。意味は察してくれ。" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" +"消火器を背負ってローラーブレードを履いている女の噂を聞いたんだ。ほとんど素っ裸の格好で走り回って、野球バットでゾンビの頭を粉砕するんだってさ。最高だな？" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -134187,6 +136265,12 @@ msgid "" msgstr "" "毎日は無理かもしれないけど、なるべくしっかり眠るようにしよう。眠らないと実力が出せないからね。枕と毛布を用意しよう。眠れない時は、衣類をたくさん置いて暖まることが、枕元にテディベアを置くのと同じくらい効果的だ。寝る場所はちゃんと選ぼう。冷たい地面よりは椅子やベンチの方がマシだ。" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "ズボンを何枚も着用することを禁止する規則はない。いや、もしかしたらある、かもしれない。でも、規則を破ることを咎める奴はもういないよ！" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -134232,8 +136316,8 @@ msgid "Hey there's some pink tablets, take some!" msgstr "ピンクタブレットだ、持っていけ！" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" -msgstr "これは、LSDだな。よし、皆でcataclysm: fun times aheadをプレイしよう！" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" +msgstr "これは、LSDだな。よし、皆でCataclysm: fun times aheadをプレイしよう！" #: lang/json/snippet_from_json.py msgid "Say yes to LSD, say yes to Fun!" @@ -135531,7 +137615,7 @@ msgstr "びっくりするほど" #: lang/json/snippet_from_json.py msgctxt "" msgid "fine" -msgstr "いいね" +msgstr "いい" #: lang/json/snippet_from_json.py msgctxt "" @@ -137062,16 +139146,16 @@ msgid "" msgstr "電力を確保するために、大量の放射線を発生させるプルトニウム懸濁液が今すぐ必要なんだ。" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." +msgid "Tell me about how you survived the Cataclysm." msgstr "どうやって大変動を生き延びたのか教えてくれ。" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" +msgid "How did you survive the Cataclysm?" msgstr "どうやって大変動を生き延びたんだ？" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" -msgstr "大変動が起きた時はどんな状況だった？" +msgid "What was the Cataclysm like for you?" +msgstr "大変動が起きた時はどんな感じだった？" #: lang/json/snippet_from_json.py msgid "How did you make it through the initial chaos?" @@ -137332,7 +139416,7 @@ msgid "eldritch horror" msgstr "異界の怪異" #: lang/json/snippet_from_json.py -msgid "the cataclysm" +msgid "the Cataclysm" msgstr "大変動" #: lang/json/snippet_from_json.py @@ -137726,6 +139810,316 @@ msgstr "" "\n" "報告の詳細に関してはファイルEXO-M-312を参照されたし。" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "はで一番の尻軽、誇らしいね！" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "[完成度の高いサイン]" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "は異性愛しか許さないガキ大将！" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr " + " + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "は地獄" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "どうせみんな死ぬ" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "ママ" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "ファック・ユー" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "[マンガ風のゾンビの絵]" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "[スプレーで描かれたサインと頭蓋骨の絵]" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" +"私はあなたのお母さんと安全かつ愛情のある関係を持っています。あなたも受け入れてください。\n" +"\n" +"お話しませんか？いつでも連絡してください。愛しています。" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "め、ふざけた飲み物よこしやがって、マジクソ" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "<3 " + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "はをファックした" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "[スプレーで描かれた蔓の翼をもつ天使の絵]" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "様は吸血鬼！" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "奴らは真実を隠している" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "ケムトレイルを追え" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "[トイレットペーパーが徐々に虹に変化する奇妙な絵]" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "君の脳みそを食べたい" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "水は飲むな" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "そして奴らは自らの物となった地球を闊歩した。それは罰であった。価値のあるものだけが生き残った" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "[頭に弾痕が空いたゾンビの絵]" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "[非常に芸術的な男性器の絵]" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "[スプレーで簡単に描かれた立ち並ぶ骨の森の絵]" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "[スプレーで描かれた巨大なキノコとその根元で祈る人々の絵]" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "二度と戻れない" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "からヤクを買うな" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "に50ドル貸してる" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "殺してやる" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "それは水の中にいる" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "[スプレーで描かれた解剖学的に奇妙なほとんど服を着ていない女の絵]" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "完全に税金の無駄くたばれ政府" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "プロテインバーは食べるな" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "FEMA: ファッキン・イート・マイ・アスホール" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "[非常用ジャケットとガスマスクを着用している細身の人間のイラスト。その下に「服に感謝」と走り書きされている。]" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "ここにいる全員、希望を捨てろ。" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "誰も来てくれない" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "救助のバスは来ない" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "奴らには失望した" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "死者を中に入れるな" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "聖域" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "のコスプレグッズは大歓迎" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "大変動前バス停" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "奴らは助けに来ない、処分しに来る" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "[大変動の際に襲ってきたとされる巨大な怪物を非常に詳細に描いた、強烈な印象を受ける絵]" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "[手早く描かれた渦巻くゲートとそこから溢れ出すゾンビの絵。その下に「奴らは何をした？」と書かれている。]" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "人類よ安らかに" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "全員死んだ デイブ" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "私たちみんな無事そっちは無事か" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "へ もう待てない キャンプ36へ向かった そこで落ち合おう 愛を込めてより" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "へ 今もあなたを探しています" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "はここにいた まだ生きてる" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "ブルー52" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "へ 待ってると言ったけど、先に逃げました 探してください" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" +"追悼\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"皆がいなければ生きていられなかった。決して忘れない。" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "[ハンマーでゾンビの死体を粉砕する漫画のキャラクターのイラスト。その下に「奴らを潰そう」と走り書きされている。]" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "奴らは立ち上がる。ヘッドショットは無意味。" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "に留まるな" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "は落ちた" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "ここには誰もいない進め" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "死の罠" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "誰も来ない" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "政府がやりやがった" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "ファック・チャイナ" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "ファック・共産主義者" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "を忘れない" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -138997,8 +141391,8 @@ msgstr "破滅が目の前に迫っている気がします。" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." -msgstr "大変動を引き起こした原因は自分だったのだ、という考えが突然浮かびました。" +"Cataclysm." +msgstr "突然、自分こそが大変動の原因だったのだという確信を得ました。" #: lang/json/snippet_from_json.py msgid "You get the odd feeling that your thoughts are not your own." @@ -139265,7 +141659,7 @@ msgid "" "down over his eyes. The captions read: \"It's a tough job, so why should " "you have to do it?\" and \"R.U.R. Technology you can Trust.\"" msgstr "" -"ロバート万能ロボット会社製の作業用ロボットの広告です。レンガの山を運ぶロボットと、その後ろでヘルメットで顔を覆って寝る作業員が描かれれ、次のような見出しが載っています。「その辛い作業、貴方がやる必要はありますか？」「R.U.R.社の製品は高い信頼性を誇っています」" +"ロバート万能ロボット会社製の作業用ロボットの広告です。レンガの山を運ぶロボットと、その後ろでヘルメットで顔を覆って寝る作業員が描かれ、次のような見出しが載っています。「その辛い作業、貴方がやる必要はありますか？」「R.U.R.社の製品は高い信頼性を誇っています」" #: lang/json/snippet_from_json.py msgid "" @@ -140654,7 +143048,7 @@ msgid "" "\"Check out my cooking show on The Television! Making Mannwurst sausages " "out of some of those assholes who tried to raid my kitchen earlier…\"" msgstr "" -"「テレビをご覧の皆様、クッキングショーをお見逃しなく！以前我が家のキッチンを略奪しようとしたろくでなし共を使ってマンヴォルストソーセージを作りましょう...」" +"「テレビをご覧の皆様、クッキングショーをお見逃しなく！以前我が家のキッチンを略奪しようとしたろくでなし共を使って人肉ソーセージを作りましょう...」" #: lang/json/snippet_from_json.py msgid "" @@ -143092,7 +145486,7 @@ msgstr "「武装小隊の編成に必要なものが見つかった。大抵の #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "「ああ、このらせん状に歪んだ形を見ろよ！これが過流の力！永遠の恵みだ！美しい色合い...」" #: lang/json/snippet_from_json.py @@ -143110,14 +145504,14 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" "「40日目。制御装置が壊れた車--" "これに魔法の反応炉を取り付けると問題なく動くようになった。前面の巨大ローラーが森の木々をなぎ倒していく。待ってろよ、メーン州」" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" +msgid "\"my car is a diamond in the rough… literally\"" msgstr "「私の車はダイヤモンドの原石だ...文字通りの意味で」" #: lang/json/snippet_from_json.py @@ -143140,7 +145534,7 @@ msgstr "「いつか、私も車両の一部品になるのだろうか」" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "「ダイナマイトをちょいと、あと地雷を半分、そんでもって飲み終わったソーダの缶...ドカン！どっかへ飛んでっちまうよ」" @@ -144756,6 +147150,38 @@ msgstr "キャン！" msgid "WOOF!" msgstr "グルル！" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "「口が無いのにまだ叫んでいる！」" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "「¿Por qué?(なんで？)」" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "「近くへおいで、おちびさん」" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "「君を食べてしまおう！実際、それ以外にもう食べ物がない」" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "「サイラスは、辛抱強くしていれば新しい身体を手に入れられると言った」" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "「Quem é Você?(あなたは誰？)」" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "「Eu vou te matar!(お前を殺す！)」" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "「お前を殺さずにはいられない、逃げてくれ！」" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "「君を殺したくはない」" @@ -144864,13 +147290,13 @@ msgstr "「テストが終了すれば、あなたは行方不明となってし #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "「信じられません。[被験者名]は[被験者の故郷]の誇りです」" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "「あれは、おそらく未処理下水コンテナか何かでしょう。さあ、顔をつけてみてください」" @@ -144882,7 +147308,7 @@ msgstr "「安全のため、必要ないものには触れな[ノイズ]」" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "中止したからといって、誰もあなたを責めることはありません。実際、現時点では、中止することが最も妥当な選択です」" @@ -144893,7 +147319,7 @@ msgid "" msgstr "「すばらしいです！ あなたは極めて悲観的な状況においても、決意と才能を発揮しました」" #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" +msgid "Hello again. To reiterate our previous warning: [garbled]" msgstr "「ご機嫌いかがですか?再度警告します[ノイズ]」" #: lang/json/speech_from_json.py @@ -144969,8 +147395,8 @@ msgstr "「誰かがひどいケガをすることになりますよ」" #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "「ああ、 誰かがケーキを切ってしまいました。あなたを待つように言っておいたのですが、先走ってしまったようです」" #: lang/json/speech_from_json.py @@ -145002,7 +147428,7 @@ msgstr "「何です？何か言いましたか？」" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "「あなたは成功のチャンスをことごとく逃しました」" #: lang/json/speech_from_json.py @@ -145050,7 +147476,7 @@ msgstr "「信じられないと思いますが、これまでのことはすべ #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "「見取り図を確認中です。どうやら... 間違いありません。ここです。全く逆方向に進んでいます」" @@ -145087,7 +147513,7 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "「ここにいるのは言葉の分からん男だ」" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" +msgid "\"E.T. phone home.\"" msgstr "「E.T. ウチ デンワ」" #: lang/json/speech_from_json.py @@ -145151,7 +147577,7 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "「道？今から行こうとしているところには、道なんて必要ないさ」" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" msgstr "「シートベルトを締めて。今夜は荒れそうよ」" #: lang/json/speech_from_json.py @@ -145518,7 +147944,7 @@ msgid "\"I'm scared!\"" msgstr "「怖い！」" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" +msgid "\"Something's wrong…\"" msgstr "「なにか変...」" #: lang/json/speech_from_json.py @@ -145546,15 +147972,15 @@ msgid "\"Excuse me?\"" msgstr "「すみません」" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" +msgid "\"I'm different…\"" msgstr "「私は違うの...」" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" +msgid "\"Thanks anyway…\"" msgstr "「でもありがとう...」" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" +msgid "\"Take me with you…\"" msgstr "「私を連れて行って...」" #: lang/json/speech_from_json.py @@ -145634,7 +148060,7 @@ msgid "\"This time is OUR time.\"" msgstr "「今回は俺たちが主役だぜ」" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" +msgid "\"Second time's a charm…\"" msgstr "「二度目の正直...」" #: lang/json/speech_from_json.py @@ -145706,7 +148132,7 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "「[ため息] 誰にも言うなよ」" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" +msgid "\"Well, I tried. Best of luck!\"" msgstr "「俺じゃダメだ。後は任せたぜ！」" #: lang/json/speech_from_json.py @@ -146000,7 +148426,7 @@ msgid "Cabin" msgstr "山小屋" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "病院" @@ -146152,7 +148578,7 @@ msgstr "FEMAキャンプ" msgid "Mansion Entrance" msgstr "大邸宅(玄関)" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "大邸宅" @@ -146226,7 +148652,7 @@ msgstr "ええと...ああ、そうだね。もう行かないと。" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -146331,17 +148757,8 @@ msgid "Yeah, alright." msgstr "ああ、そりゃいいや。" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." -msgstr "必要があれば、もっと歌を用意しよう。" - -#: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." -msgstr "もっと知りたいのなら、役に立つかもしれない骨について心当たりがある。" - -#: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." -msgstr "お前が望むなら、歌うこともできるだろう。" +msgid "There are bones to etch, songs to sing. Wish to join me?" +msgstr "彫る骨と、奏でる歌がある。我らに加わるか？" #: lang/json/talk_topic_from_json.py msgid "Do you wish to take on more songs?" @@ -146352,16 +148769,17 @@ msgid "Do you believe you can take on the burden of additional bones?" msgstr "これ以上の骨をお前に負担させられると思っているのか？" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" -msgstr "彫る骨と、奏でる歌がある。我らに加わるか？" +msgid "A song may yet be sung by you, should you wish to." +msgstr "お前が望むなら、歌うこともできるだろう。" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." -msgstr "修行者は一度に多くの歌を歌うべきではない。" +msgid "There is an additional song you could take on, if you'd like." +msgstr "必要があれば、もっと歌を用意しよう。" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." -msgstr "今は話すことはない。" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." +msgstr "もっと知りたいのなら、役に立つかもしれない骨について心当たりがある。" #: lang/json/talk_topic_from_json.py msgid "" @@ -146369,6 +148787,14 @@ msgid "" "the bones of this world." msgstr "歌は...今のところ聞こえないな。恐らく時間が経てば、この世界の骨にもっと多くの記録が刻まれることだろう。" +#: lang/json/talk_topic_from_json.py +msgid "An acolyte should not take on too many songs at once." +msgstr "修行者は一度に多くの歌を歌うべきではない。" + +#: lang/json/talk_topic_from_json.py +msgid "That is all for now." +msgstr "今は話すことはない。" + #: lang/json/talk_topic_from_json.py msgid "I see." msgstr "なるほどね。" @@ -147150,7 +149576,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "後ろに下がるな。私の移動の邪魔になる地点へ移動するな。" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -147463,16 +149889,16 @@ msgstr "ああ、この暑さに私も参っていたんだ。ちょっと休憩 msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "いいよ。話していれば凍えずに済むからな。最近どう？" +#: lang/json/talk_topic_from_json.py +msgid "Man it's dark out isn't it? what's up?" +msgstr "まだ日は落ちていないようだな？調子はどう？" + #: lang/json/talk_topic_from_json.py msgid "" "Well, it's the time of day for a quick break surely! How are you holding " "up?" msgstr "そうだな、そろそろ息抜きの時間だ！最近調子はどう？" -#: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" -msgstr "まだ日は落ちていないようだな？調子はどう？" - #: lang/json/talk_topic_from_json.py msgid "Well, I'm feeling pretty sick… are you doing OK though?" msgstr "その、今はかなり体調が悪いんだけど...それでもやるのか？" @@ -147560,14 +149986,14 @@ msgstr "よし、急に動いたりはするなよ..." msgid "Keep your distance!" msgstr "近寄るな！" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "ここはうちのシマだ、。" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "ここはうちのシマだ、。" + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "落ち着けよ。君を傷付けるつもりはないよ。" @@ -147621,11 +150047,7 @@ msgid "I don't care." msgstr "どうでもいいね。" #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "1つ頼みたい事があるんだ。聞いてくれるか？" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" +msgid "I have other jobs for you. Want to hear about them?" msgstr "一つ頼みたい事があるんだ。聞いてくれるか？" #: lang/json/talk_topic_from_json.py @@ -147633,17 +150055,21 @@ msgid "I have more jobs for you. Want to hear about them?" msgstr "他にも頼みたい事があるんだ。聞いてくれるか？" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" +msgid "I have another job for you. Want to hear about it?" msgstr "一つ頼みたい事があるんだ。聞いてくれるか？" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "頼みたい事はそれだけだ。" +msgid "I just have one job for you. Want to hear about it?" +msgstr "1つ頼みたい事があるんだ。聞いてくれるか？" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "特に頼みたい事はないね。" +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "頼みたい事はそれだけだ。" + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -147653,6 +150079,10 @@ msgstr "ああ、分かったよ。" msgid "Never mind, I'm not interested." msgstr "いいや、興味ないね。" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "頼んでいる仕事は今のところ何もないよ。" + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "どの依頼の話だ？" @@ -147661,10 +150091,6 @@ msgstr "どの依頼の話だ？" msgid "What about it?" msgstr "何だ？" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "頼んでいる仕事は今のところ何もないよ。" - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "いいだろう、引き受けたよ！" @@ -147873,10 +150299,6 @@ msgstr "ふーん、分かった。" msgid "Thanks!" msgstr "ありがとう！" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "相棒、運転に集中してくれ！" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "ちょっと理由があって話せないんだ。" @@ -147901,6 +150323,10 @@ msgstr "すごく喉が渇いたよ。何か飲みたいな。" msgid "I must focus on the road!" msgstr "運転に集中させてくれ！" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "相棒、運転に集中してくれ！" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "あぁ、分かった。" @@ -148005,10 +150431,6 @@ msgstr "いや、ここでいい。" msgid "On second thought, never mind." msgstr "ただの思い付きだ、気にしないでくれ。" -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "車両を運転している間は、ちゃんと訓練できないよ！" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "ちょっと理由があって訓練はできないんだ。" @@ -148021,6 +150443,10 @@ msgstr "少し時間をくれないか。後で話をしよう。" msgid "I can't train you properly while I'm operating a vehicle!" msgstr "車両を運転している間は、ちゃんと訓練できないよ！" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "車両を運転している間は、ちゃんと訓練できないよ！" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "絶対に嫌だね、付いて行くからな！" @@ -148742,7 +151168,7 @@ msgid "How are you alive?" msgstr "どうやって生き残ったんだ？" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" +msgid "What did you do before the Cataclysm?" msgstr "大変動の前は何をしていたんだ？" #: lang/json/talk_topic_from_json.py @@ -148969,7 +151395,7 @@ msgid "This is a season spring test response." msgstr "春季のテスト用返答です。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." +msgid "This is a days since Cataclysm 30 test response." msgstr "大変動から30日後のテスト用返答です。" #: lang/json/talk_topic_from_json.py @@ -148977,7 +151403,7 @@ msgid "This is a season summer test response." msgstr "夏季のテスト用返答です。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." +msgid "This is a days since Cataclysm 120 test response." msgstr "大変動から120日後のテスト用返答です。" #: lang/json/talk_topic_from_json.py @@ -148985,7 +151411,7 @@ msgid "This is a season autumn test response." msgstr "秋季のテスト用返答です。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." +msgid "This is a days since Cataclysm 210 test response." msgstr "大変動から210日後のテスト用返答です。" #: lang/json/talk_topic_from_json.py @@ -148993,7 +151419,7 @@ msgid "This is a season winter test response." msgstr "冬季のテスト用返答です。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." +msgid "This is a days since Cataclysm 300 test response." msgstr "大変動から300日後のテスト用返答です。" #: lang/json/talk_topic_from_json.py @@ -149034,7 +151460,7 @@ msgstr "所持金、NPCの支援、特質のテスト用返答です。" #: lang/json/talk_topic_from_json.py msgid "This is a complex nested test response." -msgstr "複雑な入れ子構造ののテスト用返答です。" +msgstr "複雑な入れ子構造のテスト用返答です。" #: lang/json/talk_topic_from_json.py msgid "This is a true/false true response." @@ -149510,7 +151936,7 @@ msgstr "説明してる暇はない。世界は滅びかけていて、力を合 #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "大変動が時空の連続性を歪めたことで、次元の裂け目に偶然落ちてしまい、ここに辿り付いたんだ。戦い続けるには君の力が必要だ。" @@ -149841,7 +152267,7 @@ msgstr "" "が起きる前は警官だったんだ。世界が崩壊する数日前に撃たれた...麻薬のガサ入れでヘマをやって腹に穴が開きかけたが、防弾ベストのお陰でかろうじて助かったんだ。かなり重症の打撲で済んだ。銃で撃たれて生き残るなんて考えてもみなかったが、世界崩壊が起きた時は、まだ職務に復帰できていなかったんだ。" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" +msgid "What did you do when you found out about the Cataclysm?" msgstr "大変動に直面したときは何をしていたんだ？" #: lang/json/talk_topic_from_json.py @@ -151112,8 +153538,8 @@ msgstr "ないよ、気持ち悪い。" #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." -msgstr "ああ、あるね。時々、自分の存在が大変動の時から始まったような気がするんだ。" +"the Cataclysm." +msgstr "ああ、あるね。時々、自分の存在が大変動の瞬間から始まったような気がするんだ。" #: lang/json/talk_topic_from_json.py msgid "" @@ -152413,7 +154839,7 @@ msgid "What were you saying before that?" msgstr "前の話をもう一度聞かせてもらえないかな？" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "幻覚じゃないよな。ここから出してくれ..." #: lang/json/talk_topic_from_json.py @@ -152452,7 +154878,7 @@ msgstr "やあお客さん、何しに来たんだ？" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "バッジを着けているな。ここの土地には入らず、そのまま去った方がいい。" @@ -152484,8 +154910,8 @@ msgstr "バリーについて聞いたよ。彼が何に捕まったのか教え #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" "アレはピンク色で、とても素早く、手足がたくさん生えていて、人間じゃなかった。逃げようとしたけど、すぐ追いつかれた。恐ろしかったよ。転んだバリーは一瞬で連れ去られたんだ。" @@ -152514,7 +154940,7 @@ msgid "" msgstr "クリスは私有地の周りを歩き回って、防衛計画を立てているよ。" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "私の農場から立ち去った方がいい。政府の策略には乗らないよ。" #: lang/json/talk_topic_from_json.py @@ -152535,14 +154961,14 @@ msgstr "やあ、調子はどう？" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "バッジを着けているな。この土地から出て行った方がいい。うちの家族は執行官が嫌いなんだ。" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "やあ、あなたのお父さんが探していたよ。それと、叔父さんの行方を調べているんだってな。" #: lang/json/talk_topic_from_json.py @@ -152555,7 +154981,7 @@ msgstr "さっきルークと話していたんだ。あなたは世界の崩壊 msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" "ああ、うちの両親は心配ばかりしているな。私は野外を調査して、変化を見つけるのが好きなんだ。この小屋を修理して、平和と静寂を手に入れたいと思っていてね..." @@ -152587,7 +155013,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" "バリーを捜索するための調査旅行をしばらく続けている時、野原で何かの集団が出てくる場所を見たんだ。まるで実体がないかのように揺らめいていた。私はしばらく怪物たちを追いかけたんだ..." @@ -152598,7 +155024,7 @@ msgstr "何があったんだ？" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -152625,7 +155051,7 @@ msgstr "私の家族に見つかる前に出ていった方がいい。" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "あなたのお父さんが探していたよ。それと、叔父さんの行方を調べているんだってな。" #: lang/json/talk_topic_from_json.py @@ -152678,7 +155104,7 @@ msgstr "溢れる狂気の中で平穏な場所を確保したいなら、少し msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" "準備して共に働けば、運の良さはそれほど必要ないよ。それに、失ったものもある。義理の兄のバリーは最高の狩人だったけど、そんなことを言える状況ではなくなってしまった..." @@ -152692,7 +155118,7 @@ msgstr "ここ最近は、農場はかなり安全な場所になっているは #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "あぁ、はじめまして。私が薬草で作った薬のことをジャックが自慢していただろう。夫は私たちがここで作り上げたものを誇りに思っているんだ。" @@ -152735,8 +155161,8 @@ msgstr "ジャックと私は40年間も一緒にいるんだ。この混乱の #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "ジェシーとその家族は馬牧場の方に住んでいるよ。きっと手伝いが必要だろうから、聞いてみるといい。" #: lang/json/talk_topic_from_json.py @@ -152765,6 +155191,12 @@ msgstr "あなたの娘はこの道沿いに住んでいるのか？" msgid "Where is your brother's place?" msgstr "あなたの兄弟はどこにいるんだ？" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "バッジを着けているな。ここの土地には入らず、そのまま去った方がいい。" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "素晴らしい乳製品だ。生産を続けるのは大変だろうな。" @@ -152832,6 +155264,10 @@ msgid "" " a forage set up." msgstr "カーロスは狩りへ出かけてなければ作業場にいるんじゃないかな。鍛冶場を作る準備をしているんだ。" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "私の農場から立ち去った方がいい。政府の策略には乗らないよ。" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "あなたの息子は酪農を手伝っているのか？" @@ -153164,14 +155600,14 @@ msgstr "あなたの父について聞きたい。" #: lang/json/talk_topic_from_json.py msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." +"Sir, I don't know how the hell you got down here but if you have any sense " +"you'll get out while you can." msgstr "執行官、どうやってここまで来たのか知らんが、身動きが取れるうちにここを脱出した方がいいぞ。" #: lang/json/talk_topic_from_json.py msgid "" -"Sir, I don't know how the hell you got down here but if you have any sense " -"you'll get out while you can." +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." msgstr "執行官、どうやってここまで来たのか知らんが、身動きが取れるうちにここを脱出した方がいいぞ。" #: lang/json/talk_topic_from_json.py @@ -153592,15 +156028,15 @@ msgstr "わかったよ！さあ行こう。" msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "段ボールの事は話したっけ？君、段ボール持ってる？" +#: lang/json/talk_topic_from_json.py +msgid "We've done it! We've solved the list!" +msgstr "やった！リストが全部埋まった！" + #: lang/json/talk_topic_from_json.py msgid "" "How's things with you? My cardboard collection is getting quite impressive." msgstr "調子はどう？私の段ボールコレクションはかなり良い感じだよ。" -#: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" -msgstr "やった！リストが全部埋まった！" - #: lang/json/talk_topic_from_json.py msgid "About that shopping list of yours…" msgstr "あなたの買い物リストについて..." @@ -154402,7 +156838,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" "気味が悪いだろ？ムダ毛みたいなものだ。大変動からしばらく経って、至る所から生え始めた。原因は分からない。嫌だからと言って怒っても仕方がない、まぁ、嫌だけど。" @@ -154464,7 +156900,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" "知らないのか？知事が狂って、他の人達も同じように狂っていったんだ。ある日知事が、物騒な民兵や支持者たちを伴って現れ、クーデターを宣言した。政府機能を完全に引き継ぎ、反対者を殺し、たくさんの支持者たちを島に移住させた。彼らの大半が大変動を乗り切って主導権を握ってるなんて噂もあるが、とても信じられないよ。" @@ -155026,7 +157462,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -157235,14 +159671,14 @@ msgstr "痛い目に遭うのが嫌なら大人しくしていろ。" msgid "Just on watch, move along." msgstr "見張りをしてるだけだ、どっか行け。" -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "お嬢さん、外をうろつくは止めた方が身の為だよ。" - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "外は大混乱のようだな？" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "お嬢さん、外をうろつくは止めた方が身の為だよ。" + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "ここが避難センターだと聞いたんだが..." @@ -158476,10 +160912,10 @@ msgstr "君を雇いたいと思っているんだが。" #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" -"農場建設を手伝うために送られてきた者だ。我々のような者の多くは、大変動以前の世界から役立つ技術を持ち越してこられなかった人間だから、何事も試行錯誤だよ。" +"農場建設を手伝うために送られてきたんだ。我々のような者の多くは、大変動以前の世界から役立つ技術を持ち越してこられなかった人間だから、何事も試行錯誤だよ。" #: lang/json/talk_topic_from_json.py msgid "" @@ -158848,7 +161284,7 @@ msgstr "各地に秩序を取り戻そうとしているんだ。" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -158868,7 +161304,7 @@ msgstr "常軌を逸した者だけが生き残る、という事か。" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "ここの食料は、私たちのコミュニティに還元されるものだ。何かサービスを提供してくれるなら、交換してやってもいい。" @@ -158882,8 +161318,8 @@ msgstr "そろそろ行くよ。" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "まずは取り引きする権利を獲得しないと。それと、ここでは大変動以前から独自の通貨が流通しているんだ。" #: lang/json/talk_topic_from_json.py @@ -158906,8 +161342,8 @@ msgstr "仲間に加わるのは止めておこう。" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "ここで？果物やベリー類だよ。他には農機具もあるが、購入には暗号通貨が必要だ。" #: lang/json/talk_topic_from_json.py @@ -158920,9 +161356,9 @@ msgstr "暗号通貨とは何だ？" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" "共済組合の人にこのコミュニティを紹介されたんだ。それからは、世界の凋落に備えることに人生の全てを費やした。大多数の他の人間よりも上手く生き残れてるみたいだな。" @@ -158940,9 +161376,9 @@ msgstr "忙しいようで何よりだ。" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" "ここでは取り引きに暗号通貨を使う。大変動前から電子的な通貨を作っていて、将来的には仮想通貨を流通させるつもりだったんだ。私たちは今でも使い続けている。欲しいなら、物々交換だ。" @@ -158972,15 +161408,15 @@ msgstr "何か助けが必要か？" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" "まさか...まぁ、少しは手を加えたが。ここを見つけた当時は、本当に修理できるのかってぐらい酷い状態だった。空いてる部屋はしばらく使っていてもいいが、独占はするなよ。この辺にいるスカベンジャーは君だけじゃないからな。" #: lang/json/talk_topic_from_json.py -msgid "Interesting..." +msgid "Interesting…" msgstr "なるほどね..." #: lang/json/talk_topic_from_json.py @@ -158990,7 +161426,7 @@ msgid "" msgstr "ただの幸運なスカベンジャーだよ。宝の山に囲まれて暮らす現状に満足してるのさ。もし現金を持ってるなら、物々交換ではなく売買で取引しよう。" #: lang/json/talk_topic_from_json.py -msgid "I see..." +msgid "I see…" msgstr "なるほど..." #: lang/json/talk_topic_from_json.py @@ -159000,7 +161436,7 @@ msgid "" msgstr "逆にどうして使わない？皆が現金を使う、それが重要なのさ。私のATMは銀行などのあらゆるサーバーに接続されているんだ。" #: lang/json/talk_topic_from_json.py -msgid "Hmm..." +msgid "Hmm…" msgstr "むむ..." #: lang/json/talk_topic_from_json.py @@ -159010,7 +161446,7 @@ msgid "" msgstr "そうだろうな。君みたいなスカベンジャーにとって消耗品は不可欠だろう？それに私が金を使う機会なんていくらでもあるからな。" #: lang/json/talk_topic_from_json.py -msgid "Alright..." +msgid "Alright…" msgstr "分かった..." #: lang/json/talk_topic_from_json.py @@ -159018,7 +161454,7 @@ msgid "Not at the moment, check back later perhaps." msgstr "今の所は何もないな、また今度寄ってくれ。" #: lang/json/talk_topic_from_json.py -msgid "Sure..." +msgid "Sure…" msgstr "そうか..." #: lang/json/talk_topic_from_json.py @@ -159038,7 +161474,7 @@ msgid "So are you busting us out of here or what?" msgstr "ここから脱出できるのか？" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." +msgid "Hold tight, . I've got to clear a path." msgstr "じっとしていてくれ、。まずは脱出経路を確保しないと。" #: lang/json/talk_topic_from_json.py @@ -162752,6 +165188,15 @@ msgstr "閉じた門(金属)" msgid "A closed metal gate." msgstr "閉じた金属製の門です。" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "開いた門(金属)" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "開いた金属製の門です。" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "柵(目隠し)" @@ -164523,14 +166968,23 @@ msgstr "" "ガソリンは貴重です。この神殿に導いてくれた旧世界のガソリンの神に跪きましょう。仲間の道路戦士に燃料を供給できるだけの十分な量が残っています。この装置が無料で燃料を提供してくれない場合は、付近の端末で料金を支払う必要があります。" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "ガソリンタンク" +msgid "fuel tank" +msgstr "燃料タンク" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "ガソリンを満載したタンクです。" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "壊れた燃料タンク" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "ガソリンを満載した壊れたタンクです。" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "破壊された給油ポンプ" @@ -166325,6 +168779,27 @@ msgstr "小型金属柱" msgid "A metal support beam." msgstr "金属製の支柱です。" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "壁(石垣)" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "モルタルなしで石を重ね合わせて作った、頑丈な石垣の壁です。" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "石垣" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "モルタルなしで石を重ね合わせて作った、頑丈な石垣です。そのまま建設作業を続ければ2倍の高さの壁になります。" + #: lang/json/terrain_from_json.py msgid "window" msgstr "窓" @@ -166703,8 +169178,8 @@ msgstr "壁(棒)" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" "丸太の柱に板と棒を寄せ集めて作った安っぽい壁です。泥や石でしっかりと固定されており、上階または屋根を十分に支えられます。やや燃えやすい材質です。" @@ -166719,7 +169194,7 @@ msgstr "水耕栽培装置(廃止)" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "使われなくなった水耕栽培装置です。分解すると素材を入手できます。" @@ -167072,7 +169547,7 @@ msgstr "マナ織込" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "なし" @@ -167358,7 +169833,7 @@ msgid "" "powered weapons) have a range, which is added on top of the ammo's range " "when firing." msgstr "" -"銃を拾いました。銃は強力な武器ですが、弾薬を必要とします。銃には様々な特性があります。弾薬により威力を調整できます。分散率は命中率に影響します。セミオートマチックと連射に切り替え可能な銃もあります。弓などは筋力が射程距離に加算されます。" +"銃を拾いました。銃は強力な武器ですが、弾薬を必要とします。銃には様々な特性があります。弾薬により威力を調整できます。分散率は命中精度に影響します。セミオートマチックと連射に切り替え可能な銃もあります。弓などは筋力が射程距離に加算されます。" #: lang/json/tutorial_messages_from_json.py msgid "" @@ -167369,7 +169844,7 @@ msgid "" "value will reduce this effect. The Range is the maximum range the ammo can " "achieve, and the dispersion affects its chance to hit." msgstr "" -"銃の弾薬を拾いました。弾薬には様々な性質があります。威力の値は普通に命中した時に与える最大ダメージを示し、クリティカルやヘッドショット時はさらにダメージを与えます。装甲が高く銃のダメージを減少させるモンスターやNPCもいますが、貫通の値が高いと装甲を貫けます。射程距離は弾薬の最大射程を、分散率は命中率を表します。" +"銃の弾薬を拾いました。弾薬には様々な性質があります。威力の値は普通に命中した時に与える最大ダメージを示し、クリティカルやヘッドショット時はさらにダメージを与えます。装甲が高く銃のダメージを減少させるモンスターやNPCもいますが、貫通の値が高いと装甲を貫けます。射程距離は弾薬の最大射程を表し、分散率は命中精度に影響します。" #: lang/json/tutorial_messages_from_json.py msgid "" @@ -167417,7 +169892,7 @@ msgid "" "another attack. Your dexterity and melee skills are used to determine " "whether an attack hits, while strength affects damage." msgstr "" -"攻撃を命中させるとモンスターを一時的に気絶させることがあり、逃げたり次の攻撃を加えたりできます。器用と近接攻撃スキルは命中率に影響し、筋力はダメージ量に影響します。" +"攻撃を命中させるとモンスターを一時的に気絶させることがあり、逃げたり次の攻撃を加えたりできます。器用と近接攻撃スキルは命中精度に影響し、筋力はダメージ量に影響します。" #: lang/json/tutorial_messages_from_json.py msgid "" @@ -167516,7 +169991,7 @@ msgid "" "reduces recoil, so weak characters might want to stick to .22 or 9x19mm " "guns." msgstr "" -"射撃後、画面右下に反動が表示されます。一般的に弾丸の威力が高いと反動も強くなります。反動は命中率を減少させ、('.')で待機するか他の行動をしていれば安定します。筋力が高いと反動も減るため、貧弱なキャラクターは反動の小さい.22口径や9x19mmの銃を主に使うと良いでしょう。" +"射撃後、画面右下に反動が表示されます。一般的に弾丸の威力が高いと反動も強くなります。反動は命中精度を減少させ、('.')で待機するか他の行動をしていれば安定します。筋力が高いと反動も減るため、貧弱なキャラクターは反動の小さい.22口径や9x19mmの銃を主に使うと良いでしょう。" #: lang/json/tutorial_messages_from_json.py msgid "" @@ -167724,7 +170199,7 @@ msgstr "アイスクリームカート" msgid "Luggage Cart" msgstr "手荷物用台車" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "ショッピングカート" @@ -170051,7 +172526,7 @@ msgid "" "'e'xamine the forge rig to utilize its welder or soldering iron; you'll " "still need glare protection." msgstr "" -"車両のバッテリーを動力源にに溶接と金属加工を行う設備です。調べることではんだ付けや溶接を実行できます。溶接にはこの装置の他に遮光性能を持つ道具が必要です。" +"車両のバッテリーを動力源に溶接と金属加工を行う設備です。調べることではんだ付けや溶接を実行できます。溶接にはこの装置の他に遮光性能を持つ道具が必要です。" #. ~ Description for cooking rig #: lang/json/vehicle_part_from_json.py @@ -170879,8 +173354,8 @@ msgstr "タレット(LACPﾚｰｻﾞｰ)" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "ブロブで作られた無限軌道です。ホイールの代わりとして利用でき、強い牽引力とオフロード走破性を備えています。" #. ~ Description for gel shooter @@ -171482,7 +173957,7 @@ msgstr "ライフル(渦流ﾗｲﾌﾙ/自動照準)" #: lang/json/vehicle_part_from_json.py msgid "diamond barrier" -msgstr "障壁(ダイヤモンド)" +msgstr "障壁(ﾀﾞｲﾔﾓﾝﾄﾞ)" #. ~ Description for diamond barrier #: lang/json/vehicle_part_from_json.py @@ -171610,6 +174085,10 @@ msgstr "ビタミンC" msgid "Toxins" msgstr "毒素" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "食欲不振" + #: src/action.cpp src/input.cpp msgid "Press " msgstr " " @@ -171740,7 +174219,7 @@ msgid "" "To perform a full butchery on a corpse this big, you need either a " "butchering rack, a nearby hanging meathook, or both a long rope in your " "inventory and a nearby tree to hang the corpse from." -msgstr "大型の死体を完全に解体するには、設置された状態の食肉解体ラックか食肉用フック、もしくはロープ(9m)と木が必要です。" +msgstr "大型の死体を完全に解体するには、設置された状態の食肉処理ラックか食肉用フック、もしくはロープ(9m)と木が必要です。" #: src/activity_handlers.cpp msgid "" @@ -171776,7 +174255,7 @@ msgstr "既に部位解体が済んでいます。" #: src/activity_handlers.cpp msgid "You need to perform field dressing before quartering." -msgstr "部位解体を行う前に内蔵を摘出する必要があります。" +msgstr "部位解体を行う前に内臓を摘出する必要があります。" #: src/activity_handlers.cpp msgid "Would you dare desecrate the mortal remains of a fellow human being?" @@ -172084,6 +174563,12 @@ msgstr "%sを装填できません。" msgid "You reload the %s." msgstr "%sに装填しました。" +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "%sの塵を取り除いて何とか操作できるようにしました。" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -172972,6 +175457,10 @@ msgstr "この作業を実行する前に邪魔なものをどけてください msgid "The required items are not available to complete this task." msgstr "この作業を完了するために必要なアイテムが足りません。" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "暗すぎて行動できません。" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -173386,6 +175875,10 @@ msgstr "充填" msgid "spoilage" msgstr "腐敗" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "取引価格" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -175415,6 +177908,44 @@ msgstr "%sは現在の状態では起動できません。" msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "%sは互換性のない%sを装填した状態では発砲できません。" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "何も装備していません。" + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "満腹のため%sの葉を食べられません。" + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "藪を食べました。" + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "満腹のため草を食べられません。" + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "草を食べました。" + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "草丈が短すぎて食べられません。" + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "葉が枯れており食べるのに適しません。" + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "この葉は塗料で汚染されていて食べられません。" + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "空の%sを置きました。" + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "殻の中から投擲はできません。" @@ -175452,6 +177983,14 @@ msgstr "精神を強く集中し、体を動かしました！" msgid "You can't muster up the effort to throw anything…" msgstr "投擲する気力が湧きません..." +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "アイテムを抜き取る" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "抜き取るアイテムを持っていません。" + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -176329,18 +178868,14 @@ msgstr "手術の始まりに興奮を隠せません。" #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." -msgstr "" -"オートドクが身体を苦も無く切り裂く様子に興奮を覚えています。メスが身体をバラバラに切り分ける光景に楽しさを感じています。しかし、手術がある程度まで進んだ時点で疲れが出て、気を失いました。" +"sight of scalpels slicing you apart." +msgstr "オートドクが身体を苦も無く切り裂く様子に興奮を覚えています。メスが身体をバラバラに切り分ける光景に快楽を感じています。" #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." -msgstr "" -"じっと、ひたすらじっと待ち、天井の特徴的な模様を見つめています。オートドクの器具は、少しの痛みも伴わずに、身体を切り開いています。目の前にメスの刃が迫ってきた段階で、幸いにも意識を失いました。" +"ceiling, as the Autodoc slices painlessly into you." +msgstr "じっと、ひたすらじっと待ち、天井の特徴的な模様を見つめています。オートドクの器具は、少しの痛みも伴わずに、身体を切り開いています。" #: src/bionics.cpp msgid "" @@ -178911,8 +181446,8 @@ msgstr "この状態では食べられません。" msgid "This is full of dirt after being on the ground." msgstr "地面に置いたアイテムが汚れています。" -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "水中でその行動はできません。" @@ -179788,11 +182323,11 @@ msgstr "一括製作時間: %s" msgid "Dark craftable? %s" msgstr "暗所作業: %s" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "簡単" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "困難" @@ -180292,6 +182827,10 @@ msgstr "出力 - NPC魔法" msgid "Test weather" msgstr "テスト - 天候" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "テスト - 特殊地形一覧" + #: src/debug_menu.cpp msgid "Info…" msgstr "情報..." @@ -180498,7 +183037,7 @@ msgstr "収集: %d" msgid "Altruism: %d" msgstr "利他: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "必要:" @@ -181187,390 +183726,6 @@ msgstr "呪文レベルを設定: (現在%d)" msgid "%s is now level %d!" msgstr "%sがレベル%dになりました！" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "マップを生成中です。しばらくお待ち下さい [ 0%%]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "隊商が近づいてきました！スペースを押して下さい..." - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "寝る必要はありません！" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "防衛モードではセーブは出来ません！" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "%sを置いては行けません！" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "第%dウェーブを何とか生き延びました！" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "マップを生成中です。しばらくお待ち下さい [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "前のオプション" - -#: src/defense.cpp -msgid "Next option" -msgstr "次のオプション" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "オプションの値を変更" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "設定切替" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "最低1つはモンスターの群れを選ばなくてはいけません！" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "特殊ゾンビ" - -#: src/defense.cpp -msgid "Zombies" -msgstr "ゾンビ" - -#: src/defense.cpp -msgid "Triffids" -msgstr "トリフィド" - -#: src/defense.cpp -msgid "Robots" -msgstr "ロボット" - -#: src/defense.cpp -msgid "Subspace" -msgstr "亜空間" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "食料" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "傭兵" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "防衛モード" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "方向キーで移動、ENTERで切り替え" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "Sを押して開始" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "シナリオ: " - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "場所:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "初期の難易度: " - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "第一波の難易度" - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "ウェーブ難易度: " - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "各ウェーブの難易度" - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "時間/1ウェーブ: " - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "次のウェーブまでの分単位の時間。" - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "ウェーブ/1隊商: " - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "次の隊商が来るまでのウェーブ回数。" - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "初期の資金: " - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "プレイヤーが開始時が所持している資金。" - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "第一波の資金: " - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "第一波の時に与えられる資金。" - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "資金増加: " - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "各ウェーブの資金増加量。" - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "敵の選択: " - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "カスタム" - -#: src/defense.cpp -msgid "Medium" -msgstr "普通" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "ショーン・オブ・ザ・デッド" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "ドーン・オブ・ザ・デッド" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "スパイダーパニック！" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "トリフィド時代" - -#: src/defense.cpp -msgid "Skynet" -msgstr "スカイネット" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "クトゥルフの呼び声" - -#: src/defense.cpp -msgid "A custom game." -msgstr "カスタムゲーム。" - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "モンスターは弱く賞金は多い。" - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "モンスターが強い。食事をとる必要がある。" - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "全てのモンスターが出現。食事と飲み物をとる必要がある。" - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "古典的なゾンビから酒場を守れ。簡単で楽しい。" - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "非常に遅くて現実的な昔ながらのゾンビ。" - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "テンポが速く楽しいクモとの戦い！" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "邸宅をトリフィドから守れ。" - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "ロボットたちは人類を敵と認定した！" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "名状しがたき恐怖の軍団から逃げろ。" - -#: src/defense.cpp -msgid "Public Works" -msgstr "公共事業土木現場" - -#: src/defense.cpp -msgid "Megastore" -msgstr "超大型店" - -#: src/defense.cpp -msgid "Bar" -msgstr "酒場" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "入口は一か所だが部屋数は多い。一部の医療用品が置いてある。" - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "有用なツールがたくさん見つかり、要塞化しやすい建物。" - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "資源が豊富な大きい建物。" - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "アルコール類が豊富な小さい建物。" - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "多くの部屋を有する大邸宅。" - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" -"隊商:\n" -"上下キーでカテゴリーを選択します。\n" -"%sでカテゴリー選択とアイテム選択を切り替えます。\n" -"上下キーでアイテムを選択し、左右キーで数量を決定します。\n" -"%sでカートに入れたものを全て購入します。%sでキャンセルします。" - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "本当に何も購入しませんか？" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "それらのアイテムを買う余裕がありません！" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "%d個のアイテムを%sで購入しますか？" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "一部のアイテムを置きました。" - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "近接武器" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "遠距離武器" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "弾薬" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "製作 & 建設材料" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "食料 & 薬品" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "衣類 & 防具" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "道具と罠 & 手榴弾" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "?を押してヘルプを表示。" - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "所持金: %s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "第%dウェーブにようこそ！" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "第%dウェーブ: " - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "%sの侵攻だ！" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "%sの襲撃だ！" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "%sの攻撃だ！" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "地獄から%sがやって来ました！" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "用心しろ！%sだ！" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "%sの日が訪れました！" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "%sの復讐だ！" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "%sの復活だ！" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -181771,7 +183926,7 @@ msgstr "落書き: %s" #: src/editmap.cpp src/game.cpp #, c-format msgid "Inscription: %s" -msgstr "文字: %s" +msgstr "内容: %s" #: src/editmap.cpp msgctxt "map editor state" @@ -182144,53 +184299,53 @@ msgstr "あの草はシズニトルバムスニップスナップサックだ。 #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "筋力 +%d / " +msgid "Strength +%d; " +msgstr "筋力 +%d; " #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "筋力 %d / " +msgid "Strength %d; " +msgstr "筋力 %d; " #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "器用 +%d / " +msgid "Dexterity +%d; " +msgstr "器用 +%d; " #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "器用 %d / " +msgid "Dexterity %d; " +msgstr "器用 %d; " #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "感覚 +%d / " +msgid "Perception +%d; " +msgstr "感覚 +%d; " #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "感覚 %d / " +msgid "Perception %d; " +msgstr "感覚 %d; " #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "知性 +%d / " +msgid "Intelligence +%d; " +msgstr "知力 +%d; " #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "知性 %d / " +msgid "Intelligence %d; " +msgstr "知力 %d; " #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "速度 +%d / " +msgid "Speed +%d; " +msgstr "速度 +%d; " #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "速度 %d / " +msgid "Speed %d; " +msgstr "速度 %d; " #: src/effect.cpp msgid "pain" @@ -183182,8 +185337,9 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." -msgstr "%sは拠点「%s」の開設に失敗しました。" +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." +msgstr "%sは拠点「%s」の開設に失敗しました。恐らく敷地内に車両が存在しています。" #: src/faction_camp.cpp msgid "There is no faction camp here to recover!" @@ -184055,8 +186211,9 @@ msgstr "は緊急帰還の指示に従いました..." #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." -msgstr "%sは%sの改良に失敗しました。" +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." +msgstr "%sは%sの改良に失敗しました。恐らく敷地内に車両が存在しています。" #: src/faction_camp.cpp msgid "returns from upgrading the camp having earned a bit of experience…" @@ -184272,8 +186429,9 @@ msgstr "拡張施設を選択: " #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" -msgstr "%sは%sの拡張の追加に失敗しました。" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." +msgstr "%sは%sの拡張に失敗しました。恐らく敷地内に車両が存在しています。" #: src/faction_camp.cpp msgid "returns from surveying for the expansion." @@ -184551,6 +186709,26 @@ msgstr "%sの身体の一部が、周囲の茂みに飛び散っていました msgid "(You wonder if your companions are fit to work on their own…)" msgstr "(もっと向いている仕事を与えていれば、と思わずにはいられません...)" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr " %sの中にいます。" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "%sに覆われています。" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "%sの上にいます。" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "%sの下にいます。" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -185337,7 +187515,8 @@ msgstr "焚き木を追加しなくても%sは燃え続けそうです。" msgid "Without extra fuel it will burn for between %s to %s." msgstr "焚き木を追加しなくても%sから%sは燃え続けそうです。" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "騎乗中にその行動はできません。" @@ -185829,40 +188008,6 @@ msgstr "気分が落ち込んでおり、作業を始めようとする気分に msgid "%s helps with this task…" msgstr "%sが作業を手伝ってくれました..." -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "満腹のため%sの葉を食べられません。" - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "藪を食べました。" - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "満腹のため草を食べられません。" - -#: src/game.cpp -msgid "You eat the grass." -msgstr "草を食べました。" - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "草丈が短すぎて食べられません。" - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "葉が枯れており食べるのに適しません。" - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "この葉は塗料で汚染されていて食べられません。" - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "空の%sを置きました。" - #: src/game.cpp msgid "Change side for item" msgstr "着用部位の左右を変更するアイテムを選択" @@ -185891,6 +188036,11 @@ msgstr "%sにはこれ以上装填できません！" msgid "You can't reload a %s!" msgstr "%sには装填できません！" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "汚れがこびりついた%sに苦労しながら装填しました。" + #: src/game.cpp msgid "Reload item" msgstr "装填するアイテムを選択" @@ -185899,18 +188049,6 @@ msgstr "装填するアイテムを選択" msgid "You have nothing to reload." msgstr "装填するアイテムを持っていません。" -#: src/game.cpp -msgid "Unload item" -msgstr "アイテムを抜き取る" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "抜き取るアイテムを持っていません。" - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "何も装備していません。" - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -185995,6 +188133,13 @@ msgstr "掴めるものがありません。" msgid "You cannot board a vehicle whilst riding." msgstr "騎乗中は車両に搭乗できません。" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "%1$sへ進入するのは危険です。それでも移動したい場合は駆け足で進んでください。" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "騎乗中は障害物を通り抜けられません。" @@ -186043,7 +188188,7 @@ msgstr "看板がありますが、内容は分かりません。" #: src/game.cpp #, c-format msgid "Written here: %s" -msgstr "文字: %s" +msgstr "内容: %s" #: src/game.cpp msgid "Something is written here, but you are unable to read it." @@ -186654,11 +188799,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "所持品がありません。" -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "%sを持っていません。" - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "動作制限" @@ -186797,8 +188937,8 @@ msgid "CBM" msgstr "CBM" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "電力" +msgid "ENERGY (kJ)" +msgstr "電力(kJ)" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -187022,13 +189162,13 @@ msgstr "道具を収納する" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" -msgstr "%sに収納する武器を選択" +msgid "Choose an item to put into your %s" +msgstr "%sに収納するアイテムを選択" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." -msgstr "%sに収納できる武器を持っていません。" +msgid "You have no items you could put into your %s." +msgstr "%sに収納できるアイテムを持っていません。" #: src/game_inventory.cpp src/iuse.cpp msgid "Cut up what?" @@ -187268,6 +189408,404 @@ msgstr "チュートリアル" msgid "Defense" msgstr "防衛" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "マップを生成中です。しばらくお待ち下さい [ 0%%]" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "隊商が近づいてきました！スペースを押して下さい..." + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "寝る必要はありません！" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "防衛モードではセーブは出来ません！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "%sを置いては行けません！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "第%dウェーブを何とか生き延びました！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "マップを生成中です。しばらくお待ち下さい [%2d%%]" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "前のオプション" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "次のオプション" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "オプションの値を変更" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "設定切替" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "最低1つはモンスターの群れを選ばなくてはいけません！" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "特殊ゾンビ" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "ゾンビ" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "トリフィド" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "ロボット" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "亜空間" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "食料" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "傭兵" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "保存許可" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "防衛モード" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "方向キーで移動、ENTERで切り替え、Sで開始" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "シナリオ: " + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "場所:" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "初期の難易度: " + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "第一波の難易度" + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "ウェーブ難易度: " + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "各ウェーブの難易度" + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "時間/1ウェーブ: " + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "次のウェーブまでの分単位の時間。" + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "ウェーブ/1隊商: " + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "次の隊商が来るまでのウェーブ回数。" + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "初期の資金: " + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "プレイヤーが開始時が所持している資金。" + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "第一波の資金: " + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "第一波の時に与えられる資金。" + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "資金増加: " + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "各ウェーブの資金増加量。" + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "敵の選択: " + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "カスタム" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "普通" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "ショーン・オブ・ザ・デッド" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "ドーン・オブ・ザ・デッド" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "スパイダーパニック！" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "トリフィド時代" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "スカイネット" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "クトゥルフの呼び声" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "カスタムゲーム。" + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "モンスターは弱く賞金は多い。" + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "モンスターが強い。食事をとる必要がある。" + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "全てのモンスターが出現。食事と飲み物をとる必要がある。" + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "古典的なゾンビから酒場を守れ。簡単で楽しい。" + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "非常に遅くて現実的な昔ながらのゾンビ。" + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "テンポが速く楽しいクモとの戦い！" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "邸宅をトリフィドから守れ。" + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "ロボットたちは人類を敵と認定した！" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "名状しがたき恐怖の軍団から逃げろ。" + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "公共事業土木現場" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "超大型店" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "酒場" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "入口は一か所だが部屋数は多い。一部の医療用品が置いてある。" + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "有用なツールがたくさん見つかり、要塞化しやすい建物。" + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "資源が豊富な大きい建物。" + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "アルコール類が豊富な小さい建物。" + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "多くの部屋を有する大邸宅。" + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" +"隊商:\n" +"上下キーでカテゴリーを選択します。\n" +"%sでカテゴリー選択とアイテム選択を切り替えます。\n" +"上下キーでアイテムを選択し、左右キーで数量を決定します。\n" +"%sでカートに入れたものを全て購入します。%sでキャンセルします。" + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "本当に何も購入しませんか？" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "それらのアイテムを買う余裕がありません！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "%d個のアイテムを%sで購入しますか？" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "一部のアイテムを置きました。" + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "近接武器" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "遠距離武器" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "弾薬" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "製作 & 建設材料" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "食料 & 薬品" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "衣類 & 防具" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "道具と罠 & 手榴弾" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "?を押してヘルプを表示。" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "所持金: %s" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "第%dウェーブにようこそ！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "第%dウェーブ: " + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "%sの侵攻だ！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "%sの襲撃だ！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "%sの攻撃だ！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "地獄から%sがやって来ました！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "用心しろ！%sだ！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "%sの日が訪れました！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "%sの復讐だ！" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "%sの復活だ！" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "ｼﾞｮﾝ ｽﾐｽ" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" +"チュートリアルをセーブしています - " +"チュートリアルは通常世界と異なる構造をしており、このセーブデータをロードすると不具合が発生する可能性があります。警告はしましたよ。" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "どこかのお馬鹿さんが邪魔で閉められません！" @@ -187615,6 +190153,10 @@ msgstr "眠りにつく前に%sの演奏を止めました。" msgid "You may want to deactivate these before you sleep." msgstr "眠る前にこれらの道具のスイッチを切ったほうがいいでしょう。" +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr " (難聴!)" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -188504,7 +191046,7 @@ msgstr "銃保管庫をピッキングしますか？" #: src/iexamine.cpp msgid "You successfully unlock the gun safe." -msgstr "銃保管庫の開錠に成功しました。" +msgstr "銃保管庫の解錠に成功しました。" #: src/iexamine.cpp msgid "Your clumsy attempt jams the lock!" @@ -192532,7 +195074,7 @@ msgstr "%1$sにはこれ以上%2$sを入れられません。" msgid "That %s doesn't have room to expand." msgstr "%sには拡張する余裕がありません。" -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%dx%s" @@ -192615,69 +195157,6 @@ msgstr "%sの銃口内は黒色火薬によって錆びました。" msgid "Your %s disappears!" msgstr "%sは消滅しました！" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "%sの死体(皮剥)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "%sの死体(処理済/皮剥)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "%sの死体(処理済)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "%sの死体(分割)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "%sの死体" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "%sの死体(%s/皮剥)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "%sの死体(%s/処理済/皮剥)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "%s(%s)の死体(処理済)" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%sの死体(%s)" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -192691,6 +195170,21 @@ msgid "%s blood" msgid_plural "%s blood" msgstr[0] "%sの血液" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "%2$sの%1$s" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "%2$s(%3$s)の%1$s" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "その作業が可能なアイテムを所持していません" @@ -193270,7 +195764,7 @@ msgstr "餌を与えられる対象がいません。" msgid "Modify what?" msgstr "どれを改良しますか？" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "そのアイテムを所持していません！" @@ -194321,6 +196815,10 @@ msgstr "マインスイーパー" msgid "Lights on!" msgstr "ライツオン！" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "適当に暇をつぶす" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -194743,10 +197241,6 @@ msgstr "%s" msgid "You need a mechanics skill of 2 to use this repair kit." msgstr "修復キットを使用するにはレベル2の機械整備スキルが必要です。" -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "修復する銃火器を選択" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "それは銃火器ではありません！" @@ -194797,23 +197291,6 @@ msgstr "適合する道具を持っていません。" msgid "You cancel unloading the tool." msgstr "工具の抜き取りを中断しました。" -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "暗くて修復できません！" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "修復キットを使用するには1以上の製作スキルが必要です。" - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "修復するアイテムを選択" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "%sを強化しました。" - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "カラン！カラン！" @@ -195061,31 +197538,6 @@ msgstr "ファームウェアプロテクトの解除に失敗し、カードの msgid " on " msgstr "上" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "%sに覆われています。" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "%sの上にいます。" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "%sの下にいます。" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "%sで照らされています。" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr " %sの中にいます。" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -195894,6 +198346,14 @@ msgid "" " but best to stop messing with it." msgstr "力任せにいじって壊してしまうところでした！幸運にも故障は免れました。下手にいじるのはやめましょう。" +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "UPSを選択: " + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "UPSを持っていません。" + #: src/iuse.cpp msgid "Using cable:" msgstr "ケーブルメニュー: " @@ -195922,14 +198382,6 @@ msgstr "ケーブルを自らのケーブル充電システムに接続しまし msgid "You attach the cable to the solar pack." msgstr "ケーブルを携帯型ソーラーパックに接続しました。" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "UPSを選択: " - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "UPSを持っていません。" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "ケーブルをUPSに接続しました。" @@ -198414,12 +200866,9 @@ msgid "Congratulations, you won!" msgstr "おめでとうございます！あなたの勝ちです！" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "最大: " - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "最小: " +#, c-format +msgid "Min: %d Max: %d" +msgstr "最小: %d 最大: %d" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -199275,6 +201724,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "今すぐ開始！" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "ポイント割り振り、シナリオ、キャラクターの職業、能力値、特質などを選択して作成します。" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "以前に作成したキャラクターテンプレートの中から選択して作成します。" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "キャラクターをランダムに生成します。生成されたキャラクターとシナリオは必要に応じて変更できます。" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "キャラクターの特質、職業、スキルなどをランダムに選択し、「避難者」シナリオですぐにゲームを開始します。" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "シナリオ、キャラクターの特質、職業、スキルなどをランダムに選択し、すぐにゲームを開始します。" + #: src/main_menu.cpp msgid "No templates found!" msgstr "テンプレートがありません！" @@ -199502,6 +201979,14 @@ msgstr "%sから何かが這い出しました！" msgid "DANGER! MINEFIELD!" msgstr "危険！ 地雷原！" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "どの特殊地形をテストしますか？" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "32400スポーンの結果: " + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -199634,20 +202119,9 @@ msgid "You're violently teleported!" msgstr "勢いよく瞬間移動しました！" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "ハチに刺されました！" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "ハチに数箇所を刺されました！" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "ハチに数十箇所を刺されました！" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "ハチに全身を刺されました！" +#, c-format +msgid "The bees sting you in %s!" +msgstr "ハチが%sを刺しました！" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -199810,6 +202284,16 @@ msgid "Skill" msgid_plural "Skills" msgstr[0] "スキル" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "攻撃条件: " + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "%s: %d" + #: src/martialarts.cpp msgid "Requires: " msgstr "必要: " @@ -204699,6 +207183,10 @@ msgstr "%sを覆う酸が手を焼きました！" msgid "Acid sprays out of %s as it is hit!" msgstr "%sは酸を噴射しました！" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "視認できない敵からの射撃を検出し、撃ち返しモードを有効化します。" + #: src/monexamine.cpp msgid "zombie slave" msgstr "奴隷ゾンビ" @@ -207621,8 +210109,9 @@ msgid "I have news." msgstr "知らせたい事がある。" #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "よし、訓練を再開しようか。 " +#, c-format +msgid "Yes, let's resume training %s" +msgstr "よし、%sの訓練を再開しようか。 " #: src/npctalk.cpp #, c-format @@ -208324,6 +210813,16 @@ msgid "" "weight limit." msgstr "Falseにすると重量制限を超えるまで新しいアイテムを持てます。" +#: src/options.cpp +msgid "Dangerous running" +msgstr "危険な移動" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "trueにすると、駆足状態のときは既知の危険なタイルに移動する際も警告が表示されません。" + #: src/options.cpp msgid "Safe mode" msgstr "セーフモード" @@ -210528,10 +213027,10 @@ msgstr "検索語句: " #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" -"複数の単語で検索する場合は-で区切る\n" +"複数の単語で検索する場合は,(コンマ)で区切る。除外する場合は語頭に-(ハイフン)を付ける。\n" "検索半径%d(オプションで変更可能)" #: src/overmap_ui.cpp @@ -210970,6 +213469,10 @@ msgstr "休息:" msgid "Heat :" msgstr "寒暖:" +#: src/panels.cpp +msgid "Deaf!" +msgstr "難聴！" + #: src/panels.cpp msgid "Underground" msgstr "地下" @@ -211028,10 +213531,6 @@ msgstr "月齢:" msgid "Lighting:" msgstr "光量:" -#: src/panels.cpp -msgid "Deaf!" -msgstr "難聴！" - #: src/panels.cpp msgid "Weapon :" msgstr "装備:" @@ -212053,6 +214552,11 @@ msgstr "修理内容を選択" msgid "Turns into: %s\n" msgstr "変化: %s\n" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "同時修理: %s\n" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -212506,77 +215010,78 @@ msgstr "速度" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "水泳コスト%+d " +msgid "Swimming movement point cost: %+d\n" +msgstr "水泳コスト: %+d\n" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "走行時の移動コスト%+d " +msgid "Running movement point cost: %+d\n" +msgstr "駆足コスト: %+d\n" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "装填コスト%+d " +msgid "Reloading movement point cost: %+d\n" +msgstr "装填コスト: %+d\n" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "近接&投擲攻撃コスト%+d " +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "近接/投擲攻撃コスト: %+d\n" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "回避スキル%+.1f " +msgid "Dodge skill: %+.1f\n" +msgstr "回避スキル: %+.1f\n" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "近接命中%+d%% " +msgid "Melee attack rolls: %+d%%\n" +msgstr "近接命中: %+d%%\n" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." -msgstr "頭部は動作制限の影響を受けません。どの程度重ね着出来るかという単純な制限です。" +"Head encumbrance has no effect; it simply limits how much you" +" can put on." +msgstr "頭部の動作制限に悪影響はありません。単純に重ね着できるアイテム数を示す数値です。" #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"罠探知/遠距離攻撃時に感覚%+d\n" -"投擲攻撃時の分散率%+d" +"罠探知/遠距離攻撃時に感覚%+d\n" +"投擲攻撃時の分散率%+d" #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "口を覆うと通常時の呼吸が困難になり、上がった息の回復も遅くなります。" +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "口を覆うと通常時の呼吸が困難になり、上がった息の回復も遅くなります。" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." -msgstr "腕の動作制限は近接攻撃の消費スタミナや遠距離攻撃の精度に関係します。" +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." +msgstr "腕の動作制限は近接攻撃時の消費スタミナや遠距離攻撃の精度に関係します。" #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "道具を扱う速度が低下します。\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" +"アイテムの使用にかかる速度が低下します。\n" +"\n" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "投擲攻撃時に器用%+.1f\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "アイテム投擲時の器用: %+.1f\n" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "銃器の照準速度%.1f" +msgid "Reduced gun aim speed: %.1f" +msgstr "照準速度低下: %.1f" #: src/player_display.cpp msgid "" @@ -212604,7 +215109,7 @@ msgstr "近接与ダメージ: %.1f" msgid "" "Dexterity affects your chance to hit in melee combat, helps you steady your " "gun for ranged combat, and enhances many actions that require finesse." -msgstr "近接攻撃の命中率と銃の安定性、多くの技巧的な行動に影響します。" +msgstr "近接攻撃の命中精度と銃の安定性、多くの技巧的な行動に影響します。" #: src/player_display.cpp #, c-format @@ -212666,8 +215171,8 @@ msgstr "体重:" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" "体重は身体に蓄えている脂肪の量の一般的な指標であり、しばらくの間食料なしで生存できることを示しています。重すぎる、または軽すぎる場合は健康に影響を与える可能性があります。" @@ -213413,6 +215918,16 @@ msgstr "%sが鈍い音を立てて不発を起こしました！" msgid "'s %s misfires with a muffled click!" msgstr "の%sが鈍い音を立てて不発を起こしました！" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "一旦%sから弾薬を取り出して再度装填すれば上手くいくかもしれません。" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "一旦の%sから弾薬を取り出して再度装填すれば上手くいくかもしれません。" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -213453,6 +215968,16 @@ msgstr "取り付けてある%sが発砲の衝撃で損傷しました！" msgid "'s %s is damaged by their shot!" msgstr "の%sが発砲の衝撃で損傷しました！" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "%sから顔が歪むほどの甲高い音が聞こえました！" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "の%sから顔が歪むほどの甲高い音が響きました！" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -213651,6 +216176,10 @@ msgstr "狙撃(レベル3)" msgid "[%c] to take precise aim and fire." msgstr "[%c] 狙撃(レベル3)" +#: src/ranged.cpp +msgid "turrets" +msgstr "タレット" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -214082,7 +216611,7 @@ msgstr "%sが聞こえました！" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." +msgid "From your position you hear %1$s" msgstr "その場で%1$sが聞こえました。" #: src/sounds.cpp @@ -214821,15 +217350,15 @@ msgstr "パチン！" #: src/trapfunc.cpp #, c-format msgid "A snare closes on your %s's leg!" -msgstr "%sの脚にくくり罠が絡まりました！" +msgstr "くくり罠が%sの脚に絡まりました！" #: src/trapfunc.cpp msgid "A snare closes on your leg." -msgstr "くくり罠に引っ掛かり、足に絡まりました。" +msgstr "くくり罠が脚に絡まりました。" #: src/trapfunc.cpp msgid "A snare closes on s leg." -msgstr "くくり罠に引っ掛かり、の足に絡まりました。" +msgstr "くくり罠がの脚に絡まりました。" #. ~ %s is bodypart name in accusative. #: src/trapfunc.cpp @@ -215176,20 +217705,6 @@ msgid "%s emits an IFF warning beep." msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "%sは%dに向かって大きな警告音を発しました。" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "ｼﾞｮﾝ ｽﾐｽ" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" -"チュートリアルをセーブしています - " -"チュートリアルは通常世界と異なる構造をしており、このセーブデータをロードすると不具合が発生する可能性があります。警告はしましたよ。" - #: src/veh_interact.cpp msgid "Select part" msgstr "部品選択" @@ -217478,6 +219993,10 @@ msgstr "快晴" msgid "Cloudy" msgstr "曇り" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "霧雨" + #: src/weather_data.cpp msgid "Drizzle" msgstr "小雨" diff --git a/lang/po/ko.po b/lang/po/ko.po index e19fd0fc9aaad..4b43ca027075a 100644 --- a/lang/po/ko.po +++ b/lang/po/ko.po @@ -4,22 +4,22 @@ # 김정국 , 2019 # Dawon Shin , 2019 # 탯새 , 2019 -# Vlasov Vitaly , 2019 # Nick, 2019 # fenjo , 2019 # 장현우 , 2019 # T itan , 2019 # Sail Recycle , 2019 -# Brett Dong , 2019 # indejeC , 2019 +# Vlasov Vitaly , 2019 +# Brett Dong , 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" -"Last-Translator: indejeC , 2019\n" +"Last-Translator: Brett Dong , 2019\n" "Language-Team: Korean (https://www.transifex.com/cataclysm-dda-translators/teams/2217/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1512,8 +1512,8 @@ msgstr "세제" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." -msgstr "대중적이었던 대재앙 전 분말 세제." +msgid "A popular pre-Cataclysm washing powder." +msgstr "" #: lang/json/AMMO_from_json.py msgid "soap flakes" @@ -1790,6 +1790,16 @@ msgstr[0] "램프 기름" msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "기름 램프에 사용하는 묽은 기름으로 깔끔하게 연소합니다." +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -1940,6 +1950,60 @@ msgstr "" "수술을 위한 마취제가 포함된 키트. 전용 용기에 여러가지 강력한 수면성, 환각성 흥분성 약물이 들어 있습니다. 전용 의료기기에 사용되는 " "것이기 때문에 개별적으로 사용할수 없습니다." +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "40mm 조명탄" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "40mm 신호용 조명탄. 약 1분 동안 밝게 타오르며 타오를 때 많은 연기가 발생합니다." + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "섬광탄이 탑재된 40mm 유탄. 강력한 빛과 소음을 내 가까운 사람을 실명시키고 귀를 먹게 하여 무력화시킵니다." + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "40mm 소이탄" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "소량의 네이팜이 탑재된 40mm 유탄. 화염 폭발을 만들도록 설계되었습니다." + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40mm 연막탄" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "연막용 40mm 유탄" + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "40mm 슬러그 유탄" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "커다란 슬러그가 채워진 40mm 유탄. 어깨가 아작나는 고통을 감수할 수 있다면 엄청난 파괴력을 보여줄 수 있다." + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "10mm Auto FMJ" @@ -2764,125 +2828,133 @@ msgid ".40 S&W JHP, reloaded" msgstr "" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40mm 유탄" +msgid "40x46mm grenade" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "40mm 빈백" +msgid "40x46mm M1006" +msgstr "" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." -msgstr "콩주머니가 든 40mm 유탄. 맞으면 엄청나게 아프다. 비살상탄이지만 위력이 충분히 강해 자칫하면 살해할 수도 있다." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40mm 충격탄" +msgid "40x46mm M433" +msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "체내 충격을 주는 폭발성 장약이 탑재된 40mm 유탄." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "40mm 조명탄" +msgid "40x46mm M576" +msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." -msgstr "40mm 신호용 조명탄. 약 1분 동안 밝게 타오르며 타오를 때 많은 연기가 발생합니다." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "40mm 섬광탄" +msgid "40x46mm M651" +msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." -msgstr "섬광탄이 탑재된 40mm 유탄. 강력한 빛과 소음을 내 가까운 사람을 실명시키고 귀를 먹게 하여 무력화시킵니다." +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "40mm 플레쉐트탄" +msgid "40x46mm buckshot" +msgstr "" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." -msgstr "방어구 관통용 철침이 들어있는 40mm 유탄이다." +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40mm 파편탄" +msgid "40x46mm slug" +msgstr "" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." -msgstr "소량의 폭발물과 살상력을 발휘하는 파편이 들어있는 40mm 유탄." +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "40mm 소이탄" +msgid "40x46mm flechette" +msgstr "" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." -msgstr "소량의 네이팜이 탑재된 40mm 유탄. 화염 폭발을 만들도록 설계되었습니다." +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "40mm 벅샷" +msgid "40x53mm M1001" +msgstr "" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M430A1" +msgstr "" + +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." -msgstr "벅샷이 채워진 40mm 유탄. 장애물을 부수거나 근접전에서 샷건 대용으로 쓰이도록 설계되었다." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40mm 연막탄" +msgid "40x53mm buckshot" +msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "연막용 40mm 유탄" +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "40mm 최루탄" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." -msgstr "최루가스가 탑재된 40mm 유탄. 터지면서 강력한 무력화 가스를 분사합니다." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "40mm 슬러그 유탄" +msgid "40x53mm flechette" +msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." -msgstr "커다란 슬러그가 채워진 40mm 유탄. 어깨가 아작나는 고통을 감수할 수 있다면 엄청난 파괴력을 보여줄 수 있다." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." +msgstr "" #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -4617,9 +4689,9 @@ msgstr[0] "은" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." -msgstr "빛이 나는 무른 금속. 세상이 멸망하기 전에는 꽤나 값이 나갔지만 지금은 그 가치가 크게 줄었습니다." +msgstr "" #: lang/json/AMMO_from_json.py msgid "small metal sheet" @@ -5129,13 +5201,6 @@ msgstr "블로우건의 탄약으로 사용할 수 있는 한 움큼의 다트." msgid "plutonium cell" msgstr "플루토늄 전지" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "흔히 찾을 수 있는 일회용 배터리. 충전식 배터리를 충전하는 데 쓸 수 있다." - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5204,7 +5269,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" @@ -5673,18 +5738,6 @@ msgid "" "Hefty round projectiles cast from lead, useful as ammunition for slings." msgstr "납으로 둥글게 만든 묵직한 알갱이. 슬링 탄약으로 적당합니다." -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "뼈 쇠뇌 볼트" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "뼈를 깎아만든 날카로운 볼트. 화살깃이 달려있다. 무게가 가볍고 적당한 피해량과 명중률을 갖고있다. 재사용 확률이 높다." - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -6143,8 +6196,8 @@ msgstr[0] "블럽 먹이" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." -msgstr "다양한 유기체 구성물로 이루어진 혼합물. 블럽의 건강에 필요한 모든 것이 들어있는 것 같습니다. 그런 것 같은데..." +"blob needs to be healthy. You think…" +msgstr "" #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -6491,9 +6544,9 @@ msgstr[0] "유목민 외투" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." -msgstr "장거리 여행용 의류로 만든 급조 의류. 저장 공간이 많습니다." +msgstr "" #: lang/json/ARMOR_from_json.py msgid "light nomad gear" @@ -6503,10 +6556,10 @@ msgstr[0] "가벼운 유목민 외투" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." -msgstr "여름에 장거리 여행용 의류로 만든 급조 의류. 일반 유목민 의복에 비해 저장공간과 방어력이 적다." +msgstr "" #: lang/json/ARMOR_from_json.py msgid "plated leather armor" @@ -6563,9 +6616,9 @@ msgstr[0] "수색꾼 외투" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." -msgstr "대재앙 이전의 보호 장비로 만든 튼튼한 수색꾼 외투. 저장 공간이 많습니다." +msgstr "" #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -10407,8 +10460,8 @@ msgstr "무거운 모피 바지." #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" -msgstr[0] "인조 모피 바지" +msgid_plural "faux fur pants" +msgstr[0] "" #. ~ Description for faux fur pants #: lang/json/ARMOR_from_json.py @@ -11996,8 +12049,8 @@ msgstr "수수해 보이는 하얀색 즈본으로 무술 수련에 쓰입니다 #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" -msgstr[0] "바이올린 가방" +msgid_plural "violin cases" +msgstr[0] "" #. ~ Description for violin case #: lang/json/ARMOR_from_json.py @@ -12622,9 +12675,9 @@ msgstr[0] "거대한 노벨티 배낭" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." -msgstr "대재앙 이전에 장난으로 만들어진 거대한 천 가방입니다. 지금도 바보같아 보이지만 많은 것들을 넣을 수 있습니다." +msgstr "" #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -13773,6 +13826,131 @@ msgid "" msgstr "" "다이아몬드가 박혀있는 가짜 치아. 소름끼치게 딱 맞으며, 매우 반짝거립니다. 상당한 수준의 갱스터 래퍼처럼 보이기 위한 것입니다." +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -14575,6 +14753,510 @@ msgid "" " behind you when you walk." msgstr "광이 많이 나는 검은 가죽 꼬리입니다. 끝 부분에 작은 플라스틱 구슬이 달려있어서 걸을 때마다 좌우로 흔들립니다." +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -15054,8 +15736,8 @@ msgstr[0] "" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15066,10 +15748,10 @@ msgstr[0] "" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" #: lang/json/ARMOR_from_json.py @@ -15080,10 +15762,10 @@ msgstr[0] "" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15094,7 +15776,7 @@ msgstr[0] "" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" @@ -15107,8 +15789,8 @@ msgstr[0] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" @@ -15120,7 +15802,7 @@ msgstr[0] "" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -15146,8 +15828,8 @@ msgstr[0] "" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" @@ -15160,8 +15842,8 @@ msgstr[0] "" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15172,8 +15854,8 @@ msgstr[0] "" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15184,9 +15866,9 @@ msgstr[0] "" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15198,7 +15880,7 @@ msgstr[0] "" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -15211,10 +15893,10 @@ msgstr[0] "" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -15238,11 +15920,11 @@ msgstr[0] "" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" @@ -15254,9 +15936,9 @@ msgstr[0] "" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -15269,10 +15951,10 @@ msgstr[0] "" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15284,9 +15966,9 @@ msgstr[0] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15297,29 +15979,29 @@ msgstr[0] "" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" +msgid_plural "C.R.I.T trousers" msgstr[0] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" @@ -15330,7 +16012,7 @@ msgstr[0] "" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15340,19 +16022,19 @@ msgstr[0] "" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -15363,7 +16045,7 @@ msgstr[0] "" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" @@ -15375,7 +16057,7 @@ msgstr[0] "" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -15389,8 +16071,8 @@ msgstr[0] "" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15480,10 +16162,11 @@ msgid_plural "copper infusion bracelets" msgstr[0] "" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15491,13 +16174,6 @@ msgid "silver infusion bracelet" msgid_plural "silver infusion bracelets" msgstr[0] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -15780,7 +16456,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" +msgid_plural "flesh pouches" msgstr[0] "" #. ~ Description for flesh pouch @@ -15791,6 +16467,18 @@ msgid "" "minimize encumbrance." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -17549,11 +18237,9 @@ msgstr[0] "CBM:이온 과부하 발생기" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" -"강력한 이온화 에너지 발생기가 몸속에 설치되었다. 강력하고, 끊임없이 팽창하는 에너지 폭발을 일으킨다. 그 결과 충격파는 주변으로 " -"번져나가면서 산소를 발화시키고 충돌시 폭발을 일으킨다. 목표물 근처에서는 공격하지 않는 것을 권장한다. " #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py msgid "Blood Power Generator CBM" @@ -19267,6 +19953,138 @@ msgid "" "goblins, and trolls." msgstr "요정, 고블린, 트롤 따위가 나오는 흥미로운 동화책입니다." +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -19658,8 +20476,8 @@ msgstr[0] "에로 소설" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." -msgstr "진부한 서사 구조를 가진 저급한 외설물입니다." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." +msgstr "" #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -20404,7 +21222,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" @@ -21835,9 +22653,9 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" #: lang/json/BOOK_from_json.py @@ -21862,10 +22680,9 @@ msgstr[0] "재미와 이익을 위한 로봇 해킹" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" -"로봇을 불법적으로 입수, 재프로그래밍, 개조하는 내용을 담은 책. 이것은 많은 도움이 되는 단계별 가이드와 예시 청사진을 가지고 있다." #: lang/json/BOOK_from_json.py msgid "Popular Robotics" @@ -22065,6 +22882,16 @@ msgstr[0] "소금물" msgid "Water with salt added. Not good for drinking." msgstr "소금이 들은 물. 마시기엔 좋지 않습니다." +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -22603,11 +23430,9 @@ msgstr[0] "밀조주" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "" -"옥수수와 설탕을 증류해서 만든 무척이나 독한 구식 밀조주입니다. 당신이 대재앙에 관한 모든 것을 잊을 수 있도록 해주겠지만, 실명할 수도" -" 있습니다." #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -22723,6 +23548,69 @@ msgstr[0] "싱글 몰트 위스키" msgid "Only the finest whiskey straight from the bung." msgstr "마개부터 다른 최고급 위스키." +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "노숙자 칵테일" @@ -23409,6 +24297,18 @@ msgid "meat jerky" msgid_plural "meat jerky" msgstr[0] "육포" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "인육 육포" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -23427,20 +24327,26 @@ msgid "" msgstr "건조 처리한 생선에 소금 처리를 해 오랫동안 썩지 않게 한 것. 먹으면 목이 마릅니다." #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "인육 육포" +msgid "smoked meat" +msgstr "훈제 고기" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "말려서 소금 처리를 해 오랫동안 썩지 않게 한 인육. 먹으면 갈증이 생긴다." +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "훈제 고기" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -23461,17 +24367,6 @@ msgid "" "could be further smoked to dehydrate it completely." msgstr "장기간 보존을 위해 훈제된 맛있는 생선입니다. 수분을 완전히 제거하면 훈제가 될 수도 있습니다." -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "훈제 인육" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "훈제한 인육입니다. 인육 섭취에 거부감만 없다면 아주 맛있고, 장기 보존까지 가능한 고기입니다." - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -24821,8 +25716,8 @@ msgstr "레이저클로 알" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." -msgstr "레이저 클로의 알덩어리. 대재앙후의 세계에서 만날 수 있는 미식입니다." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -25984,11 +26879,11 @@ msgid "" msgstr "소금을 친 옥수수 토르티야로, 치즈를 약간 더할 수 있으며, 어쩌면 쇠고기와 함께 요리할 수 있을지도 모릅니다." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" -msgstr[0] "치즈 나쵸" +msgid "cheese nachos" +msgid_plural "cheese nachos" +msgstr[0] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -25996,47 +26891,49 @@ msgid "" msgstr "소금을 친 옥수수 토르티야에 치즈를 곁들인 것. 고기와 함께면 더 맛있습니다. " #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" -msgstr[0] "고기 나쵸" - -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "소금을 친 옥수수 토르티야에 고기를 곁들인 것. 치즈와 함께면 더 맛있습니다. " +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "인육 나쵸" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." -msgstr "소금을 친 옥수수 토르티야에 인육를 곁들인 것. 치즈와 함께면 더 맛있습니다. " +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." +msgstr "소금을 친 옥수수 토르티야에 고기를 곁들인 것. 치즈와 함께면 더 맛있습니다. " +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "" + +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "치즈 인육 나쵸" -#. ~ Description for niño nachos with cheese -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "소금을 친 옥수수 토르티야에 인육과 치즈를 곁들인 것. 맛있습니다. " - +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "고기 치즈 나쵸" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -26107,16 +27004,6 @@ msgstr "" "칠리소스를 토핑으로 사용한 핫도그입니다. 냠냠!\n" "칠리소스를 토핑으로 사용한 핫도그입니다. 냠냠!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "인육 칠리 도그" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "칠리 소스를 토핑으로 사용한 인육 핫도그입니다. 흥겹네요." - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -26200,8 +27087,8 @@ msgstr[0] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." -msgstr "많은 가공을 거친 소시지로 대격변 이전에는 야구 경기장에서 자주 보였습니다. 요리되면 훨씬 맛있습니다." +"Cataclysm. It would taste much better prepared." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -26242,6 +27129,22 @@ msgstr "" msgid "raw sausage" msgstr "생 소시지" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -26251,6 +27154,12 @@ msgstr "요리하는데 사용되는 커다란 생 소시지." msgid "sausage" msgstr "소시지" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -26260,22 +27169,17 @@ msgstr "보존 또는 훈제 처리된 묵직한 소시지입니다." msgid "cooked sausage" msgstr "요리된 소시지" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "요리된 묵직한 소시지." -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "인육 소시지" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "보존 처리된 묵직한 인육 소시지입니다. 인육을 좋아한다면 아주 맛있을 것입니다." - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -26291,6 +27195,19 @@ msgid "bratwurst" msgid_plural "bratwursts" msgstr[0] "" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26361,6 +27278,13 @@ msgstr "돼지 껍질 과자나 치카론이라는 이름으로도 알려진 과 msgid "glazed tenderloins" msgstr "안심 데리야키" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26373,6 +27297,20 @@ msgstr "부드러운 고기에 살짝 달콤한 양념을 발라 조리하고 msgid "currywurst" msgstr "카레 소시지" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26384,6 +27322,20 @@ msgstr "카레 케첩 소스로 덮인 소시지입니다. 몹시 매우며 동 msgid "aspic" msgstr "아스픽" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26452,6 +27404,13 @@ msgstr "바삭하고 맛있는 황금색 생선 튀김입니다." msgid "lunch meat" msgstr "런천 미트" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26463,6 +27422,20 @@ msgstr "조리, 보존, 얇게 썰어 만든 고기들이 편리한 샌드위치 msgid "bologna" msgstr "볼로냐 소시지" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26523,6 +27496,19 @@ msgid "sausage gravy" msgid_plural "sausage gravies" msgstr[0] "소시지 그레이비" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "인육 소시지 그레이비" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26534,6 +27520,20 @@ msgstr "비스킷, 고기, 그리고 맛있는 버섯 수프까지 모두 가득 msgid "pemmican" msgstr "페미컨" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26548,6 +27548,19 @@ msgstr "" msgid "hamburger helper" msgstr "햄버거 헬퍼" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26569,6 +27582,18 @@ msgid "chili con carne" msgid_plural "chilis con carne" msgstr[0] "칠리 소스" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -26641,18 +27666,36 @@ msgstr "잘게 썰려 물속에 담긴 대합." msgid "clam chowder" msgstr "대합 수프" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." -msgstr "뉴잉글랜드의 잃어버린 영광이 담긴 맛을 자랑하는 맛있는 하얀 스프입니다. 조개와 감자가 들어있습니다." +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" msgid_plural "baked beans" msgstr[0] "구운 콩" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -26663,6 +27706,12 @@ msgid "meat fried rice" msgid_plural "meat fried rice" msgstr[0] "고기 볶음밥" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -26673,6 +27722,13 @@ msgid "deluxe beans and rice" msgid_plural "deluxe beans and rice" msgstr[0] "특제 콩밥" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26684,6 +27740,19 @@ msgstr "콩과 쌀 그리고 양념된 고기를 쪄낸 것. 맛도 좋고 아 msgid "meat pie" msgstr "고기 파이" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -26693,6 +27762,19 @@ msgstr "맛있는 고기를 넣고 구운 맛있는 파이입니다." msgid "meat pizza" msgstr "고기 피자" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26700,11 +27782,27 @@ msgid "" "and heavily seasoned." msgstr "고기 피자입니다. 육식을 위한 것, 즉 조미료가 많이 들어간 큼지막한 고기로 가득 차있습니다." +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" msgstr[0] "특제 스크램블 에그" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26716,6 +27814,12 @@ msgstr "부드럽고 맛있는 스크램블 에그. 조미료를 넣어 더 맛 msgid "canned meat" msgstr "고기 통조림" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "인육 조각" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26728,6 +27832,12 @@ msgstr "" msgid "salted meat slice" msgstr "고기 소금절임 조각" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -26738,6 +27848,19 @@ msgid "spaghetti bolognese" msgid_plural "spaghetti bolognese" msgstr[0] "스파게티 볼로네즈" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -26747,6 +27870,20 @@ msgstr "스파게티에 걸쭉한 고기 소스를 부은 것. 맛있겠군요!" msgid "lasagne" msgstr "라자냐" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26767,17 +27904,44 @@ msgstr "구웠더니 스팸이 제법 맛있어졌습니다." msgid "cheeseburger" msgstr "치즈버거" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." -msgstr "자른 고기에 양념과 치즈를 넣은 샌드위치. 대재앙 전의 기념비적인 식품입니다." +"Cataclysm culinary achievement." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "햄버거" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -26787,6 +27951,19 @@ msgstr "자른 고기에 양념을 넣어 만든 샌드위치입니다." msgid "sloppy joe" msgstr "슬로피 조" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "인육 샌드위치" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26798,6 +27975,20 @@ msgstr "다진 고기, 양파, 그리고 토마토 소스로 구성된 샌드위 msgid "taco" msgstr "타코" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26809,6 +28000,12 @@ msgstr "옥수수 토르티야에 고기를 넣고 접거나 말아 먹는 음 msgid "pickled meat" msgstr "고기 식초절임" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26819,6 +28016,14 @@ msgstr "소금에 절인 고기를 통조림으로 만든 식품입니다. 고 msgid "dehydrated meat" msgstr "건조처리 고기" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26842,6 +28047,14 @@ msgid "haggis" msgid_plural "haggii" msgstr[0] "해기스" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26870,6 +28083,13 @@ msgid "meat temaki" msgid_plural "meat temaki" msgstr[0] "고기 데마끼" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26902,6 +28122,13 @@ msgstr "썩지 않도록 말려놓은 유독성 고기 조각. 말렸지만 독 msgid "pelmeni" msgstr "펠메니" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26913,6 +28140,12 @@ msgstr "얇은 만두피에 고기를 채워넣고 빚은 맛있는 고기만두 msgid "homemade burrito" msgstr "" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26921,310 +28154,6 @@ msgid "" "but homemade and delicious!" msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "건조처리 인육" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "건조 처리한 인육 조각. 적절하게 보관하면, 놀라울 정도로 오랫동안 먹을 수 있는 상태로 보관할 수 있습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "수분 공급된 인육" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "건조처리 인육에 다시 수분을 넣어 더 먹기 좋게 만든 음식입니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "인육 해기스" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"이 감칠맛나는 전통 스코틀랜드 푸딩은 인육을 섞은 오트밀과 내장으로 만들어, 사람의 위로 싸맨 다음에 삶은것이다. 놀랄 정도로 맛있고 꽤" -" 든든한데다, 끓인 뿌리채소와 강한 위스키가 함께 내놓으면 최고의 식사다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "인육 볼로냐 소시지" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" -"보존되어 있고 얇게 썬 인간의 살입니다. 그의 이름은 오스카였을지도 모릅니다. 당신은 냉혈한 사람들처럼 이것을 차갑게 먹을 수 있습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "인육 카레 소시지" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "카레 케첩 소스로 덮인 인육 소시지입니다. 몹시 매우며 동시에 인상적입니다!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "인육 소시지 그레이비" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "비스킷, 인육 그리고 맛있는 버섯 수프까지 모두 들어간, 기름지면서도 맛있는 옥수수죽입니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "인육 아스픽" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "인간 사골로 만든 젤라틴에 인육을 넣고 굳힌 요리. 살인적인 맛이다. 물론 이런 걸 좋아한다면 말이지만." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "인육 페미컨" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "영양가 있는 고에너지 음식으로 쓰이는 지방과 단백질의 농축 혼합물. 우지, 식용 식물, 그리고 인육으로 이루어져있다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "인육 샌드위치" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "빵 사이에 인육을 끼웠다. 놀라워라!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "두디럭스 샌드위치" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "인육, 야채에 양념친 치즈로 만든 샌드위치. 적의 영혼위에서 만찬을 즐기며 녹색의 싱그러움을 즐기세요!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "인육 햄버거 헬퍼" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "다진 인육이 더해진 치즈와 마카로니는 살인만큼 기분 좋습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "인육 칠리 소스" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "고추, 인육, 토마토 그리고 콩이 들어간 매콤한 소스." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "인육 파이" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -"군인이나 어쩌면 과학자의 일부가 들어갔을지도 모르는 고기 파이입니다. God, that's good!\r\n" -"(역주: 'God, that's good!'은 스위니 토드(Sweeney Todd)의 패러디로 인육파이가 중요한 소재로 나옴.)" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "인육 피자" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "세상의 모든 식인종들을 위한 고기 피자. 인육을 갈아서 꽉 채우고 양념을 많이 뿌렸다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "인육 조각" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -"인육을 삶아서 연한 소금물에 담가 밀봉한 보존음식입니다. 영양소를 대부분 잘 보존하고 있지만 구운 고기처럼 맛있지는 않습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "인육 소금절임 조각" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "소금물에 절인 후 진공 포장한 인육. 짜지만, 맛있습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "인육 스파게티" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "스파게티에 걸쭉한 인육 소스를 부은 것. 이런걸 즐긴다면, 맛있겠지요." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "인육 라자냐" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "" -"얇은 라자냐와 소스, 치즈, 그리고 고기가 교차로 만든 층으로 된 파스타로 아주 오래된 음식입니다. 인육으로 만들어서 더 맛있습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "인육 치즈버거" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "자른 인육에 양념과 치즈를 넣은 샌드위치. 대재앙 후의 기념비적인 식인 식품입니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "인육버거" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "이 햄버거는 FDA(미국 식품의약국) 허용량인 4%보다 많은 인육이 함유되어있습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "인육 샌드위치" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "샌드위치는 샌드위치지만, 이것은 사람들로 만들어져 있습니다!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "인육 타코" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -"다진 쇠고기 대신에 다진 인육을 써서 만든 타코입니다. 어떠한 이유로 당신은 조금 떨어진 곳에서 들리는 듯한 종소리를 들을 수 있습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "생 인육 소시지" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "훈제용 또는 조리용으로 사용하는 커다란 생 인육소시지." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "요리된 인육소시지" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "두꺼운 생 인육소시지가 맜있게 구워졌습니다. 이성적으로 정말 맛있는 냄새가 납니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "맨브라트" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "" -"잘게 썬 고기로 만든 독일식 소시지의 일종으로, 프라이팬으로 튀기다 혹은 굽다라는 단어에서 유래됐다. 신선하고 뜨거울 때 먹는 것이 " -"좋다. 사람 신체 중 식재료로 사용할 수 있는 것은 모두 넣되 반드시 독일인의 신체를 사용할 필요는 없다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "인육 식초절임" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "소금에 절인 인육을 통조림으로 만든 것입니다. 이런걸 먹는데 문제가 없다면, 식감이 좋고 맛있으며 영양가가 높습니다." - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -28020,10 +28949,8 @@ msgstr "감미료 넣은 뼛가루 알약" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" -"뼈로 만든 수제 칼슘 보충제입니다. 가루 같은 질감과 재의 맛을 상쇄하기 위해 약간의 단맛을 섞었기 때문에, 이것은 거의 고양이 알약과 " -"같이 맛있습니다." #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -28603,7 +29530,7 @@ msgstr "조류 혈청" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" @@ -29474,11 +30401,9 @@ msgstr[0] "말로스 젤라틴" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" -"레몬색 액체덩어리 한움큼. 대재앙 전의 젤로(과일 젤리)와 닮았다. 강렬하지만 맛있을것 같은 아로마향이 짙으며 돌연변이 혹은 외계에서 " -"온것이 분명해보인다." #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -29744,13 +30669,13 @@ msgstr[0] "개 사료" msgid "This is food for dogs. It smells strange, but dogs seem to love it." msgstr "애견용 사료이다. 이상한 냄새가 나지만, 개들은 좋아하는것 같다." -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "고양이 사료" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "고양이 사료이다. 이상한 냄새가 나지만, 고양이들은 좋아하는것 같다." @@ -29787,59 +30712,28 @@ msgstr[0] "" msgid "Some nectar. Seeing this item is a bug." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "단백질 음료" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "소일렌트 그린 음료" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "정제된 인간 단백질과 물을 섞어 만든 걸쭉한 액체. 꽤 영양가 있지만, 딱히 맛있지는 않습니다." - +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" msgstr[0] "" -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" -"가공하지 않은, 정제된 단백질. 사람으로 만들었습니다! 꽤 영양가 있지만, 가공하지 않고 먹기는 불가능에 가까우니 물에 타서 " -"섭취하십시오." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "소일렌트 그린 셰이크" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "영양소가 풍부한 과일과 정제한 인육 단백질로 만든, 걸쭉하고 맛 좋은 음료." - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "소일렌트 그린 셰이크 강화주" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "정제된 단백질에 영양가가 높은 과일을 섞어 만든, 걸쭉하고 맛 좋은 음료. 비타민과 미네랄을 첨가했습니다." - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "단백질 음료" - #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29852,6 +30746,13 @@ msgid "protein powder" msgid_plural "protein powder" msgstr[0] "" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29860,12 +30761,10 @@ msgid "" msgstr "정제된 단백질 가루입니다. 꽤 영양소가 높지만, 가공하지 않고 먹기는 불가능에 가까우니 물에 타서 섭취하십시오." #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -29881,6 +30780,12 @@ msgstr "" msgid "protein shake" msgstr "단백질 셰이크" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29892,6 +30797,13 @@ msgstr "정제된 단백질에 영양소 풍부한 과일을 섞어 만든, 걸 msgid "fortified protein shake" msgstr "단백질 셰이크 강화주" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30648,6 +31560,12 @@ msgid "deluxe sandwich" msgid_plural "deluxe sandwiches" msgstr[0] "디럭스 샌드위치" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30734,6 +31652,20 @@ msgid "meat sandwich" msgid_plural "meat sandwiches" msgstr[0] "고기 샌드위치" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "인육 샌드위치" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -31617,15 +32549,6 @@ msgstr "육수 브로스" msgid "A tasty and nutritious broth made from bones." msgstr "뼈를 우려내 만든 맛있고 영양가가 풍부한 육수." -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "인육 브로스" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "인간의 뼈를 우려내 만든 영양가가 풍부한 육수." - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "야채 수프" @@ -31639,6 +32562,12 @@ msgstr "따뜻한 야채 수프. 맛있고 영양가도 풍부합니다." msgid "meat soup" msgstr "고기 수프" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -31668,6 +32597,12 @@ msgid "curry with meat" msgid_plural "curries with meat" msgstr[0] "고기 카레" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -31677,20 +32612,17 @@ msgstr "매콤하며 약간의 후추와 고기가 들어가 있습니다! 꽤 msgid "woods soup" msgstr "나물 수프" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "맛있고 영양가 있는 수프입니다. 숲에서 나는 자연의 선물로 만들어졌습니다." -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "인육 수프" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "보통 사람보다 훨씬 맛있는 사람으로 만든 수프." - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "닭고기 국수 수프" @@ -32701,17 +33633,6 @@ msgid "" " resembles spoiled milk." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "" @@ -32760,6 +33681,17 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "" @@ -32778,8 +33710,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -32794,7 +33726,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -33039,17 +33971,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "아교 끈" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "끈과 천연 풀로 만든 원시적인 묶는 도구입니다. 나무, 종이, 뼈나 키틴제 물품을 수리하는 데 씁니다." - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -33057,8 +33978,8 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -33081,8 +34002,8 @@ msgstr[0] "열매형 변이체" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" -msgstr "원래대로 가만히 놔두면 아무나 꽃에 가서 열매를 딸 수 있을 것이다. 그렇게 하게 내버려 둘 수는 없잖아?" +"uncontested and partake of the Fruit. We can't have that, can we?" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -33093,8 +34014,8 @@ msgstr[0] "씨앗형 변이체" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" -msgstr "원래대로 가만히 놔두면 아무나 뜰에 가서 씨앗을 수확 할 수 있을 것이다. 그렇게 하게 내버려 둘수는 없잖아?" +"uncontested and partake of the Seed. We can't have that, can we?" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -33105,8 +34026,8 @@ msgstr[0] "말로스 젤라틴" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" -msgstr "원래대로 가만히 놔두면 아무나 꼭대기로 올라가 수액을 채취 할 수 있을 것이다. 잠깐, 애초에 이거 어디서 난거야?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -33116,9 +34037,9 @@ msgstr[0] "과일모양의 변이체" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." -msgstr "우린 지금은 없어. 현명한 작은 친구여, 디버깅을 했구만? 우리가 모딩되기 전까지는 껴주지 않을거야." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -33232,9 +34153,8 @@ msgstr[0] "글루텐 없는 PB&H 샌드위치" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" -"어떤 빌어먹을 멍청이가 이 땅콩버터 샌드위치에 꿀을 넣어놨는데 제정신으로 한- 오, 잠깐만. 이거 꽤 괜찮은데? 글루텐도 없어!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free PB&M sandwich" @@ -33255,18 +34175,16 @@ msgstr "유당 없는 히코리 열매 암브로시아" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." -msgstr "신들의 음료라는 말에 걸맞은 맛있는 히코리 열매 암브로시아입니다. 우유를 사용하지 않고 만들었습니다." +msgstr "" #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "" -"넌 이게 옥수수가루라고 생각해... 아니면 쌀가루... 아니면 다른 무언가? 확실한 것은, 이것은 밀가루가 아닙니다! 이것은 빵을 굽는 " -"데 유용합니다." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free johnnycake" @@ -33275,9 +34193,9 @@ msgstr "글루텐 없는 튀김 옥수수빵" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " -msgstr "우리 모두는 가끔 케이크를 갈망합니다. 이것은 완벽하지는 않지만 맛있고 영양가 있는 글루텐 없는 튀김 빵 요리입니다." +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit pancake" @@ -33312,10 +34230,9 @@ msgstr[0] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" -"보들거리고 맛있는 글루텐과 유당없는 팬케이크에 엄선된 과일을 넣어 영양과 맛을 강화시켰습니다. 진짜 메이플 시럽이 뿌려져 있습니다." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free chocolate pancake" @@ -33349,11 +34266,9 @@ msgstr[0] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" -"글루텐 없는 빵 조각이 유당 없는 우유와 달걀 혼합물에 담갔다가 튀겨집니다. 당신은 그것이 가능하다고 결코 생각하지 않았지만, 이제 " -"당신은 실로 천년 이후의 일처럼 느껴집니다." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free biscuit" @@ -33441,8 +34356,8 @@ msgstr "글루텐 없는 치즈 버거" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." -msgstr "조미료가 들어간 다진 고기와 치즈를 넣은 글루텐 없는 샌드위치입니다. 요리 전 성취의 정점입니다." +"of pre-Cataclysm culinary achievement." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -33563,8 +34478,8 @@ msgstr[0] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" -msgstr "간단한 글루텐 없는 소스 샌드위치입니다. 배부르지는 않지만 빵만 먹는 것을 능가합니다. 특히 빵의 종류가 틀리면요!" +" the bread… especially if it is the wrong type of bread!" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free waffle" @@ -33572,8 +34487,8 @@ msgstr "글루텐 없는 와플" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." -msgstr "글루텐 없는 와플입니다. 기본적으로 해시태그 형태의 팬케이크입니다." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "lactose free waffle" @@ -33581,15 +34496,15 @@ msgstr "유당 없는 와플" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." -msgstr "유당 없는 와플입니다. 기본적으로 해시태그 형태의 팬케이크입니다." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgstr "" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." -msgstr "글루텐과 유당이 없는 와플입니다. 기본적으로 해시태그 형태의 팬케이크입니다" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit waffle" @@ -33634,9 +34549,9 @@ msgstr[0] "라이스밀크" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." -msgstr "진짜 우유보다 훨씬 달고, 바닐라 아이스크림 맛이 납니다. 이 음식은 빨리 상합니다." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "coconut water" @@ -33646,9 +34561,9 @@ msgstr[0] "코코넛 워터" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." -msgstr "양을 늘리기 위해 코코넛 우유에 물을 첨가하였다. 맛은 여전히 나쁘지 않다. 이 음식은 빨리 상합니다." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "jarred coconut milk" @@ -34424,6 +35339,16 @@ msgid "" "it's anyone's guess what it's for." msgstr "" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -35160,6 +36085,26 @@ msgid "corpse" msgid_plural "corpses" msgstr[0] "시체" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -35177,12 +36122,7 @@ msgid "" " so with a gigantic claw." msgstr "" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "" @@ -35272,6 +36212,32 @@ msgid "" "wound." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -36929,6 +37895,136 @@ msgstr[0] "다이아몬드" msgid "A sparkling diamond." msgstr "번쩍이는 다이아몬드." +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -37904,9 +39000,9 @@ msgstr[0] "카에스투스" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." -msgstr "주먹을 감싸는 금속 보호구로, 타격력을 증가시킵니다. 착용자의 손을 보호하기 위해 밑에 두터운 패드가 붙어있습니다." +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -38595,16 +39691,16 @@ msgstr[0] "" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "터렛 틀" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" #: lang/json/GENERIC_from_json.py @@ -40508,6 +41604,274 @@ msgid ".50 ammo belt linkage" msgid_plural ".50 ammo belt linkages" msgstr[0] ".50 탄약 벨트 링크" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -40634,14 +41998,38 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "40mm 탄피" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "" -#. ~ Description for 40mm canister +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "발사된 40mm 유탄의 빈 탄피." +msgid "A large canister from a spent 40mm cartridge." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -40977,16 +42365,6 @@ msgid "generic silverware" msgid_plural "generic silverwares" msgstr[0] "" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -43530,6 +44908,26 @@ msgid "" "twist ties, duct tape, and other random stuff has been used to compensate." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -45070,8 +46468,8 @@ msgstr[0] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -45191,9 +46589,74 @@ msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -47138,7 +48601,20 @@ msgstr[0] "" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" #: lang/json/GENERIC_from_json.py @@ -48242,6 +49718,16 @@ msgstr[0] "" msgid "A small book, containing spells created by a novice magician." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -48401,6 +49887,44 @@ msgid "" "hopes to discover a more permanent solution." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -48718,9 +50242,9 @@ msgstr[0] "" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." -msgstr "고장난 스키터봇입니다. 내부 무기가 제거되었습니다. 부품으로 분해하거나 재활용 로봇으로 만들 수 있습니다." +msgstr "" #. ~ Description for broken skitterbot #: lang/json/GENERIC_from_json.py @@ -48743,9 +50267,9 @@ msgstr[0] "" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." -msgstr "고장난 비무장 방어 봇." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -48775,9 +50299,9 @@ msgstr[0] "고장난 비무장 치킨워커" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." -msgstr "고장난 치킨워커입니다. 내부 무기가 제거되었습니다. 부품으로 분해하거나 재활용 로봇으로 만들 수 있습니다." +msgstr "" #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -49268,8 +50792,8 @@ msgstr[0] "" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." -msgstr " 고장난 재활용 로봇. 분해하거나 다시 제작 할 수 있다." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -49294,8 +50818,8 @@ msgstr[0] "" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -49306,43 +50830,43 @@ msgstr[0] "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -49353,8 +50877,8 @@ msgstr[0] "" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -49367,8 +50891,10 @@ msgstr[0] "" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "" #: lang/json/GENERIC_from_json.py @@ -49378,7 +50904,7 @@ msgstr[0] "" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "" #: lang/json/GENERIC_from_json.py @@ -49399,7 +50925,7 @@ msgstr[0] "" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" @@ -49411,29 +50937,29 @@ msgstr[0] "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -49456,8 +50982,8 @@ msgstr[0] "" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "" #: lang/json/GENERIC_from_json.py @@ -49475,12 +51001,6 @@ msgid "broken fist king" msgid_plural "broken fist kings" msgstr[0] "" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -49597,12 +51117,8 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." +"you…" msgstr "" -"이 확실한 형채가 없는 질량은 개발을 마친 것 같다; 진보된 내부 구조들이 그것에 대해 증언한다. 내부의 유압을 통해 움직일 수 있고, " -"상당한 하중을 움직일 수 있으며, 놀라운 지능의 보여준다. 블럽 기반의 것이든, 다른 것이든, 확장된 사이러도포드를 통해 부착된 모든 " -"것을 조작할 수 있다. 원생동물을 통해 블럽 기반이든 아니든, 부착된 모든 것을 조작할 수 있다. 접촉하기 위해 자세를 고쳐야 할 " -"것이다. 그리고 그것은 변함없이 기꺼이 당신을 수용하려고 하는 것처럼 보인다." #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -49653,6 +51169,11 @@ msgstr "" "수십개의 개량한 태양 전지판을 수미터 높이의 구조물에 고정시킨 것. 파손되기 쉬운 전지판을 위험요소에서 멀리 떨어트려 놓고 태양을 추적할" " 수 있도록 해서 효율이 증가했습니다. 하지만 그 대신 굉장히 무거워 지고 건너서 지나갈 수 없어졌습니다." +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "터렛 틀" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -49700,11 +51221,9 @@ msgstr[0] "안정된 포탈" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"무한히 깊은 듯한 이 구멍을 보고 있노라면 마음 속에 이미 지나간 시간들로부터 온 한 문장이 메아리치기 시작한다. \"세상에 영원한 것이" -" 두 가지 있지. 우주와 도벽.\"" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -50942,6 +52461,17 @@ msgid "" " reload a compatible revolver." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "" @@ -51007,6 +52537,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "AF2011A1 탄창" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "" @@ -51317,8 +52858,8 @@ msgstr "" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -52522,10 +54063,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"블롭이 느리게 전류를 생성하는 능력을 얻도록 진화한 것. 생물학적으로 어떤 구조를 가지고 있는지는 의문이다. 흐리게 자체발광하면서 전류를" -" 내뿜으며, 어떤 다른 원천에서 전류를 끌어다 충전하는 능력이 있지만, 그동안 움직이지 않으며 상당히 약해진다. " #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -52577,24 +54116,6 @@ msgstr "" msgid "pebble hopper" msgstr "자갈 호퍼" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "AF2011A1 탄창" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "두개의 탄창이 부착있는 되있다. AF2011A1 전용." - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "M1991A1 .38 Super 탄창" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "M1991A1 .38 super 권총에 사용되는 9발들이 탄창" - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "기본값" @@ -52816,9 +54337,9 @@ msgstr "Fuji's 의 더많은 빌딩" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" -msgstr "더 많은 건물과 살아가는데 더많은 변화를 추가합니다" +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -52838,7 +54359,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -52870,7 +54391,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" @@ -52966,8 +54487,8 @@ msgstr "돌연변이 NPC" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" -msgstr "황무지를 배회하는 NPC들이 종종 변이를 지니게 됩니다... 그게 적이더라도 말이죠. 조심하시길!" +"included. Beware!" +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -52976,9 +54497,8 @@ msgstr "" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -53285,7 +54805,7 @@ msgstr "" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "" @@ -53323,10 +54843,9 @@ msgstr "지도 기호 수정" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" -"전체 지도를 더 보기 쉽도록 바꿉니다. 건물은 형태에 따라 다른 색 코드로 구분하고, ^v<> 대신에 머리글자를 따서 표기합니다." #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -53467,7 +54986,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -53479,7 +54998,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -53490,7 +55009,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -53500,7 +55019,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -53570,8 +55089,8 @@ msgstr[0] "오리" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." -msgstr "강이나 다른 물가에서 종종 보이는 청둥오리. 주로 곤충, 씨앗, 뿌리 등을 먹지만, 대재앙 이전에는 빵조각도 먹고 살았다." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." +msgstr "" #: lang/json/MONSTER_from_json.py msgid "goose" @@ -54283,7 +55802,7 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" #: lang/json/MONSTER_from_json.py @@ -54426,7 +55945,7 @@ msgid "skittering plague" msgid_plural "skittering plagues" msgstr[0] "" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "감염된 거대한 바퀴벌레가 죽은 사람을 먹고 있다." @@ -54436,7 +55955,7 @@ msgid "plague nymph" msgid_plural "plague nymphs" msgstr[0] "" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "쥐만한 크기의 감염된 돌연변이 바퀴벌레." @@ -54446,7 +55965,7 @@ msgid "plague vector" msgid_plural "plague vectors" msgstr[0] "" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -54468,7 +55987,7 @@ msgid "giant cockroach nymph" msgid_plural "giant cockroach nymphs" msgstr[0] "" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "쥐 만한 크기의 새끼 돌연변이 바퀴벌레" @@ -54490,7 +56009,7 @@ msgid "giant bee" msgid_plural "giant bees" msgstr[0] "" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -54504,7 +56023,7 @@ msgid "giant centipede" msgid_plural "giant centipedes" msgstr[0] "" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -54540,7 +56059,7 @@ msgid "giant mosquito" msgid_plural "giant mosquitos" msgstr[0] "" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -54552,7 +56071,7 @@ msgid "giant cellar spider" msgid_plural "giant cellar spiders" msgstr[0] "" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -54567,7 +56086,7 @@ msgid "immature giant cellar spider" msgid_plural "immature giant cellar spiders" msgstr[0] "" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -54579,7 +56098,7 @@ msgid "giant jumping spider" msgid_plural "giant jumping spiders" msgstr[0] "" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -54591,7 +56110,7 @@ msgid "giant trapdoor spider" msgid_plural "giant trapdoor spiders" msgstr[0] "" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -54603,7 +56122,7 @@ msgid "giant web spider" msgid_plural "giant web spiders" msgstr[0] "" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -54615,7 +56134,7 @@ msgid "fungal spider" msgid_plural "fungal spiders" msgstr[0] "" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -54628,7 +56147,7 @@ msgid "immature giant web spider" msgid_plural "immature giant web spiders" msgstr[0] "" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -54640,7 +56159,7 @@ msgid "giant black widow" msgid_plural "giant black widows" msgstr[0] "" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -54652,7 +56171,7 @@ msgid "giant black widow spiderling" msgid_plural "giant black widow spiderlings" msgstr[0] "" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -54664,7 +56183,7 @@ msgid "giant wolf spider" msgid_plural "giant wolf spiders" msgstr[0] "" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -54676,7 +56195,7 @@ msgid "giant wasp" msgid_plural "giant wasps" msgstr[0] "" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -54688,7 +56207,7 @@ msgid "dermatik" msgid_plural "dermatiks" msgstr[0] "" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -54712,7 +56231,7 @@ msgid "giant ant" msgid_plural "giant ants" msgstr[0] "" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -54724,7 +56243,7 @@ msgid "giant acidic ant" msgid_plural "giant acidic ants" msgstr[0] "" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -54749,7 +56268,7 @@ msgid "acidic queen ant" msgid_plural "acidic queen ants" msgstr[0] "" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -54764,7 +56283,7 @@ msgid "acidic soldier ant" msgid_plural "acidic soldier ants" msgstr[0] "" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -54779,7 +56298,7 @@ msgid "fungal ant" msgid_plural "fungal ants" msgstr[0] "" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -54803,7 +56322,7 @@ msgid "queen ant" msgid_plural "queen ants" msgstr[0] "" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -54815,7 +56334,7 @@ msgid "soldier ant" msgid_plural "soldier ants" msgstr[0] "" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -54827,7 +56346,7 @@ msgid "giant locust" msgid_plural "giant locusts" msgstr[0] "" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -54840,7 +56359,7 @@ msgid "locust nymph" msgid_plural "locust nymphs" msgstr[0] "" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -55647,14 +57166,14 @@ msgid "marloss zealot" msgid_plural "marloss zealots" msgstr[0] "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -55666,7 +57185,7 @@ msgid "X-03: 'Spectre' Recon Mech" msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -55683,7 +57202,7 @@ msgid "X-02: 'Grunt' Combat Mech" msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -55699,7 +57218,7 @@ msgid "X-01: 'Jack' Lifting Mech" msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -55715,7 +57234,7 @@ msgid "mi-go" msgid_plural "mi-gos" msgstr[0] "" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -55733,7 +57252,7 @@ msgid "mi-go slaver" msgid_plural "mi-go slavers" msgstr[0] "" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -55749,7 +57268,7 @@ msgid "mi-go surgeon" msgid_plural "mi-go surgeons" msgstr[0] "" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -55762,7 +57281,7 @@ msgid "mi-go guard" msgid_plural "mi-go guards" msgstr[0] "" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -55778,7 +57297,7 @@ msgid "mi-go myrmidon" msgid_plural "mi-go myrmidons" msgstr[0] "" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -55794,7 +57313,7 @@ msgid "mi-go scout" msgid_plural "mi-go scouts" msgstr[0] "" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -57309,6 +58828,18 @@ msgstr "" "이 좀비의 머리는 한번 분명하게 파괴되었으나, 얼굴 조각의 틈이 특이한 회색 점액으로 채워지고 있습니다. 거대한 인간의 귀가 옆에 " "불안하게 걸려 있습니다. 앞쪽의 얇고 긴 구멍으로 볼 수 있을 거 같습니다." +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -57919,7 +59450,7 @@ msgid "experimental mutant" msgid_plural "experimental mutants" msgstr[0] "" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -57933,7 +59464,7 @@ msgid "evolved mutant" msgid_plural "evolved mutants" msgstr[0] "" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -58345,7 +59876,7 @@ msgstr[0] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" @@ -58360,7 +59891,7 @@ msgstr[0] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" @@ -58374,7 +59905,7 @@ msgstr[0] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" @@ -58730,7 +60261,7 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -58744,7 +60275,20 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -59090,9 +60634,9 @@ msgstr[0] "" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" #: lang/json/MONSTER_from_json.py @@ -59103,10 +60647,10 @@ msgstr[0] "" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -59118,7 +60662,7 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -59131,8 +60675,8 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" @@ -59145,7 +60689,7 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -59158,10 +60702,10 @@ msgstr[0] "" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -59172,9 +60716,9 @@ msgstr[0] "" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -59187,8 +60731,8 @@ msgstr[0] "" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -59199,16 +60743,16 @@ msgstr[0] "" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" @@ -59221,8 +60765,8 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" #: lang/json/MONSTER_from_json.py @@ -59245,8 +60789,8 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." -msgstr "위풍당당하던 곰이 껍데기만 남은 채 연기를 내뿜고 있다. 시선을 보내는 검은 눈에 가득 찬 것은 적의와... 굶주림이다." +"gaze at you with malice… and hunger." +msgstr "" #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -59530,6 +61074,82 @@ msgid "" "like jaws." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -59995,7 +61615,7 @@ msgstr[0] "" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" @@ -60007,7 +61627,7 @@ msgstr[0] "" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" @@ -60019,7 +61639,7 @@ msgstr[0] "" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" @@ -60336,8 +61956,8 @@ msgstr[0] "" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" #: lang/json/MONSTER_from_json.py @@ -60387,8 +62007,8 @@ msgstr[0] "" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" #: lang/json/MONSTER_from_json.py @@ -61809,6 +63429,17 @@ msgstr "" msgid "Ethereal Grasp" msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "" @@ -62230,6 +63861,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "" @@ -64037,6 +65691,18 @@ msgid "" "This is a medical listening tool. Use it to listen to things. Closely." msgstr "소리를 듣기 위해 사용하는 의학 도구. 사용하면 소리를 들을 수 있습니다. 좀 더 가까이요." +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -64303,9 +65969,9 @@ msgstr[0] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -64315,7 +65981,7 @@ msgstr[0] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -64328,9 +65994,9 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -64346,7 +66012,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -64358,12 +66024,12 @@ msgstr[0] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." +msgid "Power levels too low for safe bootup…" msgstr "" #. ~ Description for CRIT EM vest (off) @@ -64371,9 +66037,9 @@ msgstr "" msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -64388,7 +66054,7 @@ msgstr "" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "" #. ~ Description for CRIT EM vest (on) @@ -64397,8 +66063,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -64415,7 +66081,7 @@ msgstr "" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -64433,10 +66099,10 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -64671,6 +66337,30 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -65184,12 +66874,13 @@ msgstr "" #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "틱." @@ -65262,11 +66953,10 @@ msgstr "대전자기 수류탄의 핀을 뽑았다." #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" #: lang/json/TOOL_from_json.py @@ -65281,6 +66971,51 @@ msgid "" "control wave that temporarily converts robots to your side." msgstr "핀이 까진 대전자기 수류탄, 곧 터지며 근처 로봇의 통제권을 바꿔 일시적으로 자신의 편으로 만들 수 있습니다." +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "EMP 수류탄" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "EMP 수류탄 핀을 뽑았다." + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +"매우 조그마한 핵폭발을 일으키며 전자기 펄스를 발생시키는 수류탄. 사용하면 핀이 뽑히면서 도화전이 점화되며, 곧 작동되는 EMP " +"수류탄으로 될 겁니다. 터지기 전까지 3턴이 걸립니다. EMP 필드를 생성시켜 바이오닉 에너지를 고갈시키고 로봇에게 피해를 줍니다." + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "EMP 수류탄 (켜짐)" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "이미 %s의 핀을 뽑았다. 던져야 한다." + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"켜진 EMP 수류탄, 곧 터질것이고, 거대한 EMP 필드를 생성시켜 로봇에게 피해를 주고 바이오닉 에너지를 고갈시킵니다. 손에 계속 들고" +" 있지 않는게 좋을걸요." + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -65668,26 +67403,29 @@ msgid "" msgstr "우주 기술에 사용되는 재료로 만들어진 담요. 중요 신체 부위를 덮을 수 있으며, 접혀져 있습니다. 사용하면 펼칩니다." #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "EMP 수류탄" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "EMP 수류탄 핀을 뽑았다." +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -"매우 조그마한 핵폭발을 일으키며 전자기 펄스를 발생시키는 수류탄. 사용하면 핀이 뽑히면서 도화전이 점화되며, 곧 작동되는 EMP " -"수류탄으로 될 겁니다. 터지기 전까지 3턴이 걸립니다. EMP 필드를 생성시켜 바이오닉 에너지를 고갈시키고 로봇에게 피해를 줍니다." #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -65702,27 +67440,23 @@ msgid "" msgstr "" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "EMP 수류탄 (켜짐)" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "이미 %s의 핀을 뽑았다. 던져야 한다." +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"켜진 EMP 수류탄, 곧 터질것이고, 거대한 EMP 필드를 생성시켜 로봇에게 피해를 주고 바이오닉 에너지를 고갈시킵니다. 손에 계속 들고" -" 있지 않는게 좋을걸요." #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -66152,12 +67886,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -"35밀리 디지털 SLR(일안 반사식) 카메라로 광학 디지털 뷰파인더, 자동 초점 및 떨림방지 기능이 있는 줌 렌즈, 플래시가 딸려 " -"있습니다. 사진을 바로 보거나 메모리카드에 전송할 수 있습니다. 흔히 쓰는 배터리로 작동합니다. 대재앙 전에는 이걸로 프로급 사진을 " -"찍었을 겁니다." #: lang/json/TOOL_from_json.py msgid "candle" @@ -66835,6 +68566,7 @@ msgid_plural "pseudo butter churns" msgstr[0] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -66847,12 +68579,10 @@ msgstr[0] "" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -"색감이 뛰어난 전자잉크 디스플레이를 사용한 태블릿 PC. 대재앙 이전엔 실용적인 도구였지만, 지금은 큰 가치가 없다. 표준 배터리로 " -"작동한다." #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -67932,9 +69662,9 @@ msgstr[0] "간이 망치" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." -msgstr "금속 조각을 모아 막대기 처럼 만든 망치. 대충 망치로 쓸 수는 있지만, 진짜 망치와는 비교할 수 없습니다." +msgstr "" #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -68893,18 +70623,6 @@ msgid "" "blade allows for precision strikes in the hands of the skilled." msgstr "외과 수술용으로 쓰이는 매우 예리한 칼. 숙련자의 손에 들어가면 정확한 일격을 가할 수 있는 무기로 변한다." -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "가위" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "튼튼하고 커다란 가위. 사용(a)하면 면으로 만들어진 물건(의류 등)을 잘라 천조각으로 만들 수 있습니다." - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -71076,6 +72794,17 @@ msgid "" "distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -73030,6 +74759,18 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "가위" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "튼튼하고 커다란 가위. 사용(a)하면 면으로 만들어진 물건(의류 등)을 잘라 천조각으로 만들 수 있습니다." + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -73181,6 +74922,26 @@ msgid "precision solderers" msgid_plural "precision soldererss" msgstr[0] "" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -73369,12 +75130,12 @@ msgstr[0] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -73385,10 +75146,11 @@ msgstr[0] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -73399,7 +75161,7 @@ msgstr[0] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -73411,7 +75173,7 @@ msgstr[0] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -73424,10 +75186,10 @@ msgstr[0] "" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -73439,7 +75201,7 @@ msgstr[0] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -73452,7 +75214,7 @@ msgstr[0] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -73915,7 +75677,7 @@ msgstr[0] "" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" @@ -73927,7 +75689,7 @@ msgstr[0] "" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" @@ -73939,7 +75701,7 @@ msgstr[0] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" @@ -73951,7 +75713,7 @@ msgstr[0] "" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" @@ -73963,8 +75725,8 @@ msgstr[0] "" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -73975,8 +75737,8 @@ msgstr[0] "" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -73987,7 +75749,7 @@ msgstr[0] "" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" @@ -73999,8 +75761,8 @@ msgstr[0] "" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -74011,7 +75773,7 @@ msgstr[0] "" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -74094,7 +75856,7 @@ msgstr[0] "황혼" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." @@ -74104,7 +75866,7 @@ msgstr "" #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." +msgid "Error. No weapon systems found." msgstr "" #. ~ Description for disarmed defense turret @@ -74261,7 +76023,7 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" @@ -74315,8 +76077,8 @@ msgstr[0] "" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" @@ -74329,7 +76091,7 @@ msgstr[0] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" @@ -74342,7 +76104,7 @@ msgstr[0] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" @@ -74634,7 +76396,7 @@ msgstr[0] "" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" @@ -74647,7 +76409,7 @@ msgstr[0] "" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." @@ -74706,10 +76468,10 @@ msgstr[0] "" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" #: lang/json/TOOL_from_json.py @@ -74740,7 +76502,7 @@ msgstr[0] "" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" @@ -74778,8 +76540,8 @@ msgstr[0] "" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" @@ -74821,7 +76583,7 @@ msgstr[0] "" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" @@ -74865,7 +76627,7 @@ msgstr[0] "" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" #: lang/json/TOOL_from_json.py @@ -75173,7 +76935,7 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" #: lang/json/TOOL_from_json.py @@ -75357,9 +77119,9 @@ msgstr "다이아몬드 클러스터가 손에서 산산조각났다." #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" #: lang/json/TOOL_from_json.py @@ -75370,7 +77132,7 @@ msgstr[0] "다이아몬드 매트릭스" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +"Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "" #. ~ Description for diamond matrix @@ -75388,10 +77150,10 @@ msgstr[0] "볼텍스 엔진" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" @@ -75403,10 +77165,10 @@ msgstr[0] "볼텍스 발전기" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" @@ -78580,6 +80342,10 @@ msgstr "말뚝 울타리벽 만들기" msgid "Build Stone Wall" msgstr "돌벽 만들기" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "" @@ -82181,6 +83947,35 @@ msgid "" "from the inside." msgstr "" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "빛이 남" @@ -82838,7 +84633,7 @@ msgstr "" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "" @@ -82972,7 +84767,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -82986,7 +84781,7 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" #: lang/json/epilogue_from_json.py @@ -83003,7 +84798,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " @@ -83033,7 +84828,7 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" @@ -83379,7 +85174,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -83410,7 +85205,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " @@ -83683,7 +85478,7 @@ msgstr "" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" @@ -83851,7 +85646,7 @@ msgstr "피난민" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." @@ -83925,6 +85720,20 @@ msgstr "" msgid "You clean your %s." msgstr "" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "" @@ -83948,6 +85757,29 @@ msgstr "" msgid "You eject the spent casing from the %s." msgstr "" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "" @@ -83968,6 +85800,11 @@ msgstr "" msgid "Clean gun" msgstr "" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "" @@ -84690,11 +86527,13 @@ msgstr "" msgid "A big, blocky metal device for refrigerating large areas." msgstr "" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "끼기기기긱!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "큰 금속음!" @@ -86520,6 +88359,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "진열용 선반" @@ -87428,8 +89276,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -87462,7 +89310,7 @@ msgstr "" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -87473,7 +89321,7 @@ msgstr "" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -87484,7 +89332,7 @@ msgstr "" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -87495,7 +89343,7 @@ msgstr "" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -89278,9 +91126,9 @@ msgstr "" "사용하기 어렵습니다. 대부분의 사람들은 액션 영화 주인공이 아니니까요." #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" -msgstr[0] "수제 소총: .308" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" +msgstr[0] "" #: lang/json/gun_from_json.py msgid "" @@ -89484,6 +91332,18 @@ msgid "" "hammers of the four barrels arranged in a square formation." msgstr "" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -89588,6 +91448,17 @@ msgid "" "quality, durable materials." msgstr "" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -89746,20 +91617,6 @@ msgstr "" "베트남 전쟁에서 미군이 처음 사용하면서 모습을 드러냈으며, 지금까지 널리 사용된 유탄발사기입니다. 대부분 더 현대적인 유탄발사기로 " "대체되었지만, M79는 여전히 전 세계의 많은 나라에서 사용하고 있습니다." -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "Mark 19 고속유탄발사기" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"이 삼각대에 장착된 무거운 탄띠 급탄식 유탄발사기는 미군이 냉전 시작부터 대격변 이전까지 사용했습니다. 혹시라도 40mm 유탄을 " -"발견한다면 훨씬 막강한 화력을 보여줄 것입니다." - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -89804,6 +91661,20 @@ msgstr "수제 3연장 40mm 유탄 발사기. 한 번에 3발의 유탄을 발 msgid "multi" msgstr "멀티" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "Mark 19 고속유탄발사기" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"이 삼각대에 장착된 무거운 탄띠 급탄식 유탄발사기는 미군이 냉전 시작부터 대격변 이전까지 사용했습니다. 혹시라도 40mm 유탄을 " +"발견한다면 훨씬 막강한 화력을 보여줄 것입니다." + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -89816,6 +91687,18 @@ msgid "" "shell at a time like most shotguns." msgstr "" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -90079,6 +91962,17 @@ msgstr "" "타우러스 레이징 불(Taurus Raging Bull)은 .454 Casull 탄을 사용하는 5연발 리볼버입니다. 이 총은 강력한 " "저지력을 가지고 있습니다." +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "타우러스 레이징 저지 매그넘" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -90116,6 +92010,34 @@ msgid "" "ammunition." msgstr "" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "본드 암즈 데린저" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -90228,11 +92150,9 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" -"미군이 사용되는 중기관총. 대재앙 생존자들이 쉽게 찾기 힘든것입니다. 거대한 크기와 형태 때문에 거치하거나 차량에 설치하지 않으면 사용할" -" 수 없습니다." #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -91567,7 +93487,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -91714,7 +93634,7 @@ msgstr[0] "A7 레이저 라이플" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" @@ -91777,6 +93697,17 @@ msgid "" "ammunition." msgstr "목재 블로우건. 사용하기 쉽고 정확도가 높습니다. 다트를 탄약으로 씁니다." +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -91822,7 +93753,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -91834,7 +93765,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -91847,7 +93778,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -91858,8 +93789,8 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" #: lang/json/gun_from_json.py @@ -91869,12 +93800,12 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" #: lang/json/gun_from_json.py @@ -91897,11 +93828,11 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" #: lang/json/gun_from_json.py @@ -91911,7 +93842,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -91922,8 +93853,8 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -91935,7 +93866,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -91946,8 +93877,8 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -91958,7 +93889,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -91981,8 +93912,8 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" @@ -92102,8 +94033,9 @@ msgstr[0] "JHEC M128" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" #: lang/json/gun_from_json.py @@ -92185,9 +94117,9 @@ msgid "" msgstr "" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" -msgstr[0] "L.T. 카빈" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" +msgstr[0] "" #: lang/json/gun_from_json.py msgid "" @@ -92538,7 +94470,7 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" @@ -92561,8 +94493,8 @@ msgstr[0] "레이저 소총" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" @@ -92699,6 +94631,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -92723,7 +94659,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "" #: lang/json/gun_from_json.py @@ -92899,7 +94835,7 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py @@ -92913,7 +94849,7 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py @@ -93409,16 +95345,6 @@ msgstr "" "개조된 공압식 전투소총.  투사체를 더 빠르게, 더 높은 속도로 쏠 수 있게 개조되었으나 다루기가 어려워져 발사하려면 지지할 만한 것이 " "필요합니다." -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "6발들이 리볼버. 재장전하기 편하도록 스윙-아웃 방식의 실린더가 있다." - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -93434,41 +95360,6 @@ msgstr "" "경량 복합총열 총. .22구경 총열과 .410 산탄 총열이 복합되어 있으며, 부피를 최대한 줄이기 위해 접을 수 있습니다. 군용 항공기 " "파일럿이 탈출시 비상용으로 사용하기 위해 생산되었지만, 이후 여러 민간기업에서 상업적으로 생산되었습니다." -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "콜트 라이트닝 .45" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "본드 암즈 데린저" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "작은 이중 총열 권총. 주로 .45 Long Colt 탄환을 사용하나, .410 산탄 탄환도 사용할 수 있습니다." - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] ".410 어린이용 산탄총" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -93480,41 +95371,6 @@ msgid "" " with a hammer to strike the single round it holds." msgstr ".410 보어를 사용하는 수제 산탄총. 파이프가 개머리판에 단순하게 붙어 있고, 해머가 탄환을 쏠 수 있게 되어 있습니다." -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "AF2011A1 .38 Super" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "이중 총열의 반자동 권총. M1911 권총 두 개가 붙어 있는 것처럼 생겼습니다." - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38 Super" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr ".38 Super 탄환을 사용하는 현대식 M1911. 준수한 정확도를 자랑합니다." - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "타우러스 레이징 저지 매그넘" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" -".454 Casull 탄환을 사용하는 5연발 리볼버. .410 산탄 탄환과 .45 Long Colt 탄환을 사용할 수 있습니다." - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -94627,7 +96483,7 @@ msgstr[0] "" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" @@ -94971,6 +96827,17 @@ msgid "" "weapon other than pistols and pump-action guns, if you so want." msgstr "" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -95193,7 +97060,7 @@ msgstr[0] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -95215,9 +97082,9 @@ msgstr[0] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -95228,7 +97095,7 @@ msgstr[0] "" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -95392,17 +97259,6 @@ msgid "" "attacks when attached to long arm or crossbow." msgstr "쓸만한 칼날을 끈을 약간 사용해 만든 간이 대형 총검. 긴 화기나 쇠뇌에 부착하면 괜찮은 근접무기가 됩니다." -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "M6 ASW 산탄총" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "M6 비상생존용 총기에 내장된 .410 구경 산탄총. 제거할 수 없습니다." - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "" @@ -97013,10 +98869,6 @@ msgstr "볼트/철사 절단" msgid "Heat up food (with it)" msgstr "" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "나무/종이/뼈/키틴 재질 수리" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "도구 개조모듈로서 부착" @@ -97837,6 +99689,11 @@ msgid "" " This can feel good." msgstr "이 의류는 흠뻑 젖어도 제 기능을 해내며, 기분이 나빠지지 않는다." +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -98958,7 +100815,8 @@ msgstr "지형 건설하기" msgid "Disassemble items" msgstr "물건 분해하기" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "잠자기" @@ -99768,7 +101626,8 @@ msgstr "말벌 집" msgid "Wasp nest is here." msgstr "여기에 말벌집이 있다." -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "거미" @@ -99827,6 +101686,33 @@ msgstr "" msgid "Small pond is here." msgstr "" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "" @@ -99897,7 +101783,7 @@ msgstr "" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "" #. ~ Computer name @@ -100670,6 +102556,16 @@ msgstr "" msgid "NO Diving!" msgstr "" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -100804,8 +102700,7 @@ msgid "Emergency Message" msgstr "비상 메시지" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "외부 전원 비활성화" @@ -101443,7 +103338,7 @@ msgstr "" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -102447,7 +104342,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -102470,7 +104365,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -102481,7 +104376,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -102490,7 +104385,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -102501,7 +104396,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -102511,7 +104406,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -102522,7 +104417,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -102696,6 +104591,10 @@ msgstr "누더기" msgid "Diamond" msgstr "다이아몬드" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "알" @@ -102913,8 +104812,8 @@ msgid "Mushroom" msgstr "버섯" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "물" @@ -104249,7 +106148,7 @@ msgstr "생존자임을 증명" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" @@ -104393,11 +106292,11 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "" #: lang/json/mission_def_from_json.py @@ -104438,6 +106337,10 @@ msgstr "" msgid "What good does this do me?" msgstr "" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "" @@ -104478,7 +106381,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "" #: lang/json/mission_def_from_json.py @@ -104516,12 +106419,12 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "" #: lang/json/mission_def_from_json.py @@ -104590,7 +106493,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "" #: lang/json/mission_def_from_json.py @@ -104608,7 +106511,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" @@ -104629,7 +106532,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" #: lang/json/mission_def_from_json.py @@ -104637,7 +106540,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "" #: lang/json/mission_def_from_json.py @@ -105329,7 +107232,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" @@ -105726,7 +107629,7 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -106019,7 +107922,7 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" @@ -107389,7 +109292,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -107415,10 +109318,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "도와주려 한 것... 고마워." - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -107443,7 +109342,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -107483,8 +109382,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -107505,7 +109404,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -107532,7 +109431,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -107547,7 +109446,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -107616,6 +109515,54 @@ msgstr "" msgid "The %1$s tries to slam into , but fails to." msgstr "" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -115030,7 +116977,7 @@ msgstr "" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" +msgid "This NPC could tell you about how they survived the Cataclysm" msgstr "" #: lang/json/mutation_from_json.py @@ -115498,7 +117445,7 @@ msgstr "" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -115562,18 +117509,10 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "" @@ -116205,7 +118144,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -116238,8 +118177,8 @@ msgid "I'm just trying to stay alive." msgstr "나는 그저 목숨을 부지할 뿐이야." #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." -msgstr "나는 그저 목숨을 부지할 뿐이야.... 보시다시피 쉽진 않지만." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Lizard Mutant" @@ -116247,8 +118186,8 @@ msgstr "파충류 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116257,8 +118196,8 @@ msgstr "의학실험체 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116267,8 +118206,8 @@ msgstr "조류 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116277,8 +118216,8 @@ msgstr "어류 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116287,7 +118226,7 @@ msgstr "야수 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -116297,8 +118236,8 @@ msgstr "곰 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116307,8 +118246,8 @@ msgstr "고양이 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116317,8 +118256,8 @@ msgstr "이리 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116327,8 +118266,8 @@ msgstr "초식동물 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116337,8 +118276,8 @@ msgstr "곤충 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116347,7 +118286,7 @@ msgstr "식물 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -116357,7 +118296,7 @@ msgstr "슬라임 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -116367,7 +118306,7 @@ msgstr "동굴성 생물 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" @@ -116377,7 +118316,7 @@ msgstr "연체동물 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" @@ -116387,8 +118326,8 @@ msgstr "거미 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116397,8 +118336,8 @@ msgstr "설치류 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116407,7 +118346,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -116417,7 +118356,7 @@ msgstr "알파 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" @@ -116427,8 +118366,8 @@ msgstr "요정 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116437,8 +118376,8 @@ msgstr "키메라 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_class_from_json.py @@ -116447,8 +118386,8 @@ msgstr "랩터 돌연변이" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" #: lang/json/npc_from_json.py @@ -119700,12 +121639,10 @@ msgstr "피신한 생존자" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"대재앙이 시작되었을 때, 당신은 방공호에 틀어박혔습니다. 그리고 시간이 지나 이제 겨울이 되었고, 당신은 책을 통해 익힌 잡다한 기술들이" -" 당신의 생존을 돕길 바랍니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -119716,12 +121653,10 @@ msgstr "피신한 생존자" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"대재앙이 시작되었을 때, 당신은 방공호에 틀어박혔습니다. 그리고 시간이 지나 이제 겨울이 되었고, 당신은 책을 통해 익힌 잡다한 기술들이" -" 당신의 생존을 돕길 바랍니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -119732,12 +121667,10 @@ msgstr "피신한 민병대" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"대재앙이 시작되었을 때, 당신은 방공호에 틀어박혔습니다. 시간이 지나 겨울이 되었고, 이제 당신은 당신의 사격술과 당신이 배운 기술들로 " -"당신의 생존을 도우기를 바랍니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -119748,12 +121681,10 @@ msgstr "피신한 민병대" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"대재앙이 시작되었을 때, 당신은 방공호에 틀어박혔습니다. 시간이 지나 겨울이 되었고, 이제 당신은 당신의 사격술과 당신이 배운 기술들로 " -"당신의 생존을 도우기를 바랍니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -119830,11 +121761,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"이런 육시럴? 내는 이런 요상한 곳에 떨어트린 요술 같은건 필요 읍서라. 인자 갖고 있는걸로 이 지금까지 그 으떤 아그들도 봐부르지 못헌" -" 겁나 흐막한 재앙에서으 새로운 인생을 살아부릴 필요가 있응거시여." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -119847,11 +121776,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"이런 육시럴? 내는 이런 요상한 곳에 떨어트린 요술 같은건 필요 읍서라. 인자 갖고 있는걸로 이 지금까지 그 으떤 아그들도 봐부르지 못헌" -" 겁나 흐막한 재앙에서으 새로운 인생을 살아부릴 필요가 있응거시여." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -119955,11 +121882,9 @@ msgstr "양봉업자" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"당신은 과거 양봉의 전문가였습니다. 대재앙이 닥쳤을 때 당신은 소중한 벌들을 버려야 했습니다만, 적어도 양봉도구와 꿀을 조금이나마 챙겨올" -" 수 있었습니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -119971,11 +121896,9 @@ msgstr "양봉업자" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"당신은 과거 양봉의 전문가였습니다. 대재앙이 닥쳤을 때 당신은 소중한 벌들을 버려야 했습니다만, 적어도 양봉도구와 꿀을 조금이나마 챙겨올" -" 수 있었습니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -119986,12 +121909,10 @@ msgstr "농구 선수" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"이번이 당신의 첫 메이저 리그 경기가 될 예정이었지만, 대재앙이 닥치고 말았습니다. 빠른 발 덕분에 당신도 그곳에서 빠져나올 수 있었던 " -"소수의 운 좋은 사람 명단에 이름을 올릴 수 있었습니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120002,12 +121923,10 @@ msgstr "농구 선수" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"이번이 당신의 첫 메이저 리그 경기가 될 예정이었지만, 대재앙이 닥치고 말았습니다. 빠른 발 덕분에 당신도 그곳에서 빠져나올 수 있었던 " -"소수의 운 좋은 사람 명단에 이름을 올릴 수 있었습니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -120154,11 +122073,9 @@ msgstr "집사" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"당신은 부유한 저택에서 일해왔지만, 대재앙이 일어나자 저택에 살던 사람들은 알려지지 않은 장소로 가족여행을 떠났습니다. 당신만을 " -"남겨두고요." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120169,11 +122086,9 @@ msgstr "하녀" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"당신은 부유한 저택에서 일해왔지만, 대재앙이 일어나자 저택에 살던 사람들은 알려지지 않은 장소로 가족여행을 떠났습니다. 당신만을 " -"남겨두고요." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -121144,11 +123059,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"당신은 소규모 자영업자들에게서 소규모 전기작업 의뢰를 받으며 일했었습니다만, 공교롭게도 대재앙이 닥쳐온 이후부터는 대피소에서 일하게 " -"되었습니다. 유감스럽게도, 컴퓨터를 제외하면 지금 하고 있는 배선작업 중 아무것도 마치지 못했습니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -121161,11 +123074,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"당신은 소규모 자영업자들에게서 소규모 전기작업 의뢰를 받으며 일했었습니다만, 공교롭게도 대재앙이 닥쳐온 이후부터는 대피소에서 일하게 " -"되었습니다. 유감스럽게도, 컴퓨터를 제외하면 지금 하고 있는 배선작업 중 아무것도 마치지 못했습니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -121240,7 +123151,7 @@ msgstr "샤워하다 봉변당한 자" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -121254,7 +123165,7 @@ msgstr "샤워하다 봉변당한 자" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -121294,9 +123205,9 @@ msgstr "무도회 춤꾼" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." -msgstr "대재앙 이전에 당신은 무도회 춤꾼이었으며, 지금은 그 기술로 목숨을 보전하고 있습니다." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -121307,9 +123218,9 @@ msgstr "무도회 춤꾼" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." -msgstr "대재앙 이전에 당신은 무도회 춤꾼이었으며, 지금은 그 기술로 목숨을 보전하고 있습니다." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122144,11 +124055,9 @@ msgstr "신랑" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"경사스런 날에 대재앙이 일어났고, 당신은 혼례복을 입은 채 간신히 도망쳐 나왔습니다. 두렵고 떨립니까? 떨리지 않도록 발을 딱 붙이고 " -"계세요!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -122159,11 +124068,9 @@ msgstr "신부" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"경사스런 날에 대재앙이 일어났고, 당신은 혼례복을 입은 채 간신히 도망쳐 나왔습니다. 두렵고 떨립니까? 떨리지 않도록 발을 딱 붙이고 " -"계세요!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122239,10 +124146,8 @@ msgstr "스카 매니아" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"당신의 스카 밴드는 드러머가 좀비로 변한 뒤에 와해되어 버렸습니다. 이제 당신은 MP3 플레이어와 담배 몇 개비만을 지닌 채 홀로 " -"대재앙을 헤쳐나가야 합니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -122254,10 +124159,8 @@ msgstr "스카 매니아" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"당신의 스카 밴드는 드러머가 좀비로 변한 뒤에 와해되어 버렸습니다. 이제 당신은 MP3 플레이어와 담배 몇 개비만을 지닌 채 홀로 " -"대재앙을 헤쳐나가야 합니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122294,9 +124197,9 @@ msgstr "죄수" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." -msgstr "대재앙은 당신에게 도망칠 기회를 주었지만, 자유의 대가는 혹독했습니다." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -122307,9 +124210,9 @@ msgstr "죄수" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." -msgstr "대재앙은 당신에게 도망칠 기회를 주었지만, 자유의 대가는 혹독했습니다." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122718,9 +124621,9 @@ msgstr "랍비" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" -msgstr "당신이 신도들과 함께 사원에서 제사를 드리고 있을 때 대재앙이 일어났습니다. 메시아가 필요합니다. 지금 당장!" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -122731,9 +124634,9 @@ msgstr "랍비" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" -msgstr "당신이 신도들과 함께 사원에서 제사를 드리고 있을 때 대재앙이 일어났습니다. 메시아가 필요합니다. 지금 당장!" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122923,12 +124826,10 @@ msgstr "피자 배달부" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"당신은 대재앙이 닥치던 날 밤 동네에 있는 저온보존 연구소에 마지막 피자를 배달하러 가는 중이었습니다. 가장 가까운 피난처로 도망쳐 " -"간신히 정신을 차린 후 가진 것은 팁도 없이 그저 약간 남은 피자뿐입니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -122940,12 +124841,10 @@ msgstr "피자 배달부" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"당신은 대재앙이 닥치던 날 밤 동네에 있는 저온보존 연구소에 마지막 피자를 배달하러 가는 중이었습니다. 가장 가까운 피난처로 도망쳐 " -"간신히 정신을 차린 후 가진 것은 팁도 없이 그저 약간 남은 피자뿐입니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -123054,12 +124953,10 @@ msgstr "농부" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"당신은 농작물을 기르며 살고 있었습니다만, 대격변이 일어났습니다. 이제 당신의 믿음직한 괭이와 종자를 조금 가지고 세상을 재건할 " -"때입니다. 한 번에 한 그루씩 심어서 말입니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123070,12 +124967,10 @@ msgstr "농부" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"당신은 농작물을 기르며 살고 있었습니다만, 대격변이 일어났습니다. 이제 당신의 믿음직한 괭이와 종자를 조금 가지고 세상을 재건할 " -"때입니다. 한 번에 한 그루씩 심어서 말입니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -123118,7 +125013,7 @@ msgstr "노련한 수색꾼" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" @@ -123132,7 +125027,7 @@ msgstr "노련한 수색꾼" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" @@ -123424,14 +125319,11 @@ msgstr "생존주의자의 아들" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"당신의 부모님은 \"대재앙\"이 닥쳐올 것이라고 생각하며 당신도 이에 대비해야 한다고 주장하던 미친 사람들이었습니다. 결국 그들이 " -"맞았지만, 당신은 그들에게 감사를 표할 기회조차 얻지 못했습니다. 지금 당신이 그들을 위해 할 수 있는 일은 그들이 항상 원했듯이 이 " -"어두운 나날을 헤쳐나가 살아남는 것뿐입니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123442,14 +125334,11 @@ msgstr "생존주의자의 딸" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"당신의 부모님은 \"대재앙\"이 닥쳐올 것이라고 생각하며 당신도 이에 대비해야 한다고 주장하던 미친 사람들이었습니다. 결국 그들이 " -"맞았지만, 당신은 그들에게 감사를 표할 기회조차 얻지 못했습니다. 지금 당신이 그들을 위해 할 수 있는 일은 그들이 항상 원했듯이 이 " -"어두운 나날을 헤쳐나가 살아남는 것뿐입니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -124373,7 +126262,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -124390,7 +126279,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -124641,10 +126530,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -124657,10 +126546,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -124672,9 +126561,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -124688,9 +126577,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -124704,7 +126593,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -124718,7 +126607,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -124733,9 +126622,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -124750,9 +126639,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -124766,13 +126655,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -124784,13 +126673,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -124803,8 +126692,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -124819,8 +126708,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -124835,9 +126724,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -124850,9 +126739,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -124864,13 +126753,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -124882,13 +126771,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -124900,10 +126789,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -124915,10 +126804,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -124930,12 +126819,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -124947,12 +126836,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -124964,17 +126853,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -124986,17 +126875,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -125010,9 +126899,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -125026,9 +126915,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -125042,10 +126931,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -125061,10 +126950,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -125079,9 +126968,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -125094,9 +126983,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -125108,11 +126997,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -125124,11 +127014,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -125280,7 +127171,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -125293,7 +127184,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -125330,7 +127221,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -125343,7 +127234,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -125356,7 +127247,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -125369,7 +127260,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -125429,7 +127320,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -125440,7 +127331,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -125504,7 +127395,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -125517,7 +127408,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -125609,7 +127500,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -125623,7 +127514,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -125639,7 +127530,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -125654,7 +127545,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -126626,12 +128517,10 @@ msgstr "야구 선수" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"대재앙이 벌어지기 전까지, 당신은 지방의 마이너리그 팀에서 타자 역할을 맡고 있었습니다. 겨우 장비를 가지고 도망쳐 나왔지만, 이닝이 " -"끝나기까지 얼마나 오래 살아남을 수 있을까요?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -126642,12 +128531,10 @@ msgstr "야구 선수" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"대재앙이 벌어지기 전까지, 당신은 지방의 마이너리그 팀에서 타자 역할을 맡고 있었습니다. 겨우 장비를 가지고 도망쳐 나왔지만, 이닝이 " -"끝나기까지 얼마나 오래 살아남을 수 있을까요?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -126724,9 +128611,9 @@ msgstr "잠에서 깨어남" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." -msgstr "당신은 한밤중에 시끄러운 소리에 잠에서 깼어요. 조사하러 간 손전등으로만 무장하고, 이제 대혼란에 직면하게 됩니다." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -126737,9 +128624,9 @@ msgstr "잠에서 깨어남" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." -msgstr "당신은 한밤중에 시끄러운 소리에 잠에서 깼어요. 조사하러 간 손전등으로만 무장하고, 이제 대혼란에 직면하게 됩니다." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -126751,11 +128638,9 @@ msgstr "바이오닉 자전거선수" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"사이버 올림픽 사이클 대회를 위한 당신의 훈련과 노력은 대제앙의 시작에서 벗어날 수 있는 우위를 제공해 주었습니다. 계속 도망칠 수 " -"있어요?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -126767,11 +128652,9 @@ msgstr "바이오닉 자전거선수" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"사이버 올림픽 사이클 대회를 위한 당신의 훈련과 노력은 대제앙의 시작에서 벗어날 수 있는 우위를 제공해 주었습니다. 계속 도망칠 수 " -"있어요?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -126782,12 +128665,10 @@ msgstr "용접사" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"당신은 대재앙전에 조선업체에서 용접사로 근무했습니다. 대재앙이 닥치자 집으로 돌아가기로 했습니다. 적어도 뭔가 만들 도구는 가지고 " -"있습니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -126798,12 +128679,10 @@ msgstr "용접사" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"당신은 대재앙전에 조선업체에서 용접사로 근무했습니다. 대재앙이 닥치자 집으로 돌아가기로 했습니다. 적어도 뭔가 만들 도구는 가지고 " -"있습니다." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -126814,12 +128693,10 @@ msgstr "근본주의 생존주의자" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"이런 일이 터질줄 알았지, 다 잦될줄 알았다니까. 당신은 이런날을 준비했습니다. 장비에 의존하는게 아니라 기술을 갈고 닦았습니다. 숲에서" -" 보낸 그 많은 시간들이 쓸모가 있었습니다. 선조들이 기술 없이도 생존했었으니 못하면 천벌 받을지로 모릅니다." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -126830,12 +128707,10 @@ msgstr "근본주의 생존주의자" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"이런 일이 터질줄 알았지, 다 잦될줄 알았다니까. 당신은 이런날을 준비했습니다. 장비에 의존하는게 아니라 기술을 갈고 닦았습니다. 숲에서" -" 보낸 그 많은 시간들이 쓸모가 있었습니다. 선조들이 기술 없이도 생존했었으니 못하면 천벌 받을지로 모릅니다." #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py @@ -131284,10 +133159,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"재앙이 시작되었을 때, 당신은 가까운 대피소로 피난했습니다. 당신이 살고 있고, 절대 떠나지 않을 이곳은 바깥세상에 있는 미지의 존재들이" -" 당신을 해칠 수 없도록 막아줍니다. 하지만 물자가 고갈되어가자 당신은 대재앙이 시작된 이래 처음으로 바깥세상을 마주하게 됩니다." #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -131296,10 +133169,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"재앙이 시작되었을 때, 당신은 가까운 대피소로 피난했습니다. 당신이 살고 있고, 절대 떠나지 않을 이곳은 바깥세상에 있는 미지의 존재들이" -" 당신을 해칠 수 없도록 막아줍니다. 하지만 물자가 고갈되어가자 당신은 대재앙이 시작된 이래 처음으로 바깥세상을 마주하게 됩니다." #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -131363,7 +133234,7 @@ msgstr "감옥" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -131372,7 +133243,7 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -131476,22 +133347,18 @@ msgstr "실험체" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"당신이 원해서였든 원하지 않았든 태어날 때부터 당신의 유일한 존재 의의는 유전 과학의 진보였습니다. 대재앙이 닥쳐왔을 때, 당신은 " -"연구소에 남겨졌고, 목적 없이 떠돌아다니다가 숲에서 멈춰 섰습니다." #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"당신이 원해서였든 원하지 않았든 태어날 때부터 당신의 유일한 존재 의의는 유전 과학의 진보였습니다. 대재앙이 닥쳐왔을 때, 당신은 " -"연구소에 남겨졌고, 목적 없이 떠돌아다니다가 숲에서 멈춰 섰습니다." #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -131736,8 +133603,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Description for scenario 'Lost Faith' for a female character. @@ -131745,8 +133612,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Starting location for scenario 'Lost Faith'. @@ -131775,7 +133642,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Description for scenario 'The Wizard's Apprentice' for a female @@ -131787,7 +133654,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -131813,8 +133680,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -131823,8 +133690,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -131926,9 +133793,9 @@ msgstr "챌린지-죽음의 FEMA 캠프" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female @@ -131937,9 +133804,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -132883,6 +134750,11 @@ msgstr "" "다람쥐는 꽤 맛있죠. 하지만 높은 화력을 지닌 총으로 쏴버리면 고기가 남아나질 않을 겁니다! BB탄 총을 쓰거나, 없다면 22구경 소총을" " 사용하세요." +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -132903,8 +134775,24 @@ msgstr "거대 벌레를 죽였더라도 방심하지 마세요. 벌레의 일 #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." -msgstr "좀비 떼거리가 오는 것을 발견했다면, 도망치세요! 큰 전술적 이점이 없는 한, 그들과 맞서 싸우는 것은 자살행위입니다." +"impossible unless you have a big tactical advantage." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "좀비 떼에게 쫓기고 있다면, 지하철 쪽으로 도망치세요. 한 두 블록 정도 이동한 다음, 다시 나오면 됩니다." #: lang/json/snippet_from_json.py msgid "" @@ -133211,7 +135099,7 @@ msgstr "알고 있겠지만, 돌격소총은 연사보다 단발로 쏘는 것 #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" @@ -133413,6 +135301,12 @@ msgstr "" "힘이 약하거나 민첩하지 못하다면 화염병이나 수류탄 가지고 장난질 하지 않는 게 좋을 거야. 던지려다가 실수로 떨어트리기라도 하면 단박에 " "치명상이니까." +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -133462,9 +135356,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" #: lang/json/snippet_from_json.py @@ -133479,6 +135372,12 @@ msgid "" " bad!" msgstr "다음에 식료품점에 올 일이 생긴다면, 캔에 담긴 음식을 챙겨가세요. 거의 썩지 않으니까요!" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -133504,12 +135403,6 @@ msgid "" "defense… it's perfect!" msgstr "" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "좀비 떼에게 쫓기고 있다면, 지하철 쪽으로 도망치세요. 한 두 블록 정도 이동한 다음, 다시 나오면 됩니다." - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -133518,9 +135411,9 @@ msgstr "허허벌판에서 기묘한 과학 연구소를 본 적이 없나요? #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" #: lang/json/snippet_from_json.py @@ -133577,27 +135470,41 @@ msgstr "하루에 스크루드라이버 한 병이면 괴혈병을 막아줄거 #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" -msgstr "평소보다 배가 고파? 천연 오일은 도움이 될 수 있어. 전혀 맛있지 않지만, 너의 다리를 핥을 때 누가 신경 써?" +msgstr "" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." -msgstr "지형은 전투의 흐름을 바꿀 수 있어. 적을 상대로 반드시 그것을 사용할 수 있도록 노력해." +msgstr "" #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" -"광산을 지나던 사람들이 악취에 대해 뭐라고 했어. 만약 너가 그곳을 방문할 계획이라면, 가스 마스크를 가지고 가는 것을 고려해." #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "아는 것이 힘이다. 진짜로, 그냥 책이나 집어봐." +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -133664,12 +135571,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" -"납땜하는 철은 기계공들의 가장 친한 친구가 될 수 있습니다. 상처를 지질수도 있지만, 그 치료로 살아난 만큼 많은 사람들이 죽었기 때문에" -" 마지막 수단인 것 같습니다." #: lang/json/snippet_from_json.py msgid "" @@ -133711,11 +135616,10 @@ msgstr "친구는 채워야 할 두 번째 입이지만, 일에 관한 한 네 #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" -"나는 좀비에게 거의 죽을 뻔할때 까지 약아 맞섰고 사람무리로 부터 떨어져 간신히 나의 엉덩이를 끌고나왔다 . 그 시간을 날 구했습니다." #: lang/json/snippet_from_json.py msgid "" @@ -133743,6 +135647,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -133850,6 +135760,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -133871,6 +135805,13 @@ msgid "" "either, if you catch my drift." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -133923,6 +135864,12 @@ msgid "" " a cold ground." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -133968,7 +135915,7 @@ msgid "Hey there's some pink tablets, take some!" msgstr "" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" msgstr "" #: lang/json/snippet_from_json.py @@ -136797,15 +138744,15 @@ msgid "" msgstr "" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." -msgstr "대재앙에서 어떻게 살아남았는지 말해줘." +msgid "Tell me about how you survived the Cataclysm." +msgstr "" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" -msgstr "대재앙에서 어떻게 살아남았어?" +msgid "How did you survive the Cataclysm?" +msgstr "" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" +msgid "What was the Cataclysm like for you?" msgstr "" #: lang/json/snippet_from_json.py @@ -137067,8 +139014,8 @@ msgid "eldritch horror" msgstr "" #: lang/json/snippet_from_json.py -msgid "the cataclysm" -msgstr "카타클리즘" +msgid "the Cataclysm" +msgstr "" #: lang/json/snippet_from_json.py msgid "the apocalypse" @@ -137433,6 +139380,306 @@ msgid "" "Refer to file EXO-M-312 for full report." msgstr "" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -138699,7 +140946,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "" #: lang/json/snippet_from_json.py @@ -142661,7 +144908,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" #: lang/json/snippet_from_json.py @@ -142677,13 +144924,13 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" -msgstr "\"말 그대로 차가 다듬지 않은 다이아몬드가 됐군...\"" +msgid "\"my car is a diamond in the rough… literally\"" +msgstr "" #: lang/json/snippet_from_json.py msgid "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" @@ -142705,7 +144952,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" @@ -144320,6 +146567,38 @@ msgstr "" msgid "WOOF!" msgstr "" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "" @@ -144428,13 +146707,13 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" @@ -144446,7 +146725,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" @@ -144457,7 +146736,7 @@ msgid "" msgstr "" #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" +msgid "Hello again. To reiterate our previous warning: [garbled]" msgstr "" #: lang/json/speech_from_json.py @@ -144533,9 +146812,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." -msgstr "이런. 누군가가 케이크를 잘랐어. 나는 너가 올 때까지 기다리라고 했지만, 그들은 그냥 잘라버렸어." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." +msgstr "" #: lang/json/speech_from_json.py msgid "This is your fault. It didn't have to be like this." @@ -144566,7 +146845,7 @@ msgstr "뭐라고? 방금 뭐라고 했지?" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "" #: lang/json/speech_from_json.py @@ -144614,7 +146893,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" @@ -144651,8 +146930,8 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "\"우리가 여기 있는 것은 의사소통 실패야.\"" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" -msgstr "\"E.T. 전화 집으로.\"" +msgid "\"E.T. phone home.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"I'm as mad as hell, and I'm not going to take this anymore!\"" @@ -144733,10 +147012,8 @@ msgstr "" "(영화 백투더퓨처)" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" msgstr "" -"\"안전벨트를 빨리 해. 울퉁불퉁한 밤이 될 거야.\"\n" -"(영화 이브의 모든것)" #: lang/json/speech_from_json.py msgid "" @@ -145114,8 +147391,8 @@ msgid "\"I'm scared!\"" msgstr "\"무서워!\"" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" -msgstr "\"뭔가 이상해...\"" +msgid "\"Something's wrong…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"What are you doing?\"" @@ -145142,15 +147419,15 @@ msgid "\"Excuse me?\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" +msgid "\"I'm different…\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" +msgid "\"Thanks anyway…\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" +msgid "\"Take me with you…\"" msgstr "" #: lang/json/speech_from_json.py @@ -145230,7 +147507,7 @@ msgid "\"This time is OUR time.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" +msgid "\"Second time's a charm…\"" msgstr "" #: lang/json/speech_from_json.py @@ -145302,7 +147579,7 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "\"[한숨] 누구에게도 이것을 알리지마.\"" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" +msgid "\"Well, I tried. Best of luck!\"" msgstr "" #: lang/json/speech_from_json.py @@ -145596,7 +147873,7 @@ msgid "Cabin" msgstr "오두막" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "병원" @@ -145748,7 +148025,7 @@ msgstr "FEMA 캠프" msgid "Mansion Entrance" msgstr "저택 입구" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "저택" @@ -145822,7 +148099,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -145921,42 +148198,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -146667,7 +148944,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -146981,13 +149258,13 @@ msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "그래, 이런 날씨에 내가 얼지 않게 해줄지도 몰라, 무슨 일이야?" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding " -"up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding " +"up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -147077,14 +149354,14 @@ msgstr "좋아, 가만히 있으라고..." msgid "Keep your distance!" msgstr "가까이 오지마!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr ", 여긴 내 구역이야." - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr ", 여긴 내 구역이야." + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "진정해. 난 너에게 해코지할 생각이 없어." @@ -147138,29 +149415,29 @@ msgid "I don't care." msgstr "내가 알 바 아냐." #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "해줬으면 하는 일이 있어. 들어볼래?" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "또 해줬으면 하는 일이 있어. 들어볼래?" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "" +msgid "I have another job for you. Want to hear about it?" +msgstr "또 해줬으면 하는 일이 있어. 들어볼래?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "더 시킬 일은 없어." +msgid "I just have one job for you. Want to hear about it?" +msgstr "해줬으면 하는 일이 있어. 들어볼래?" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "너한테 시킬 일 없어." +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "더 시킬 일은 없어." + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -147170,6 +149447,10 @@ msgstr "오. 알았어." msgid "Never mind, I'm not interested." msgstr "아무것도 아냐, 난 관심 없어." +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "무슨 일?" @@ -147178,10 +149459,6 @@ msgstr "무슨 일?" msgid "What about it?" msgstr "이건 어때?" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "내가 하지!" @@ -147390,10 +149667,6 @@ msgstr "흠, 알겠어." msgid "Thanks!" msgstr "고마워!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "" @@ -147418,6 +149691,10 @@ msgstr "너무 목말라, 뭔가 마실 것좀 주겠어?" msgid "I must focus on the road!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "" @@ -147522,10 +149799,6 @@ msgstr "아니, 우린 여기 있어도 괜찮을거야." msgid "On second thought, never mind." msgstr "다시 생각해봤어. 신경 쓰지마." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "" @@ -147538,6 +149811,10 @@ msgstr "시간을 좀 줘, 나중에 새로운 걸 보여 줄게..." msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "시발 안되지, 그랬다간 뒤쳐질거라고!" @@ -148209,8 +150486,8 @@ msgid "How are you alive?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" -msgstr "대재앙 전에 뭐 했어?" +msgid "What did you do before the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -148439,32 +150716,32 @@ msgid "This is a season spring test response." msgstr "This is a season spring test response." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." -msgstr "This is a days since cataclysm 30 test response." +msgid "This is a days since Cataclysm 30 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season summer test response." msgstr "This is a season summer test response." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." -msgstr "This is a days since cataclysm 120 test response." +msgid "This is a days since Cataclysm 120 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season autumn test response." msgstr "This is a season autumn test response." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." -msgstr "This is a days since cataclysm 210 test response." +msgid "This is a days since Cataclysm 210 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season winter test response." msgstr "This is a season winter test response." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." -msgstr "This is a days since cataclysm 300 test response." +msgid "This is a days since Cataclysm 300 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a is day test response." @@ -148980,7 +151257,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" @@ -149305,7 +151582,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" +msgid "What did you do when you found out about the Cataclysm?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -150497,7 +152774,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" #: lang/json/talk_topic_from_json.py @@ -151723,7 +154000,7 @@ msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -151762,7 +154039,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "" @@ -151794,8 +154071,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -151822,7 +154099,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -151843,14 +154120,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -151863,7 +154140,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -151893,7 +154170,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -151903,7 +154180,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -151928,7 +154205,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -151981,7 +154258,7 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -151994,7 +154271,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" @@ -152035,8 +154312,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -152065,6 +154342,12 @@ msgstr "" msgid "Where is your brother's place?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "" @@ -152129,6 +154412,10 @@ msgid "" " a forage set up." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "" @@ -152452,14 +154739,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." +"Sir, I don't know how the hell you got down here but if you have any sense " +"you'll get out while you can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Sir, I don't know how the hell you got down here but if you have any sense " -"you'll get out while you can." +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." msgstr "" #: lang/json/talk_topic_from_json.py @@ -152880,12 +155167,12 @@ msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "내가 너에게 판지가 있나고 물었나, 친구? 가지고있어?" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -153663,11 +155950,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" -"정말 역겹지? 대재앙이 일어난 이후 몸 구석구석에 털이 나기 시작했어. 무슨 이유때문인지 모르겠고 이것들만 보고 있으면 느낌이 꼭 배 " -"밑에 자라는 음모같다니까. 정말 짜증나 죽겠어." #: lang/json/talk_topic_from_json.py msgid "" @@ -153723,7 +156008,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" @@ -154269,7 +156554,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -156399,14 +158684,14 @@ msgstr "얌전히 있지 않으면 따끔한 맛을 보게 될 거야." msgid "Just on watch, move along." msgstr "그냥 경비서는 중이야, 갈 길 가라고." -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "부인, 밖으로 나가시면 위험합니다." - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "밖에선 꽤 먹고 살기 힘들지?" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "부인, 밖으로 나가시면 위험합니다." + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "" @@ -157625,7 +159910,7 @@ msgstr "널 고용하고 싶어." #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" @@ -157988,7 +160273,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -158007,7 +160292,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" @@ -158021,8 +160306,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" #: lang/json/talk_topic_from_json.py @@ -158045,8 +160330,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" #: lang/json/talk_topic_from_json.py @@ -158059,9 +160344,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158077,9 +160362,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -158108,15 +160393,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "흥미롭군..." +msgid "Interesting…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -158125,7 +160410,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I see..." +msgid "I see…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -158135,8 +160420,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "흠..." +msgid "Hmm…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -158145,7 +160430,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alright..." +msgid "Alright…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -158153,8 +160438,8 @@ msgid "Not at the moment, check back later perhaps." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Sure..." -msgstr "물론..." +msgid "Sure…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Are you part of the rescue team?" @@ -158173,7 +160458,7 @@ msgid "So are you busting us out of here or what?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." +msgid "Hold tight, . I've got to clear a path." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161865,6 +164150,15 @@ msgstr "" msgid "A closed metal gate." msgstr "" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "" @@ -163597,14 +165891,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "휘발유 탱크" +msgid "fuel tank" +msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "박살난 가스 펌프" @@ -165370,6 +167673,27 @@ msgstr "소형 금속 지지대" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "창문" @@ -165741,8 +168065,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -165756,7 +168080,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -166109,7 +168433,7 @@ msgstr "" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "없음" @@ -166815,7 +169139,7 @@ msgstr "아이스크림 카트" msgid "Luggage Cart" msgstr "수하물 카트" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "쇼핑카트" @@ -169939,8 +172263,8 @@ msgstr "LACP 레이저 터렛" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" #. ~ Description for gel shooter @@ -170665,6 +172989,10 @@ msgstr "비타민 C" msgid "Toxins" msgstr "" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "" + #: src/action.cpp src/input.cpp msgid "Press " msgstr " " @@ -171139,6 +173467,12 @@ msgstr "%s의 재장전을 할 수 없다." msgid "You reload the %s." msgstr "%s의 재장전을 했다." +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -172025,6 +174359,10 @@ msgstr "" msgid "The required items are not available to complete this task." msgstr "" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -172433,6 +174771,10 @@ msgstr "" msgid "spoilage" msgstr "부패" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -174435,6 +176777,44 @@ msgstr "" msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "손에 들고 있는 것이 없다." + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "" + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "덤불을 먹었다." + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "너무 배불러서 풀을 뜯어먹을 수 없다." + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "풀을 뜯어먹었다." + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "" + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "" + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "" + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "빈 %s을(를) 그 자리에 놔뒀다." + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "" @@ -174472,6 +176852,14 @@ msgstr "" msgid "You can't muster up the effort to throw anything…" msgstr "" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "내용물 회수" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "회수할 것이 없다." + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -175342,15 +177730,13 @@ msgstr "" #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" #: src/bionics.cpp @@ -177868,8 +180254,8 @@ msgstr "현재 상태에선 먹을 수 없다." msgid "This is full of dirt after being on the ground." msgstr "" -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "수중에선 할 수 없다." @@ -178740,11 +181126,11 @@ msgstr "일괄 제작시 시간절약:%s" msgid "Dark craftable? %s" msgstr "" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "쉬움" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "어려움" @@ -179233,6 +181619,10 @@ msgstr "" msgid "Test weather" msgstr "" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "" @@ -179435,7 +181825,7 @@ msgstr "수집성: %d" msgid "Altruism: %d" msgstr "이타성: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "필요:" @@ -180118,385 +182508,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "지도를 생성하는 동안 기다려주세요 [ 0%% ]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "잠잘 필요가 없습니다!" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "디펜스 모드에서는 저장할 수 없습니다!" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "%s을(를) 내버려두고 떠날 수는 없습니다!" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "%d 번의 웨이브에서 살아남았습니다!" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "지도를 생성하는 동안 기다려주세요 [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "이전 설정" - -#: src/defense.cpp -msgid "Next option" -msgstr "다음 설정" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "설정값 전환" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "설정 전환" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "최소한 하나의 몬스터 그룹을 지정해야 합니다!" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "특수 좀비" - -#: src/defense.cpp -msgid "Zombies" -msgstr "좀비" - -#: src/defense.cpp -msgid "Triffids" -msgstr "트리피드" - -#: src/defense.cpp -msgid "Robots" -msgstr "로봇" - -#: src/defense.cpp -msgid "Subspace" -msgstr "아공간의 적" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "식량" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "용병" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "디펜스 모드" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "방향키로 전환, 엔터키로 선택" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "시나리오:" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "장소:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "시작 난이도:" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "처음 웨이브의 난이도" - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "웨이브 난이도:" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "매 웨이브의 난이도 상승량" - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "웨이브의 시간 간격:" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "웨이브 간의 분당 간격." - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "상단 간 웨이브 수:" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "행상인이 몇 웨이브마다 나오는지." - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "시작 현금:" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "시작시 소지하는 현금의 양" - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "첫 웨이브시의 현금" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "첫 웨이브 생존시 보상 현금" - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "현금 증가:" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "매 웨이브마다 증가하는 보상의 양" - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "적 선택:" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "커스텀" - -#: src/defense.cpp -msgid "Medium" -msgstr "보통" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "새벽의 황당한 저주" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "새벽의 저주" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "여덟발 달린 공포" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "트리피드의 날" - -#: src/defense.cpp -msgid "Skynet" -msgstr "스카이넷" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "크툴루의 부름" - -#: src/defense.cpp -msgid "A custom game." -msgstr "커스텀 게임." - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "약한 괴물들과 많은 돈." - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "적들이 강해집니다. 식사를 해야 합니다." - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "모든 적들이 나옵니다. 식사와 갈증 모두 해결해야 합니다." - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "고전 좀비들에 대항해 바를 지켜야 합니다. 쉽고 재미있습니다." - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "클래식 좀비물: 더 느리게, 더 사실적이게." - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "엄청 빠른 거미들과 싸우는 맛!" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "트리피드에 맞서 저택을 지키십시오." - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "로봇들이 사람을 적이라고 결정했습니다!" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "무시무시한 군세를 막아내십시오." - -#: src/defense.cpp -msgid "Public Works" -msgstr "토목 공사장" - -#: src/defense.cpp -msgid "Megastore" -msgstr "초대형 상점" - -#: src/defense.cpp -msgid "Bar" -msgstr "주점" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "입구 하나에 방이 많습니다. 의약품이 어느정도 있습니다." - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "" - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "대형건물이며 다양한 물품이 있습니다." - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "소형 건물이며 주류가 풍부합니다." - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "정말 아무것도 사지 않겠습니까?" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "이 물건들을 구입할 돈이 없습니다!" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "물품 약간을 버렸다." - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "근접 무기" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "원거리 무기" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "제작 & 건설용 부품/자재" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "음식 & 의약품" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "의류 & 보호구" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "도구, 덫 & 수류탄" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "? 를 눌러 도움말" - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "%d 번째 웨이브를 환영합시다!" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "웨이브 %d: " - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "%s의 침략!" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "%s의 공격!" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "%s이(가) 공격해온다!" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "지옥에서 온 %s 이(가) 온다!" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "%s 의 날!" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "%s의 복수!" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "%s이(가) 몰려온다!" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -181061,53 +183072,53 @@ msgstr "" #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "체력 +%d; " +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "체력 %d; " +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "민첩성 +%d; " +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "민첩성 %d; " +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "지각력 +%d; " +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "지각력 %d; " +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "지능 +%d; " +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "지능 %d; " +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "속도 +%d; " +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "속도 %d; " +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -182092,7 +184103,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -182721,7 +184733,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -182926,7 +184939,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -183184,6 +185198,26 @@ msgstr "" msgid "(You wonder if your companions are fit to work on their own…)" msgstr "" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -183950,7 +185984,8 @@ msgstr "" msgid "Without extra fuel it will burn for between %s to %s." msgstr "" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "" @@ -184444,40 +186479,6 @@ msgstr "" msgid "%s helps with this task…" msgstr "" -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "" - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "덤불을 먹었다." - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "너무 배불러서 풀을 뜯어먹을 수 없다." - -#: src/game.cpp -msgid "You eat the grass." -msgstr "풀을 뜯어먹었다." - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "" - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "" - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "" - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "빈 %s을(를) 그 자리에 놔뒀다." - #: src/game.cpp msgid "Change side for item" msgstr "물품 착용방향 바꾸기" @@ -184506,6 +186507,11 @@ msgstr "%s은(는) 이미 가득 차 있다!" msgid "You can't reload a %s!" msgstr "%s을(를) 장전할 수 없다!" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "" + #: src/game.cpp msgid "Reload item" msgstr "내용물 넣기" @@ -184514,18 +186520,6 @@ msgstr "내용물 넣기" msgid "You have nothing to reload." msgstr "장전할 것이 없다." -#: src/game.cpp -msgid "Unload item" -msgstr "내용물 회수" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "회수할 것이 없다." - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "손에 들고 있는 것이 없다." - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -184610,6 +186604,13 @@ msgstr "잡은 물체를 찾을 수 없다." msgid "You cannot board a vehicle whilst riding." msgstr "" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "" @@ -185265,11 +187266,6 @@ msgstr "물품 단축키 상태: %d/ msgid "Your inventory is empty." msgstr "소지품이 하나도 없다." -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "%s이(가) 없다." - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "방해도" @@ -185408,8 +187404,8 @@ msgid "CBM" msgstr "CBM" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "전력" +msgid "ENERGY (kJ)" +msgstr "" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -185633,13 +187629,13 @@ msgstr "물품 집어넣기" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" -msgstr "%s에 집어넣을 무기 선택" +msgid "Choose an item to put into your %s" +msgstr "" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." -msgstr "%s에 집어넣을 수 있는 무기가 없다." +msgid "You have no items you could put into your %s." +msgstr "" #: src/game_inventory.cpp src/iuse.cpp msgid "Cut up what?" @@ -185877,6 +187873,397 @@ msgstr "튜토리얼" msgid "Defense" msgstr "디펜스" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "지도를 생성하는 동안 기다려주세요 [ 0%% ]" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "잠잘 필요가 없습니다!" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "디펜스 모드에서는 저장할 수 없습니다!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "%s을(를) 내버려두고 떠날 수는 없습니다!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "%d 번의 웨이브에서 살아남았습니다!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "지도를 생성하는 동안 기다려주세요 [%2d%%]" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "이전 설정" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "다음 설정" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "설정값 전환" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "설정 전환" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "최소한 하나의 몬스터 그룹을 지정해야 합니다!" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "특수 좀비" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "좀비" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "트리피드" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "로봇" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "아공간의 적" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "식량" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "용병" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "디펜스 모드" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "시나리오:" + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "장소:" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "시작 난이도:" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "처음 웨이브의 난이도" + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "웨이브 난이도:" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "매 웨이브의 난이도 상승량" + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "웨이브의 시간 간격:" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "웨이브 간의 분당 간격." + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "상단 간 웨이브 수:" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "행상인이 몇 웨이브마다 나오는지." + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "시작 현금:" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "시작시 소지하는 현금의 양" + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "첫 웨이브시의 현금" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "첫 웨이브 생존시 보상 현금" + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "현금 증가:" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "매 웨이브마다 증가하는 보상의 양" + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "적 선택:" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "커스텀" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "보통" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "새벽의 황당한 저주" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "새벽의 저주" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "여덟발 달린 공포" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "트리피드의 날" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "스카이넷" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "크툴루의 부름" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "커스텀 게임." + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "약한 괴물들과 많은 돈." + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "적들이 강해집니다. 식사를 해야 합니다." + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "모든 적들이 나옵니다. 식사와 갈증 모두 해결해야 합니다." + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "고전 좀비들에 대항해 바를 지켜야 합니다. 쉽고 재미있습니다." + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "클래식 좀비물: 더 느리게, 더 사실적이게." + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "엄청 빠른 거미들과 싸우는 맛!" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "트리피드에 맞서 저택을 지키십시오." + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "로봇들이 사람을 적이라고 결정했습니다!" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "무시무시한 군세를 막아내십시오." + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "토목 공사장" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "초대형 상점" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "주점" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "입구 하나에 방이 많습니다. 의약품이 어느정도 있습니다." + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "대형건물이며 다양한 물품이 있습니다." + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "소형 건물이며 주류가 풍부합니다." + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "정말 아무것도 사지 않겠습니까?" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "이 물건들을 구입할 돈이 없습니다!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "물품 약간을 버렸다." + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "근접 무기" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "원거리 무기" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "제작 & 건설용 부품/자재" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "음식 & 의약품" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "의류 & 보호구" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "도구, 덫 & 수류탄" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "? 를 눌러 도움말" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "%d 번째 웨이브를 환영합시다!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "웨이브 %d: " + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "%s의 침략!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "%s의 공격!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "%s이(가) 공격해온다!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "지옥에서 온 %s 이(가) 온다!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "%s 의 날!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "%s의 복수!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "%s이(가) 몰려온다!" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "존 스미스" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "어릿광대 몇몇이 앞에 있습니다!" @@ -186224,6 +188611,10 @@ msgstr "" msgid "You may want to deactivate these before you sleep." msgstr "자기 전에 이것들을 꺼두는 것이 좋습니다." +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -191130,7 +193521,7 @@ msgstr "%1$s에 %2$s을(를) 더이상 넣을 수 없다." msgid "That %s doesn't have room to expand." msgstr "그 %s은(는) 더이상 확장할 공간이 없다." -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%d x %s" @@ -191213,69 +193604,6 @@ msgstr "" msgid "Your %s disappears!" msgstr "" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "가죽이 벗겨진 %s 시체" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "%s 시체" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%s %s 시체" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -191289,6 +193617,21 @@ msgid "%s blood" msgid_plural "%s blood" msgstr[0] "%s의 혈액" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "이 일을 할 수 있는 물건을 갖고있지 않다." @@ -191865,7 +194208,7 @@ msgstr "" msgid "Modify what?" msgstr "무엇을 개조합니까?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "그 물품을 갖고 있지 않다!" @@ -192916,6 +195259,10 @@ msgstr "지뢰 찾기" msgid "Lights on!" msgstr "불 켜기!" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -193338,10 +195685,6 @@ msgstr "" msgid "You need a mechanics skill of 2 to use this repair kit." msgstr "이 수리도구를 사용하려면 기계공학 기술이 2 이상 필요하다." -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "수리할 화기를 고르세요." - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "그것은 총기가 아니다!" @@ -193392,23 +195735,6 @@ msgstr "호환되는 도구가 없다." msgid "You cancel unloading the tool." msgstr "도구의 내용물을 회수하는 걸 그만두었다." -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "보이질 않아 수리할 수 없다!" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "이 수리도구를 사용하려면 제작 기술이 1 이상 필요하다." - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "수리할 물품 선택" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "%s을(를) 강화했다." - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "" @@ -193656,31 +195982,6 @@ msgstr "실수로 펌웨어 프로텍트를 건드리는 바람에 메모리 카 msgid " on " msgstr "" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -194477,6 +196778,14 @@ msgid "" " but best to stop messing with it." msgstr "멀티쿠커를 어설프게 손보다가 거의 부숴버렸다! 다행히 아직 동작하긴 하지만 이제 그만 망치는게 좋을 것 같다." +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "" + #: src/iuse.cpp msgid "Using cable:" msgstr "케이블 사용:" @@ -194505,14 +196814,6 @@ msgstr "" msgid "You attach the cable to the solar pack." msgstr "" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "" @@ -196994,12 +199295,9 @@ msgid "Congratulations, you won!" msgstr "축하합니다. 당신은 이겼습니다!" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "최대:" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "최소:" +#, c-format +msgid "Min: %d Max: %d" +msgstr "" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -197844,6 +200142,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "빠른 시작!()" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" + #: src/main_menu.cpp msgid "No templates found!" msgstr "템플릿이 없습니다!" @@ -198071,6 +200397,14 @@ msgstr "" msgid "DANGER! MINEFIELD!" msgstr "" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -198203,20 +200537,9 @@ msgid "You're violently teleported!" msgstr "급격하게 순간이동이 되었다!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "벌에 쏘였다!" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "벌에 여러번 쏘였다!" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "벌에 많이 쏘였다!" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "벌에 전신이 다 쏘였다!" +#, c-format +msgid "The bees sting you in %s!" +msgstr "" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -198379,6 +200702,16 @@ msgid "Skill" msgid_plural "Skills" msgstr[0] "" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "요구" @@ -203185,6 +205518,10 @@ msgstr "산으로 덮인 %s 때문에 손이 타는듯 아프다!" msgid "Acid sprays out of %s as it is hit!" msgstr "%s은(는) 산을 내뿜었다!" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" + #: src/monexamine.cpp msgid "zombie slave" msgstr "노예 좀비" @@ -206101,8 +208438,9 @@ msgid "I have news." msgstr "말해줄게 있어." #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "좋아, 훈련을 다시 시작하자고 " +#, c-format +msgid "Yes, let's resume training %s" +msgstr "" #: src/npctalk.cpp #, c-format @@ -206800,6 +209138,16 @@ msgid "" "weight limit." msgstr "이 설정을 끄면 무게 제한을 넘기는 물품을 획득 순서에 따라 자동으로 떨어트립니다." +#: src/options.cpp +msgid "Dangerous running" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" + #: src/options.cpp msgid "Safe mode" msgstr "안전모드" @@ -208995,7 +211343,7 @@ msgstr "단어 검색:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" @@ -209435,6 +211783,10 @@ msgstr "" msgid "Heat :" msgstr "" +#: src/panels.cpp +msgid "Deaf!" +msgstr "귀먹음!" + #: src/panels.cpp msgid "Underground" msgstr "지하" @@ -209493,10 +211845,6 @@ msgstr "" msgid "Lighting:" msgstr "밝기:" -#: src/panels.cpp -msgid "Deaf!" -msgstr "귀먹음!" - #: src/panels.cpp msgid "Weapon :" msgstr "" @@ -210517,6 +212865,11 @@ msgstr "어느 부분을 수리합니까?" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -210968,77 +213321,74 @@ msgstr "속도" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "수영 행동 포인트 소모 %+d. " +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "달리기 행동 포인트 소모 %+d. " +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "재장전 행동 포인트 소모 %+d. " +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "근접/투척 공격 행동 포인트 소모 %+d. " +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "회피 기술 %+.1f. " +msgid "Dodge skill: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "근접 공격 보정치 %+d%%. " +msgid "Melee attack rolls: %+d%%\n" +msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." -msgstr "머리 방해도는 얼마나 입을 수 있는가에만 영향을 주며, 다른 효과는 없다." +"Head encumbrance has no effect; it simply limits how much you" +" can put on." +msgstr "" #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"함정을 찾거나 원거리 무기를 발사할 때 지각력 %+d;\n" -"물건을 던질 때 분산도 %+d." #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "입을 가리면 숨 쉬기가 어려워지며, 숨을 돌리기 힘들어진다." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." -msgstr "팔 방해도는 근접 공격의 지구력 소모와 원거리 무기의 정확도에 영향을 끼친다." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." +msgstr "" #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "물건을 다루거나 조작하는 속도가 줄어든다.\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "물건을 던질 때 민첩성 %+.1f;\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "%.1f만큼 총기 조준 속도 감소." +msgid "Reduced gun aim speed: %.1f" +msgstr "" #: src/player_display.cpp msgid "" @@ -211134,8 +213484,8 @@ msgstr "" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" #: src/player_display.cpp @@ -211876,6 +214226,16 @@ msgstr "%s이(가) 찰칵거리는 소리와 함께 불발되었다!" msgid "'s %s misfires with a muffled click!" msgstr "의 %s이(가) 찰칵거리는 소리와 함께 불발되었다!" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -211916,6 +214276,16 @@ msgstr "" msgid "'s %s is damaged by their shot!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -212114,6 +214484,10 @@ msgstr "정밀 조준" msgid "[%c] to take precise aim and fire." msgstr "" +#: src/ranged.cpp +msgid "turrets" +msgstr "터렛" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -212536,7 +214910,7 @@ msgstr "소리! %s" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." +msgid "From your position you hear %1$s" msgstr "" #: src/sounds.cpp @@ -213630,18 +216004,6 @@ msgid "%s emits an IFF warning beep." msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "존 스미스" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" - #: src/veh_interact.cpp msgid "Select part" msgstr "부품 선택" @@ -215930,6 +218292,10 @@ msgstr "쨍쨍함" msgid "Cloudy" msgstr "흐림" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "" + #: src/weather_data.cpp msgid "Drizzle" msgstr "가랑비" diff --git a/lang/po/pl.po b/lang/po/pl.po index 8976e486a350f..7dc2353df7bdb 100644 --- a/lang/po/pl.po +++ b/lang/po/pl.po @@ -6,15 +6,15 @@ # Faalagorn, 2019 # Artur Gromek , 2019 # Brett Dong , 2019 -# Ewa Cichosz , 2019 # Chris Bittner , 2019 +# Ewa Cichosz , 2019 # Aleksander Sienkiewicz , 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Aleksander Sienkiewicz , 2019\n" "Language-Team: Polish (https://www.transifex.com/cataclysm-dda-translators/teams/2217/pl/)\n" @@ -1816,8 +1816,8 @@ msgstr "detergent" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." -msgstr "Popularny przed kataklizmem proszek do prania." +msgid "A popular pre-Cataclysm washing powder." +msgstr "" #: lang/json/AMMO_from_json.py msgid "soap flakes" @@ -2154,6 +2154,19 @@ msgstr[3] "nafta" msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "Lekkie, płonące czystym płomieniem paliwo do lamp." +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -2331,6 +2344,69 @@ msgstr "" "wyspecjalizowanego sprzętu medycznego, zatem nie może być ręcznie " "zaaplikowany." +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "40mm flara" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "" +"40 milimetrowa flara sygnałowa. Płonie jasnym ogniem przez około minutę, a " +"wytworzony dym może zapewnić tymczasową zasłonę." + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "" +"40 milimetrowy granat ogłuszający. Detonuje uderzając światłem i dźwiękiem, " +"ogłuszając i oślepiając cele, powodując ich tymczasową dezorientację." + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "40mm zapalający" +msgstr[1] "40mm zapalający" +msgstr[2] "40mm zapalający" +msgstr[3] "40mm zapalający" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "" +"40 milimetrowy granat zapalający wypełniony niewielkim ładunkiem napalmu " +"powodującym wybuch płomieni." + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40mm dymny" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "Granat 40mm przeznaczony do kładzenia zapory dymnej." + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "" @@ -3211,142 +3287,132 @@ msgid ".40 S&W JHP, reloaded" msgstr "" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40mm granat" +msgid "40x46mm grenade" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "40mm gumowe" +msgid "40x46mm M1006" +msgstr "" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40mm wstrząsowy" +msgid "40x46mm M433" +msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "40 milimetrowy granat załadowany wybuchającym ładunkiem wstrząsowym." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "40mm flara" +msgid "40x46mm M576" +msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." msgstr "" -"40 milimetrowa flara sygnałowa. Płonie jasnym ogniem przez około minutę, a " -"wytworzony dym może zapewnić tymczasową zasłonę." #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "40mm ogłuszający" +msgid "40x46mm M651" +msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" msgstr "" -"40 milimetrowy granat ogłuszający. Detonuje uderzając światłem i dźwiękiem, " -"ogłuszając i oślepiając cele, powodując ich tymczasową dezorientację." #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "40mm strzałkowy" +msgid "40x46mm buckshot" +msgstr "" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." msgstr "" -"40-milimetrowy pocisk załadowany dużą liczbą przebijających pancerz " -"strzałek." #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40mm odłamkowy" +msgid "40x46mm slug" +msgstr "" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." msgstr "" -"40 milimetrowy granat odłamkowy wypełniony materiałem wybuchowym otoczonym " -"prefabrykowanymi odłamkami (szrapnelami)." #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "40mm zapalający" -msgstr[1] "40mm zapalający" -msgstr[2] "40mm zapalający" -msgstr[3] "40mm zapalający" +msgid "40x46mm flechette" +msgstr "" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" msgstr "" -"40 milimetrowy granat zapalający wypełniony niewielkim ładunkiem napalmu " -"powodującym wybuch płomieni." #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "40mm śrutowy" +msgid "40x53mm M1001" +msgstr "" + +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "" -#. ~ Description for 40mm buckshot +#: lang/json/AMMO_from_json.py +msgid "40x53mm M430A1" +msgstr "" + +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40mm dymny" +msgid "40x53mm buckshot" +msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "Granat 40mm przeznaczony do kładzenia zapory dymnej." +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "40mm gaz łzawiący" -msgstr[1] "40mm gaz łzawiący" -msgstr[2] "40mm gaz łzawiący" -msgstr[3] "40mm gaz łzawiący" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." msgstr "" -"40 milimetrowy granat wypełniony gazem łzawiącym. Wybucha kłębem wysoce " -"obezwładniającego gazu." #: lang/json/AMMO_from_json.py -msgid "40mm slug" +msgid "40x53mm flechette" msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." msgstr "" #: lang/json/AMMO_from_json.py @@ -5245,11 +5311,9 @@ msgstr[3] "srebro" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "" -"Miękki połyskliwy metal. Przed kataklizmem byłby wart niemało, ale obecnie " -"jego wartość drastycznie zmalała." #: lang/json/AMMO_from_json.py msgid "small metal sheet" @@ -5843,15 +5907,6 @@ msgstr "Garść lotek, strzałek lub rzutek. Posłużą jako amunicja do dmuchaw msgid "plutonium cell" msgstr "ogniwo plutonowe" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "" -"Ładunek baterii wolny jak elektron. Można nim naładować akumulatorki, ale " -"nie można ich wyładować." - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5920,7 +5975,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" @@ -6520,20 +6575,6 @@ msgid "" "Hefty round projectiles cast from lead, useful as ammunition for slings." msgstr "Masywne okrągłe pociski do procy wytłoczone z ołowiu." -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "kościany bełt" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "" -"Zaostrzony bełt wycięty z kości, z lotkami. Lekki i zapewnia przyzwoity " -"zasięg i obrażenia. Ma dobre szanse pozostać w całości po wystrzeleniu." - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -7083,10 +7124,8 @@ msgstr[3] "pokarm dla gluta" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" -"Amalgam różnych organicznych substancji, zawierających wszystko co glut " -"potrzebuje dla zdrowia. Tak myślisz..." #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -7550,11 +7589,9 @@ msgstr[3] "ubiór nomada" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "" -"Prowizoryczny ubiór z ubrań sprzed kataklizmu, przeznaczony do długich " -"wędrówek. Ma sporą przestrzeń w kieszeniach." #: lang/json/ARMOR_from_json.py msgid "light nomad gear" @@ -7567,13 +7604,10 @@ msgstr[3] "lekki ubiór nomada" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "" -"Prowizoryczny ubiór z ubrań sprzed kataklizmu, przeznaczony do długich " -"letnich wędrówek. Oferuje mniejszą przestrzeń na przedmioty i słabszą " -"ochronę niż zwykły ubiór nomada." #: lang/json/ARMOR_from_json.py msgid "plated leather armor" @@ -7648,11 +7682,9 @@ msgstr[3] "ubiór szabrownika" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." msgstr "" -"Solidny ubiór szabrownika z przerobionego sprzętu ochronnego sprzed " -"kataklizmu. Ma porą przestrzeń w kieszeniach." #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -12773,11 +12805,11 @@ msgstr "Masywne spodnie podbite miękkim ciepłym futrem." #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" -msgstr[0] "spodnie ze sztucznego futra" -msgstr[1] "spodnie ze sztucznego futra" -msgstr[2] "spodni ze sztucznego futra" -msgstr[3] "spodnie ze sztucznego futra" +msgid_plural "faux fur pants" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #. ~ Description for faux fur pants #: lang/json/ARMOR_from_json.py @@ -14878,11 +14910,11 @@ msgstr "Prosty biały zubon używany w sztukach walki." #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" -msgstr[0] "futerał na skrzypce" -msgstr[1] "futerał na skrzypce" -msgstr[2] "futerał na skrzypce" -msgstr[3] "futerał na skrzypce" +msgid_plural "violin cases" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #. ~ Description for violin case #: lang/json/ARMOR_from_json.py @@ -15677,12 +15709,9 @@ msgstr[3] "gigantyczne efekciarskie plecaki" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." msgstr "" -"Olbrzymi plecak uszyty z materiału, wyprodukowany zasadniczo jako żart przed" -" kataklizmem. Obecnie nadal wygląda śmiesznie, ale może pomieścić wiele " -"rzeczy." #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -17216,6 +17245,164 @@ msgstr "" "paskudnie, ale dają ten błysk. Dla uzyskania wyglądu wysokiej klasy raperów " "gangsta." +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -18264,6 +18451,636 @@ msgstr "" "Czarny błyszczący skórzany ogon obciążony małymi plastikowymi kulkami. Giba " "się za tobą gdy chodzisz." +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -18901,8 +19718,8 @@ msgstr[3] "" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" #: lang/json/ARMOR_from_json.py @@ -18916,10 +19733,10 @@ msgstr[3] "" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" #: lang/json/ARMOR_from_json.py @@ -18933,10 +19750,10 @@ msgstr[3] "" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" #: lang/json/ARMOR_from_json.py @@ -18950,7 +19767,7 @@ msgstr[3] "" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" @@ -18966,8 +19783,8 @@ msgstr[3] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" @@ -18982,7 +19799,7 @@ msgstr[3] "" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -19014,8 +19831,8 @@ msgstr[3] "" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" @@ -19031,8 +19848,8 @@ msgstr[3] "" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19046,8 +19863,8 @@ msgstr[3] "" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19061,9 +19878,9 @@ msgstr[3] "" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19078,7 +19895,7 @@ msgstr[3] "" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -19094,10 +19911,10 @@ msgstr[3] "" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -19127,11 +19944,11 @@ msgstr[3] "" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" @@ -19146,9 +19963,9 @@ msgstr[3] "" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -19164,10 +19981,10 @@ msgstr[3] "" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19182,9 +19999,9 @@ msgstr[3] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19198,15 +20015,15 @@ msgstr[3] "" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" +msgid_plural "C.R.I.T trousers" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -19215,15 +20032,15 @@ msgstr[3] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" @@ -19237,7 +20054,7 @@ msgstr[3] "" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19250,12 +20067,12 @@ msgstr[3] "" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -19264,8 +20081,8 @@ msgstr[3] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -19279,7 +20096,7 @@ msgstr[3] "" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" @@ -19294,7 +20111,7 @@ msgstr[3] "" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -19311,8 +20128,8 @@ msgstr[3] "" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19428,10 +20245,11 @@ msgstr[2] "" msgstr[3] "" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19442,13 +20260,6 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -19806,7 +20617,7 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" +msgid_plural "flesh pouches" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -19820,6 +20631,21 @@ msgid "" "minimize encumbrance." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -22048,13 +22874,13 @@ msgstr[3] "Generatory Przeładowania Jonowego CBM" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" -"Potężny generator energii jonowej wszczepiany w klatkę piersiową. Wywołuje " -"potężny, stale rozszerzający się podmuch energii. Powstały podmuch powoduje " -"zapłon tlenu, który podpala wszystko na swojej drodze i eksploduje u celu. " -"Używanie w bliskiej odległości jest bardzo odradzane." +"Potężny jonowy generator energii implantowano w twojej klatce piersiowej. " +"Strzela silną, stale rozszerzającą się falą energii, Strzał energii w " +"rezultacie rozpala tlen tworząc pożary na swej drodze, i powoduje eksplozje " +"przy trafieniu w cel. Używanie na krótkie dystanse jest mocno odradzane." #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py msgid "Blood Power Generator CBM" @@ -22627,6 +23453,8 @@ msgid "" "This binder of highly technical papers describes some new chemical formula, " "and its effects on human subjects. It's stamped \"APPROVED\"…" msgstr "" +"Ten segregator wysoce technicznych dokumentów opisuje pewne nowe wzory " +"chemiczne i ich wpływ na ludzi. Jest oznaczony „ZATWIERDZONY”…" #: lang/json/BOOK_from_json.py msgid "PE070 \"Raptor\": Proposal" @@ -22643,6 +23471,9 @@ msgid "" "\"PE065\". Scribbled notes throughout seem to think that it might work, but" " that there's no time." msgstr "" +"Ten plik dokumentów jest wysoce spekulacyjną propozycją skoncentrowaną na " +"„PE065”. Nagryzmolone notatki wydają się twierdzić, że to może zadziałać, " +"ale nie ma czasu." #: lang/json/BOOK_from_json.py msgid "Best Practices for Compound Delivery" @@ -22682,6 +23513,10 @@ msgid "" "pertinent to many technical disciplines. If poring over tables of chemical " "and physical data is your thing, this is the book for you." msgstr "" +"Ta ogromna książka w twardej oprawie jest zbiorem danych referencyjnych i " +"formuł odnoszących się do wielu dyscyplin technicznych. Jeśli lubisz " +"przeglądać tabele danych chemicznych i fizycznych, jest to książka dla " +"ciebie." #: lang/json/BOOK_from_json.py msgid "Ye Scots Beuk o Cuikery" @@ -22991,6 +23826,9 @@ msgid "" "specifications for various electronic materials. Some of the diagrams use " "symbols you've not seen before…" msgstr "" +"Ten masywny segregator zawiera wiele schematów i specyfikacji technicznych " +"dla różnych materiałów elektronicznych. Niektóre diagramy używają symboli, " +"których wcześniej nie widziałeś…" #: lang/json/BOOK_from_json.py msgid "2XI design binder-CLASSIFIED" @@ -23065,10 +23903,10 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "schematics generic" msgid_plural "schematics generics" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "ogólny schemat" +msgstr[1] "ogólne schematy" +msgstr[2] "ogólnych schematów" +msgstr[3] "ogólnych schematów" #. ~ Description for schematics generic #. ~ Description for animal @@ -23095,10 +23933,10 @@ msgstr[3] "nie powinieneś tego wiedzieć to błąd" #: lang/json/BOOK_from_json.py msgid "nurse bot schematics" msgid_plural "nurse bot schematics" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "schemat bot pielęgniarki" +msgstr[1] "schematy bota pielęgniarki" +msgstr[2] "schematów bota pielęgniarki" +msgstr[3] "schematów bota pielęgniarki" #. ~ Description for nurse bot schematics #: lang/json/BOOK_from_json.py @@ -24315,6 +25153,138 @@ msgstr "" "Olśniewająca kolekcja folkloru i podań opisująca popularną menażerię wróżek," " krasnoludków i trolli." +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -24843,8 +25813,8 @@ msgstr[3] "powieść erotyczna" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." -msgstr "Oklepana narracja będąca fasadą niskich lotów erotyce literackiej." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." +msgstr "" #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -25669,7 +26639,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" @@ -27468,19 +28438,10 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" -"Ulotka na cukierku. Pokazuje zdjęcie lśniącego człowieka z gładkiego cukierka, który patrzy na ciebie z przerażeniem. „SugarKin jest pierwszym ludzkim cukierkiem naturalnej wielkości! Czy jesteś prawdziwym potworem? Czy będziesz w stanie go pożreć?”\n" -"  Na odwrocie ulotki widnieją pospiesznie nabazgrane słowa:\n" -"  „Witaj, moje dziecko, witaj w tym świecie. Świat, w którym będziesz mógł się rozwijać, jeśli będziesz przestrzegać kilku zasad:\n" -"1) Nigdy nie stykaj się z wodą, utopi Cię!\n" -"2) Unikaj ludzi o czystych oczach, są one bardzo niebezpieczne! (Możesz zignorować tych o czarnych oczach, które są dla ciebie nieszkodliwe).\n" -"3) Dowiedz się, jak zrobić maść karmelową, jest to jedyny sposób, aby naprawić swoje ciało, jeśli doznasz obrażeń.\n" -"  Jest wiele innych rzeczy, które chciałbym ci powiedzieć, ale muszę odejść, zanim będzie za późno. Uczyniłem cię przyjacielem, który dotrzyma ci towarzystwa, bądź dla niego miły.\n" -"  Kocham Cię,\n" -"  - F. ”." #: lang/json/BOOK_from_json.py msgid "The Weapons of Asgard" @@ -27511,12 +28472,9 @@ msgstr[3] "Przeprogramowywanie Robotów Dla Zabawy i Zysku" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" -"Książka o nielegalnym zdobywaniu, przeprogramowywaniu i modyfikowaniu " -"robotów. Zawiera mnóstwo pomocnych porad krok-po-kroku i przykładowe " -"schematy." #: lang/json/BOOK_from_json.py msgid "Popular Robotics" @@ -27763,6 +28721,19 @@ msgstr[3] "słona woda" msgid "Water with salt added. Not good for drinking." msgstr "Woda z solą. Nie nadaje się do picia." +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -28481,12 +29452,9 @@ msgstr[3] "bimber" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "" -"Tylko najmocniejszy, najczystszy, dobry stary bimber, destylowany z " -"kukurydzy i cukru. Gwarantowane zapomnienie o tym całym kataklizmie, lub " -"zwracamy wzrok." #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -28634,6 +29602,87 @@ msgstr[3] "single malt whiskey" msgid "Only the finest whiskey straight from the bung." msgstr "Tylko najlepsza whiskey prosto ze szpuntu." +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "wymyślny żul" @@ -29432,6 +30481,24 @@ msgstr[1] "suszone mięso" msgstr[2] "suszone mięso" msgstr[3] "suszone mięso" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "suszony mięśniak" +msgstr[1] "suszony mięśniak" +msgstr[2] "suszony mięśniak" +msgstr[3] "suszony mięśniak" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29455,25 +30522,32 @@ msgstr "" "Ryba suszona solą, która długo się nie psuje, ale wywołuje pragnienie." #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "suszony mięśniak" -msgstr[1] "suszony mięśniak" -msgstr[2] "suszony mięśniak" -msgstr[3] "suszony mięśniak" +msgid "smoked meat" +msgstr "wędzone mięso" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "" -"Solone i suszone mięso ludzkie, które długo się nie psuje ale wzmaga " -"pragnienie." +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "wędzone mięso" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -29501,19 +30575,6 @@ msgstr "" "Smaczna ryba, która była mocno wędzona dla długotrwałego przechowywania. " "Może być dalej wędzona dla pełnego odwodnienia." -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "wędzony drań" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "" -"Mocno uwędzony kawałek ludzkiego mięsa. Bardzo długo zachowa świeżość i " -"nieźle smakuje, jeśli ktoś lubi te rzeczy." - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -31118,8 +32179,8 @@ msgstr "ikra żyletoszpona" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." -msgstr "Zlepek jaj żyletoszpona. Postapokaliptyczny delikates." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -32597,14 +33658,14 @@ msgstr "" "może też trochę wołowiny." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" -msgstr[0] "nachos z serem" -msgstr[1] "nachos z serem" -msgstr[2] "nachos z serem" -msgstr[3] "nachos z serem" +msgid "cheese nachos" +msgid_plural "cheese nachos" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -32614,22 +33675,14 @@ msgstr "" " nieco mięsa dopełniłoby kompozycję." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" -msgstr[0] "nachos z mięsem" -msgstr[1] "nachos z mięsem" -msgstr[2] "nachos z mięsem" -msgstr[3] "nachos z mięsem" - -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "" -"Solone czipsy z kukurydzianej tortilli, teraz z dodatkiem mięsa. Może nieco " -"sera dopełniłoby kompozycję." +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" @@ -32638,15 +33691,34 @@ msgstr[1] "niño nachos" msgstr[2] "niño nachos" msgstr[3] "niño nachos" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." msgstr "" -"Solone czipsy z kukurydzianej tortilli teraz z dodatkiem ludzkiego mięsa. " -"Może nieco sera dopełniłoby kompozycję." +"Solone czipsy z kukurydzianej tortilli, teraz z dodatkiem mięsa. Może nieco " +"sera dopełniłoby kompozycję." + +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" @@ -32655,24 +33727,17 @@ msgstr[1] "niño nachos z serem" msgstr[2] "niño nachos z serem" msgstr[3] "niño nachos z serem" -#. ~ Description for niño nachos with cheese -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "" -"Solone czipsy z kukurydzianej tortilli z mielonym ludzkim mięsem i zatopione" -" w serze. Doskonałe." - +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "nachos z mięsem i serem" -msgstr[1] "nachos z mięsem i serem" -msgstr[2] "nachos z mięsem i serem" -msgstr[3] "nachos z mięsem i serem" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -32751,19 +33816,6 @@ msgstr[3] "chili dogi" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Hot dog serwowany z chilli con carne jako dodatek. Mniam!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "oszukane chili dogi" -msgstr[1] "oszukane chili dogi" -msgstr[2] "oszukane chili dogi" -msgstr[3] "oszukane chili dogi" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "Specjalny hot dog serwowany z dodatkiem chilli con carne. Mniam!" - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -32866,10 +33918,8 @@ msgstr[3] "surowe hot dogi" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." +"Cataclysm. It would taste much better prepared." msgstr "" -"Mocno przetworzona kiełbasa, powszechna na meczach baseballa przed " -"kataklizmem. Byłaby smaczniejsza przygotowana." #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -32920,6 +33970,28 @@ msgstr "" msgid "raw sausage" msgstr "surowa kiełbasa" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -32929,6 +34001,15 @@ msgstr "Swojska surowa kiełbasa, gotowa do wędzenia lub ugotowania." msgid "sausage" msgstr "kiełbasa" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -32938,24 +34019,20 @@ msgstr "Swojska kiełbasa wędzona dla długotrwałej zdatności do spożycia." msgid "cooked sausage" msgstr "gotowana kiełbasa" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "Swojska kiełbasa, która została ugotowana." -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "kiełbasa z cieniasa" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "" -"Gruba parówa wędzona dla dłuższej zdatności do spożycia. Bardzo smaczna, " -"jeśli gustujesz w ludzinie." - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -32977,6 +34054,25 @@ msgstr[1] "kiełbasa grillowa" msgstr[2] "kiełbasa grillowa" msgstr[3] "kiełbasa grillowa" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33062,6 +34158,16 @@ msgstr "" msgid "glazed tenderloins" msgstr "glazurowana polędwica" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33077,6 +34183,26 @@ msgstr "" msgid "currywurst" msgstr "kiełbasa curry" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33088,6 +34214,26 @@ msgstr "Gruba parówa w ketchupie curry. Pikantna i imponująca." msgid "aspic" msgstr "galareta" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33181,6 +34327,16 @@ msgstr "Pyszna złotobrązowa porcja chrupiącej smażonej rybki." msgid "lunch meat" msgstr "plastry mięsa" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33194,6 +34350,26 @@ msgstr "" msgid "bologna" msgstr "mortadela" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33264,6 +34440,25 @@ msgstr[1] "zupa gulaszowa" msgstr[2] "zupa gulaszowa" msgstr[3] "zupa gulaszowa" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "ludzka gulaszowa" +msgstr[1] "ludzka gulaszowa" +msgstr[2] "ludzka gulaszowa" +msgstr[3] "ludzka gulaszowa" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33277,6 +34472,26 @@ msgstr "" msgid "pemmican" msgstr "pemikan" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33292,6 +34507,25 @@ msgstr "" msgid "hamburger helper" msgstr "hamburgerowy pomocnik" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33318,6 +34552,24 @@ msgstr[1] "chili con carne" msgstr[2] "chili con carne" msgstr[3] "chili con carne" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -33397,14 +34649,30 @@ msgstr "Siekane małże w wodzie." msgid "clam chowder" msgstr "potrawka z małży" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." msgstr "" -"Delikatna biała zupa z kawałkami małży i ziemniaków. Smak utraconej chwały " -"Nowej Anglii." #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" @@ -33414,6 +34682,15 @@ msgstr[1] "fasolka po bretońsku" msgstr[2] "fasolka po bretońsku" msgstr[3] "fasolka po bretońsku" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -33427,6 +34704,15 @@ msgstr[1] "ryż smażony z mięsem" msgstr[2] "ryż smażony z mięsem" msgstr[3] "ryż smażony z mięsem" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -33440,6 +34726,16 @@ msgstr[1] "luksusowy ryż z fasolą" msgstr[2] "luksusowy ryż z fasolą" msgstr[3] "luksusowy ryż z fasolą" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33453,6 +34749,25 @@ msgstr "" msgid "meat pie" msgstr "placek z mięsem" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -33462,6 +34777,25 @@ msgstr "Pasztecik z mięsem, czyli upieczone ciasto z mięsnym nadzieniem." msgid "meat pizza" msgstr "pizza z mięsem" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33471,6 +34805,15 @@ msgstr "" "Mięsna pizza, specjalnie dla mięsożercy. Wypchana mielonym mięsem i mocno " "doprawiona." +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" @@ -33479,6 +34822,16 @@ msgstr[1] "luksusowa jajecznica" msgstr[2] "luksusowa jajecznica" msgstr[3] "luksusowa jajecznica" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33492,6 +34845,15 @@ msgstr "" msgid "canned meat" msgstr "puszkowane mięso" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "plastry pożywki" +msgstr[1] "plastry pożywki" +msgstr[2] "plastry pożywki" +msgstr[3] "plastry pożywki" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33505,6 +34867,15 @@ msgstr "" msgid "salted meat slice" msgstr "solone plastry mięsa" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -33518,6 +34889,25 @@ msgstr[1] "spaghetti bolognese" msgstr[2] "spaghetti bolognese" msgstr[3] "spaghetti bolognese" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -33527,6 +34917,26 @@ msgstr "Spaghetti pokryte gęstym mięsnym sosem. Mniam!" msgid "lasagne" msgstr "lazania" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33549,19 +34959,56 @@ msgstr "Po upieczeniu ta tuszonka stała się nawet całkiem smaczna." msgid "cheeseburger" msgstr "cheeseburger" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." +"Cataclysm culinary achievement." msgstr "" -"Kanapka z mielonym mięsem i serem wraz z przyprawami. Szczyt kulinarnych " -"osiągnięć sprzed kataklizmu." #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "hamburger" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -33571,6 +35018,25 @@ msgstr "Kanapka z mielonym mięsem i przyprawami." msgid "sloppy joe" msgstr "kanapka \"sloppy joe\"" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "kanapka z trepka" +msgstr[1] "kanapka z trepka" +msgstr[2] "kanapka z trepka" +msgstr[3] "kanapka z trepka" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33584,6 +35050,26 @@ msgstr "" msgid "taco" msgstr "taco" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33597,6 +35083,15 @@ msgstr "" msgid "pickled meat" msgstr "peklowane mięso" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33608,6 +35103,17 @@ msgstr "" msgid "dehydrated meat" msgstr "suszone mięso" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33638,6 +35144,17 @@ msgstr[1] "haggis" msgstr[2] "haggis" msgstr[3] "haggis" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33676,6 +35193,16 @@ msgstr[1] "mięsne temaki" msgstr[2] "mięsne temaki" msgstr[3] "mięsne temaki" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33715,6 +35242,16 @@ msgstr "" msgid "pelmeni" msgstr "pielmeni" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33727,6 +35264,15 @@ msgstr "" msgid "homemade burrito" msgstr "" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -33735,377 +35281,6 @@ msgid "" "but homemade and delicious!" msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "suszone mięso ludzkie" -msgstr[1] "suszone mięso ludzkie" -msgstr[2] "suszone mięso ludzkie" -msgstr[3] "suszone mięso ludzkie" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "" -"Suszone płaty ludzkiego mięsa. Odpowiednio przechowywane, to suche jedzenie " -"będzie zdatne do spożycia przez bardzo długi czas." - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "nawodnione mięso ludzkie" -msgstr[1] "nawodnione mięso ludzkie" -msgstr[2] "nawodnione mięso ludzkie" -msgstr[3] "nawodnione mięso ludzkie" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "" -"Namoczone suszone płaty ludzkiego mięsa, które dzięki nawodnieniu są " -"znacznie bardziej zjadliwe." - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "ludzki haggis" -msgstr[1] "ludzki haggis" -msgstr[2] "ludzki haggis" -msgstr[3] "ludzki haggis" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"Tradycyjne danie szkockie z ludzkiego mięsa i podrobów zmieszanych z " -"płatkami owsianymi, które są zaszywane w ludzkim żołądku i następnie " -"gotowane. Zaskakująco smaczne jak kto lubi takie rzeczy i pożywne, najlepiej" -" podawać z gotowanymi warzywami korzennymi i mocną whiskey." - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "morda-dela" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" -"Zakonserwowane i pokrojone ludzkie mięso. Jego pierwsze imię mogło brzmieć " -"Oskar. Możesz jeść je na zimno jak zimnokrwisty ludożerca, którym jesteś." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "kiełbasa z cieniasa curry" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "" -"Gruba parówa z ludzkiego mięsa w ketchupie curry. Pikantna i imponująca." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "ludzka gulaszowa" -msgstr[1] "ludzka gulaszowa" -msgstr[2] "ludzka gulaszowa" -msgstr[3] "ludzka gulaszowa" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "" -"Sucharki, kiełbasa z cieniasa i zupa grzybowa połączone razem w cudownie " -"tłuściutką mieszankę." - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "galareta z faceta" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "" -"Galareta z wywaru z ludzkich kości z zatopionymi w żelatynie ludzkim mięsem." -" Morderczo dobre, jeśli lubisz te rzeczy." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "pemikan z surwiwalisty" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "" -"Skoncentrowana mikstura z tłuszczu i białka, jako wysokoenergetyczna porcja " -"żywności. Składa się z łoju, jadalnych roślin i surwiwalisty, który nie miał" -" szczęścia." - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "kanapka z mięśniaka" -msgstr[1] "kanapka z mięśniaka" -msgstr[2] "kanapka z mięśniaka" -msgstr[3] "kanapka z mięśniaka" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "Chleb i mięsko z człeka. Niespodzianka!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "kanapka ciulux" -msgstr[1] "kanapki ciulux" -msgstr[2] "kanapek ciulux" -msgstr[3] "kanapek ciulux" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "" -"Kanapka z ludzkim mięsem, warzywami, serem i przyprawami. Pożyw się duszami " -"wrogów i zieleniną z ogródka!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "żulerski pomocnik" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "" -"Makaron z serem, z dodatkiem mielonego ludzkiego mięsa. Morderczo smaczne." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "chili con koleś" -msgstr[1] "chili con koleś" -msgstr[2] "chili con koleś" -msgstr[3] "chili con koleś" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "" -"Pikantna potrawka z papryczek chilli, ludzkiego mięsa, pomidorów i fasoli." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "placek z pasztetem" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -"Mięsny placek z żołnierza, naukowca, czy kogo tam jeszcze. Niebo w gębie." - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "pizza z pozera" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "" -"Mięsna pizza, specjalnie dla kanibali. Wypchana mielonym ludzkim mięsem i " -"mocno doprawiona." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "plastry pożywki" -msgstr[1] "plastry pożywki" -msgstr[2] "plastry pożywki" -msgstr[3] "plastry pożywki" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -"Niskosodowe konserwowe ludzkie mięso. Ugotowane i zapuszkowane. Zawiera " -"wszystkie składniki odżywcze, lecz nie pozostało wiele smaku gotowanego " -"mięsa." - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "solone plastry prostaka" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "" -"Plastry ludzkiego mięsa konserwowane w zalewie solankowej pakowane " -"próżniowo. Słone ale smaczne." - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "spaghetti ciuloneze" -msgstr[1] "spaghetti ciuloneze" -msgstr[2] "spaghetti ciuloneze" -msgstr[3] "spaghetti ciuloneze" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "Spaghetti pokryte gęstym sosem z ludzkiego mięsa. Mniam!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "lazania z Luigi" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "" -"Danie z tradycjami zrobione z kilku naprzemiennych warstw płatów makaronu, " -"sera, sosów i mięsa. Wsad nie był Włochem i nie nazywał się Luigi, ale czy " -"ktoś narzeka na dobre ludzkie mięsko? " - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "sero-kolo-burger" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "" -"Kanapka z mielonym ludzkim mięsem i serem wraz z przyprawami. Szczyt " -"kanibalistycznych kulinarnych osiągnięć po katakliźmie." - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "koloburger" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "" -"Ten burger zawiera w sobie więcej niż dopuszczalne przez sanepid 4% " -"ludzkiego mięsa." - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "kanapka z trepka" -msgstr[1] "kanapka z trepka" -msgstr[2] "kanapka z trepka" -msgstr[3] "kanapka z trepka" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "Kanapka to kanapka, tylko że ta jest z odrobiną ludzi." - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "jaco-taco" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -"Taco z mielonym ludzkim mięsem, w miejsce wołowiny. Wydaje ci się że w " -"oddali słychać dzwony." - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "surowa kiełbasa z cieniasa" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "" -"Swojska surowa kiełbasa z ludzkiego mięsa gotowa do wędzenia lub gotowania." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "gotowana kiełbasa z cieniasa" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "" -"Swojska gotowana kiełbasa z ludzkiego mięsa. Pachnie smakowicie jak to tylko" -" po ludzku możliwe." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "grillowa kiełbasa z cieniasa" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "" -"Rodzaj niemieckiej kiełbasy z drobno siekanego ludzkiego mięsa, którą " -"przyrządza się smażąc na patelni lub grillując. Najlepsza jest świeża na " -"gorąco. Wystarczy dowolny człowiek, ni musi to być Niemiec." - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "peklowany punk" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "" -"Porcja chrupiącego puszkowanego ludzkiego mięsa w słonej zalewie. Smaczne i " -"pożywne." - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -35051,11 +36226,8 @@ msgstr "smakowa tabletka z mączki kostnej" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" -"Domowy suplement wapnia z mączki kostnej. Ze względu na odrobinę słodyczy " -"wymieszanych w celu przeciwdziałania pudrowej konsystencji i smakowi " -"popiołu, jest prawie równie smaczna jak tabletki przed kataklizmem." #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -35731,7 +36903,7 @@ msgstr "ptasie serum" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" @@ -36740,12 +37912,9 @@ msgstr[3] "żelatyna z marloss" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" -"Kanarkowy w kolorze płyn który zastygł niemal jak galaretka sprzed " -"kataklizmu. Ma intensywny, zachęcający zapach, ale jest albo zmutowany albo " -"obcego pochodzenia." #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -37089,7 +38258,7 @@ msgstr[3] "psie żarcie" msgid "This is food for dogs. It smells strange, but dogs seem to love it." msgstr "To żarcie dla psów. Dziwnie pachnie, ale psom wydaje się smakować." -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "kocie żarcie" @@ -37098,7 +38267,7 @@ msgstr[2] "kocie żarcie" msgstr[3] "kocie żarcie" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "To żarcie dla kotów. Dziwnie pachnie, ale kotom wydaje się smakować." @@ -37144,6 +38313,11 @@ msgstr[3] "" msgid "Some nectar. Seeing this item is a bug." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "drink proteinowy" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" @@ -37152,64 +38326,21 @@ msgstr[1] "drink zielonej pożywki" msgstr[2] "drink zielonej pożywki" msgstr[3] "drink zielonej pożywki" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "" -"Przejrzysta mieszanka rafinowanych białek ludzkich i wody. Pożywna ale " -"niezbyt smaczna." - +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" -"Surowy rafinowany proszek białkowy zrobiony z przetworzonej ludzkiej tkanki." -" Pożywny, ale nie można się nim cieszyć w czystej formie, spróbuj raczej " -"rozpuścić w wodzie." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "szejk z zielonej pożywki" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "" -"Gęsty i smaczny napój z czystych rafinowanych białek ludzkich i pożywnych " -"owoców." - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "wzmocniony szejk z zielonej pożywki" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "" -"Gęsty i smaczny napój z czystych rafinowanych białek ludzkich i pożywnych " -"owoców. Wzbogacony dodatkowymi minerałami i witaminami." - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "drink proteinowy" - #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -37227,6 +38358,16 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -37237,15 +38378,10 @@ msgstr "" " czystej formie, spróbuj raczej rozpuścić w wodzie." #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -37261,6 +38397,15 @@ msgstr "" msgid "protein shake" msgstr "szejk proteinowy" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -37273,6 +38418,16 @@ msgstr "" msgid "fortified protein shake" msgstr "wzmocniony szejk proteinowy" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -38177,6 +39332,15 @@ msgstr[1] "kanapki delux" msgstr[2] "kanapek delux" msgstr[3] "kanapek delux" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -38287,6 +39451,26 @@ msgstr[1] "kanapki z mięsem" msgstr[2] "kanapek z mięsem" msgstr[3] "kanapek z mięsem" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "kanapka z mięśniaka" +msgstr[1] "kanapka z mięśniaka" +msgstr[2] "kanapka z mięśniaka" +msgstr[3] "kanapka z mięśniaka" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -39410,15 +40594,6 @@ msgstr "wywar z kości" msgid "A tasty and nutritious broth made from bones." msgstr "Smaczny i pożywny wywar z kości." -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "wywar z ludzkich kości" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "Smaczny i pożywny wywar z ludzkich kości." - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "zupa jarzynowa" @@ -39432,6 +40607,15 @@ msgstr "Pożywna i przepyszna w smaku solidna zupa z warzyw." msgid "meat soup" msgstr "zupa z mięsem" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -39467,6 +40651,15 @@ msgstr[1] "curry z mięsem" msgstr[2] "curry z mięsem" msgstr[3] "curry z mięsem" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -39476,20 +40669,20 @@ msgstr "Ostre, i pełne kawałków mięsa i papryki. Całkiem niezłe." msgid "woods soup" msgstr "zupa drwala" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "Pożywana i smaczna zupa z darów natury. Darz bór!" -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "zupa z trupa" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "Zupa zrobiona z kogoś kto jest lepszym posiłkiem niż człowiekiem." - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "rosół z kury" @@ -40710,17 +41903,6 @@ msgid "" " resembles spoiled milk." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "" @@ -40769,6 +41951,17 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "" @@ -40787,12 +41980,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" -"Superskoncentrowana czarna jak smoła substancja z srebrzystymi drobinkami " -"przypominającymi gwiaździste niebo. Potrzebujesz strzykawki, aby ją " -"wstrzyknąć ... jeśli naprawdę chcesz?" #: lang/json/COMESTIBLE_from_json.py msgid "wendigo mutagen" @@ -40806,12 +41996,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" -"Superskoncentrowana torfowobrązowa substancja z błyszczącymi zielonymi " -"drobinkami przypominającymi drzewo. Potrzebujesz strzykawki, aby ją " -"wstrzyknąć ... jeśli naprawdę chcesz?" #: lang/json/COMESTIBLE_from_json.py msgid "SpOreos" @@ -41064,19 +42251,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "żywiczny sznur" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "" -"Prymitywny materiał łączący, ze sznurka i naturalnego kleju. Użyj do naprawy" -" rzeczy z papieru, drewna, kości lub chityny." - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -41084,8 +42258,8 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -41111,10 +42285,8 @@ msgstr[3] "jagodokształtne anomalie" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "" -"Jeżeli zostawimy to w spokoju, jak być powinno, ktoś mógłby wejść w Wykwit " -"bez walki i czerpać z Owoców. Nie możemy na to pozwolić, czyż nie?" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -41128,10 +42300,8 @@ msgstr[3] "nasionokształtne anomalie" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "" -"Jeżeli zostawimy to w spokoju, jak być powinno, ktoś mógłby wejść w Ogród " -"bez walki i czerpać z Nasion. Nie możemy na to pozwolić, czyż nie?" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -41145,10 +42315,8 @@ msgstr[3] "żelatyna z marloss" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "" -"Jeżeli zostawimy to w spokoju, jak być powinno, ktoś mógłby wejść w Iglicę " -"bez walki i czerpać z Żywicy. Chwila, skąd to w ogóle WZIĄŁEŚ?" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -41161,12 +42329,9 @@ msgstr[3] "owocokształtne anomalie" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" -"W tej chwili nie istniejemy. Sprytny mały człowieczek, bez wątpienia " -"debuggował by to zobaczyć? Nie zezwolimy byś do nas dołączył gdy jesteśmy " -"modowane." #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -41307,10 +42472,8 @@ msgstr[3] "bezglutenowych kanapek z masłem orzechowym i miodem" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" -"Jakiś potępiony głupiec polał miodem kanapkę z masłem orzechowym. Kto u " -"zdrowych zmysłów... chwila, to jest całkiem dobre... I bezglutenowe!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free PB&M sandwich" @@ -41336,21 +42499,16 @@ msgstr "orzechowa ambrozja bez laktozy" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "" -"Przepyszna ambrozja z orzechów orzesznika. Napój godny bogów. Ta została " -"stworzona z alternatywy do krowiego mleka." #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "" -"Wydaje ci się, że jest to mąka kukurydziana... albo mąka ryżowa... Albo coś " -"innego. Ale na pewno nie jest to mąka pszenna! Jest za to przydatna do " -"pieczenia." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free johnnycake" @@ -41359,11 +42517,9 @@ msgstr "bezglutenowy naleśnik kukurydziany" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "" -"Wszyscy mamy czasem chętkę na ciasto. To nie jest idealne, ale jest pysznym " -"i pożywnym bezglutenowym chlebowym smażonym przysmakiem." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit pancake" @@ -41411,12 +42567,9 @@ msgstr[3] "bezglutenowych naleśników bez laktozy z owocami" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" -"Puszyste naleśniki zrobione z rzeczy które jeszcze możesz jeść. Ale za to są" -" z prawdziwym syropem klonowym, wypełnione słodkimi i zdrowymi kawałkami " -"owoców." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free chocolate pancake" @@ -41463,12 +42616,9 @@ msgstr[3] "bezglutenowych francuskich tostów bez laktozy" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" -"Kawałki bezglutenowego chleba moczone w mieszaninie jaj z mlekiem bez " -"laktozy i następnie smażone. Nie było ci dane myśleć, że to możliwe, ale " -"teraz czujesz się jak prawdziwy post-milenials." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free biscuit" @@ -41565,10 +42715,8 @@ msgstr "bezglutenowy cheeseburger" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." +"of pre-Cataclysm culinary achievement." msgstr "" -"Bezglutenowa kanapka z mielonym mięsem i serem wraz z przyprawami. Szczyt " -"kulinarnych osiągnięć sprzed kataklizmu." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -41722,10 +42870,8 @@ msgstr[3] "nudnych bezglutenowych kanapek" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "" -"Prosta bezglutenowa kanapka z sosem. Nie jest sycąca, ale lepsza niż sam " -"chleb... szczególnie jeśli jest to chleb złego typu!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free waffle" @@ -41733,8 +42879,8 @@ msgstr "bezglutenowy gofr" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." -msgstr "Bezglutenowy gofr. W gruncie rzeczy to naleśnik w kratkę." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "lactose free waffle" @@ -41742,15 +42888,15 @@ msgstr "gofr bez laktozy" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." -msgstr "Gofr bez laktozy. W gruncie rzeczy to naleśnik w kratkę." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgstr "" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." -msgstr "Bezglutenowy gofr bez laktozy. W gruncie rzeczy to naleśnik w kratkę." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit waffle" @@ -41802,11 +42948,9 @@ msgstr[3] "mlek ryżowych" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "" -"Słodsze niż mleko od prawdziwej krowy, smakuje prawie jak lód waniliowy. " -"Szybko się psuje." #: lang/json/COMESTIBLE_from_json.py msgid "coconut water" @@ -41819,11 +42963,9 @@ msgstr[3] "wód kokosowych" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "" -"Mleko kokosowe, rozcieńczone wodą. Smakuje za to w porządku. Szybko się " -"psuje." #: lang/json/COMESTIBLE_from_json.py msgid "jarred coconut milk" @@ -42868,6 +44010,19 @@ msgid "" "it's anyone's guess what it's for." msgstr "" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -43773,6 +44928,35 @@ msgstr[1] "ciała" msgstr[2] "ciała" msgstr[3] "ciała" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -43793,15 +44977,7 @@ msgid "" " so with a gigantic claw." msgstr "" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "" @@ -43891,6 +45067,38 @@ msgid "" "wound." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -46118,6 +47326,175 @@ msgstr[3] "diament" msgid "A sparkling diamond." msgstr "Błyszczący diament." +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -47407,11 +48784,9 @@ msgstr[3] "cestus" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." msgstr "" -"Ciężka metalowa rękawica zakrywająca pięść i zwiększająca siłę uderzeń, z " -"grubym podbiciem chroniącym dłonie użytkownika." #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -48319,19 +49694,19 @@ msgstr[3] "" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "korpus wieżyczki" -msgstr[1] "korpus wieżyczki" -msgstr[2] "korpus wieżyczki" -msgstr[3] "korpus wieżyczki" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" #: lang/json/GENERIC_from_json.py @@ -50760,6 +52135,316 @@ msgstr[1] "połączenia do pasa amunicyjnego .50" msgstr[2] "połączenia do pasa amunicyjnego .50" msgstr[3] "połączenia do pasa amunicyjnego .50" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "ogólny szablon produktu" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -50925,17 +52610,53 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "łuski 40mm" -msgstr[1] "łuski 40mm" -msgstr[2] "łuski 40mm" -msgstr[3] "łuski 40mm" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing +#: lang/json/GENERIC_from_json.py +msgid "A large canister from a spent 40mm cartridge." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Description for 40mm canister #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "Duża łuska po zużytym granacie 40mm." +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -51368,16 +53089,6 @@ msgstr[1] "ogólne wyroby ze srebra" msgstr[2] "ogólnych wyrobów ze srebra" msgstr[3] "ogólnych wyrobów ze srebra" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "ogólny szablon produktu" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -54627,6 +56338,32 @@ msgid "" "twist ties, duct tape, and other random stuff has been used to compensate." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -56697,8 +58434,8 @@ msgstr[3] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -56848,9 +58585,89 @@ msgstr[3] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -59438,7 +61255,23 @@ msgstr[3] "" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" #: lang/json/GENERIC_from_json.py @@ -60809,6 +62642,19 @@ msgstr[3] "" msgid "A small book, containing spells created by a novice magician." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -61007,6 +62853,53 @@ msgid "" "hopes to discover a more permanent solution." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -61452,11 +63345,9 @@ msgstr[3] "zepsuty rozbrojony smyrgobot" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" -"Zepsuty smyrgobot. Jego zintegrowany moduł broni został wymontowany. Może " -"być rozebrany na części albo przerobiony na robota z odzysku." #. ~ Description for broken skitterbot #: lang/json/GENERIC_from_json.py @@ -61484,11 +63375,9 @@ msgstr[3] "zepsuty rozbrojony bot obronny" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Zepsuty robot obronny. Jego zintegrowany moduł broni został wymontowany. " -"Może być rozebrany na części albo przerobiony na robota z odzysku." #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -61530,11 +63419,9 @@ msgstr[3] "zepsuty rozbrojony kurzy kroczarz" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Zepsuty kurzy kroczarz. Jego zintegrowane bronie zostały wymontowane. Może " -"być rozebrany na części." #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -62241,9 +64128,8 @@ msgstr[3] "zepsuty kowboj ze złomowiska" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "" -"Zniszczony robot z odzysku. Może być rozebrany na części albo przerobiony." #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -62280,11 +64166,9 @@ msgstr[3] "zepsuty wojskowy robot treningowy" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" -"Zepsuty wojskowy robot treningowy, teraz rozbity i nieruchomy. Ten jest " -"uzbrojony w zintegrowany painball. Można go rozebrać na części." #: lang/json/GENERIC_from_json.py msgid "broken military robot" @@ -62297,56 +64181,44 @@ msgstr[3] "zepsuty robot wojskowy" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" -"Zepsuty wojskowy robot , teraz rozbity i nieruchomy. Ten jest uzbrojony w " -"zintegrowaną broń 5,56 mm. Można go rozebrać na części." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" -"Zepsuty wojskowy robot , teraz rozbity i nieruchomy. Ten jest uzbrojony w " -"zintegrowaną broń 7,62 mm. Można go rozebrać na części." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" -"Zepsuty wojskowy robot , teraz rozbity i nieruchomy. Ten jest uzbrojony w " -"zintegrowaną broń kalibru 50. Można go rozebrać na części." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" -"Zepsuty wojskowy robot , teraz rozbity i nieruchomy. Ten jest uzbrojony w " -"zintegrowaną broń 8x40 mm. Można go rozebrać na części." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" -"Zepsuty wojskowy robot , teraz rozbity i nieruchomy. Ten jest uzbrojony w " -"zintegrowaną broń strzałkową. Można go rozebrać na części." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" -"Zepsuty wojskowy robot , teraz rozbity i nieruchomy. Ten jest uzbrojony w " -"zintegrowaną wyrzutnię granatów 40 mm. Można go rozebrać na części." #: lang/json/GENERIC_from_json.py msgid "broken military flame robot" @@ -62359,11 +64231,9 @@ msgstr[3] "zepsuty ognisty robot wojskowy" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" -"Zepsuty wojskowy robot , teraz rozbity i nieruchomy. Ten jest uzbrojony w " -"zintegrowany miotacz ognia. Można go rozebrać na części." #: lang/json/GENERIC_from_json.py msgid "broken robo-guardian" @@ -62378,10 +64248,12 @@ msgstr[3] "" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "" -"Zniszczony robot z odzysku. Może być rozebrany na części albo przerobiony." +"Zniszczony robot z odzysku. Może być rozebrany na części ale przerobiony." #: lang/json/GENERIC_from_json.py msgid "broken robote deluxe" @@ -62393,9 +64265,8 @@ msgstr[3] "zepsuty robot deluxe" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "" -"Zniszczony robot deluxe. Może być rozebrany na części albo przerobiony." #: lang/json/GENERIC_from_json.py msgid "broken robo-protector" @@ -62424,12 +64295,9 @@ msgstr[3] "zepsuty rozbrojony zaawansowany bot" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Zepsuty zaawansowany robot. Jego zintegrowany moduł broni został " -"wymontowany. Może być rozebrany na części albo przerobiony na robota z " -"odzysku." #: lang/json/GENERIC_from_json.py msgid "broken advanced robot" @@ -62442,38 +64310,30 @@ msgstr[3] "zepsuty zaawansowany robot" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" -"Zepsuty zaawansowany robot, teraz rozbity i nieruchomy. Ten jest uzbrojony w" -" zintegrowany emiter laserowy. Można go rozebrać na części." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" -"Zepsuty zaawansowany robot, teraz rozbity i nieruchomy. Ten jest uzbrojony w" -" zintegrowany miotacz plazmy. Można go rozebrać na części." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" -"Zepsuty zaawansowany robot, teraz rozbity i nieruchomy. Ten jest uzbrojony w" -" zintegrowany miotacz łuku elektrycznego. Można go rozebrać na części." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" -"Zepsuty zaawansowany robot, teraz rozbity i nieruchomy. Ten jest uzbrojony w" -" zintegrowany emiter EMP. Można go rozebrać na części." #: lang/json/GENERIC_from_json.py msgid "broken glittering lady" @@ -62504,11 +64364,9 @@ msgstr[3] "zepsuty pilarz z horroru" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "" -"Zniszczony robot z odzysku. Dzięki Bogu jest już martwy. Może być rozebrany " -"na części ale przerobiony." #: lang/json/GENERIC_from_json.py msgid "broken screeching terror" @@ -62534,13 +64392,6 @@ msgstr[1] "zniszczony król pięści" msgstr[2] "zniszczony król pięści" msgstr[3] "zniszczony król pięści" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "" -"Zniszczony robot z odzysku. Może być rozebrany na części ale przerobiony." - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -62696,16 +64547,8 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." +"you…" msgstr "" -"Ta amorficzna masa zakończyła swój rozwój; jej rozwinięte wewnętrzne " -"struktury są tego dowodem. Jest zdolna do poruszania się z pomocą " -"wewnętrznych hydraulicznych ciśnień, i zdolna jest przenosić znaczące " -"ciężary, a także wykazując niezwykłą inteligencję, zdolna jest manipulować " -"wszystkim do czego jest przyłączona czy będzie to oparte na glutach czy też " -"nie, dzięki wyciągniętym nibynóżkom. Myślisz, że możesz nią manipulować oraz" -" wszelkie rzeczy, do których będzie przyłączona. Musisz się ustawić by mieć " -"z nią kontakt; wygląda na niepokojąco chętną by cię przyjąć..." #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -62773,6 +64616,14 @@ msgstr "" "podążania za słońcem. Jednak odbywa się to za cenę ograniczeń z uwagi na " "wielką wagę i blokowanie przestrzeni." +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "korpus wieżyczki" +msgstr[1] "korpus wieżyczki" +msgstr[2] "korpus wieżyczki" +msgstr[3] "korpus wieżyczki" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -62836,12 +64687,9 @@ msgstr[3] "ustabilizowany portal" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"Gdy wpatrujesz się w wyglądające na nieskończone głębiny tej przenośnej " -"dziury w rzeczywistości przypomina ci się powiedzenie z zamierzchłych " -"czasów. \"Dwie rzeczy są nieskończone: wszechświat i ludzka kleptomania.\"" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -64149,6 +65997,17 @@ msgid "" " reload a compatible revolver." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "" @@ -64214,6 +66073,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "magazynek " + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "" @@ -64532,8 +66402,8 @@ msgstr "" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -65853,12 +67723,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"Biologiczna zagadka, ten glut ewoluował sobie zdolność wolnej produkcji " -"prądu elektrycznego w jakimś nieznanym procesie. Lekko fosforyzuje gdy to " -"robi. Potrafi też magazynować elektryczność z innych źródeł, ale to powoduje" -" że się dezaktywuje. Wygląda na tyle sprężyście, by móc go rozdzielić..." #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -65916,24 +67782,6 @@ msgstr "" msgid "pebble hopper" msgstr "podajnik kamyków" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "magazynek " - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "Dwa magazynki przyłączone do wspólnej podstawy. Unikatowe dla " - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "magazynek " - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "9-nabojowy magazynek do pistoletu M1991A1 .38 Super." - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "domyślne" @@ -66162,11 +68010,9 @@ msgstr "Więcej Budynków od Fuji" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "" -"Dodaje więcej budynków i więcej wariantów istniejących budynków. (Wymaga " -"'Więcej Lokacji')" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -66188,7 +68034,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -66222,7 +68068,7 @@ msgstr "Hydroponika" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" @@ -66325,10 +68171,8 @@ msgstr "Zmutowani NPC" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "" -"NPC-e podróżujący przez pustkowia mogą okazjonalnie mieć mutacje --- twoi " -"wrogowie również. Strzeż się!" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -66337,9 +68181,8 @@ msgstr "" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -66660,11 +68503,9 @@ msgstr "Bezglutenowe przepisy Bena" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "" -"Parę prostych alternatywnych opcji przepisów bezglutenowych i bez laktozy. " -"NIE SĄ WYCZERPUJĄCE." #: lang/json/MOD_INFO_from_json.py msgid "Tough Zombies" @@ -66700,11 +68541,9 @@ msgstr "Alternatywne Klucze Mapy" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" -"Zmienia mapę główna dla lepszej czytelności. Budynki są kodowane kolorami po" -" typie i wskazywane są angielskim inicjałem zamiast ^v<>." #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -66851,7 +68690,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -66863,7 +68702,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -66874,7 +68713,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -66884,7 +68723,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -66971,11 +68810,8 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." msgstr "" -"Kaczka krzyżówka, często widywana w pobliżu rzek i innych zbiorników " -"wodnych. Żywi się głównie owadami, nasionami, korzeniami roślin a przed " -"kataklizmem także okruchami chleba." #: lang/json/MONSTER_from_json.py msgid "goose" @@ -67910,7 +69746,7 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68096,7 +69932,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "Gigantyczny zainfekowany karaluch, który pożywiał się na nieumarłych." @@ -68109,7 +69945,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "Zainfekowany zmutowany karaluch mniej więcej wielkości szczura." @@ -68122,7 +69958,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -68154,7 +69990,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "Dziecko zmutowanego karalucha wielkości szczura." @@ -68183,7 +70019,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -68200,7 +70036,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -68251,7 +70087,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -68268,7 +70104,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -68287,7 +70123,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -68304,7 +70140,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -68321,7 +70157,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -68338,7 +70174,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -68355,7 +70191,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -68371,7 +70207,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -68388,7 +70224,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -68405,7 +70241,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -68422,7 +70258,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -68440,7 +70276,7 @@ msgstr[1] "wielkie osy" msgstr[2] "wielkich os" msgstr[3] "wielkich os" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -68457,7 +70293,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -68491,7 +70327,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -68508,7 +70344,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -68543,7 +70379,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -68562,7 +70398,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -68581,7 +70417,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -68616,7 +70452,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -68633,7 +70469,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -68650,7 +70486,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -68667,7 +70503,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -69731,14 +71567,14 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -69753,7 +71589,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -69773,7 +71609,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -69792,7 +71628,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -69811,7 +71647,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -69835,7 +71671,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -69854,7 +71690,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -69870,7 +71706,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -69889,7 +71725,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -69908,7 +71744,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -71891,6 +73727,21 @@ msgstr "" "ogromne i niepokojące. Cienkie szparki w miejsce oczu sugerują, że nie jest " "ślepy." +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -72709,7 +74560,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -72726,7 +74577,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -73284,7 +75135,7 @@ msgstr[3] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" @@ -73302,7 +75153,7 @@ msgstr[3] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" @@ -73319,7 +75170,7 @@ msgstr[3] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" @@ -73776,7 +75627,7 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -73793,7 +75644,23 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -74271,9 +76138,9 @@ msgstr[3] "" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" #: lang/json/MONSTER_from_json.py @@ -74287,10 +76154,10 @@ msgstr[3] "" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -74305,7 +76172,7 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -74321,8 +76188,8 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" @@ -74338,7 +76205,7 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -74354,10 +76221,10 @@ msgstr[3] "" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -74371,9 +76238,9 @@ msgstr[3] "" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -74389,8 +76256,8 @@ msgstr[3] "" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -74404,20 +76271,18 @@ msgstr[3] "" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" -"Ludzkie ciało z bladoniebieskim ciałem, iskrzącym energią elektryczną. " -"Wygląda jakby było zdeterminowane, by coś ci powiedzieć." #: lang/json/MONSTER_from_json.py msgid "mr skeltal" @@ -74431,12 +76296,9 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" -"Całkiem pozbawiony ciała i wnętrzności, ten kroczący szkielet mrozi ci krew " -"w żyłach aż do kości. W kościstej ręce ściska nieskazitelnie czystą trąbkę " -"nietkniętą przez koniec świata." #: lang/json/MONSTER_from_json.py msgid "minion of skeltal" @@ -74464,10 +76326,8 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" -"Dymiąca skorupa to jedyne co zostało z niegdyś dumnego niedźwiedzia. Jego " -"czarne oczy łypią na ciebie ze złością... i głodem." #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -74842,6 +76702,97 @@ msgid "" "like jaws." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -75477,12 +77428,9 @@ msgstr[3] "" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" -"Zautomatyzowany robot obronny nadal aktywny dzięki wewnętrznemu źródłu " -"zasilania. Ten jest wyposażony w elektryczną pałkę i zintegrowaną broń " -"kalibru 9 mm." #: lang/json/MONSTER_from_json.py msgid "security robot" @@ -75495,11 +77443,9 @@ msgstr[3] "" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" -"Zautomatyzowany robot obronny nadal aktywny dzięki wewnętrznemu źródłu " -"zasilania. Ten jest wyposażony w zintegrowaną broń kalibru 9 mm." #: lang/json/MONSTER_from_json.py msgid "riotcontrol robot" @@ -75512,13 +77458,10 @@ msgstr[3] "" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" -"Zautomatyzowany robot obronny nadal aktywny dzięki wewnętrznemu źródłu " -"zasilania. Ten jest wyposażony w elektryczną pałkę, miotacz gazu łzawiącego " -"i zintegrowaną wyrzutnię woreczków z grochem 40 mm." #: lang/json/MONSTER_from_json.py msgid "necco" @@ -75969,13 +77912,9 @@ msgstr[3] "" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" -"Robot użytkowy z odzysku przerobiony na automatyczny odkurzacz. Będzie " -"zasysał pozostawione luzem przedmioty z ziemi i rozpuszczał jej w " -"wewnętrznych zbiornikach z kwasem. Użyteczny pomocnik do czyszczenia ogródka" -" ze śmieci... lub ciał." #: lang/json/MONSTER_from_json.py msgid "bee bot" @@ -76046,11 +77985,9 @@ msgstr[3] "" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" -"Jeszcze nie działa. Nie buduj go jeszcze... Robot medyczny z odzysku z " -"syntezatorem farmaceutyków przebudowanym do produkcji mutagenów." #: lang/json/MONSTER_from_json.py msgid "party bot" @@ -77700,6 +79637,17 @@ msgstr "" msgid "Ethereal Grasp" msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "" @@ -78121,6 +80069,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "" @@ -80351,6 +82322,21 @@ msgid "" msgstr "" "To medyczne urządzenie do słuchania. Użyj by słuchać rzeczy. Z bliska." +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -80682,9 +82668,9 @@ msgstr[3] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -80697,7 +82683,7 @@ msgstr[3] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -80710,9 +82696,9 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -80731,7 +82717,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -80746,12 +82732,12 @@ msgstr[3] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." +msgid "Power levels too low for safe bootup…" msgstr "" #. ~ Description for CRIT EM vest (off) @@ -80759,9 +82745,9 @@ msgstr "" msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -80779,7 +82765,7 @@ msgstr "" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "" #. ~ Description for CRIT EM vest (on) @@ -80788,8 +82774,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -80809,7 +82795,7 @@ msgstr "" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -80830,10 +82816,10 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -81128,6 +83114,36 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -81789,12 +83805,13 @@ msgstr "" #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "Tick." @@ -81884,11 +83901,10 @@ msgstr "Wyciągasz zawleczkę w granacie zagłuszającym." #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" #: lang/json/TOOL_from_json.py @@ -81908,6 +83924,61 @@ msgstr "" "Aktywny granat zagłuszający, który zaraz wybuchnie, powodując zwarcie w " "czipach kontrolnych robotów i czasowo przeciągając je na twoją stronę." +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "granat EMP" +msgstr[1] "granat EMP" +msgstr[2] "granat EMP" +msgstr[3] "granat EMP" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "Wyciągasz zawleczkę w granacie EMP." + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +"Granat, który generuje impuls elektromagnetyczny wykorzystując rozładowanie " +"nisko indukcyjnego kondensatora w jedno-pętlową antenę. Użyj go by wyciągnąć" +" zawleczkę i odpalić zapalnik, zmieniając go w aktywny granat EMP. Będziesz " +"miał trzy tury zanim zdetonuje, tworząc pole elektromagnetyczne uszkadzające" +" roboty i drenujące bioniczną energię." + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "aktywny granat EMP" +msgstr[1] "aktywny granat EMP" +msgstr[2] "aktywny granat EMP" +msgstr[3] "aktywny granat EMP" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "Już wyrwałeś zawleczkę w %s, spróbuj zamiast tego rzucić." + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"Ten granat EMP jest aktywny i zaraz zdetonuje tworząc pole " +"elektromagnetyczne uszkadzające roboty i drenujące bioniczną energię. Możesz" +" nie chcieć trzymać go dłużej." + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -82376,32 +84447,32 @@ msgstr "" "części ciała. Użyj by rozwinąć do używania." #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "granat EMP" -msgstr[1] "granat EMP" -msgstr[2] "granat EMP" -msgstr[3] "granat EMP" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "Wyciągasz zawleczkę w granacie EMP." +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -"Granat, który generuje impuls elektromagnetyczny wykorzystując rozładowanie " -"nisko indukcyjnego kondensatora w jedno-pętlową antenę. Użyj go by wyciągnąć" -" zawleczkę i odpalić zapalnik, zmieniając go w aktywny granat EMP. Będziesz " -"miał trzy tury zanim zdetonuje, tworząc pole elektromagnetyczne uszkadzające" -" roboty i drenujące bioniczną energię." #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -82419,31 +84490,26 @@ msgid "" msgstr "" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "aktywny granat EMP" -msgstr[1] "aktywny granat EMP" -msgstr[2] "aktywny granat EMP" -msgstr[3] "aktywny granat EMP" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "Już wyrwałeś zawleczkę w %s, spróbuj zamiast tego rzucić." +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"Ten granat EMP jest aktywny i zaraz zdetonuje tworząc pole " -"elektromagnetyczne uszkadzające roboty i drenujące bioniczną energię. Możesz" -" nie chcieć trzymać go dłużej." #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -82985,13 +85051,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -"35mm SLR (lustrzanka jednoobiektywowa) z cyfrowym i optycznym wizjerem, " -"soczekwami zoom z autofokusem i stabilizacją obrazu, oraz lampą błyskową. " -"Możesz oglądać zdjęcia na ekranie lub zapisać je na karcie pamięci. Korzysta" -" ze zwykłych baterii. Przed kataklizmem robiłbyś nią profesjonalne zdjęcia." #: lang/json/TOOL_from_json.py msgid "candle" @@ -83877,6 +85939,7 @@ msgstr[2] "" msgstr[3] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -83892,13 +85955,10 @@ msgstr[3] "tabletu w technologii e-papieru" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -"Tablet PC używający efektywnego kolorowego e-tuszu. Przed kataklizmem to " -"były zmyślny gadżet; teraz to bezcenny zasób. Działa na konwencjonalnych " -"bateriach." #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -85283,11 +87343,9 @@ msgstr[3] "improwizowany młotek" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "" -"To toporny młotek zrobiony z kawałka metalu przyczepionego do kija. " -"Funkcjonuje adekwatnie do młotka, ale nie można go równać do prawdziwego." #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -86528,23 +88586,6 @@ msgstr "" "To bardzo ostry nóż opracowany do cięć chirurgicznych. Jego małe ostre " "ostrze pozwala na precyzyjne uderzenia w uzdolnionych dłoniach." -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "nożyce" -msgstr[1] "nożyce" -msgstr[2] "nożyce" -msgstr[3] "nożyce" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "" -"Długie przemysłowe nożyce. Użyj ich by pociąć ubrania z bawełny (itp.) na " -"szmaty." - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -89244,6 +91285,20 @@ msgid "" "distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -91732,6 +93787,23 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "nożyce" +msgstr[1] "nożyce" +msgstr[2] "nożyce" +msgstr[3] "nożyce" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "" +"Długie przemysłowe nożyce. Użyj ich by pociąć ubrania z bawełny (itp.) na " +"szmaty." + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -91928,6 +94000,32 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -92149,12 +94247,12 @@ msgstr[3] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -92168,10 +94266,11 @@ msgstr[3] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -92185,7 +94284,7 @@ msgstr[3] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -92200,7 +94299,7 @@ msgstr[3] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -92216,10 +94315,10 @@ msgstr[3] "" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -92234,7 +94333,7 @@ msgstr[3] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -92250,7 +94349,7 @@ msgstr[3] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -92862,7 +94961,7 @@ msgstr[3] "" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" @@ -92877,7 +94976,7 @@ msgstr[3] "" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" @@ -92892,7 +94991,7 @@ msgstr[3] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" @@ -92907,7 +95006,7 @@ msgstr[3] "" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" @@ -92922,8 +95021,8 @@ msgstr[3] "" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -92937,8 +95036,8 @@ msgstr[3] "" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -92952,7 +95051,7 @@ msgstr[3] "" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" @@ -92967,8 +95066,8 @@ msgstr[3] "" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -92982,7 +95081,7 @@ msgstr[3] "" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -93083,23 +95182,18 @@ msgstr[3] "Zmierzch" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." msgstr "" -"Długi miecz, zrobiony z bardzo ciemnego, niemal czarnego metalu. Wygląda na " -"to że ma szerszą krawędź niż typowe stalowe ostrza i jest... bardziej " -"komfortowy w dłoni. Choć ostrze jest zrobione z tego czarnego metalu, to " -"jelec i rączka wyglądają na zrobione z jaśniejszego materiału, który wydaje " -"się nienaturalnie chłodny w dotyku." #. ~ Use action use_message for disarmed defense turret. #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." -msgstr "Błąd. Nie znaleziono zamontowanej broni." +msgid "Error. No weapon systems found." +msgstr "" #. ~ Description for disarmed defense turret #: lang/json/TOOL_from_json.py @@ -93327,14 +95421,9 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Nieaktywna wojskowa wieżyczka granatnik. Maksymalnie 50 standardowych " -"granatów odłamkowych 40 mm zostanie automatycznie załadowane z twego " -"ekwipunku do wieżyczki w czasie aktywacji. Umieść wieżyczkę a zidentyfikuje " -"cię jako przyjaciela swoim zaawansowanym oprogramowaniem IFF. Przeczytaj " -"instrukcję bezpieczeństwa w razie awarii." #: lang/json/TOOL_from_json.py msgid "inactive military flamethrower turret" @@ -93409,15 +95498,10 @@ msgstr[3] "nieaktywna zaawansowana wieżyczka szynowa" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Nieaktywna zaawansowana wieżyczka szynowa. Maksymalnie 50 standardowych " -"pocisków szynowych zostanie automatycznie załadowane z twego ekwipunku do " -"wieżyczki w czasie aktywacji. Umieść wieżyczkę a zidentyfikuje cię jako " -"przyjaciela swoim zaawansowanym oprogramowaniem IFF. Przeczytaj instrukcję " -"bezpieczeństwa w razie awarii." #: lang/json/TOOL_from_json.py msgid "inactive advanced acid turret" @@ -93431,12 +95515,9 @@ msgstr[3] "nieaktywna zaawansowana wieżyczka kwasowa" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Nieaktywna zaawansowana wieżyczka kwasowa. Umieść wieżyczkę a zidentyfikuje " -"cię jako przyjaciela swoim zaawansowanym oprogramowaniem IFF. Przeczytaj " -"instrukcję bezpieczeństwa w razie awarii." #: lang/json/TOOL_from_json.py msgid "inactive advanced EMP turret" @@ -93450,12 +95531,9 @@ msgstr[3] "nieaktywna zaawansowana wieżyczka EMP" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Nieaktywna zaawansowana wieżyczka EMP. Umieść wieżyczkę a zidentyfikuje cię " -"jako przyjaciela swoim zaawansowanym oprogramowaniem IFF. Przeczytaj " -"instrukcję bezpieczeństwa w razie awarii." #: lang/json/TOOL_from_json.py msgid "inactive advanced electro turret" @@ -93845,13 +95923,10 @@ msgstr[3] "nieaktywny dryfujący grzejnik" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" -"Odzyskany ze złomu okobot przerobiony na latający grzejnik. Emituje stały " -"strumień gorącego powietrza, które rozgrzeje zamkniętą przestrzeń. Nie jest " -"agresywny i nie jest wyposażony w żadną broń. Aktywuj by uruchomić." #: lang/json/TOOL_from_json.py msgid "inactive floating furnace" @@ -93864,15 +95939,11 @@ msgstr[3] "nieaktywny dryfujący piec" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." msgstr "" -"Odzyskany ze złomu okobot przerobiony na latający grzejnik. Emituje stały " -"strumień niebezpiecznie gorącego powietrza, które rozgrzeje zamkniętą " -"przestrzeń. Nie jest agresywny i nie jest wyposażony w żadną broń. Aktywuj " -"by uruchomić." #: lang/json/TOOL_from_json.py msgid "inactive burning eye" @@ -93950,15 +96021,11 @@ msgstr[3] "nieaktywny przeżuwacz" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" -"Robot użytkowy z odzysku przerobiony na automatyczny odkurzacz. Będzie " -"zasysał pozostawione luzem przedmioty z ziemi i rozpuszczał jej w " -"wewnętrznych zbiornikach z kwasem. Nieagresywny i nieuzbrojony. Aktywuj by " -"uruchomić." #: lang/json/TOOL_from_json.py msgid "inactive bee-bot" @@ -94001,13 +96068,10 @@ msgstr[3] "nieaktywny robot zabójca" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" -"Robot medyczny z odzysku przerobiony na maszynę mordercę. Będzie atakować " -"wrogów zestawem straszliwych ostrzy, i strzykawką napełnioną toksynami. " -"Aktywuj by uruchomić." #: lang/json/TOOL_from_json.py msgid "inactive elixirator" @@ -94055,12 +96119,10 @@ msgstr[3] "nieaktywny szczurołap" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" -"Bot smyrgacz z odzysku przerobiony do polowania na małą zdobycz. Atakuje " -"cele szczypcami i zintegrowanym paralizatorem. Aktywuj by uruchomić." #: lang/json/TOOL_from_json.py msgid "inactive grab-bot" @@ -94116,11 +96178,9 @@ msgstr[3] "nieaktywny nekrotyczny cyborg" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" -"Cyborg z odzysku na którym osadzono głowę nekromanty zombie. Ożywiona głowa " -"zachowała nieco zdolności do ożywiania zombie. Aktywuj by uruchomić robota." #: lang/json/TOOL_from_json.py msgid "inactive defense robot" @@ -94178,11 +96238,8 @@ msgstr[3] "nieaktywny niedbały paladyn" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" -"Robot obronny z odzysku wyposażony w domowej roboty miotacz ognia i dwa " -"rozgrzane do czerwoności ostrza. Aktywuj mając benzynę w ekwipunku, by " -"przeładować i uruchomić robota, najlepiej z dala od palnych rzeczy..." #: lang/json/TOOL_from_json.py msgid "inactive military robot" @@ -94591,13 +96648,8 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" -"Biologiczna zagadka. Wewnętrzne struktury tego gluta funkcjonują w zbiorniku" -" płynu niskiej gęstości który pozostaje płynny pomimo bycia w super-" -"schłodzonym stanie. Ponadto nadal zachowuje kowalność swoich wcześniejszych " -"form. Fragmenty szronu stale się od niego odłupują. Wygląda na tyle ciągliwy" -" by go rozdzielić." #: lang/json/TOOL_from_json.py msgid "growing cold mass" @@ -94870,13 +96922,10 @@ msgstr "Zbitek rozpada się w twoich dłoniach." #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" -"Zbitek sztucznych kryształów które odłamały się od matrycy diamentowej. " -"Substancja zwykle ulega degradacji po oddzieleniu katalizatora, ale te " -"fragmenty wydają się samodzielnie podtrzymywać przez jakiś nieznany proces." #: lang/json/TOOL_from_json.py msgid "diamond matrix" @@ -94889,10 +96938,8 @@ msgstr[3] "diamentowa matryca" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +"Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "" -"Twoje zmysły stępiają się gdy patrzysz w głębię rdzenia z kamieni " -"szlachetnych..." #. ~ Description for diamond matrix #: lang/json/TOOL_from_json.py @@ -94914,17 +96961,12 @@ msgstr[3] "silnik wiru" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" -"Jak to mówią, tornado w pudle. Wnętrze tego niepozornego pojemnika zawiera " -"albo kulminację ludzkich innowacji w zakresie czystej energii, lub broń " -"masowego rażenia zdolną zmieść cywilizacje - lub to co po nich zostało - z " -"powierzchni ziemi. Zewnętrzny mechanizm pozwala na podczepienie go do " -"pojazdu dla nadania mobilności." #: lang/json/TOOL_from_json.py lang/json/vehicle_part_from_json.py msgid "vortex generator" @@ -94937,17 +96979,12 @@ msgstr[3] "generator wiru" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" -"Jak to mówią, tornado w pudle. Wnętrze tego niepozornego pojemnika zawiera " -"albo kulminację ludzkich innowacji w zakresie czystej energii, lub broń " -"masowego rażenia zdolną zmieść cywilizacje - lub to co po nich zostało - z " -"powierzchni ziemi. Zewnętrzny mechanizm pozwala na podczepienie go do " -"baterii dla zmagazynowania generowanej mocy." #: lang/json/TOOL_from_json.py msgid "control chip" @@ -98396,6 +100433,10 @@ msgstr "Zbuduj Ścianę Palisadę" msgid "Build Stone Wall" msgstr "Zbuduj Kamienną Ścianę" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "Zbuduj Niską Ścianę" @@ -102120,6 +104161,35 @@ msgid "" "from the inside." msgstr "" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "Oświetlony" @@ -102792,11 +104862,9 @@ msgstr "Dług Snu" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "" -"Twój dług snu powoli zwiększa się od jakiegoś czasu. Powinieneś nieco " -"odpocząć." #. ~ Apply message for effect(s) 'Sleep Deprived'. #: lang/json/effects_from_json.py @@ -102965,7 +105033,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -102979,13 +105047,8 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" -" Znalazł nową drogę życia po twojej śmierci. Choć ci nigdy nie " -"powiedział, jego przestępstwa w dawnym świecie uniemożliwiły mu bycie " -"częścią społeczeństwa. Wraz z końcem rejestru karnego podjął wezwanie " -"udowodnienia swojej wartości swoim towarzyszom. Umarł na atak serca podczas " -"samotnej wyprawy wiele lat po kataklizmie." #: lang/json/epilogue_from_json.py msgid "" @@ -103007,19 +105070,12 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " "enact revenge himself." msgstr "" -" Nigdy nie był znany jako szczególnie odważny człowiek ani też " -"szczególnie stabilny emocjonalnie. Jego żal spowodowany nieudzieleniem " -"pomocy ludziom w pierwszych dniach kataklizmu doprowadziło go do kilku prób " -"samobójczych w nadchodzących latach. Jego życie polepszyło się na krótko gdy" -" ożenił się z ocaloną towarzyszką, ale legło w gruzach gdy zabili ją " -"członkowie tajemniczej apokaliptycznej sekty. Zginą podczas próby " -"zakradnięcia się do kryjówki kultu celem samodzielnego wywarcia zemsty." #: lang/json/epilogue_from_json.py msgid "" @@ -103053,17 +105109,10 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" -" Po twojej śmierci ciężko pracował by zorganizować własną bandę " -"ocalonych. Później ożenił się i miał dwójkę dzieci, które zostały nauczone " -"każdej umiejętności przetrwania jakiej kiedykolwiek miałyby potrzebować. " -"Jego przeszłość w końcu go dogoniła gdy naraził się pułkownikowi Starej " -"Gwardii. Ponieważ uciekł z posterunku jako żołnierz Gwardii Narodowej " -"podczas kataklizmu, został powieszony mimo protestów wielkiej liczby " -"ocalonych, którym pomógł przez lata." #: lang/json/epilogue_from_json.py msgid "" @@ -103477,7 +105526,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -103514,19 +105563,12 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " "of crimes against humanity." msgstr "" -" Nigdy nie była znana jako szczególnie odważny człowiek ani też " -"szczególnie stabilna emocjonalnie. Jej niezdolność do przystosowania się do " -"życia po kataklizmie doprowadziła ją do kilku prób samobójczych w " -"nadchodzących latach. Przyciągnięta obietnicami odnowienia i perspektywą " -"życia w nowej rodzinie, wstąpiła do charyzmatycznego kultu. Stała się " -"niewinną ofiarą śmiertelną gdy Stara Gwardia szturmowała siedzibę kultu pod " -"zarzutami zbrodni przeciwko ludzkości." #: lang/json/epilogue_from_json.py msgid "" @@ -103835,13 +105877,10 @@ msgstr "Hub 01" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" -"Ocalała załoga Hub 01, laboratorium badawczego sprzed kataklizmu. Rzadko " -"wychodzą z laboratorium, jeśli w ogóle, i bazują na swoich robotach i " -"zaawansowanej technologii by przeżyć." #: lang/json/faction_from_json.py msgid "Hub 01 Ancillia" @@ -104021,16 +106060,11 @@ msgstr "Uchodźcy" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." msgstr "" -"Jak rozproszone skrawki cywilizacji, tych kilku szczęśliwców zdołało " -"zabarykadować się wewnątrz budynku w czasie wczesnych faz kataklizmu. Choć " -"chwilowo bezpieczni, brak im zapasów i umiejętności by zdobyć więcej. To " -"tylko kwestia czasu gdy staną się zwierzyną dla nieziemskich stworów, lub aż" -" nazbyt ludzkich potworów." #: lang/json/fault_from_json.py msgid "Dusty" @@ -104100,6 +106134,20 @@ msgstr "" msgid "You clean your %s." msgstr "" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "" @@ -104123,6 +106171,29 @@ msgstr "" msgid "You eject the spent casing from the %s." msgstr "" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "" @@ -104143,6 +106214,11 @@ msgstr "" msgid "Clean gun" msgstr "" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "" @@ -104867,11 +106943,13 @@ msgstr "" msgid "A big, blocky metal device for refrigerating large areas." msgstr "" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "zgrzyt metalu!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "klang!" @@ -106726,6 +108804,15 @@ msgstr "" "Metalowa skrzynka zamontowana na drewnianym słupku. Listonosza już długo tu " "nie było. I chyba nieprędko się pojawi." +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "gablota" @@ -107667,8 +109754,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -107701,7 +109788,7 @@ msgstr "" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -107712,7 +109799,7 @@ msgstr "" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -107723,7 +109810,7 @@ msgstr "" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -107734,7 +109821,7 @@ msgstr "" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -110055,12 +112142,12 @@ msgstr "" "akcji." #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" -msgstr[0] "karabin rurowy: .308" -msgstr[1] "karabin rurowy: .308" -msgstr[2] "karabin rurowy: .308" -msgstr[3] "karabin rurowy: .308" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/gun_from_json.py msgid "" @@ -110323,6 +112410,21 @@ msgid "" "hammers of the four barrels arranged in a square formation." msgstr "" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -110458,6 +112560,20 @@ msgid "" "quality, durable materials." msgstr "" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -110664,24 +112780,6 @@ msgstr "" "wojnie wietnamskiej. Choć zasadniczo wyparty przez współczesne konstrukcje, " "granatnik M79 nadal jest używany w wielu jednostkach wojskowych na świecie." -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "granatnik Mark 19" -msgstr[1] "granatnik Mark 19" -msgstr[2] "granatnik Mark 19" -msgstr[3] "granatnik Mark 19" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"Ciężki granatnik na trójnogu zasilany taśmą amunicyjną, używany przez wojska" -" amerykańskie od początku zimnej wojny, aż do kataklizmu, a jak znajdziesz " -"trochę 40mm granatów to nawet i dłużej." - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -110742,6 +112840,24 @@ msgstr "" msgid "multi" msgstr "multi" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "granatnik Mark 19" +msgstr[1] "granatnik Mark 19" +msgstr[2] "granatnik Mark 19" +msgstr[3] "granatnik Mark 19" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"Ciężki granatnik na trójnogu zasilany taśmą amunicyjną, używany przez wojska" +" amerykańskie od początku zimnej wojny, aż do kataklizmu, a jak znajdziesz " +"trochę 40mm granatów to nawet i dłużej." + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -110757,6 +112873,21 @@ msgid "" "shell at a time like most shotguns." msgstr "" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -111101,6 +113232,20 @@ msgstr "" "Taurus Raging Bull to 5-strzałowy rewolwer w kalibrze .454 Casull. Ma " "imponującą siłę obalającą." +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "Taurus Raging Judge Magnum" +msgstr[1] "Taurus Raging Judge Magnum" +msgstr[2] "Taurus Raging Judge Magnum" +msgstr[3] "Taurus Raging Judge Magnum" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -111147,6 +113292,40 @@ msgid "" "ammunition." msgstr "" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "Bond Arms Derringer" +msgstr[1] "Bond Arms Derringer" +msgstr[2] "Bond Arms Derringer" +msgstr[3] "Bond Arms Derringer" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -111303,13 +113482,9 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" -"Ciężki karabin maszynowy używany przez wojsko Stanów Zjednoczonych od " -"wprowadzenia do kataklizmu, a niekiedy przez ocalonych. Jego masywny rozmiar" -" i budowa czyni go niemożliwym do stosowania w sposób inny niż przez " -"zamontowanie w pojeździe." #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -113078,7 +115253,7 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -113262,14 +115437,9 @@ msgstr[3] "karabin laserowy A7" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" -"Najwyższej jakości karabin laserowy opracowany przez dział badawczy " -"Laboratoriów Lotniczych. Pierwsze próby dościgły najlepsze konstrukcje " -"Rivtech, z plotkami mówiącymi o machlojkach przemysłowych. Choć kataklizm " -"wyrzucił je na śmietnisko historii, to ta broń może uczynić to samo z twoimi" -" wrogami." #: lang/json/gun_from_json.py msgid "V29 laser pistol" @@ -113355,6 +115525,20 @@ msgstr "" "Drewniana dmuchawka, łatwa w użyciu i bardzo celna. Używa strzałek jako " "amunicji." +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -113414,7 +115598,7 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -113429,7 +115613,7 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -113445,7 +115629,7 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -113459,8 +115643,8 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" #: lang/json/gun_from_json.py @@ -113473,12 +115657,12 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" #: lang/json/gun_from_json.py @@ -113507,11 +115691,11 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" #: lang/json/gun_from_json.py @@ -113524,7 +115708,7 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -113538,8 +115722,8 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -113554,7 +115738,7 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -113568,8 +115752,8 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -113583,7 +115767,7 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -113613,8 +115797,8 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" @@ -113770,11 +115954,10 @@ msgstr[3] "JHEC M128" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" -"Autorewolwer M128 produkcji Johnson Heavy Equipment Co. Inne się mu nie " -"równają. Johnson Heavy Equipment Co. to odłam D&B Minneapolis." #: lang/json/gun_from_json.py msgid "Boomlighter 454" @@ -113884,12 +116067,12 @@ msgstr "" "i zawierający zintegrowany granatnik. Eagle 1776: Z arsenału wolności!" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" -msgstr[0] "karabinek L.T." -msgstr[1] "karabinki L.T." -msgstr[2] "karabinki L.T." -msgstr[3] "karabinki L.T." +msgid "L.T. carbine" +msgid_plural "L.T. carbines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/gun_from_json.py msgid "" @@ -114372,12 +116555,9 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" -"Potężny elektrolaser opracowany przez paramilitarny dział badawczy niedługo " -"przed kataklizmem. Skuteczny zwłaszcza przeciwko elektronicznym celom. " -"Zasilany z UPS-a." #: lang/json/gun_from_json.py msgid "hand-held laser cannon" @@ -114406,15 +116586,11 @@ msgstr[3] "karabin laserowy" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" -"Najwyższej jakości karabin laserowy zasilany z UPS-a opracowany przez " -"paramilitarny dział badawczy na krótko przed kataklizmem. Pierwsze próby " -"dościgły najlepsze współczesne bronie balistyczne. Choć kataklizm wyrzucił " -"je na śmietnisko historii, to ta broń może uczynić to samo z twoimi wrogami." #: lang/json/gun_from_json.py msgid "laser pistol" @@ -114598,6 +116774,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -114631,8 +116811,8 @@ msgstr[3] "bazowy robokarabin" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." -msgstr "To pseudo przedmiot do ataków potworów. Jeśli go widzisz to błąd." +"This is a pseudo item for monster attacks. If you see this, it's a bug." +msgstr "" #: lang/json/gun_from_json.py msgid "integral 12 gauge shotgun" @@ -114882,15 +117062,8 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" -"Żywy glut zmieniony w autonomiczną broń; zaprojektowany do rozciągnięcia na " -"ramie jako bariera. Wyewoluował zdolność stałego tworzenia zwapniałych " -"wypustek kontrolowanych następnie przez rozciągliwe włókna ścięgno-podobne. " -"Te \"zęby\" potrafią chwytać i ranić wszystko co będzie miało nieszczęście " -"znaleźć się w pobliżu. Zewnętrzna membrana stała się znacznie grubsza by " -"wspierać bardziej obciążający ruch, choć jest na tyle ciągliwa by ją " -"rozdzielić..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "gel shooter" @@ -114906,14 +117079,8 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" -"Żywy glut zmieniony w autonomiczną broń. Przeszukuje ziemię w poszukiwaniu " -"materiału, który odziera ze składników odżywczych. Pozostałości są " -"wystrzeliwane ze znaczną prędkością w kierunku pobliskich zagrożeń. " -"Amorficzna masa może być kształtowana i przyłączana dotykiem, ale broń jest " -"bierna sama z siebie bez czegoś co by ją kontrolowało. Wygląda na tyle " -"ciągliwe by ją rozdzielić." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "frost lancer" @@ -115665,21 +117832,6 @@ msgstr "" "szybciej i z większą mocą. Jednakże to czyni go bardzo nieporęczną bronią i " "musi być zamontowany na wspierającej platformie by go używać." -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "rewolwer Model 10" -msgstr[1] "rewolwer Model 10" -msgstr[2] "rewolwer Model 10" -msgstr[3] "rewolwer Model 10" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "" -"Sześciostrzałowy rewolwer. Ma wysuwany bębenek dla łatwiejszego " -"przeładowywania." - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -115701,59 +117853,6 @@ msgstr "" "po wypadku lotniczym, następnie produkowany też komercyjnie przez różne " "firmy." -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "Colt Lightning .45" -msgstr[1] "Colt Lightning .45" -msgstr[2] "Colt Lightning .45" -msgstr[3] "Colt Lightning .45" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -"Współczesna reprodukcja karabinu Colta z przeładowaniem typu pump action. W " -"oryginale na naboje .44-40, ale współczesne wersje używają popularnych .45 " -"Long Colt, uzupełniając rewolwer Single Action Army w strzelaniu w stylu " -"kowbojskim." - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "Bond Arms Derringer" -msgstr[1] "Bond Arms Derringer" -msgstr[2] "Bond Arms Derringer" -msgstr[3] "Bond Arms Derringer" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" -"Bond Arms Derringer to seria dwulufowych kompaktowych pistoletów. " -"Najczęściej używają naboi kalibru .45 Long Colt, z komorą na tyle długą by " -"zmieścić nabój do strzelb kalibru .410." - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] "młodzieżowa strzelba .410" -msgstr[1] "młodzieżowa strzelba .410" -msgstr[2] "młodzieżowa strzelba .410" -msgstr[3] "młodzieżowa strzelba .410" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" -"Stara łamana strzelba w kalibrze .410. Opracowana jako posiadająca mniejszy " -"odrzut alternatywa kalibru 12, i jest lekka i łatwa w produkcji." - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -115770,51 +117869,6 @@ msgstr "" "Domowej roboty strzelba w kalibrze .410. Po prostu rura przyłączona do " "kolby, z kurkiem do odpalania naboju." -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "AF2011A1 .38 Super" -msgstr[1] "AF2011A1 .38 Super" -msgstr[2] "AF2011A1 .38 Super" -msgstr[3] "AF2011A1 .38 Super" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "Dwulufowy pistolet półautomatyczny. Wygląda jak dwa zespawane M1911." - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38 Super" -msgstr[1] "M1991A1 .38 Super" -msgstr[2] "M1991A1 .38 Super" -msgstr[3] "M1991A1 .38 Super" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "Współczesny M1911 w kalibrze .38 Super. Ma dobrą celność." - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "Taurus Raging Judge Magnum" -msgstr[1] "Taurus Raging Judge Magnum" -msgstr[2] "Taurus Raging Judge Magnum" -msgstr[3] "Taurus Raging Judge Magnum" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" -"Taurus Raging Judge Magnum to 5-strzałowy rewolwer w kalibrze .454 Casull. " -"Może też strzelać nabojami kalibru .410 i .45 Long Colt." - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -117283,7 +119337,7 @@ msgstr[3] "celownik teleskopowy" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" @@ -117742,6 +119796,20 @@ msgid "" "weapon other than pistols and pump-action guns, if you so want." msgstr "" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -118046,7 +120114,7 @@ msgstr[3] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -118074,9 +120142,9 @@ msgstr[3] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -118090,7 +120158,7 @@ msgstr[3] "" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -118312,22 +120380,6 @@ msgstr "" "i kawałka sznurka. To nadal niezła broń do walki wręcz zapewniająca ataki " "zasięgowe gdy przyłączona do broni długiej lub kuszy." -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "strzelba M6 ASW" -msgstr[1] "strzelba M6 ASW" -msgstr[2] "strzelba M6 ASW" -msgstr[3] "strzelba M6 ASW" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "" -"Zintegrowana strzelba kalibru .410 do M6 Broni Surwiwalowej Załóg " -"Lotniczych. Nieusuwalna." - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "Patroszysz i filetujesz rybę" @@ -120011,10 +122063,6 @@ msgstr "Tnij rygle lub druty" msgid "Heat up food (with it)" msgstr "Podgrzej żywność (tym)" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "Napraw drewno/papier/kość/chitynę" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "Przyłącz jako mod narzędzia" @@ -120905,6 +122953,11 @@ msgstr "" "To ubranie sprawuje się świetnie nawet gdy jest " "przemoczone. To może być przyjemne." +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -122067,7 +124120,8 @@ msgstr "Konstruuj Teren" msgid "Disassemble items" msgstr "Rozmontuj Przedmioty" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "Śpij" @@ -122877,7 +124931,8 @@ msgstr "" msgid "Wasp nest is here." msgstr "" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "Pająki" @@ -122936,6 +124991,33 @@ msgstr "" msgid "Small pond is here." msgstr "" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "" @@ -123006,7 +125088,7 @@ msgstr "" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "" #. ~ Computer name @@ -123791,6 +125873,16 @@ msgstr "ZAKAZ Biegania!" msgid "NO Diving!" msgstr "ZAKAZ Nurkowania!" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -123927,8 +126019,7 @@ msgid "Emergency Message" msgstr "Wiadomość Alarmowa" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "Odetnij Zasilanie Zewnętrzne" @@ -124584,13 +126675,10 @@ msgstr "" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" -"Jesteś krzepki i nie drgniesz wobec żadnego zagrożenia.\n" -"\n" -"+2 prób uniku, -1.0 umiejętności uniku, blokowane obrażenia zmniejszone o 50%% siły." #: lang/json/martial_art_from_json.py msgid "Tactical Retreat" @@ -125597,7 +127685,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -125620,7 +127708,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -125631,7 +127719,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -125640,7 +127728,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -125651,7 +127739,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -125661,7 +127749,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -125672,7 +127760,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -125846,6 +127934,10 @@ msgstr "obszarpany" msgid "Diamond" msgstr "Diament" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "Jajo" @@ -126063,8 +128155,8 @@ msgid "Mushroom" msgstr "Grzyb" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "Woda" @@ -127490,7 +129582,7 @@ msgstr "" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" @@ -127638,11 +129730,11 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "" #: lang/json/mission_def_from_json.py @@ -127683,6 +129775,10 @@ msgstr "" msgid "What good does this do me?" msgstr "" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "" @@ -127723,7 +129819,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "" #: lang/json/mission_def_from_json.py @@ -127761,12 +129857,12 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "" #: lang/json/mission_def_from_json.py @@ -127835,7 +129931,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "" #: lang/json/mission_def_from_json.py @@ -127853,7 +129949,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" @@ -127874,7 +129970,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" #: lang/json/mission_def_from_json.py @@ -127882,7 +129978,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "" #: lang/json/mission_def_from_json.py @@ -128627,7 +130723,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" @@ -129055,7 +131151,7 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -129378,15 +131474,10 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" -"Wygląda to na miesiące, może nawet lata badań, więc tych danych musi być " -"masa. Serwery bazodanowe duże na tyle by to pomieścić przegrzałyby się na " -"zasilaniu awaryjnym. Znalazłem więc wiadomości z laboratorium w którym " -"otworzył się jakiś zamrażający portal w czasie kataklizmu, zamrażający " -"wszystko na amen. Założę się, że archiwa tam wciąż działają." #: lang/json/mission_def_from_json.py msgid "" @@ -130962,7 +133053,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -130988,10 +133079,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "Przynajmniej próbowałeś, jak sądzę..." - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -131016,7 +133103,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -131056,8 +133143,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -131078,7 +133165,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -131105,7 +133192,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -131120,7 +133207,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -131189,6 +133276,54 @@ msgstr "" msgid "The %1$s tries to slam into , but fails to." msgstr "" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -139341,8 +141476,8 @@ msgstr "Historia Ocalonego" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" -msgstr "Ten NPC może ci powiedzieć jak przetrwał kataklizm" +msgid "This NPC could tell you about how they survived the Cataclysm" +msgstr "" #: lang/json/mutation_from_json.py msgid "Mark of the Seer" @@ -139883,7 +142018,7 @@ msgstr "" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -139947,20 +142082,10 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" -"Coś w twojej osobie powoduje łagodność zwierząt, i traktują cię z wrodzonym " -"zaufaniem. Dotyczy to wyłącznie naturalnej fauny, np. leśnej." - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "" @@ -140592,7 +142717,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -140625,10 +142750,8 @@ msgid "I'm just trying to stay alive." msgstr "Po prostu staram się pozostać przy życiu." #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." msgstr "" -"Po prostu staram się pozostać przy życiu... a to nie takie proste na jakie " -"wygląda." #: lang/json/npc_class_from_json.py msgid "Lizard Mutant" @@ -140636,11 +142759,9 @@ msgstr "Jaszczurzy Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam jaszczurzego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Medical Mutant" @@ -140648,11 +142769,9 @@ msgstr "Medyczny Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam medycznego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Bird Mutant" @@ -140660,11 +142779,9 @@ msgstr "Ptasi Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Szukam ptasiego mutagenu... ten świat nie jest już dla ludzi, i nie planuję " -"pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Fish Mutant" @@ -140672,11 +142789,9 @@ msgstr "Rybi Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Szukam rybiego mutagenu... ten świat nie jest już dla ludzi, i nie planuję " -"pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Beast Mutant" @@ -140684,11 +142799,9 @@ msgstr "Bestialski Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Szukam bestialskiego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Ursine Mutant" @@ -140696,11 +142809,9 @@ msgstr "Niedźwiedzi Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam niedźwiedziego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Feline Mutant" @@ -140708,11 +142819,9 @@ msgstr "Koci Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam kociego mutagenu... ten świat nie jest już dla ludzi, i nie planuję " -"pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Lupine Mutant" @@ -140720,11 +142829,9 @@ msgstr "Wilczy Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam wilczego mutagenu... ten świat nie jest już dla ludzi, i nie planuję " -"pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Cattle Mutant" @@ -140732,11 +142839,9 @@ msgstr "Bydlęcy Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam bydlęcego mutagenu... ten świat nie jest już dla ludzi, i nie planuję" -" pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Insect Mutant" @@ -140744,11 +142849,9 @@ msgstr "Owadzi Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam owadziego mutagenu... ten świat nie jest już dla ludzi, i nie planuję" -" pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Plant Mutant" @@ -140756,11 +142859,9 @@ msgstr "Roślinny Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Szukam roślinnego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Slime Mutant" @@ -140768,11 +142869,9 @@ msgstr "Ślimaczy Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Szukam ślimaczego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Troglobite Mutant" @@ -140780,11 +142879,9 @@ msgstr "Troglobiontyczny Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -"Szukam troglobiontycznego mutagenu... ten świat nie jest już dla ludzi, i " -"nie planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Cephalopod Mutant" @@ -140792,11 +142889,9 @@ msgstr "Głowonogi Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -"Szukam głowonogiego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Spider Mutant" @@ -140804,11 +142899,9 @@ msgstr "Pajęczy Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam pajęczego mutagenu... ten świat nie jest już dla ludzi, i nie planuję" -" pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Rat Mutant" @@ -140816,11 +142909,9 @@ msgstr "Szczurzy Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" -"Szukam szczurzego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Mouse Mutant" @@ -140828,11 +142919,9 @@ msgstr "Mysi Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Szukam mysiego mutagenu... ten świat nie jest już dla ludzi, i nie planuję " -"pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Alpha Mutant" @@ -140840,11 +142929,9 @@ msgstr "Alfa Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Szukam alfa mutagenu... ten świat nie jest już dla ludzi, i nie planuję " -"pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Elfa Mutant" @@ -140852,11 +142939,9 @@ msgstr "Elfa Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Szukam elfa mutagenu... ten świat nie jest już dla ludzi, i nie planuję " -"pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Chimera Mutant" @@ -140864,11 +142949,9 @@ msgstr "Chimeryczny Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam chimerycznego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_class_from_json.py msgid "Raptor Mutant" @@ -140876,11 +142959,9 @@ msgstr "Drapieżny Mutant" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Szukam drapieżnego mutagenu... ten świat nie jest już dla ludzi, i nie " -"planuję pozostać jednym z nich." #: lang/json/npc_from_json.py msgid "Brigitte LaCroix" @@ -144164,13 +146245,10 @@ msgstr "Ocalony ze Schronu" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"Na początku kataklizmu zaszyłeś się w schronie przeciwlotniczym. Teraz " -"nastała zima, i masz nadzieję że ta mieszanina umiejętności których " -"nauczyłeś się z książek pomoże ci przetrwać." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -144181,13 +146259,10 @@ msgstr "Ocalona ze Schronu" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"Na początku kataklizmu zaszyłaś się w schronie przeciwlotniczym. Teraz " -"nastała zima, i masz nadzieję że ta mieszanina umiejętności których " -"nauczyłaś się z książek pomoże ci przetrwać." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -144198,13 +146273,10 @@ msgstr "Ukryty Rezerwista" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Na początku kataklizmu zaszyłeś się w schronie przeciwlotniczym. Teraz " -"nastała zima, i masz nadzieję że twoja broń i nabyte umiejętności pomogą ci " -"przetrwać." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -144215,13 +146287,10 @@ msgstr "Ukryta Rezerwistka" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Na początku kataklizmu zaszyłaś się w schronie przeciwlotniczym. Teraz " -"nastała zima, i masz nadzieję że twoja broń i nabyte umiejętności pomogą ci " -"przetrwać." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -144302,13 +146371,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"Y cóż to za diabełstwo!? Ni rozumisz nyc z tygo dziwnego mijsca ni wisz tysz" -" co za czarostwo cie tu rzuciło. Z tym przyklyństwym mysisz znyleść nowe " -"życie w nyjstraszlifszym kytyklyzmie jaku człek widzioł łot czasu potopu " -"jkich żech Noe przytrwoł ne sfej wilkiej łajbie." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -144321,13 +146386,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"Y cóż to za diabełstwo!? Ni rozumisz nyc z tygo dziwnego mijsca ni wisz tysz" -" co za czarostwo cie tu rzuciło. Z tym przyklyństwym mysisz znyleść nowe " -"życie w nyjstraszlifszym kytyklyzmie jaku człek widzioł łot czasu potopu " -"jkich żech Noe przytrwoł ne sfej wilkiej łajbie." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -144441,12 +146502,9 @@ msgstr "Pszczelarz" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Byłeś profesjonalnym pszczelarzem. Musiałeś opuścić swoje cenne pszczółki " -"gdy uderzył kataklizm, ale przynajmniej zdołałeś ocalić trochę sprzętu i " -"miodu." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -144458,11 +146516,9 @@ msgstr "Pszczelarka" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Byłeś profesjonalną pszczelarką. Musiałaś opuścić swoje cenne pszczółki gdy " -"uderzył kataklizm, ale przynajmniej zdołałaś ocalić trochę sprzętu i miodu." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -144473,12 +146529,10 @@ msgstr "Koszykarz" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"To miała być twoja pokazowa gra, ale wtedy uderzył kataklizm. Dzięki szybkim" -" nogom byłeś wśród nielicznych, którzy ocaleli i uciekli przed stworzeniami." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -144489,12 +146543,10 @@ msgstr "Koszykarka" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"To miała być twoja pokazowa gra, ale wtedy uderzył kataklizm. Dzięki szybkim" -" nogom byłaś wśród nielicznych, którzy ocaleli i uciekli przed stworzeniami." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -144647,11 +146699,9 @@ msgstr "Lokaj" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Pracowałeś w bogatej posiadłości, ale po kataklizmie właściciele udali się " -"na rodzinne wakacje w nieznanym kierunku, porzucając cię byś bronił się sam." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -144662,12 +146712,9 @@ msgstr "Pokojówka" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Pracowałaś w bogatej posiadłości, ale po kataklizmie właściciele udali się " -"na rodzinne wakacje w nieznanym kierunku, porzucając cię byś broniła się " -"sam." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -145710,14 +147757,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Pracowałeś dla właścicieli małej firmy robiąc drobne prace przy elektryce, i" -" tak się akurat złożyło że pracowałeś przy jednym z tych żartów zwanych " -"schronami ewakuacyjnymi, gdy uderzył kataklizm. Niestety nie zdążyłeś " -"wszystkiego okablować prócz komputera - akurat dużo \"dobrego\" to ci " -"pomoże." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -145730,14 +147772,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Pracowałaś dla właścicieli małej firmy robiąc drobne prace przy elektryce, i" -" tak się akurat złożyło że pracowałaś przy jednym z tych żartów zwanych " -"schronami ewakuacyjnymi, gdy uderzył kataklizm. Niestety nie zdążyłaś " -"wszystkiego okablować prócz komputera - akurat dużo \"dobrego\" to ci " -"pomoże." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -145816,7 +147853,7 @@ msgstr "Ofiara Prysznica" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -145830,7 +147867,7 @@ msgstr "Ofiara Prysznica" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -145874,11 +147911,9 @@ msgstr "Tancerz Towarzyski" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"Byłeś adeptem tańca towarzyskiego przed kataklizmem, i i teraz używasz " -"swoich umiejętności by ocalić życie." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -145889,11 +147924,9 @@ msgstr "Tancerka Towarzyska" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"Byłaś adeptką tańca towarzyskiego przed kataklizmem, i i teraz używasz " -"swoich umiejętności by ocalić życie." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -146812,11 +148845,9 @@ msgstr "Pan Młody" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"Kataklizm wydarzył się w twój wielki dzień i uciekłeś tyko w ślubnym stroju." -" Efekt \"zimnych stóp\"? Przynajmniej masz te stopy razem ze sobą!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -146827,11 +148858,9 @@ msgstr "Panna Młoda" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"Kataklizm wydarzył się w twój wielki dzień i uciekłaś tyko w ślubnym stroju." -" Efekt \"zimnych stóp\"? Przynajmniej masz te stopy razem ze sobą!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -146913,10 +148942,8 @@ msgstr "Niegrzeczny Chłopiec" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Twoja grupa ska rozpadła się gdy perkusista zmienił się w zombie, i teraz " -"jesteś sam pośród apokalipsy z paroma fajkami i odtwarzaczem mp3." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -146928,10 +148955,8 @@ msgstr "Niegrzeczna Dziewczynka" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Twoja grupa ska rozpadła się gdy perkusista zmienił się w zombie, i teraz " -"jesteś sama pośród apokalipsy z paroma fajkami i odtwarzaczem mp3." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -146972,11 +148997,9 @@ msgstr "Skazany" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"Kataklizm dał ci szansę na ucieczkę, ale wolność każe za siebie płacić srogą" -" cenę." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -146987,11 +149010,9 @@ msgstr "Skazana" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -"Kataklizm dał ci szansę na ucieczkę, ale wolność każe za siebie płacić srogą" -" cenę." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -147432,11 +149453,9 @@ msgstr "Rabbi" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Celebrowałeś ze swoim zgromadzeniem w synagodze, gdy uderzył kataklizm. " -"Przydałby się teraz mesjasz!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -147447,11 +149466,9 @@ msgstr "Rabbi" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Celebrowałaś ze swoim zgromadzeniem w synagodze, gdy uderzył kataklizm. " -"Przydałby się teraz mesjasz!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -147653,14 +149670,10 @@ msgstr "Dostarczyciel Pizzy" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Dostarczałeś ostatnią pizzę tej nocki do lokalnego laboratorium " -"kriogenicznego gdy nastał kataklizm. Uciekłeś do najbliższego schronu, gdzie" -" jesteś tylko ty, twój zdrowy rozsądek, i resztki pizzy. I nawet nie dali " -"napiwku!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -147672,14 +149685,10 @@ msgstr "Dostarczycielka Pizzy" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Dostarczałaś ostatnią pizzę tej nocki do lokalnego laboratorium " -"kriogenicznego gdy nastał kataklizm. Uciekłaś do najbliższego schronu, gdzie" -" jesteś tylko ty, twój zdrowy rozsądek, i resztki pizzy. I nawet nie dali " -"napiwku!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -147796,13 +149805,10 @@ msgstr "Rolnik" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Zarabiałeś na życie z uprawy żywności, gdy uderzył kataklizm. Teraz ze swoją" -" zaufaną motyką i garścią nasion czas odbudować Ziemię, po jednej roślinie " -"naraz." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -147813,13 +149819,10 @@ msgstr "Rolnik" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Zarabiałaś na życie z uprawy żywności, gdy uderzył kataklizm. Teraz ze swoją" -" zaufaną motyką i garścią nasion czas odbudować Ziemię, po jednej roślinie " -"naraz." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -147864,13 +149867,10 @@ msgstr "Zatwardziały Szabrownik" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Jako jeden z nielicznych którzy uciekli przed kataklizmem, zorganizowałeś " -"sobie życie na ruinie innych. Czy z użyciem siły czy też przez szczęśliwy " -"traf, pozyskałeś najlepszy sprzęt jaki tylko mogłeś znaleźć." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -147881,13 +149881,10 @@ msgstr "Zatwardziała Szabrowniczka" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Jako jedna z nielicznych którzy uciekli przed kataklizmem, zorganizowałaś " -"sobie życie na ruinie innych. Czy z użyciem siły czy też przez szczęśliwy " -"traf, pozyskałaś najlepszy sprzęt jaki tylko mogłaś znaleźć." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -148207,16 +150204,11 @@ msgstr "Surwiwalista Junior" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Twoi rodzice byli zwariowanymi preppersami, którzy sądzili, że jakiś " -"'kataklizm' się zbliża, i nalegali na przygotowanie cię do niego. Wyszło na " -"to, że mieli rację. Nie miałeś okazji im podziękować. Jedyną rzeczą jako " -"możesz dla nich zrobić to to, o czym zawsze marzyli, że zrobisz w mrocznych " -"dniach przed tobą: przeżyjesz." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -148227,16 +150219,11 @@ msgstr "Surwiwalistka Juniorka" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Twoi rodzice byli zwariowanymi preppersami, którzy sądzili, że jakiś " -"'kataklizm' się zbliża, i nalegali na przygotowanie cię do niego. Wyszło na " -"to, że mieli rację. Nie miałaś okazji im podziękować. Jedyną rzeczą jako " -"możesz dla nich zrobić to to, o czym zawsze marzyli, że zrobisz w mrocznych " -"dniach przed tobą: przeżyjesz." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -149224,7 +151211,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -149241,7 +151228,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -149512,10 +151499,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -149528,10 +151515,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -149543,9 +151530,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -149559,9 +151546,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -149575,7 +151562,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -149589,7 +151576,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -149604,9 +151591,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -149621,9 +151608,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -149637,13 +151624,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -149655,13 +151642,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -149674,8 +151661,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -149690,8 +151677,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -149706,9 +151693,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -149721,9 +151708,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -149735,13 +151722,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -149753,13 +151740,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -149771,10 +151758,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -149786,10 +151773,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -149801,12 +151788,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -149818,12 +151805,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -149835,17 +151822,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -149857,17 +151844,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -149881,9 +151868,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -149897,9 +151884,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -149913,10 +151900,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -149932,10 +151919,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -149950,9 +151937,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -149965,9 +151952,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -149979,11 +151966,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -149995,11 +151983,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -150151,7 +152140,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -150164,7 +152153,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -150201,7 +152190,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -150214,7 +152203,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -150227,7 +152216,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -150240,7 +152229,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -150306,7 +152295,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -150317,7 +152306,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -150381,7 +152370,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -150394,7 +152383,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -150486,7 +152475,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -150500,7 +152489,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -150516,7 +152505,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -150531,7 +152520,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -151601,12 +153590,10 @@ msgstr "Baseballista" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"Byłeś pałkarzem w drużynie z pośledniej ligi przed kataklizmem. Uciekłeś ze " -"sprzętem, ale jak długo zdołasz przeżyć zanim skończy się zmiana?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151617,12 +153604,10 @@ msgstr "Baseballistka" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"Byłaś pałkarką w drużynie z pośledniej ligi przed kataklizmem. Uciekłaś ze " -"sprzętem, ale jak długo zdołasz przeżyć zanim skończy się zmiana?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151705,11 +153690,9 @@ msgstr "Obudzony" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Hałas obudził cię w środku nocy. Uzbrojony jedynie w latarkę udałeś się " -"sprawdzić co się dzieje, a teraz stawiasz czoła kataklizmowi." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151720,11 +153703,9 @@ msgstr "Obudzona" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Hałas obudził cię w środku nocy. Uzbrojona jedynie w latarkę udałaś się " -"sprawdzić co się dzieje, a teraz stawiasz czoła kataklizmowi." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151736,12 +153717,9 @@ msgstr "Bioniczny Cyklista" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Twój trening i wspomaganie zainstalowane by wziąć udział w zawodach " -"kolarskich na Cyber Olimpiadzie dały ci przewagę podczas ucieczki w " -"początkach kataklizmu. Czy zdołasz wiecznie przed nim uciekać?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151753,12 +153731,9 @@ msgstr "Bioniczna Cyklistka" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Twój trening i wspomaganie zainstalowane by wziąć udział w zawodach " -"kolarskich na Cyber Olimpiadzie dały ci przewagę podczas ucieczki w " -"początkach kataklizmu. Czy zdołasz wiecznie przed nim uciekać?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151769,12 +153744,10 @@ msgstr "Spawacz" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"Pracowałeś jako spawacz dla zagranicznej firmy przed kataklizmem. Byłeś w " -"drodze do domu gdy nastał. Przynajmniej zachowałeś narzędzia twojego fachu." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151785,12 +153758,10 @@ msgstr "Spawacz" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"Pracowałaś jako spawacz dla zagranicznej firmy przed kataklizmem. Byłaś w " -"drodze do domu gdy nastał. Przynajmniej zachowałaś narzędzia twojego fachu." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151801,14 +153772,10 @@ msgstr "Prymitywny Surwiwalista" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Wiedziałaś, że ten dzień nastanie, dzień kiedy wszystko pójdzie w diabły. " -"Przygotowałaś się, nie sprzętowo, lecz przez nabycie umiejętności, a " -"wszystkie te dni w lesie opłaciły się. Jeśli twoi przodkowie przetrwali bez " -"sprzętu, niech cię diabli jeśli ty nie zdołasz." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151819,14 +153786,10 @@ msgstr "Prymitywna Surwiwalistka" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Wiedziałaś, że ten dzień nastanie, dzień kiedy wszystko pójdzie w diabły. " -"Przygotowałaś się, nie sprzętowo, lecz przez nabycie umiejętności, a " -"wszystkie te dni w lesie opłaciły się. Jeśli twoi przodkowie przetrwali bez " -"sprzętu, niech cię diabli jeśli ty nie zdołasz." #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py @@ -156347,12 +158310,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Gdy wybuchała apokalipsa, zabunkrowałeś się w najbliższym schronie. Tu " -"żyłaś, nigdy nie wychodząc, na wypadek gdyby nieznane zagrożenia " -"zewnętrznego świata miały cię zranić. Zapasy się kurczą, i po raz pierwszy " -"od kataklizmu będziesz zmuszona zmierzyć się ze światem na zewnątrz." #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -156361,12 +158320,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Gdy wybuchała apokalipsa, zabunkrowałaś się w najbliższym schronie. Tu " -"żyłaś, nigdy nie wychodząc, na wypadek gdyby nieznane zagrożenia " -"zewnętrznego świata miały cię zranić. Zapasy się kurczą, i po raz pierwszy " -"od kataklizmu będziesz zmuszona zmierzyć się ze światem na zewnątrz." #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -156432,7 +158387,7 @@ msgstr "więzienie" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -156441,7 +158396,7 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -156545,24 +158500,18 @@ msgstr "Eksperyment " msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Od urodzenia twoim jedynym przeznaczeniem w życiu był rozwój nauk " -"genetycznych, ochotniczo lub pod przymusem. Po uderzeniu kataklizmu " -"opuściłeś laboratorium, i włóczyłeś się bez celu, aż dotarłeś do lasu." #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Od urodzenia twoim jedynym przeznaczeniem w życiu był rozwój nauk " -"genetycznych, ochotniczo lub pod przymusem. Po uderzeniu kataklizmu " -"opuściłaś laboratorium, i włóczyłaś się bez celu, aż dotarłaś do lasu." #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -156813,8 +158762,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Description for scenario 'Lost Faith' for a female character. @@ -156822,8 +158771,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Starting location for scenario 'Lost Faith'. @@ -156852,7 +158801,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Description for scenario 'The Wizard's Apprentice' for a female @@ -156864,7 +158813,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -156890,8 +158839,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -156900,8 +158849,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -157003,9 +158952,9 @@ msgstr "Wyzwanie - Obóz Śmierci FEMA" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female @@ -157014,9 +158963,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -158083,6 +160032,11 @@ msgstr "" "Wiewiórki są dość smaczne, ale strzelanie do nich z dużego kalibru pozbawi " "je zjadliwego mięsa. Użyj wiatrówki lub 22-ki." +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -158108,10 +160062,26 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." +"impossible unless you have a big tactical advantage." msgstr "" -"Jak widzisz nadchodzący tłum zombie - UCIEKAJ! Walka ze wszystkimi na raz to" -" samobójstwo chyba że masz znaczną przewagę taktyczną." + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "" +"Jak cię ściga horda zombie, spróbuj wskoczyć do metra i wyjdź na " +"powierzchnię dwie przecznice dalej." #: lang/json/snippet_from_json.py msgid "" @@ -158448,7 +160418,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" @@ -158682,6 +160652,12 @@ msgstr "" "Jak jesteś słaby lub niezdarny odpuść sobie Mołotowy i granaty. Rzucanie ich" " sobie pod stopy zamiast w dal źle się skończy." +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -158737,9 +160713,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" #: lang/json/snippet_from_json.py @@ -158758,6 +160733,12 @@ msgstr "" "Następnym razem jak trafisz na spożywczak napakuj puszkowanej żywności. Ta " "nigdy się nie psuje." +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -158787,14 +160768,6 @@ msgid "" "defense… it's perfect!" msgstr "" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "" -"Jak cię ściga horda zombie, spróbuj wskoczyć do metra i wyjdź na " -"powierzchnię dwie przecznice dalej." - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -158805,9 +160778,9 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" #: lang/json/snippet_from_json.py @@ -158870,32 +160843,41 @@ msgstr "Łyczek koktajlu cytrynowego dziennie i precz ze szkorbutem!" #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "" -"Głodniejszy niż zwykle? Naturalne oleje mogą pomóc. Smaku żadnego, ale kogo " -"to obchodzi jak kolejną opcją jest zjedzenie własnej nogi?" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." msgstr "" -"Otoczenie może odwrócić przebieg bitwy, więc użyj go przeciwko swoim wrogom," -" w przeciwnym razie zostanie użyte przeciwko tobie." #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" -"Ludzie, którzy przechodzili obok kopalni mówili coś o paskudnym zapachu. " -"Jeśli planujesz tam wizytę rozważ wzięcie ze sobą maski gazowej." #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "Wiedza to potęga. Serio, po prostu weź jakąś książkę." +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -158976,13 +160958,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" -"Lutownica może być najlepszym przyjacielem aspirującego mechanika. Można nią" -" też kauteryzować rany, ale ponieważ tyle samo ludzi umarło od tego co " -"przeżyło, sądzę że to raczej ostatnia deska ratunku." #: lang/json/snippet_from_json.py msgid "" @@ -159028,14 +161007,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" -"Byłem przeciwny narkotykom dopóki niemal zostałem zabity przez zombie i " -"wlekłem swój żałosny tyłek z dala od hordy, nie mając przy sobie nic oprócz " -"garści białego proszku z kieszeni tego zombiaka. Uratowało mi to wtedy " -"życie." #: lang/json/snippet_from_json.py msgid "" @@ -159065,6 +161040,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -159175,6 +161156,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -159196,6 +161201,13 @@ msgid "" "either, if you catch my drift." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -159248,6 +161260,12 @@ msgid "" " a cold ground." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -159293,8 +161311,8 @@ msgid "Hey there's some pink tablets, take some!" msgstr "Hej są tu różowe tabletki, weź trochę!" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" -msgstr "Patrz, LSD, zagrajmy w kataklizm: zabawne dni przed nami!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" +msgstr "" #: lang/json/snippet_from_json.py msgid "Say yes to LSD, say yes to Fun!" @@ -162131,16 +164149,16 @@ msgid "" msgstr "" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." -msgstr "Opowiedz mi o tym jak przetrwałeś kataklizm." +msgid "Tell me about how you survived the Cataclysm." +msgstr "" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" -msgstr "Jak przetrwałeś kataklizm?" +msgid "How did you survive the Cataclysm?" +msgstr "" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" -msgstr "Jak kataklizmy wyglądał z twojej perspektywy?" +msgid "What was the Cataclysm like for you?" +msgstr "" #: lang/json/snippet_from_json.py msgid "How did you make it through the initial chaos?" @@ -162401,8 +164419,8 @@ msgid "eldritch horror" msgstr "" #: lang/json/snippet_from_json.py -msgid "the cataclysm" -msgstr "kataklizm" +msgid "the Cataclysm" +msgstr "" #: lang/json/snippet_from_json.py msgid "the apocalypse" @@ -162769,6 +164787,306 @@ msgid "" "Refer to file EXO-M-312 for full report." msgstr "" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -163991,7 +166309,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "" #: lang/json/snippet_from_json.py @@ -168634,10 +170952,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" -"\"Agh! Zobaczyć Spiralę w takiej Zaburzonej Postaci! Zmanipulowanej dla " -"ruchu Wiru! Jej Bezustanną Grację! Jej piękno Zszargane...\"" #: lang/json/snippet_from_json.py msgid "\"My friend died, but at least I made her into a blob turret.\"" @@ -168657,16 +170973,13 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" -"\"Dzień 40. Sterowanie zepsute - magiczny reaktor samochodu niebłagalnie " -"pcha go naprzód. Gigantyczne walce na froncie rozdzierają las na wykałaczki." -" Stanie Maine, nadchodzę.\"" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" -msgstr "\"mój samochód to nieoszlifowany diament ... dosłownie\"" +msgid "\"my car is a diamond in the rough… literally\"" +msgstr "" #: lang/json/snippet_from_json.py msgid "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" @@ -168692,11 +171005,9 @@ msgstr "\"pewnego dnia ja też będę częścią samochodu\"" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" -"\"Wsadź tyci tyci dynamitu i pół miny lądowej do puszki po koli.... WHAM! " -"Dojdziesz do czegoś.\"" #: lang/json/speech_from_json.py msgid "\"Hello?\"" @@ -170317,6 +172628,38 @@ msgstr "" msgid "WOOF!" msgstr "" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "\"Nie zmuszaj mnie bym kazał ci przespacerować się po desce.\"" @@ -170425,19 +172768,15 @@ msgstr "Gdy skończą się testy, będziemy tęsknić." #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" -"Niewiarygodne, Ty, [wstaw imię podmiotu], musisz być dumą [wstaw miasto " -"pochodzenia podmiotu]!" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" -"Ta rzecz to prawdopodobnie jakiś rodzaj pojemnika na nieprzetworzone ścieki." -" Dalej, wytrzyj sobie o niego twarz." #: lang/json/speech_from_json.py msgid "" @@ -170449,11 +172788,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" -"Nikt cię nie będzie obwiniał jak się poddasz. W rzeczy samej odpuszczenie w " -"tym miejscu to całkiem rozsądna reakcja." #: lang/json/speech_from_json.py msgid "" @@ -170464,9 +172801,8 @@ msgstr "" "pesymizmu." #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" +msgid "Hello again. To reiterate our previous warning: [garbled]" msgstr "" -"Witaj ponownie. By powtórzyć nasze poprzednie ostrzeżenie: [zniekształcone]" #: lang/json/speech_from_json.py msgid "Weeeeeeeeeeeeeeeeeeeeee[bzzt]" @@ -170550,11 +172886,9 @@ msgstr "Komuś stanie się poważna krzywda." #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "" -"Uh oh. Ktoś pociął ciasto. Mówiłam im by na ciebie zaczekali, ale zrobili to" -" mimo to." #: lang/json/speech_from_json.py msgid "This is your fault. It didn't have to be like this." @@ -170587,8 +172921,8 @@ msgstr "Co to było? Coś mówiłeś?" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " -msgstr "Chcę tylko podkreślić, że dano ci każdą szansę byś odniósł sukces." +" " +msgstr "" #: lang/json/speech_from_json.py msgid "What's your point, anyway? Survival?" @@ -170649,11 +172983,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" -"Sprawdzam kilka schematów i planów, i myślę .... Tak, w tym miejscu. Z całą " -"pewnością idziesz w złym kierunku." #: lang/json/speech_from_json.py msgid "Are you even listening to me?" @@ -170688,8 +173020,8 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "\"Oglądacie skutek braku porozumienia.\"" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" -msgstr "\"E.T. dzwoni dom.\"" +msgid "\"E.T. phone home.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"I'm as mad as hell, and I'm not going to take this anymore!\"" @@ -170754,8 +173086,8 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "\"Drogi? Tam, gdzie się udajemy, nie potrzebujemy dróg.\"" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" -msgstr "\"Zapnijcie pasy. Zanosi się na ciężką noc.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "" @@ -171121,8 +173453,8 @@ msgid "\"I'm scared!\"" msgstr "\"Boję się!\"" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" -msgstr "\"Coś jest nie tak...\"" +msgid "\"Something's wrong…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"What are you doing?\"" @@ -171149,16 +173481,16 @@ msgid "\"Excuse me?\"" msgstr "\"Przepraszam?\"" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" -msgstr "\"Jestem inna...\"" +msgid "\"I'm different…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" -msgstr "\"Dzięki mimo to...\"" +msgid "\"Thanks anyway…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" -msgstr "\"Weź mnie ze sobą...\"" +msgid "\"Take me with you…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"You have excellent aim!\"" @@ -171237,8 +173569,8 @@ msgid "\"This time is OUR time.\"" msgstr "\"Tym razem to NASZA chwila.\"" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" -msgstr "\"Do trzech razy sztuka...\"" +msgid "\"Second time's a charm…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Howdy, stranger!\"" @@ -171309,8 +173641,8 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "\"[wzdycha] Nie mów o tym nikomu.\"" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" -msgstr "\"Cóż, próbowałam. Najlepszego!\"" +msgid "\"Well, I tried. Best of luck!\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Hey, safe travels, there.\"" @@ -171605,7 +173937,7 @@ msgid "Cabin" msgstr "chata" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "szpital" @@ -171757,7 +174089,7 @@ msgstr "obóz FEMA" msgid "Mansion Entrance" msgstr "Wejście Rezydencji" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "rezydencja" @@ -171831,19 +174163,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" " taking the bones does the cycle end - their story, their song, their " "strength, become yours to use." msgstr "" -"Kiedy to się stało, kataklizm, coś… zmieniło się. Możesz to zobaczyć we " -"wszystkich stworzeniach, ale przede wszystkim w ich kościach. Łamią się, " -"przekształcają, powstają ponownie, w nieskończonym cyklu. Żywy, martwy " -"spacer. Potwory rozrywają się i rozrywają. Możesz zobaczyć rezonans, cichy " -"szum czystej siły i tylko zabranie kości kończy cykl - ich historia, " -"piosenka, ich siła stają się twoją." #: lang/json/talk_topic_from_json.py msgid "So what do you actually do with the bones?" @@ -171936,42 +174262,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172711,7 +175037,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -173027,13 +175353,13 @@ msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "Ok, może to pozwoli mi nie zamarznąć w tą pogodę, co słychać?" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding " -"up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding " +"up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173123,14 +175449,14 @@ msgstr "Okej, żadnych gwałtownych ruchów..." msgid "Keep your distance!" msgstr "Trzymaj dystans!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "To moje terytorium, ." - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "To moje terytorium, ." + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "Uspokój się. Nie zrobię ci krzywdy." @@ -173184,29 +175510,29 @@ msgid "I don't care." msgstr "Nie obchodzi mnie to." #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "Mam tylko jedną robotę. Chcesz posłuchać?" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "Mam kolejną robotę dla ciebie. Chcesz o niej usłyszeć?" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "Mam inne zadania dla ciebie. Chcesz o nich usłyszeć?" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "Mam kolejne zadania dla ciebie. Chcesz o nich usłyszeć?" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "Mam inne zadania dla ciebie. Chcesz o nich usłyszeć?" +msgid "I have another job for you. Want to hear about it?" +msgstr "Mam kolejną robotę dla ciebie. Chcesz o niej usłyszeć?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "Nie mam już więcej prac dla ciebie." +msgid "I just have one job for you. Want to hear about it?" +msgstr "Mam tylko jedną robotę. Chcesz posłuchać?" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "Nie mam żadnych prac dla ciebie." +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "Nie mam już więcej prac dla ciebie." + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -173216,6 +175542,10 @@ msgstr "Oh, okej." msgid "Never mind, I'm not interested." msgstr "Nieważne, nie jestem zainteresowany." +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "Nie pracujesz teraz nad żadnym moim zleceniem." + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "Która praca?" @@ -173224,10 +175554,6 @@ msgstr "Która praca?" msgid "What about it?" msgstr "Co ty na to?" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "Nie pracujesz teraz nad żadnym moim zleceniem." - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "Zrobię to." @@ -173444,10 +175770,6 @@ msgstr "Hmmm, okej." msgid "Thanks!" msgstr "Dzięki!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "Skup się na drodze, kolego!" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "Mam swoje powody by ci nie mówić." @@ -173472,6 +175794,10 @@ msgstr "Pragnienie mnie męczy, daj mi coś do picia." msgid "I must focus on the road!" msgstr "Muszę się skupić na drodze!" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "Skup się na drodze, kolego!" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Oh, okej." @@ -173576,10 +175902,6 @@ msgstr "Nie, tu nam dobrze." msgid "On second thought, never mind." msgstr "Po zastanowieniu się, jednak nieważne." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "Nie jestem w stanie cię trenować gdy prowadzisz pojazd!" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "Mam swoje powody, by odmówić ci szkolenia." @@ -173592,6 +175914,10 @@ msgstr "Odczekaj trochę, później pokażę ci cos nowego..." msgid "I can't train you properly while I'm operating a vehicle!" msgstr "Nie jestem w stanie cię trenować gdy prowadzę pojazd!" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "Nie jestem w stanie cię trenować gdy prowadzisz pojazd!" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "Nie ma bata, nie zostanę porzucony w tyle!" @@ -174262,8 +176588,8 @@ msgid "How are you alive?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" -msgstr "Co robiłeś przed kataklizmem?" +msgid "What did you do before the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -174483,32 +176809,32 @@ msgid "This is a season spring test response." msgstr "To odpowiedź testowa pory roku wiosna." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." -msgstr "To odpowiedź testowa 30 dni od kataklizmu." +msgid "This is a days since Cataclysm 30 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season summer test response." msgstr "To odpowiedź testowa pory roku lato." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." -msgstr "To odpowiedź testowa 120 dni od kataklizmu." +msgid "This is a days since Cataclysm 120 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season autumn test response." msgstr "To odpowiedź testowa pory roku jesień." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." -msgstr "To odpowiedź testowa 210 dni od kataklizmu." +msgid "This is a days since Cataclysm 210 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season winter test response." msgstr "To odpowiedź testowa pory roku zima." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." -msgstr "To odpowiedź testowa 300 dni od kataklizmu." +msgid "This is a days since Cataclysm 300 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a is day test response." @@ -175024,7 +177350,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" @@ -175383,8 +177709,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" -msgstr "Co zrobiłeś dowiadując się o kataklizmie?" +msgid "What did you do when you found out about the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -176872,10 +179198,8 @@ msgstr "Nie, to pokręcone." #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" -"Tak, mam to samo. Czasem wydaje mi się, że moje istnienie zaczęło się " -"wkrótce po kataklizmie." #: lang/json/talk_topic_from_json.py msgid "" @@ -178394,7 +180718,7 @@ msgid "What were you saying before that?" msgstr "O czym to mówiłeś wcześniej?" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178433,7 +180757,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "" @@ -178465,8 +180789,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -178493,7 +180817,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178514,14 +180838,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178534,7 +180858,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178564,7 +180888,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178574,7 +180898,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -178599,7 +180923,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178652,7 +180976,7 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178665,7 +180989,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" @@ -178706,8 +181030,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178736,6 +181060,12 @@ msgstr "" msgid "Where is your brother's place?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "" @@ -178800,6 +181130,10 @@ msgid "" " a forage set up." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "" @@ -179121,14 +181455,6 @@ msgstr "" msgid "Tell me about your dad." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." -msgstr "" -"Psze Pani, nie wiem jak u licha się tu Pani dostała ale jeśli ma Pani choć " -"trochę oleju w głowie to zabierze się Pani stąd puki może." - #: lang/json/talk_topic_from_json.py msgid "" "Sir, I don't know how the hell you got down here but if you have any sense " @@ -179137,6 +181463,14 @@ msgstr "" "Sir, nie wiem jak u licha się tu Pan dostał ale jeśli ma Pan choć trochę " "oleju w głowie to zabierze się Pan stąd puki może." +#: lang/json/talk_topic_from_json.py +msgid "" +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." +msgstr "" +"Psze Pani, nie wiem jak u licha się tu Pani dostała ale jeśli ma Pani choć " +"trochę oleju w głowie to zabierze się Pani stąd puki może." + #: lang/json/talk_topic_from_json.py msgid "Marshal, I hope you're here to assist us." msgstr "Marszalu, mam nadzieję że jesteś tu by nas wesprzeć." @@ -179582,12 +181916,12 @@ msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "Czy mówiłem ci już o kartonie przyjacielu? Czy masz może jakiś?" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180401,12 +182735,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" -"Ohyda, co nie? Są jak włosy łonowe. Zaczęły rosnąć gdzie popadnie zaraz po " -"kataklizmie. Nie mam pojęcia co to spowodowało. Nie mam im za złe, że ich " -"nienawidzą, sam ich nienawidzę." #: lang/json/talk_topic_from_json.py msgid "" @@ -180462,7 +182793,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" @@ -181033,7 +183364,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -183303,14 +185634,14 @@ msgstr "Zachowuj się, bo inaczej przyprowadzę cię do porządku." msgid "Just on watch, move along." msgstr "Tylko stróżuję, ruszaj dalej." -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "Psze pani, naprawdę nie powinna pani podróżować tam na zewnątrz." - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "Ostro tam na zewnątrz, nie?" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "Psze pani, naprawdę nie powinna pani podróżować tam na zewnątrz." + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "" @@ -184602,12 +186933,9 @@ msgstr "Chcę skorzystać z twoich usług." #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" -"Zostałem wysłany by asystować w zakładaniu farmy. Większość z nas nie ma " -"prawdziwych umiejętności, które nie straciłyby znaczenia po kataklizmie, " -"więc niektóre rzeczy robione są trochę metodą prób i błędów." #: lang/json/talk_topic_from_json.py msgid "" @@ -185021,7 +187349,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -185040,7 +187368,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" @@ -185054,8 +187382,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185078,8 +187406,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185092,9 +187420,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185110,9 +187438,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185141,19 +187469,15 @@ msgstr "Potrzebujesz pomocy w czymkolwiek?" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" -"Nie, nie... cóż, może troszeczkę. Była tu taka sama ruina ja tam an górze " -"gdy ją znalazłem, nie było trudną ją naprawić. Możesz się zadekować w wolnym" -" pokoju na razie, tylko go nie uświń. Nie jesteś jedynym zbieraczem w tych " -"okolicach." #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "Interesujące..." +msgid "Interesting…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -185165,8 +187489,8 @@ msgstr "" "masz kasę." #: lang/json/talk_topic_from_json.py -msgid "I see..." -msgstr "Rozumiem..." +msgid "I see…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -185177,8 +187501,8 @@ msgstr "" "nadal działa podpięty pod serwery banku i wszystko co potrzebne." #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "Hmm..." +msgid "Hmm…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -185189,16 +187513,16 @@ msgstr "" "nie? A mi się zawsze przyda więcej forsy." #: lang/json/talk_topic_from_json.py -msgid "Alright..." -msgstr "W porządku..." +msgid "Alright…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Not at the moment, check back later perhaps." msgstr "Nie w tej chwili, ale zapytaj o to później." #: lang/json/talk_topic_from_json.py -msgid "Sure..." -msgstr "Pewnie..." +msgid "Sure…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Are you part of the rescue team?" @@ -185217,8 +187541,8 @@ msgid "So are you busting us out of here or what?" msgstr "No więc zamierzasz nas stąd wydostać czy co?" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." -msgstr "Trzymaj się mocno, . Muszę oczyścić przejście." +msgid "Hold tight, . I've got to clear a path." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Pack your bags, . We're going on a trip." @@ -189033,6 +191357,15 @@ msgstr "" msgid "A closed metal gate." msgstr "" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "" @@ -190939,14 +193272,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "zbiornik z benzyną" +msgid "fuel tank" +msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "rozbity dystrybutor benzyny" @@ -192828,6 +195170,27 @@ msgstr "mały metalowy wspornik" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "okno" @@ -193260,8 +195623,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -193275,7 +195638,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -193628,7 +195991,7 @@ msgstr "" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "żadne" @@ -194402,7 +196765,7 @@ msgstr "Wózek Lodziarza" msgid "Luggage Cart" msgstr "Wózek Bagażowy" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "Wózek Sklepowy" @@ -197787,11 +200150,9 @@ msgstr "wieżyczka laserowa LACP" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" -"Zestaw gąsienic zrobionych z gluta. Mogą być używane zamiast kół, i " -"zapewniają dobrą przyczepność i wydajność poza ubitymi drogami." #. ~ Description for gel shooter #. ~ Description for snapping ooze @@ -198581,6 +200942,10 @@ msgstr "Witamina C" msgid "Toxins" msgstr "" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "Naciśnij " @@ -199098,6 +201463,12 @@ msgstr "Nie można przeładować %s." msgid "You reload the %s." msgstr "Przeładowujesz %s." +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -200037,6 +202408,10 @@ msgstr "" msgid "The required items are not available to complete this task." msgstr "" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -200448,6 +202823,10 @@ msgstr "rodzaj amunicji/ładunku" msgid "spoilage" msgstr "zepsucie" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -202498,6 +204877,44 @@ msgstr "Nie możesz strzelać z %s, w jego obecnym stanie." msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "Niczego nie trzymasz w dłoniach." + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "Jesteś zbyt pełny by jeść liście z %s." + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "Zjadasz poszycie." + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "Jesteś zbyt pełny by się paść." + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "Zjadasz trawę." + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "Ta trawa jest zbyt krótka by się na niej paść." + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "Ta trawa jest martwa i zbyt zniszczona by się na niej paść." + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "Ta trawa jest skażona farbą, a zatem niejadalna." + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "Pozostawiasz pusty %s." + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "Nie możesz efektywnie rzucać gdy jesteś w swojej skorupie." @@ -202535,6 +204952,14 @@ msgstr "Koncentrujesz się potężnie, a twoje ciało słucha!" msgid "You can't muster up the effort to throw anything…" msgstr "" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "Rozładuj przedmiot" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "Nie masz nic do rozładowania." + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -203420,22 +205845,14 @@ msgstr "Czujesz podekscytowanie, gdy operacja się rozpoczyna." #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" -"Czujesz podekscytowanie podczas gdy Autodoc bezboleśnie tnie twoje ciało. " -"Cieszysz się z widoku skalpeli rozcinających tkanki, ale gdy operacja się " -"toczy dalej, nagłe czujesz zmęczenie i tracisz przytomność." #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" -"Leżysz bardzo ale to bardzo nieruchomo, skupiając wzrok na interesującej " -"plamie na suficie , podczas gdy Autodok kroi cię. bezboleśnie. Litościwie " -"tracisz przytomność gdy ostrza wchodzą w twoje pole widzenia. " #: src/bionics.cpp msgid "" @@ -206094,8 +208511,8 @@ msgstr "To nie wygląda na jadalne w obecnej postaci." msgid "This is full of dirt after being on the ground." msgstr "Jest pełny brudu po tym jak był na ziemi." -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "Nie możesz tego robić pod wodą." @@ -207023,11 +209440,11 @@ msgstr "Oszczędność czasu przy hurcie: %s" msgid "Dark craftable? %s" msgstr "" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "Łatwe" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "Trudne" @@ -207523,6 +209940,10 @@ msgstr "" msgid "Test weather" msgstr "Testuj pogodę" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "Info…" @@ -207729,7 +210150,7 @@ msgstr "Zbieracz: %d" msgid "Altruism: %d" msgstr "Altruizm: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "Potrzeby:" @@ -208419,393 +210840,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "Zaczekaj na wygenerowanie mapy [ 0%% ]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "Nie potrzebujesz snu!" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "Nie możesz zapisać w trybie obrony!" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "Nie możesz porzucić %s!" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "Udało ci się przetrwać falę %d!" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "Proszę czekaj na wygenerowanie mapy [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "Poprzednia opcja" - -#: src/defense.cpp -msgid "Next option" -msgstr "Następna opcja" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "Przewiń wartości opcji" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "Przełącz opcję" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "Musisz wybrać co najmniej jedną grupę potworów!" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "Specjalne Zombie" - -#: src/defense.cpp -msgid "Zombies" -msgstr "Zombie" - -#: src/defense.cpp -msgid "Triffids" -msgstr "Tryffidy" - -#: src/defense.cpp -msgid "Robots" -msgstr "Roboty" - -#: src/defense.cpp -msgid "Subspace" -msgstr "Podprzestrzeń" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "Pożywienie" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "Najemnicy" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "TRYB OBRONY" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "Naciśnij klawisze kierunków by przewijać, ENTER by przełączać" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "Scenariusz:" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "Lokacja:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "Początkowa Trudność:" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "Trudność pierwszej fali." - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "Trudność Fal:" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "Przyrost trudności z każdą falą." - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "Czas między Falami:" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "Czas, w minutach, pomiędzy falami." - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "Fale pomiędzy Karawanami:" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "Liczba fal pomiędzy pojawieniem się karawan." - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "Początkowa Gotówka:" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "Z tą ilością pieniędzy rozpoczyna gracz." - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "Gotówka za 1-szą Falę:" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "Nagroda pieniężna za pierwszą falę." - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "Przyrost Gotówki:" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "Przyrost wartości nagrody za każdą koleją falę." - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "Wybór Wroga:" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "Niestandardowy" - -#: src/defense.cpp -msgid "Medium" -msgstr "Średni" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "Wysyp Żywych Trupów" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "Świt Żywych Trupów" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "Ośmionożne Dziwadła" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "Dzień Tryffidów" - -#: src/defense.cpp -msgid "Skynet" -msgstr "Skynet" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "Zew Cthulhu" - -#: src/defense.cpp -msgid "A custom game." -msgstr "Spersonalizowana gra." - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "Łatwe potwory i dużo forsy." - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "Trudniejsze potwory. Musisz jeść." - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "Wszystkie potwory. Musisz jeść i pić." - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "Obroń bar przed klasycznymi zombie, Proste i zabawne." - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "Klasyczni zombie. Wolniejsze i bardziej realistyczne." - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "Szybka zabawa z pajęczakami!" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "Obroń swoją posiadłość przed tryffidami." - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "Roboty orzekły że ludzie to wrogowie!" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "Obroń się przez zalewem legionów nieziemskich horrorów." - -#: src/defense.cpp -msgid "Public Works" -msgstr "Roboty Publiczne" - -#: src/defense.cpp -msgid "Megastore" -msgstr "Hipermarket" - -#: src/defense.cpp -msgid "Bar" -msgstr "Bar" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "Jedno wejście i wiele pokoi. Nieco zapasów medycznych." - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "Łatwy do umocnienia budynek z dużą ilością narzędzi." - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "Duży budynek z różnym zaopatrzeniem." - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "Mały budynek z masą alkoholu." - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "Duży budynek z wieloma pokojami." - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" -"KARAWANA:\n" -"Rozpocznij wybierając kategorię ulubionymi klawiszami góra/dół.\n" -"Przełącz między wyborem kategorii i przedmiotów klawiszem %s.\n" -"Wybierz przedmiot klawiszami góra/dół, i lewo/prawo by kupić 1 mniej/więcej.\n" -"Naciśnij %s by kupić wszystko w koszyku. %s by nie kupić nic." - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "Naprawdę nic nie kupisz?" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "Nie stać cię na te przedmioty!" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "Kupić %d przedmiot, po czym zostanie ci %s?" -msgstr[1] "Kupić %d przedmiotów, po czym zostanie ci %s?" -msgstr[2] "Kupić %d przedmiotów, po czym zostanie ci %s?" -msgstr[3] "Kupić %d przedmiotów, po czym zostanie ci %s?" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "Upuszczasz niektóre przedmioty." - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "Bronie do Walki Wręcz" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "Bronie Miotające" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "Amunicja" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "Składniki Rzemieślnicze i Budowlane" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "Żywność i Medycyna" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "Ubiory i Zbroje" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "Narzędzia, Pułapki i Granaty" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "Naciśnij ? by wyświetlić pomoc." - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "Twoja Gotówka: %s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "Witamy w Fali %d!" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "Fala %d:" - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "Inwazja %s!" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "Atak %s!" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "%s Atakują!" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "%s z Piekła!" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "Dzień %s!" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "Zemsta %s!" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "Powstanie %s!" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -209392,53 +211426,53 @@ msgstr "To zielsko było debe-debe-debeściarskie." #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "Siła+%d;" +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "Siła %d;" +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "Zręczność+%d;" +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "Zręczność %d;" +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "Percepcja+%d;" +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "Percepcja %d;" +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "Inteligencja+%d;" +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "Inteligencja %d;" +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "Szybkość+%d;" +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "Szybkość %d;" +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -210434,7 +212468,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -211078,7 +213113,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -211283,7 +213319,8 @@ msgstr "Wybierz rozbudowę:" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -211550,6 +213587,26 @@ msgstr "Kawałki %s odnaleziono rozwleczone po kilku krzakach." msgid "(You wonder if your companions are fit to work on their own…)" msgstr "" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -212345,7 +214402,8 @@ msgstr "" msgid "Without extra fuel it will burn for between %s to %s." msgstr "" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "" @@ -212855,40 +214913,6 @@ msgstr "" msgid "%s helps with this task…" msgstr "" -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "Jesteś zbyt pełny by jeść liście z %s." - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "Zjadasz poszycie." - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "Jesteś zbyt pełny by się paść." - -#: src/game.cpp -msgid "You eat the grass." -msgstr "Zjadasz trawę." - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "Ta trawa jest zbyt krótka by się na niej paść." - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "Ta trawa jest martwa i zbyt zniszczona by się na niej paść." - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "Ta trawa jest skażona farbą, a zatem niejadalna." - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "Pozostawiasz pusty %s." - #: src/game.cpp msgid "Change side for item" msgstr "Zmień stronę dla przedmiotu" @@ -212917,6 +214941,11 @@ msgstr "%s jest już pełny!" msgid "You can't reload a %s!" msgstr "Nie możesz przeładować %s!" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "" + #: src/game.cpp msgid "Reload item" msgstr "Przeładuj przedmiot" @@ -212925,18 +214954,6 @@ msgstr "Przeładuj przedmiot" msgid "You have nothing to reload." msgstr "Nie masz niczego do przeładowania." -#: src/game.cpp -msgid "Unload item" -msgstr "Rozładuj przedmiot" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "Nie masz nic do rozładowania." - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "Niczego nie trzymasz w dłoniach." - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -213021,6 +215038,13 @@ msgstr "Nie możesz znaleźć uchwyconego obiektu." msgid "You cannot board a vehicle whilst riding." msgstr "" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "" @@ -213705,11 +215729,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "Twój ekwipunek jest pusty." -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "Nie masz %s." - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "SKRĘPOWANIE" @@ -213848,8 +215867,8 @@ msgid "CBM" msgstr "CBM" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "ENERGIA" +msgid "ENERGY (kJ)" +msgstr "" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -214076,13 +216095,13 @@ msgstr "Włóż do kabury" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" -msgstr "Wybierz broń do włożenia do %s" +msgid "Choose an item to put into your %s" +msgstr "" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." -msgstr "Nie masz broni które mógłbyś włożyć do %s." +msgid "You have no items you could put into your %s." +msgstr "" #: src/game_inventory.cpp src/iuse.cpp msgid "Cut up what?" @@ -214320,6 +216339,405 @@ msgstr "Tutorial" msgid "Defense" msgstr "Obrona" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "Zaczekaj na wygenerowanie mapy [ 0%% ]" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "Nie potrzebujesz snu!" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "Nie możesz zapisać w trybie obrony!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "Nie możesz porzucić %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "Udało ci się przetrwać falę %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "Proszę czekaj na wygenerowanie mapy [%2d%%]" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "Poprzednia opcja" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "Następna opcja" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "Przewiń wartości opcji" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "Przełącz opcję" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "Musisz wybrać co najmniej jedną grupę potworów!" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "Specjalne Zombie" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "Zombie" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "Tryffidy" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "Roboty" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "Podprzestrzeń" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "Pożywienie" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "Najemnicy" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "TRYB OBRONY" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "Scenariusz:" + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "Lokacja:" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "Początkowa Trudność:" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "Trudność pierwszej fali." + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "Trudność Fal:" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "Przyrost trudności z każdą falą." + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "Czas między Falami:" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "Czas, w minutach, pomiędzy falami." + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "Fale pomiędzy Karawanami:" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "Liczba fal pomiędzy pojawieniem się karawan." + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "Początkowa Gotówka:" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "Z tą ilością pieniędzy rozpoczyna gracz." + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "Gotówka za 1-szą Falę:" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "Nagroda pieniężna za pierwszą falę." + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "Przyrost Gotówki:" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "Przyrost wartości nagrody za każdą koleją falę." + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "Wybór Wroga:" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "Niestandardowy" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "Średni" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "Wysyp Żywych Trupów" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "Świt Żywych Trupów" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "Ośmionożne Dziwadła" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "Dzień Tryffidów" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "Skynet" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "Zew Cthulhu" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "Spersonalizowana gra." + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "Łatwe potwory i dużo forsy." + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "Trudniejsze potwory. Musisz jeść." + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "Wszystkie potwory. Musisz jeść i pić." + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "Obroń bar przed klasycznymi zombie, Proste i zabawne." + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "Klasyczni zombie. Wolniejsze i bardziej realistyczne." + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "Szybka zabawa z pajęczakami!" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "Obroń swoją posiadłość przed tryffidami." + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "Roboty orzekły że ludzie to wrogowie!" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "Obroń się przez zalewem legionów nieziemskich horrorów." + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "Roboty Publiczne" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "Hipermarket" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "Bar" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "Jedno wejście i wiele pokoi. Nieco zapasów medycznych." + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "Łatwy do umocnienia budynek z dużą ilością narzędzi." + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "Duży budynek z różnym zaopatrzeniem." + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "Mały budynek z masą alkoholu." + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "Duży budynek z wieloma pokojami." + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" +"KARAWANA:\n" +"Rozpocznij wybierając kategorię ulubionymi klawiszami góra/dół.\n" +"Przełącz między wyborem kategorii i przedmiotów klawiszem %s.\n" +"Wybierz przedmiot klawiszami góra/dół, i lewo/prawo by kupić 1 mniej/więcej.\n" +"Naciśnij %s by kupić wszystko w koszyku. %s by nie kupić nic." + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "Naprawdę nic nie kupisz?" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "Nie stać cię na te przedmioty!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "Kupić %d przedmiot, po czym zostanie ci %s?" +msgstr[1] "Kupić %d przedmiotów, po czym zostanie ci %s?" +msgstr[2] "Kupić %d przedmiotów, po czym zostanie ci %s?" +msgstr[3] "Kupić %d przedmiotów, po czym zostanie ci %s?" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "Upuszczasz niektóre przedmioty." + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "Bronie do Walki Wręcz" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "Bronie Miotające" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "Amunicja" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "Składniki Rzemieślnicze i Budowlane" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "Żywność i Medycyna" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "Ubiory i Zbroje" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "Narzędzia, Pułapki i Granaty" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "Naciśnij ? by wyświetlić pomoc." + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "Twoja Gotówka: %s" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "Witamy w Fali %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "Fala %d:" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "Inwazja %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "Atak %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "%s Atakują!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "%s z Piekła!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "Dzień %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "Zemsta %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "Powstanie %s!" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "John Smith" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "Jakiś bufon stoi w przejściu!" @@ -214667,6 +217085,10 @@ msgstr "Przestajesz grać na %s zanim położysz się spać." msgid "You may want to deactivate these before you sleep." msgstr "Możesz chcieć to dezaktywować przed snem." +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -219748,7 +222170,7 @@ msgstr "Twój %1$s nie zmieści więcej %2$s." msgid "That %s doesn't have room to expand." msgstr "Ten %s nie ma miejsca żeby się rozłożyć." -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%d x %s" @@ -219831,96 +222253,6 @@ msgstr "" msgid "Your %s disappears!" msgstr "" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "oskórowane ciało %s" -msgstr[1] "oskórowane ciała %s" -msgstr[2] "oskórowanych ciał %s" -msgstr[3] "oskórowanych ciał %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "oskórowana tusza %s" -msgstr[1] "oskórowane tusze %s" -msgstr[2] "oskórowane tusze %s" -msgstr[3] "oskórowane tusze %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "tusza %s" -msgstr[1] "tusze %s" -msgstr[2] "tusze %s" -msgstr[3] "tusze %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "poćwiartowana tusza %s" -msgstr[1] "poćwiartowane tusze %s" -msgstr[2] "poćwiartowane tusze %s" -msgstr[3] "poćwiartowane tusze %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "ciało %s" -msgstr[1] "ciała %s" -msgstr[2] "ciała %s" -msgstr[3] "ciała %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "%s oskórowane ciało %s" -msgstr[1] "%s oskórowane ciała %s" -msgstr[2] "%s oskórowanych ciał %s" -msgstr[3] "%s oskórowanych ciał %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "%s oskórowana tusza %s" -msgstr[1] "%s oskórowanych tusz %s" -msgstr[2] "%s oskórowanych tusz %s" -msgstr[3] "%s oskórowanych tusz %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "%s tusza %s" -msgstr[1] "%s tusz %s" -msgstr[2] "%s tusz %s" -msgstr[3] "%s tusz %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%s ciało %s" -msgstr[1] "%s ciał %s" -msgstr[2] "%s ciał %s" -msgstr[3] "%s ciał %s" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -219940,6 +222272,21 @@ msgstr[1] "krew %s" msgstr[2] "krew %s" msgstr[3] "krew %s" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "Nie masz przedmiotu który mógłby wykonać taką akcję." @@ -220537,7 +222884,7 @@ msgstr "Nie m tu niczego do nakarmienia." msgid "Modify what?" msgstr "Zmodyfikować co?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "Nie masz tego przedmiotu!" @@ -221598,6 +223945,10 @@ msgstr "Saper" msgid "Lights on!" msgstr "Światła zapal!" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -222026,10 +224377,6 @@ msgstr "" "Potrzebujesz wiedzy o mechanice na poziomie 2 aby użyć tego zestawu " "naprawczego." -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "Wybierz broń palną do naprawy" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "To nie jest broń palna!" @@ -222080,25 +224427,6 @@ msgstr "Nie masz kompatybilnych narzędzi." msgid "You cancel unloading the tool." msgstr "Anulujesz rozładowywanie narzędzia." -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "Nie widzisz na tyle wyraźnie by naprawiać!" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "" -"Potrzebujesz wiedzy o wytwarzaniu na poziomie 1 aby używać tego zestawu " -"naprawczego." - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "Wybierz przedmiot do naprawy" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "Wzmacniasz swój %s." - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "" @@ -222352,31 +224680,6 @@ msgstr "Naruszyłeś ochronę firmware, i karta skasowała zapisane na niej dane msgid " on " msgstr "" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -223208,6 +225511,14 @@ msgstr "" "Twoje grzebanie w bebechach niemal nie psuje multi-kucharza. Szczęśliwie " "nadal działa, ale lepiej będzie przestać z nim kombinować." +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "" + #: src/iuse.cpp msgid "Using cable:" msgstr "Używanie kabli:" @@ -223236,14 +225547,6 @@ msgstr "" msgid "You attach the cable to the solar pack." msgstr "" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "" @@ -225768,12 +228071,9 @@ msgid "Congratulations, you won!" msgstr "Gratulacje, wygrałeś!" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "Max:" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "Min:" +#, c-format +msgid "Min: %d Max: %d" +msgstr "" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -226618,6 +228918,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "[]Graj Teraz!" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" + #: src/main_menu.cpp msgid "No templates found!" msgstr "Nie znaleziono wzorców!" @@ -226845,6 +229173,14 @@ msgstr "Coś wypełzło z %s!" msgid "DANGER! MINEFIELD!" msgstr "" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -226977,20 +229313,9 @@ msgid "You're violently teleported!" msgstr "Zostajesz brutalnie teleportowany!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "Pszczoły cię żądlą!" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "Pszczoły cię kilkakrotnie żądlą!" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "Pszczoły cię wielokrotnie żądlą!" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "Pszczoły żądlą cię po całym ciele!" +#, c-format +msgid "The bees sting you in %s!" +msgstr "" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -227158,6 +229483,19 @@ msgstr[1] "Umiejętności" msgstr[2] "Umiejętności" msgstr[3] "Umiejętności" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "Wymaga: " @@ -231987,6 +234325,10 @@ msgstr "Kwas pokrywający %s pali twoją dłoń!" msgid "Acid sprays out of %s as it is hit!" msgstr "Po trafieniu %s wytryskuje zeń kwas!" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" + #: src/monexamine.cpp msgid "zombie slave" msgstr "niewolnik zombie" @@ -234980,8 +237322,9 @@ msgid "I have news." msgstr "Mam wieści." #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "Tak, wznówmy trening" +#, c-format +msgid "Yes, let's resume training %s" +msgstr "" #: src/npctalk.cpp #, c-format @@ -235698,6 +238041,16 @@ msgstr "" "Jeśli fałszywe, spowoduje upuszczenie przez postać nowych przedmiotów " "przekraczających limit wagi." +#: src/options.cpp +msgid "Dangerous running" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" + #: src/options.cpp msgid "Safe mode" msgstr "Tryb bezpieczny" @@ -238053,7 +240406,7 @@ msgstr "Szukaj wyrażenia:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" @@ -238493,6 +240846,10 @@ msgstr "Zmęcz:" msgid "Heat :" msgstr "Ciepł:" +#: src/panels.cpp +msgid "Deaf!" +msgstr "Głuchy!" + #: src/panels.cpp msgid "Underground" msgstr "Pod ziemią" @@ -238551,10 +240908,6 @@ msgstr "Księż:" msgid "Lighting:" msgstr "Światło:" -#: src/panels.cpp -msgid "Deaf!" -msgstr "Głuchy!" - #: src/panels.cpp msgid "Weapon :" msgstr "Broń :" @@ -239583,6 +241936,11 @@ msgstr "Napraw który defekt?" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -240039,92 +242397,74 @@ msgstr "SZYBKOŚĆ" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "Pływanie kosztuje %+d punkt ruchu." -msgstr[1] "Pływanie kosztuje %+d punktów ruchu." -msgstr[2] "Pływanie kosztuje %+d punktów ruchu." -msgstr[3] "Pływanie kosztuje %+d punktów ruchu." +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "Bieganie kosztuje %+d punkt ruchu." -msgstr[1] "Bieganie kosztuje %+d punktów ruchu." -msgstr[2] "Bieganie kosztuje %+d punktów ruchu." -msgstr[3] "Bieganie kosztuje %+d punktów ruchu." +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "Przeładowanie kosztuje %+d punkt ruchu." -msgstr[1] "Przeładowanie kosztuje %+d punktów ruchu." -msgstr[2] "Przeładowanie kosztuje %+d punktów ruchu." -msgstr[3] "Przeładowanie kosztuje %+d punktów ruchu." +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "Ataki wręcz i rzucanie kosztuje %+d punkt ruchu." -msgstr[1] "Ataki wręcz i rzucanie kosztuje %+d punktów ruchu." -msgstr[2] "Ataki wręcz i rzucanie kosztuje %+d punktów ruchu." -msgstr[3] "Ataki wręcz i rzucanie kosztuje %+d punktów ruchu." +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "Umiejętność uników %+.1f. " +msgid "Dodge skill: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "Ataki wręcz %+d%%; " +msgid "Melee attack rolls: %+d%%\n" +msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." +"Head encumbrance has no effect; it simply limits how much you" +" can put on." msgstr "" -"Skrępowanie głowy nie ma znaczenia. Jedynie ogranicza co możesz założyć." #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"Percepcja %+d podczas sprawdzania pułapek i używania broni dystansowej;\n" -"Rozrzut %+d podczas rzucania przedmiotów." #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "Zasłonięcie ust utrudnia oddychanie i ustabilizowanie zadyszki." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." msgstr "" -"Skrępowanie rąk wpływa na koszt w staminie ataków wręcz i celność broni " -"dystansowej." #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "Redukuje prędkość z którą obsługujesz lub manipulujesz przedmiotami.\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "Zręczność %+.1f podczas rzucania przedmiotami;\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "Redukuje czas celowania broni palnej o %.1f." +msgid "Reduced gun aim speed: %.1f" +msgstr "" #: src/player_display.cpp msgid "" @@ -240223,8 +242563,8 @@ msgstr "" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" #: src/player_display.cpp @@ -240981,6 +243321,16 @@ msgstr "Twój %s zacina się z głuchym kliknięciem!" msgid "'s %s misfires with a muffled click!" msgstr "Należący do %s zacina się z głuchym kliknięciem!" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -241021,6 +243371,16 @@ msgstr "" msgid "'s %s is damaged by their shot!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -241221,6 +243581,10 @@ msgstr "Precyzyjne Celowanie" msgid "[%c] to take precise aim and fire." msgstr "[%c] by precyzyjnie wymierzyć i strzelić." +#: src/ranged.cpp +msgid "turrets" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -241672,7 +244036,7 @@ msgstr "Usłyszałeś %s!" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." +msgid "From your position you hear %1$s" msgstr "" #: src/sounds.cpp @@ -242804,18 +245168,6 @@ msgstr[1] "%s emituje %d dźwięki brzmiące irytacją." msgstr[2] "%s emituje %d dźwięki brzmiące irytacją." msgstr[3] "%s emituje %d dźwięki brzmiące irytacją." -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "John Smith" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" - #: src/veh_interact.cpp msgid "Select part" msgstr "Wybierz część" @@ -245120,6 +247472,10 @@ msgstr "Słonecznie" msgid "Cloudy" msgstr "Zachmurzenie" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "" + #: src/weather_data.cpp msgid "Drizzle" msgstr "Mżawka" diff --git a/lang/po/pt_BR.po b/lang/po/pt_BR.po index 18b62e91945a9..d73dfd239986b 100644 --- a/lang/po/pt_BR.po +++ b/lang/po/pt_BR.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Yuri Laskowski , 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/pt_BR/)\n" @@ -1778,8 +1778,8 @@ msgstr "detergente" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." -msgstr "Um pó de lavagem popular no pré-cataclismo." +msgid "A popular pre-Cataclysm washing powder." +msgstr "Um pó de lavagem popular no pré-Cataclismo." #: lang/json/AMMO_from_json.py msgid "soap flakes" @@ -2114,6 +2114,17 @@ msgstr[1] "óleo de lamparina" msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "Um óleo fino e de queima limpa, feito para uso em lâmpadas a óleo." +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "óleo de motor" +msgstr[1] "óleo de motor" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "Um óleo criado para uso em motores de carro." + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -2289,6 +2300,70 @@ msgstr "" "drogas estimulantes. Feito para ser usado em equipamento médico " "especializado, e não pode ser administrado manualmente." +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "40mm tipo sinalizador" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "" +"Um sinalizador fulgurante de 40 milímetros. Ele vai queimar brilhantemente " +"por até um minuto, e também vai deixar um rastro de fumaça por onde passar." + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "40x46mm " + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "" +"Uma granada de 40 milímetros com uma carga flashbang. Ela vai detonar com " +"uma explosão de luz e som, projetada para cegar, ensurdecer e desorientar " +"qualquer um nas proximidades." + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "40mm incendiário" +msgstr[1] "40mm incendiário" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "" +"Uma granada de 40 milímetros com uma pequena carga de napalm , concebida " +"para criar uma explosão de chamas." + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40mm tipo fumaça" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "Uma granada de 40mm projetada para fornecer cobertura de fumaça." + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "40mm balaço" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "" +"Um tiro de 40mm carregado com uma bala maciça. Diga adeus ao seu ombro, " +"acho." + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "10mm Auto FMJ" @@ -3184,144 +3259,145 @@ msgid ".40 S&W JHP, reloaded" msgstr ".40 S&W JHP, recarregado" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40mm granada" +msgid "40x46mm grenade" +msgstr "40x46mm, granada" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "40mm tipo beanbag" +msgid "40x46mm M1006" +msgstr "40x46mm M1006" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." msgstr "" -"Uma munição menos-letal de 40mm que causa um forte impacto no alvo, causando" -" desorientação e muita dor. Ainda pode ferir ou matar." #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40mm concussiva" +msgid "40x46mm M433" +msgstr "40x46mm M433" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "Uma granada de 40 milímetros com uma carga de explosão de concussão." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "40mm tipo sinalizador" +msgid "40x46mm M576" +msgstr "40x46mm M576" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." msgstr "" -"Um sinalizador fulgurante de 40 milímetros. Ele vai queimar brilhantemente " -"por até um minuto, e também vai deixar um rastro de fumaça por onde passar." #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "40mm flashbang" +msgid "40x46mm M651" +msgstr "40x46mm M651" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" msgstr "" -"Uma granada de 40 milímetros com uma carga flashbang. Ela vai detonar com " -"uma explosão de luz e som, projetada para cegar, ensurdecer e desorientar " -"qualquer um nas proximidades." +"Uma granada 40mm de gás lacrimogêneo de baixa velocidade. Eficaz para " +"controle de tumultos e expulsar infantaria de posições entrincheiradas." #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "40mm flechette" +msgid "40x46mm buckshot" +msgstr "40x46mm chumbo grosso" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." msgstr "" -"Um cartucho de 40mm carregado com um grande número de flechettes para " -"perfurar armadura." +"Um cartucho 40x46mm improvisado com uma carga de chumbo grosso, um pouco " +"semelhante a um M576." #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40mm frag" +msgid "40x46mm slug" +msgstr "40x46mm balaço" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." msgstr "" -"Uma granada de 40 milímetros com uma pequena carga explosiva e um elevado " -"número de fragmentos prejudiciais." +"Um cartucho 40x46mm com uma carga improvisada lembrando um balaço de " +"escopeta muito maior." #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "40mm incendiário" -msgstr[1] "40mm incendiário" +msgid "40x46mm flechette" +msgstr "40x46mm flechette" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." +msgid "An improvised 40x46mm flechette load containing 70 steel darts." msgstr "" -"Uma granada de 40 milímetros com uma pequena carga de napalm , concebida " -"para criar uma explosão de chamas." +"Um cartucho 40x46mm improvisado com uma carga tipo flechette, contendo 70 " +"dardos de aço." + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "40x53mm, granada" #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "40mm chumbo grosso" +msgid "40x53mm M1001" +msgstr "40x53mm M1001" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M430A1" +msgstr "40x53mm M430A1" + +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40mm tipo fumaça" +msgid "40x53mm buckshot" +msgstr "40x53mm chumbo grosso" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "Uma granada de 40mm projetada para fornecer cobertura de fumaça." +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "40mm granada de gás lacrimogêneo" -msgstr[1] "40mm granadas de gás lacrimogêneo" +msgid "40x53mm slug" +msgstr "40x53mm balaço" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." msgstr "" -"Uma granada de 40 milímetros com uma carga de gás lacrimogêneo. Ela vai " -"estourar em uma nuvem de gás altamente incapacitante." +"Um cartucho 40x53mm com uma carga improvisada lembrando um balaço de " +"escopeta muito maior." #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "40mm balaço" +msgid "40x53mm flechette" +msgstr "40x53mm flechette" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." msgstr "" -"Um tiro de 40mm carregado com uma bala maciça. Diga adeus ao seu ombro, " -"acho." +"Um cartucho 40x53mm improvisado com uma carga tipo flechette, contendo 100 " +"dardos de aço." #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -4626,11 +4702,11 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "flechette shell, reloaded" -msgstr "" +msgstr "cartucho de flechettes, recarregado" #: lang/json/AMMO_from_json.py msgid "shotgun slug, reloaded" -msgstr "" +msgstr "balaço de escoleta, recarregado" #: lang/json/AMMO_from_json.py msgid "birdshot, black powder" @@ -4808,7 +4884,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "birdshot paper cartridge" -msgstr "" +msgstr "cartucho de papel com chumbinhos" #. ~ Description for birdshot paper cartridge #: lang/json/AMMO_from_json.py @@ -4816,10 +4892,13 @@ msgid "" "A paper cartridge containing a premeasured amount of black powder and an " "equal volume of birdshot. Used mostly for hunting small game or fowl." msgstr "" +"Um cartucho de papel contendo uma medida pré-calculada de pólvora negra e um" +" volume igual de chumbinhos. Usado principalmente na caça de pequenos " +"animais ou de aves." #: lang/json/AMMO_from_json.py msgid "pyrotechnic paper cartridge" -msgstr "" +msgstr "cartucho de papel pirotécnico" #. ~ Description for pyrotechnic paper cartridge #: lang/json/AMMO_from_json.py @@ -4828,10 +4907,14 @@ msgid "" "equal volume of flammable metals. When fired, burning chunks of metal and " "sparks will shoot out of the barrel, igniting everything in their path." msgstr "" +"Um cartucho de papel contendo uma quantidade pré-medida de pólvora negra e " +"um volume igual de materiais inflamáveis. Ao ser disparado, faíscas e " +"pedaços de metal queimando serão disparados do cano, incendiando tudo em seu" +" caminho," #: lang/json/AMMO_from_json.py msgid "buckshot paper cartridge" -msgstr "" +msgstr "cartucho de papel com chumbo grosso" #. ~ Description for buckshot paper cartridge #: lang/json/AMMO_from_json.py @@ -4839,10 +4922,12 @@ msgid "" "A paper cartridge containing a premeasured amount of black powder and an " "equal volume of 00 buckshot." msgstr "" +"Um cartucho de papel contendo uma medida pré-calculada de pólvora negra e um" +" volume igual de chumbo grosso 00." #: lang/json/AMMO_from_json.py msgid ".62 paper cartridge" -msgstr "" +msgstr ".62 cartucho de papel" #. ~ Description for .62 paper cartridge #: lang/json/AMMO_from_json.py @@ -4850,6 +4935,8 @@ msgid "" "A paper cartridge containing a premeasured amount of black powder and a .605" " inch lead ball." msgstr "" +"Um cartucho de papel contendo uma medida pré-calculada de pólvora negra e " +"uma bola de chumbo de .605 polegadas." #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "signal flare" @@ -4977,16 +5064,16 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "long plastic zipper" -msgstr "" +msgstr "zíper de plástico longo" #. ~ Description for long plastic zipper #: lang/json/AMMO_from_json.py msgid "A long zipper made from plastic, usually found on clothing." -msgstr "" +msgstr "Um zíper longo feito de plástico, comumente encontrado em roupas." #: lang/json/AMMO_from_json.py msgid "short plastic zipper" -msgstr "" +msgstr "zíper de plástico curto" #. ~ Description for short plastic zipper #: lang/json/AMMO_from_json.py @@ -4994,6 +5081,8 @@ msgid "" "A short zipper made from plastic, usually found on footwear or clothing " "pockets." msgstr "" +"Um zíper curto feito de plástico, comumente encontrado em sapatos ou bolsos " +"de roupas." #: lang/json/AMMO_from_json.py msgid "red paint" @@ -5198,11 +5287,9 @@ msgstr[1] "prata" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "" -"Um metal macio e brilhante. Antes do cataclismo, valeu um bocado, mas o seu " -"valor é agora grandemente diminuído." #: lang/json/AMMO_from_json.py msgid "small metal sheet" @@ -5760,15 +5847,6 @@ msgstr "Um punhado de dardos, usado como munição para zarabatanas." msgid "plutonium cell" msgstr "célula de plutônio" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "" -"Alguma carga flutuante de bateria. Isso pode ser recarregado em celulas de " -"bateria recarregaveis, mas nunca podem ser descarregadas." - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5837,7 +5915,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" @@ -6098,9 +6176,9 @@ msgid "" "A 84x246mm smoke marker round for the recoilless rifle. Commonly used for " "signaling, target designation, and for screening troop movements." msgstr "" -" Um marcador de fumaça de 84x246mm redondo para o rifle sem recuo. " -"Comumenteusado para sinalização, designação de alvos e para " -"rastrearmovimentos detropas." +"Um marcador de fumaça de 84x246mm redondo para o rifle sem recuo. Comumente " +"usado para sinalização, designação de alvos e para rastrear movimentos de " +"tropas." #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "pistol ammo" @@ -6114,8 +6192,8 @@ msgid "" "Ammunition for semiautomatic pistols, as well as submachineguns and the " "occasional robot." msgstr "" -" munição de pistola para pistolas semiautomáticas, bem como submáquinas " -"eorobô ocasional." +"Munição para pistolas semiautomáticas, bem como submetralhadoras e o robô " +"ocasional." #: lang/json/AMMO_from_json.py msgid "pistol ammo+" @@ -6129,14 +6207,14 @@ msgid "" "High power ammunition for pistols, packed with extra powder. It trades " "improved damage for increased recoil." msgstr "" -" Munição de pistola + Munição de alta potência para pistolas, embalada " -"compóextra. Troca dano melhorado por aumento do recuo." +"Munição de alta potência para pistolas, embalada com pólvora extra. Causa " +"mais dano, ao custo de mais recuo." #: lang/json/AMMO_from_json.py msgid "pistol ammo, AP" msgid_plural "AP pistol ammo" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "munição de pistola AP" +msgstr[1] "munições de pistola AP" #. ~ Description for pistol ammo, AP #: lang/json/AMMO_from_json.py @@ -6144,8 +6222,8 @@ msgid "" "Armor piercing ammunition for pistols. It trades improved penetration for " "slightly reduced damage." msgstr "" -" munição de pistola, munição perfurante APArmor para pistolas. Ele " -"trocaapenetração aprimorada por danos levemente reduzidos." +"Munição perfurante para pistolas. Possui uma penetração de armaduras melhor," +" ao custo de dano levemente reduzido." #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "revolver ammo" @@ -6156,26 +6234,25 @@ msgstr[1] "munições de revólver" #. ~ Description for revolver ammo #: lang/json/AMMO_from_json.py msgid "Powerful ammunition for large revolvers and magnum pistols." -msgstr "" -" revólver munição munição poderosa para grandes revólveres e pistolasmagnum." +msgstr "Munição poderosa para grandes revólveres e pistolas magnum." #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "light rifle ammo" msgid_plural "light rifle ammo" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "munição de rifle leve" +msgstr[1] "munições de rifle leve" #. ~ Description for light rifle ammo #: lang/json/AMMO_from_json.py msgid "Low recoil ammunition for rifles, designed for small game and humans." msgstr "" -"Munição de baixo recúo para rifles, projetada para caça pequena e humanos." +"Munição de baixo recuo para rifles, projetada para caça pequena e humanos." #: lang/json/AMMO_from_json.py msgid "light rifle ammo, incendiary" msgid_plural "light rifle ammo, incendiary" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "munição de rifle leve, incendiária" +msgstr[1] "munições de rifle leve, incendiárias" #. ~ Description for light rifle ammo, incendiary #: lang/json/AMMO_from_json.py @@ -6183,9 +6260,9 @@ msgid "" "Military ammunition for rifles, designed to burn hotly upon impact, piercing" " armor and igniting flammable substances." msgstr "" -" munição de rifle leve, incendiária Munição militar para rifles, " -"projetadapara queimar calorosamente no impacto, perfurando armaduras " -"eacendendosubstâncias inflamáveis." +"Munição militar para rifles, projetada para queimar a temperaturas muito " +"altas após o impacto, perfurando armaduras e incendiando substâncias " +"inflamáveis." #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "rifle ammo" @@ -6199,14 +6276,14 @@ msgid "" "Powerful and accurate ammunition for rifles, meant for taking down large " "game or humans." msgstr "" -" rifle munição Munição potente e precisa para rifles, destinada " -"aderrubarcaça ou humanos." +"Munição potente e precisa para rifles, destinada a derrubar caça de grande " +"porte ou humanos." #: lang/json/AMMO_from_json.py msgid "rifle ammo, incendiary" msgid_plural "rifle ammo, incendiary" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "munição de rifle, incendiária" +msgstr[1] "munições de rifle, incendiárias" #. ~ Description for rifle ammo, incendiary #: lang/json/AMMO_from_json.py @@ -6214,15 +6291,15 @@ msgid "" "Military ammo for rifles, designed to burn hotly upon impact, piercing armor" " and igniting flammable substances." msgstr "" -" munição rifle, incendiáriaMilitar munição para rifles, projetadaparaqueimar" -" quente sobre o impacto, perfurar armaduras e " -"inflamarsubstânciasinflamáveis." +"Munição militar para rifles, projetada para queimar a temperaturas muito " +"altas após o impacto, perfurando armaduras e incendiando substâncias " +"inflamáveis." #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "heavy rifle ammo" msgid_plural "heavy rifle ammo" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "munição de rifle pesado" +msgstr[1] "munições de rifle pesado" #. ~ Description for heavy rifle ammo #: lang/json/AMMO_from_json.py @@ -6230,14 +6307,14 @@ msgid "" "Serious ammunition for heavy machineguns and special military hardware, " "intended for destroying vehicles or very large creatures." msgstr "" -" Munição pesada para armas pesadas e equipamento militar especial, " -"destinadoa destruir veículos ou criaturas muito grandes." +"Munição para metralhadoras pesadas e equipamento militar especial, projetada" +" para destruir veículos ou criaturas muito grandes." #: lang/json/AMMO_from_json.py msgid "heavy rifle ammo, AP" msgid_plural "heavy rifle ammo, AP" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "munição de rifle pesado, AP" +msgstr[1] "munições de rifle pesado, AP" #. ~ Description for heavy rifle ammo, AP #: lang/json/AMMO_from_json.py @@ -6245,15 +6322,15 @@ msgid "" "Armor piercing ammunition for heavy machineguns and other military hardware." " It trades improved penetration for slightly reduced damage." msgstr "" -" munição pesada do rifle, munição perfurando de APArmor " -"paramachinegunspesados e a outra ferragem militar. Ele troca a " -"penetraçãoaprimorada pordanos levemente reduzidos." +"Munição perfurante para metralhadoras pesadas e outros equipamentos " +"militares. Possui melhor penetração de armaduras, ao custo de um dano " +"levemente reduzido." #: lang/json/AMMO_from_json.py msgid "heavy rifle ammo, incendiary" msgid_plural "heavy rifle ammo, incendiary" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "munição de rifle pesado, incendiária" +msgstr[1] "munições de rifle pesado, incendiárias" #. ~ Description for heavy rifle ammo, incendiary #: lang/json/AMMO_from_json.py @@ -6261,10 +6338,9 @@ msgid "" "Ammunition for heavy machine guns and other military hardware, designed to " "burn hotly upon impact, piercing armor and igniting flammable substances." msgstr "" -" Munição pesada para rifle, incendiária Munição para metralhadoras " -"pesadaseoutras ferragens militares, projetada para queimar " -"calorosamentenoimpacto, perfurar armaduras e inflamar substâncias " -"inflamáveis." +"Munição para metralhadoras pesadas e outros equipamentos militares, " +"projetada para queimar a temperaturas muito altas após o impacto, perfurando" +" armaduras e incendiando substâncias inflamáveis." #: lang/json/AMMO_from_json.py msgid "makeshift shotgun shot" @@ -6272,7 +6348,7 @@ msgstr "tiro de espingarda improvisado" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "orichalcum arrow" -msgstr "" +msgstr "flecha de oricalco" #. ~ Description for orichalcum arrow #: lang/json/AMMO_from_json.py @@ -6281,12 +6357,15 @@ msgid "" "glow. Has a very high chance of staying intact when fired, however can only" " be fired from Ichaival." msgstr "" +"Uma flecha composta de uma lasca de oricalco. Possui um brilho misterioso. " +"Tem uma chance muito alta de permanecer intacta após o disparo, mas só pode " +"ser disparada com Ichaival." #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "dragon blood" msgid_plural "dragon blood" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "sangue de dragão" +msgstr[1] "sangue de dragão" #. ~ Description for dragon blood #: lang/json/AMMO_from_json.py @@ -6298,8 +6377,8 @@ msgstr "" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "tainted blood" msgid_plural "tainted blood" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "sangue contaminado" +msgstr[1] "sangue contaminado" #. ~ Description for tainted blood #: lang/json/AMMO_from_json.py @@ -6318,13 +6397,13 @@ msgstr[1] "sangue" #. ~ Description for blood #: lang/json/AMMO_from_json.py lang/json/COMESTIBLE_from_json.py msgid "Blood, possibly that of a human. Disgusting!" -msgstr "sangue Sangue, possivelmente de um humano. Repugnante!" +msgstr "Sangue, possivelmente de um humano. Repugnante!" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "crystallized mana" msgid_plural "crystallized mana" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "mana cristalizada" +msgstr[1] "mana cristalizada" #. ~ Description for crystallized mana #: lang/json/AMMO_from_json.py @@ -6332,20 +6411,23 @@ msgid "" "Some crystallized mana. This can be reloaded into rechargable mana " "crystals, but can never be unloaded." msgstr "" +"Um pouco de mana cristalizado. Isso pode ser usado para abastecer cristais " +"de mana recarregáveis, mas não poderá ser retirado novamente." #: lang/json/AMMO_from_json.py msgid "lump of orichalcum" -msgstr "" +msgstr "pedaço de oricalco" #. ~ Description for lump of orichalcum #: lang/json/AMMO_from_json.py msgid "" "A heavy formed piece of strange metal. Useful for some crafting recipes." msgstr "" +"Um pedaço pesado, moldado com um metal estranho. útil em algumas receitas." #: lang/json/AMMO_from_json.py msgid "sliver of orichalcum" -msgstr "" +msgstr "lasca de oricalco" #. ~ Description for sliver of orichalcum #: lang/json/AMMO_from_json.py @@ -6353,6 +6435,8 @@ msgid "" "A sliver of a strange glowing metal. Useful as a weapon, but better suited " "for crafting." msgstr "" +"Uma lasca de um metal estranho e brilhante. Útil como arma, porém mais útil " +"para criar coisas." #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "fire lance charge" @@ -6364,12 +6448,12 @@ msgid "" "Little more than a charge of gunpowder for a basic firearm. Despite the " "minimal range, it packs a punch." msgstr "" -" Pouco mais que uma carga de pólvora por uma arma básica. Apesar " -"doalcancemínimo, ele embala um soco." +"Pouco mais que uma carga de pólvora para uma arma básica. Apesar do alcance " +"mínimo, causa um impacto e tanto." #: lang/json/AMMO_from_json.py msgid "fire lance shot" -msgstr "tiro lance de fogo" +msgstr "chumbo para lança de fogo" #. ~ Description for fire lance shot #: lang/json/AMMO_from_json.py @@ -6389,33 +6473,18 @@ msgstr "pelota de chumbo" msgid "" "Hefty round projectiles cast from lead, useful as ammunition for slings." msgstr "" -" Projéteis redondos pesados lançados de chumbo, úteis como " -"muniçãoparaslings." - -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "parafuso de besta de osso" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "" -" Um parafuso afiado esculpido em osso, com fletching anexado. Éleve, " -"proporcionando danos decentes e precisão. Existe uma boa chancedepermanecer " -"intacto uma vez disparado." +"Projéteis redondos pesados, fundidos de chumbo, úteis como munição para " +"fundas." #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "dardo de madeira" +msgstr[1] "dardos de madeira" #: lang/json/AMMO_from_json.py msgid "stone javelin" -msgstr "dardo de madeira javelinstone" +msgstr "dardo de pedra" #. ~ Description for stone javelin #: lang/json/AMMO_from_json.py @@ -6429,12 +6498,12 @@ msgstr "" #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "iron javelin" msgid_plural "iron javelins" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "dardo de ferro" +msgstr[1] "dardos de ferro" #: lang/json/AMMO_from_json.py msgid "copper javelin" -msgstr "dardo de javelincopper de ferro" +msgstr "dardo de cobre" #. ~ Description for copper javelin #: lang/json/AMMO_from_json.py @@ -6532,7 +6601,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "120mm APFSDS" -msgstr "APFSDS de 120 mm" +msgstr "APFSDS de 120mm" #. ~ Description for 120mm APFSDS #: lang/json/AMMO_from_json.py @@ -6540,9 +6609,6 @@ msgid "" "A 120mm Armor-Piercing Fin-Stabilized Discarding Sabot round. Uses a " "depleted uranium projectile to give whatever it hits a really bad day." msgstr "" -" Um 120 milímetros de armadura-Piercing Fin-estabilizado " -"descartandoSabotrodada. Usa um projétil de urânio empobrecido para dar o que" -" querqueaconteça em um dia muito ruim." #: lang/json/AMMO_from_json.py msgid "reloaded 120mm shot" @@ -6561,7 +6627,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "makeshift 120mm slug" -msgstr "lesma improvisada de 120mm" +msgstr "balaço improvisado de 120mm" #. ~ Description for makeshift 120mm slug #: lang/json/AMMO_from_json.py @@ -6575,7 +6641,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "155mm HEAT" -msgstr "CALOR DE 155mm" +msgstr "155mm HEAT" #. ~ Description for 155mm HEAT #: lang/json/AMMO_from_json.py @@ -6583,12 +6649,12 @@ msgid "" "A 155mm High Explosive Anti Tank round. More than enough firepower for " "whatever you could think to point it at." msgstr "" -" Uma volta de 155 mm de alto explosivo anti tanque. Poder de fogo mais " -"doquesuficiente para o que você poderia pensar em apontar." +"Um cartucho de 155mm alto-explosivo e anti-tanque. Poder de fogo mais do que" +" suficiente para qualquer tipo de alvo." #: lang/json/AMMO_from_json.py msgid "155mm frag" -msgstr "155mm perguntar" +msgstr "155mm de fragmentação" #. ~ Description for 155mm frag #: lang/json/AMMO_from_json.py @@ -6596,12 +6662,12 @@ msgid "" "A 155mm High Explosive Fragmentation round. Designed to give anything near " "what you hit a really bad day." msgstr "" -" Uma ronda de fragmentação explosiva de 155 mm. Projetado para " -"darqualquercoisa perto do que você atingiu um dia muito ruim." +"Uma cartucho 155mm alto-explosivo de fragmentação. Projetado para dar um dia" +" muito ruim para qualquer coisa perto de onde você atingir." #: lang/json/AMMO_from_json.py msgid "reloaded 155mm shot" -msgstr "recarregado 155mm tiro" +msgstr "155mm chumbo, recarregado" #. ~ Description for reloaded 155mm shot #: lang/json/AMMO_from_json.py @@ -6610,13 +6676,13 @@ msgid "" "amount of buckshot. Effectively turns a howitzer into a punt gun on " "steroids." msgstr "" -" Um invólucro de 155 mm com um novo primer elétrico instalado, " -"preenchidocomuma enorme quantidade de chumbo grosso. Efetivamente transforma" -" um obusemuma arma em esteróides." +"Um invólucro de 155mm com uma nova espoleta elétrica instalada, preenchido " +"com uma enorme quantidade de chumbo grosso. Efetivamente transforma um obus " +"em uma escopeta sob efeito de esteróides." #: lang/json/AMMO_from_json.py msgid "reloaded 155mm slug" -msgstr "Slug de 155mm recarregado" +msgstr "155mm recarregado, balaço" #. ~ Description for reloaded 155mm slug #: lang/json/AMMO_from_json.py @@ -6625,9 +6691,9 @@ msgid "" "handmade slug. Despite the lower effectiveness, whatever it hits is sure to" " feel it." msgstr "" -" Um invólucro de 155 mm com um novo primer elétrico instalado, " -"preenchidocomuma enorme lesma artesanal. Apesar da menor eficácia, o que " -"quer queacerteé certo para sentir isso." +"Um invólucro de 155mm com uma nova espoleta elétrica instalada, preenchido " +"com um enorme balaço artesanal. Apesar da menor eficácia, o que quer que " +"seja atingido com certeza vai sentir." #: lang/json/AMMO_from_json.py msgid "small electric primer" @@ -6649,8 +6715,8 @@ msgstr "espoleta elétrica grande" msgid "" "Primer for a tank or artillery shell. Seems to use an electric ignition." msgstr "" -" Primário para um tanque ou projétil de artilharia. Parece usar " -"umaigniçãoelétrica." +"Espoleta para um projétil de tanque ou artilharia. Parece usar uma ignição " +"elétrica." #: lang/json/AMMO_from_json.py msgid "IED" @@ -6658,7 +6724,7 @@ msgstr "IED" #: lang/json/AMMO_from_json.py msgid "blast canister" -msgstr "caixinha de explosão" +msgstr "lata explosiva" #. ~ Description for blast canister #: lang/json/AMMO_from_json.py @@ -6672,7 +6738,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "Big Bang canister" -msgstr "Caixinha do Big Bang" +msgstr "lata do Big Bang" #. ~ Description for Big Bang canister #: lang/json/AMMO_from_json.py @@ -6718,7 +6784,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "fragmentation canister" -msgstr "caixinha de fragmentação" +msgstr "lata de fragmentação" #. ~ Description for fragmentation canister #: lang/json/AMMO_from_json.py @@ -6948,10 +7014,8 @@ msgstr[1] "" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" -" blob feed Um amálgama de vários tipos de material orgânico, contém tudooque" -" o blob precisa para ser saudável. Você pensa..." #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -7369,11 +7433,9 @@ msgstr[1] "" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "" -" nômades gearA roupa improvisada feita a partir de roupas pré- " -"cataclismoprojetado para viagens longas. Tem muito espaço de armazenamento." #: lang/json/ARMOR_from_json.py msgid "light nomad gear" @@ -7384,14 +7446,10 @@ msgstr[1] "" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "" -" Engrenagem nômade claraUma roupa improvisada leve feita de roupas pré- " -"cataclísmicas projetadas para longas viagens de verão. Ele " -"oferecemenosespaço de armazenamento e armadura em comparação com a " -"engrenagemnômadecomum." #: lang/json/ARMOR_from_json.py msgid "plated leather armor" @@ -7455,12 +7513,9 @@ msgstr[1] "" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." msgstr "" -" Engrenagem do limpador Uma roupa robusta do escravo feito de " -"equipamentodeproteção pré-cataclismo reformado. Tem muito espaço de " -"armazenamento." #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -12079,9 +12134,9 @@ msgstr "Um par robusto de calças forradas com pele." #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" -msgstr[0] "calça de pele artificial" -msgstr[1] "calças de pele artificial" +msgid_plural "faux fur pants" +msgstr[0] "" +msgstr[1] "" #. ~ Description for faux fur pants #: lang/json/ARMOR_from_json.py @@ -13093,8 +13148,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of sunglasses" msgid_plural "pairs of sunglasses" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "par de óculos de sol" +msgstr[1] "pares de óculos de sol" #. ~ Description for pair of sunglasses #: lang/json/ARMOR_from_json.py @@ -13106,8 +13161,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "survivor belt" msgid_plural "survivor belts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "cinto do sobrevivente" +msgstr[1] "cintos do sobrevivente" #. ~ Use action holster_prompt for survivor belt. #. ~ Use action holster_prompt for survivor utility belt. @@ -13133,8 +13188,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "survivor goggles" msgid_plural "pairs of survivor goggles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "par de óculos do sobrevivente" +msgstr[1] "pares de óculos do sobrevivente" #. ~ Description for survivor goggles #: lang/json/ARMOR_from_json.py @@ -13388,8 +13443,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "tinfoil hat" msgid_plural "tinfoil hats" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "chapéu de papel-alumínio" +msgstr[1] "chapéus de papel-alumínio" #. ~ Description for tinfoil hat #: lang/json/ARMOR_from_json.py @@ -13404,8 +13459,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "tool belt" msgid_plural "tool belts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "cinto de ferramentas" +msgstr[1] "cintos de ferramentas" #. ~ Description for tool belt #: lang/json/ARMOR_from_json.py @@ -13660,7 +13715,7 @@ msgstr[1] "" #. ~ Description for headscarf #: lang/json/ARMOR_from_json.py msgid "A loose cloth worn over the head and around the neck." -msgstr "" +msgstr "Um tecido folgado usado sobre a cabeça e ao redor do pescoço." #: lang/json/ARMOR_from_json.py msgid "tuxedo" @@ -13964,7 +14019,7 @@ msgstr "zubonPlain zubon branco para uso em artes marciais." #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" +msgid_plural "violin cases" msgstr[0] "" msgstr[1] "" @@ -14200,8 +14255,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "zentai" msgid_plural "zentais" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "zentai" +msgstr[1] "zentais" #. ~ Description for zentai #: lang/json/ARMOR_from_json.py @@ -14385,12 +14440,12 @@ msgstr[1] "" #. ~ Use action menu_text for pair of attached ear plugs (in). #: lang/json/ARMOR_from_json.py msgid "Unplug" -msgstr "" +msgstr "Retirar" #. ~ Use action msg for pair of attached ear plugs (in). #: lang/json/ARMOR_from_json.py msgid "You take the ear plugs out." -msgstr "" +msgstr "Você retira os tampões de ouvido." #. ~ Description for pair of attached ear plugs (in) #: lang/json/ARMOR_from_json.py @@ -14683,12 +14738,9 @@ msgstr[1] "" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." msgstr "" -" Mochila de novidade giganteUma mochila de tecido enorme " -"feitaprincipalmentecomo uma piada antes do cataclismo. Agora, ainda é um " -"poucobobo, mas podearmazenar muitas coisas." #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -14813,8 +14865,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "messenger bag" msgid_plural "messenger bags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bolsa de mensageiro" +msgstr[1] "bolsas de mensageiro" #. ~ Description for messenger bag #: lang/json/ARMOR_from_json.py @@ -14841,8 +14893,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "purse" msgid_plural "purses" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bolsa" +msgstr[1] "bolsas" #. ~ Description for purse #: lang/json/ARMOR_from_json.py @@ -14958,8 +15010,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "golf bag" msgid_plural "golf bags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bolsa de golfe" +msgstr[1] "bolsas de golfe" #. ~ Use action holster_msg for golf bag. #: lang/json/ARMOR_from_json.py @@ -16077,6 +16129,142 @@ msgstr "" "usadossobre os dentes. Se encaixa horrivelmente, mas parece muitobrilhante. " "Paraaquele visual de gangsta rap de alta classe." +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -17001,6 +17189,552 @@ msgstr "" "Um rabo de couro preto brilhante pesado com pequenas contas de plástico. " "Balança atrás de você quando você anda." +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -17564,8 +18298,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17577,10 +18311,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" #: lang/json/ARMOR_from_json.py @@ -17592,10 +18326,10 @@ msgstr[1] "" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17607,7 +18341,7 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" @@ -17621,8 +18355,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" @@ -17635,7 +18369,7 @@ msgstr[1] "" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -17663,8 +18397,8 @@ msgstr[1] "" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" @@ -17678,8 +18412,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17691,8 +18425,8 @@ msgstr[1] "" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17704,9 +18438,9 @@ msgstr[1] "" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17719,7 +18453,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -17733,10 +18467,10 @@ msgstr[1] "" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -17762,11 +18496,11 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" @@ -17779,9 +18513,9 @@ msgstr[1] "" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -17795,10 +18529,10 @@ msgstr[1] "" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17811,9 +18545,9 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17825,30 +18559,30 @@ msgstr[1] "" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" +msgid_plural "C.R.I.T trousers" msgstr[0] "" msgstr[1] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" @@ -17860,7 +18594,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17871,20 +18605,20 @@ msgstr[1] "" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "" msgstr[1] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -17896,7 +18630,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" @@ -17909,7 +18643,7 @@ msgstr[1] "" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -17924,8 +18658,8 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" #: lang/json/ARMOR_from_json.py @@ -18030,10 +18764,11 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" #: lang/json/ARMOR_from_json.py @@ -18042,13 +18777,6 @@ msgid_plural "silver infusion bracelets" msgstr[0] "" msgstr[1] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -18358,9 +19086,9 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" -msgstr[0] "bolsa de carne" -msgstr[1] "bolsas de carne" +msgid_plural "flesh pouches" +msgstr[0] "" +msgstr[1] "" #. ~ Description for flesh pouch #: lang/json/ARMOR_from_json.py @@ -18370,6 +19098,19 @@ msgid "" "minimize encumbrance." msgstr "" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -20289,14 +21030,9 @@ msgstr[1] "" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" -" Gerador de Sobrecarga Iônico O poderoso gerador de energia iônica " -"CBMAéimplantado em seu peito. Dispara uma poderosa explosão de " -"energiaemconstante expansão. A explosão resultante inflama o " -"oxigêniocriandoincêndios enquanto se move e uma explosão no impacto. O uso " -"acurtadistância é altamente desencorajado." #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py msgid "Blood Power Generator CBM" @@ -22339,6 +23075,138 @@ msgstr "" "Uma divertida coleção de folclore com o elenco habitual de fadas, goblins e " "trolls." +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -22661,8 +23529,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "TIME magazine" msgid_plural "TIME magazines" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "revista TIME" +msgstr[1] "revistas TIME" #. ~ Description for TIME magazine #: lang/json/BOOK_from_json.py @@ -22674,8 +23542,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Playboy" msgid_plural "Playboys" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "revista Playboy" +msgstr[1] "revistas Playboy" #. ~ Description for Playboy #: lang/json/BOOK_from_json.py @@ -22809,8 +23677,8 @@ msgstr[1] "" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." -msgstr "Narrativa empenhada escondendo obscenidade literária de baixo grau." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." +msgstr "" #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -23593,7 +24461,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" @@ -25226,16 +26094,16 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" #: lang/json/BOOK_from_json.py msgid "The Weapons of Asgard" msgid_plural "The Weapons of Asgard" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "As Armas de Asgard" +msgstr[1] "As Armas de Asgard" #. ~ Description for The Weapons of Asgard #: lang/json/BOOK_from_json.py @@ -25251,24 +26119,21 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Hacking Robots for Fun & Profit" msgid_plural "Hacking Robots for Fun & Profit" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hackeando Robôs por Diversão & Lucro" +msgstr[1] "Hackeando Robôs por Diversão & Lucro" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" -" Hacking Robots for Fun & ProfitUm livro sobre como obter, " -"reprogramaremodificar ilegalmente robôs. Tem muitos guias passo-a-passo " -"úteiseesquemas de exemplo." #: lang/json/BOOK_from_json.py msgid "Popular Robotics" msgid_plural "Popular Robotics" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Robótica Popular" +msgstr[1] "Robótica Popular" #. ~ Description for Popular Robotics #: lang/json/BOOK_from_json.py @@ -25317,8 +26182,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py lang/json/ammunition_type_from_json.py msgid "water" msgid_plural "water" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "água" +msgstr[1] "água" #. ~ Description for water #: lang/json/COMESTIBLE_from_json.py @@ -25424,8 +26289,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "ammonia" msgid_plural "ammonia" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "amônia" +msgstr[1] "amônia" #. ~ Description for ammonia #: lang/json/COMESTIBLE_from_json.py @@ -25439,8 +26304,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "liquid fertilizer" msgid_plural "liquid fertilizer" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "fertilizante líquidod" +msgstr[1] "fertilizante líquido" #. ~ Description for liquid fertilizer #: lang/json/COMESTIBLE_from_json.py @@ -25450,8 +26315,8 @@ msgstr "fertilizante líquidoUm elixir rico em nutrientes para plantas." #: lang/json/COMESTIBLE_from_json.py msgid "commercial fertilizer" msgid_plural "commercial fertilizer" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "fertilizante comercial" +msgstr[1] "fertilizante comercial" #. ~ Description for commercial fertilizer #: lang/json/COMESTIBLE_from_json.py @@ -25461,8 +26326,8 @@ msgstr "fertilizante comercial Grânulos ricos em nutrientes para plantas." #: lang/json/COMESTIBLE_from_json.py msgid "fungicide" msgid_plural "fungicide" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "fungicida" +msgstr[1] "fungicida" #. ~ Description for fungicide #: lang/json/COMESTIBLE_from_json.py @@ -25476,8 +26341,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "insecticide" msgid_plural "insecticide" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "inseticida" +msgstr[1] "inseticida" #. ~ Description for insecticide #: lang/json/COMESTIBLE_from_json.py @@ -25485,23 +26350,36 @@ msgid "" "Agricultural-grade chemical insecticide powder designed to eradicate insect " "pests." msgstr "" +"Pó inseticida químico para agricultura, projetado para erradicar pragas de " +"insetos." #: lang/json/COMESTIBLE_from_json.py msgid "salt water" msgid_plural "salt water" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "água salgada" +msgstr[1] "água salgada" #. ~ Description for salt water #: lang/json/COMESTIBLE_from_json.py msgid "Water with salt added. Not good for drinking." msgstr "água salgada Água com sal adicionado. Não é bom para beber." +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "água com sabão" +msgstr[1] "água com sabão" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "Água com sabão adicionado. Não é boa para beber." + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "água ácida" +msgstr[1] "água ácida" #. ~ Description for acid water #: lang/json/COMESTIBLE_from_json.py @@ -25515,8 +26393,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "weak acid water" msgid_plural "weak acid water" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "água ácida fraca" +msgstr[1] "água ácida fraca" #. ~ Description for weak acid water #: lang/json/COMESTIBLE_from_json.py @@ -25530,8 +26408,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "concentrated acid" msgid_plural "concentrated acid" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ácido concentrado" +msgstr[1] "ácido concentrado" #. ~ Description for concentrated acid #: lang/json/COMESTIBLE_from_json.py @@ -25567,8 +26445,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "sewage water" msgid_plural "sewage water" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "água de esgoto" +msgstr[1] "água de esgoto" #. ~ Description for sewage water #: lang/json/COMESTIBLE_from_json.py @@ -25578,8 +26456,8 @@ msgstr "água de esgotoTurbídeo líquido dos esgotos com mau cheiro horrível." #: lang/json/COMESTIBLE_from_json.py msgid "lye" msgid_plural "lye" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lixívia" +msgstr[1] "lixívia" #. ~ Description for lye #: lang/json/COMESTIBLE_from_json.py @@ -25593,8 +26471,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "ether" msgid_plural "ether" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "éter" +msgstr[1] "éter" #. ~ Description for ether #: lang/json/COMESTIBLE_from_json.py @@ -25611,8 +26489,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "dimethyl sulfoxide" msgid_plural "dimethyl sulfoxide" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "dimetilsulfóxido" +msgstr[1] "dimetilsulfóxido" #. ~ Description for dimethyl sulfoxide #: lang/json/COMESTIBLE_from_json.py @@ -25622,6 +26500,10 @@ msgid "" "that it absorbs very quickly through the skin, causing a garlic flavor in " "the mouth even if it touched your arm." msgstr "" +"Dimetilsulfóxido, ou DMSO, é um solvente aprótico comum e importante, capaz " +"de dissolver muitas coisas. Possui a propriedade estranha de ser absorvido " +"muito rapidamente através da pele, causando um gosto de alho na boca mesmo " +"quando toca apenas o seu braço." #: lang/json/COMESTIBLE_from_json.py msgid "chloroform" @@ -25678,8 +26560,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "peptone broth powder" msgid_plural "peptone broth powder" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pó de caldo de peptona" +msgstr[1] "pó de caldo de peptona" #. ~ Description for peptone broth powder #: lang/json/COMESTIBLE_from_json.py @@ -25688,6 +26570,9 @@ msgid "" "bacteria to eat, but if you were desperate you could eat it too; it's not " "much different from cup noodle stock." msgstr "" +"Uma solução salgada pré-misturada de proteína e açúcar. Feita para nutrir " +"bactérias, mas em caso de desespero você também poderia comer isso; não é " +"muito diferente de um tempero de miojo." #: lang/json/COMESTIBLE_from_json.py msgid "agar" @@ -25733,6 +26618,8 @@ msgid "" "A flammable gas that explodes under pressure. Combined with oxygen, " "acetylene makes a great welding gas." msgstr "" +"Um gás inflamável que explode sob pressão. Combinado com oxigênio, acetileno" +" dá um ótimo gás de soldagem." #: lang/json/COMESTIBLE_from_json.py msgid "Spice" @@ -26140,12 +27027,9 @@ msgstr[1] "moonshines" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "" -" MoonshineOnly o mais forte, mais puro, bom ol 'fashionedhooch, " -"destilado de milho e açúcar. Garantido para fazer você esquecer todaacoisa " -"de cataclismo, ou você recupera sua visão." #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -26207,8 +27091,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "Belgian ale" msgid_plural "Belgian ale" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "cerveja Belga" +msgstr[1] "cervejas Belgas" #. ~ Description for Belgian ale #: lang/json/COMESTIBLE_from_json.py @@ -26270,14 +27154,85 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "single malt whiskey" msgid_plural "single malt whiskey" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "uísque de malte único" +msgstr[1] "uísques de malte único" #. ~ Description for single malt whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Only the finest whiskey straight from the bung." msgstr "uísque de malte ÚnicoO melhor uísque direto do batoque." +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "uísque barato" +msgstr[1] "uísque barato" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "xerez" +msgstr[1] "xerez" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" +"Solera das Índias Orientais. Uma bebida para verdadeiros cavalheiros " +"britânicos. Xerez, Niles?" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "vagabundo chique" @@ -26764,13 +27719,13 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "chunk of human fat" msgid_plural "chunks of human fat" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pedaço de gordura humana" +msgstr[1] "pedaços de gordura humana" #. ~ Description for chunk of human fat #: lang/json/COMESTIBLE_from_json.py msgid "Freshly harvested from a human body." -msgstr "" +msgstr "Retirada a pouco tempo de um corpo humano." #: lang/json/COMESTIBLE_from_json.py msgid "human tallow" @@ -27045,6 +28000,20 @@ msgid_plural "meat jerky" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -27068,23 +28037,28 @@ msgstr "" "deixarvocêcom sede." #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "" -msgstr[1] "" +msgid "smoked meat" +msgstr "carne defumada" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "" -" jerk jerkySalty seco carne humana que dura por um longo tempo, mas " -"vaifazervocê com sede." +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +msgstr[1] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "carne defumada" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "%s, mutante" +msgstr[1] "%s, mutante" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -27111,19 +28085,6 @@ msgstr "" "preservaçãoalongo prazo. Pode ser ainda mais fumado para desidratar " "completamente." -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "otário fumado" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "" -" Uma porção muito fumada de carne humana. Dura por um longo tempo e " -"temumgosto muito bom, se você gosta desse tipo de coisa." - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -27191,7 +28152,7 @@ msgstr[1] "cérebros crus" #. ~ Description for raw brains #: lang/json/COMESTIBLE_from_json.py msgid "The brain from an animal. You wouldn't want to eat this raw…" -msgstr "" +msgstr "Um cérebro de animal. Você não gostaria de comer isso cru..." #: lang/json/COMESTIBLE_from_json.py msgid "cooked brains" @@ -27686,20 +28647,22 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "raw butter" msgid_plural "raw butter" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "manteiga crua" +msgstr[1] "manteiga crua" #. ~ Description for raw butter #: lang/json/COMESTIBLE_from_json.py msgid "" "A white stick of raw milkfat and milk solids, made directly from cow's milk." msgstr "" +"Uma barra branca de gordura de leite crua e sólidos do leite, feita " +"diretamente de leite de vaca." #: lang/json/COMESTIBLE_from_json.py msgid "ghee" msgid_plural "ghee" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ghee" +msgstr[1] "ghee" #. ~ Description for ghee #: lang/json/COMESTIBLE_from_json.py @@ -27707,6 +28670,8 @@ msgid "" "Clarified butter, free from milk solids and water. Will last a very long " "time." msgstr "" +"Manteiga clarificada, livre de sólidos do leite e água. Vai durar muito " +"tempo." #: lang/json/COMESTIBLE_from_json.py msgid "pudding" @@ -28300,8 +29265,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "sweet water" msgid_plural "sweet water" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "água doce" +msgstr[1] "água doce" #. ~ Description for sweet water #: lang/json/COMESTIBLE_from_json.py @@ -28347,8 +29312,8 @@ msgstr "Contém até oito legumes! Nutritivo e saboroso." #: lang/json/COMESTIBLE_from_json.py msgid "clean water" msgid_plural "clean water" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "água purificada" +msgstr[1] "água purificada" #. ~ Description for clean water #: lang/json/COMESTIBLE_from_json.py @@ -28382,8 +29347,8 @@ msgstr "Um molho minimamente temperado de tomates cozidos." #: lang/json/COMESTIBLE_from_json.py msgid "maple sap" msgid_plural "maple sap" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "seiva de bordo" +msgstr[1] "seiva de bordo" #. ~ Description for maple sap #: lang/json/COMESTIBLE_from_json.py @@ -28433,8 +29398,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "forest honey" msgid_plural "forest honey" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "mel silvestre" +msgstr[1] "mel silvestre" #. ~ Description for forest honey #: lang/json/COMESTIBLE_from_json.py @@ -28497,13 +29462,13 @@ msgstr "óleo vegetal amarelo óleo vegetal usado para cozinhar." #: lang/json/COMESTIBLE_from_json.py msgid "animal cooking oil" msgid_plural "animal cooking oil" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "óleo de cozinha animal" +msgstr[1] "óleo de cozinha animal" #. ~ Description for animal cooking oil #: lang/json/COMESTIBLE_from_json.py msgid "Thin yellow animal oil used for cooking." -msgstr "" +msgstr "Um óleo fino e amarelado de origem animal, usado para cozinhar." #: lang/json/COMESTIBLE_from_json.py msgid "molasses" @@ -28524,8 +29489,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "horseradish" msgid_plural "horseradish" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "rábano" +msgstr[1] "rábanos" #. ~ Description for horseradish #: lang/json/COMESTIBLE_from_json.py @@ -28535,8 +29500,8 @@ msgstr "rábano picante vegetal de raiz ralado embalado em salmoura vinagreed." #: lang/json/COMESTIBLE_from_json.py msgid "coffee syrup" msgid_plural "coffee syrup" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "xarope de café" +msgstr[1] "xarope de café" #. ~ Description for coffee syrup #: lang/json/COMESTIBLE_from_json.py @@ -28647,8 +29612,8 @@ msgstr "roe razorclaw" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." -msgstr "Um monte de ovos de navalha. Uma delicadeza pós-cataclismo." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -28662,8 +29627,8 @@ msgstr "Ovas comuns de um peixe desconhecido." #: lang/json/COMESTIBLE_from_json.py msgid "powdered egg" msgid_plural "powdered eggs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ovos em pó" +msgstr[1] "ovos em pó" #. ~ Description for powdered egg #: lang/json/COMESTIBLE_from_json.py @@ -28673,8 +29638,8 @@ msgstr "ovo em pó ovos frescos, desidratados em um fácil de armazenar em pó." #: lang/json/COMESTIBLE_from_json.py msgid "scrambled eggs" msgid_plural "scrambled eggs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ovo mexido" +msgstr[1] "ovos mexidos" #. ~ Description for scrambled eggs #: lang/json/COMESTIBLE_from_json.py @@ -28684,8 +29649,8 @@ msgstr "ovos mexidos, ovos mexidos, deliciosos e deliciosos." #: lang/json/COMESTIBLE_from_json.py msgid "boiled egg" msgid_plural "boiled eggs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ovo fervido" +msgstr[1] "ovos fervidos" #. ~ Description for boiled egg #: lang/json/COMESTIBLE_from_json.py @@ -28706,8 +29671,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "milkshake" msgid_plural "milkshakes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "milkshake" +msgstr[1] "milkshakes" #. ~ Description for milkshake #: lang/json/COMESTIBLE_from_json.py @@ -28721,8 +29686,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "fast food milkshake" msgid_plural "fast food milkshakes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "milkshake de fast-food" +msgstr[1] "milkshakes de fast-food" #. ~ Description for fast food milkshake #: lang/json/COMESTIBLE_from_json.py @@ -28737,8 +29702,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "deluxe milkshake" msgid_plural "deluxe milkshakes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "milkshake de luxo" +msgstr[1] "milkshakes de luxo" #. ~ Description for deluxe milkshake #: lang/json/COMESTIBLE_from_json.py @@ -28753,8 +29718,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "ice cream" msgid_plural "ice cream scoops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "sorvete" +msgstr[1] "bolas de sorvete" #. ~ Description for ice cream #: lang/json/COMESTIBLE_from_json.py @@ -28765,8 +29730,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "dairy dessert" msgid_plural "dairy dessert scoops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "sobremesa láctea" +msgstr[1] "bolas de sobremesa láctea" #. ~ Description for dairy dessert #: lang/json/COMESTIBLE_from_json.py @@ -28782,8 +29747,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "candy ice cream" msgid_plural "candy ice cream scoops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "sorvete com doces" +msgstr[1] "bolas de sorvete com doces" #. ~ Description for candy ice cream #: lang/json/COMESTIBLE_from_json.py @@ -28796,8 +29761,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "fruity ice cream" msgid_plural "fruity ice cream scoops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "sorvete frutado" +msgstr[1] "bolas de sorvete frutado" #. ~ Description for fruity ice cream #: lang/json/COMESTIBLE_from_json.py @@ -28811,8 +29776,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "frozen custard" msgid_plural "frozen custard scoops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "quindim congelado" +msgstr[1] "colheradas de quindim congelado" #. ~ Description for frozen custard #: lang/json/COMESTIBLE_from_json.py @@ -28829,8 +29794,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "frozen yogurt" msgid_plural "frozen yogurt" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "iogurte congelado" +msgstr[1] "iogurte congelado" #. ~ Description for frozen yogurt #: lang/json/COMESTIBLE_from_json.py @@ -28845,8 +29810,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "sorbet" msgid_plural "sorbet scoops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "sorbet" +msgstr[1] "bolas de sorbet" #. ~ Description for sorbet #: lang/json/COMESTIBLE_from_json.py @@ -28857,8 +29822,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gelato" msgid_plural "gelato scoops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "gelato" +msgstr[1] "bolas de gelato" #. ~ Description for gelato #: lang/json/COMESTIBLE_from_json.py @@ -28872,8 +29837,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked strawberry" msgid_plural "cooked strawberries" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "morango cozido" +msgstr[1] "morangos cozidos" #. ~ Description for cooked strawberry #: lang/json/COMESTIBLE_from_json.py @@ -28892,8 +29857,8 @@ msgstr "Tiras secas de pasta de frutas açucaradas." #: lang/json/COMESTIBLE_from_json.py msgid "cooked blueberry" msgid_plural "cooked blueberries" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "mirtilo cozido" +msgstr[1] "mirtilos cozidos" #. ~ Description for cooked blueberry #: lang/json/COMESTIBLE_from_json.py @@ -28903,8 +29868,8 @@ msgstr "blueberry cozido É como geléia de mirtilo, só sem açúcar." #: lang/json/COMESTIBLE_from_json.py msgid "peaches in syrup" msgid_plural "peaches in syrup" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pêssegos em calda" +msgstr[1] "pêssegos em calda" #. ~ Description for peaches in syrup #: lang/json/COMESTIBLE_from_json.py @@ -28925,8 +29890,8 @@ msgstr "Anéis de abacaxi em conserva na água. Muito saborosa." #: lang/json/COMESTIBLE_from_json.py msgid "lemonade drink mix" msgid_plural "lemonade drink mix" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bebida mix de limonada" +msgstr[1] "bebida mix de limonada" #. ~ Description for {'str': 'lemonade drink mix', 'str_pl': 'lemonade drink #. mix'} @@ -28959,8 +29924,8 @@ msgstr "Frutas frescas, cozidas com açúcar para durarem mais tempo." #: lang/json/COMESTIBLE_from_json.py msgid "dehydrated fruit" msgid_plural "dehydrated fruit" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "fruta desidratada" +msgstr[1] "frutas desidratadas" #. ~ Description for dehydrated fruit #: lang/json/COMESTIBLE_from_json.py @@ -28976,8 +29941,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "rehydrated fruit" msgid_plural "rehydrated fruit" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "fruta reidratada" +msgstr[1] "frutas reidratadas" #. ~ Description for rehydrated fruit #: lang/json/COMESTIBLE_from_json.py @@ -29003,8 +29968,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "canned fruit" msgid_plural "canned fruit" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "frutas enlatadas" +msgstr[1] "frutas enlatadas" #. ~ Description for canned fruit #: lang/json/COMESTIBLE_from_json.py @@ -29651,8 +30616,8 @@ msgstr "Oh cara, você ama esses chips! Ponto!" #: lang/json/COMESTIBLE_from_json.py msgid "popcorn kernels" msgid_plural "popcorn kernels" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "milhos de pipoca" +msgstr[1] "milhos de pipoca" #. ~ Description for popcorn kernels #: lang/json/COMESTIBLE_from_json.py @@ -29666,8 +30631,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "popcorn" msgid_plural "popcorn" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pipoca" +msgstr[1] "pipoca" #. ~ Description for popcorn #: lang/json/COMESTIBLE_from_json.py @@ -29681,8 +30646,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "salted popcorn" msgid_plural "salted popcorn" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pipoca salgada" +msgstr[1] "pipoca salgada" #. ~ Description for salted popcorn #: lang/json/COMESTIBLE_from_json.py @@ -29692,8 +30657,8 @@ msgstr "Pipoca com sal adicionado para dar um sabor extra." #: lang/json/COMESTIBLE_from_json.py msgid "buttered popcorn" msgid_plural "buttered popcorn" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pipoca amanteigada" +msgstr[1] "pipoca amanteigada" #. ~ Description for buttered popcorn #: lang/json/COMESTIBLE_from_json.py @@ -29703,8 +30668,8 @@ msgstr "Pipoca com uma cobertura leve de manteiga para dar um sabor extra." #: lang/json/COMESTIBLE_from_json.py msgid "pretzels" msgid_plural "pretzels" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pretzels" +msgstr[1] "pretzels" #. ~ Description for pretzels #: lang/json/COMESTIBLE_from_json.py @@ -29732,8 +30697,8 @@ msgstr "O chocolate não é muito saudável, mas é um deleite delicioso." #: lang/json/COMESTIBLE_from_json.py msgid "marshmallows" msgid_plural "marshmallows" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "marshmallows" +msgstr[1] "marshmallows" #. ~ Description for marshmallows #: lang/json/COMESTIBLE_from_json.py @@ -29760,19 +30725,19 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "peanut butter candy" msgid_plural "peanut butter candies" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doce de manteiga de amendoim" +msgstr[1] "doces de manteiga de amendoim" #. ~ Description for peanut butter candy #: lang/json/COMESTIBLE_from_json.py msgid "A handful of peanut butter cups… your favorite!" -msgstr "" +msgstr "Um punhado de cubinhos de manteiga de amendoim... seus favoritos!" #: lang/json/COMESTIBLE_from_json.py msgid "chocolate candy" msgid_plural "chocolate candies" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doce de chocolate" +msgstr[1] "doces de chocolate" #. ~ Description for chocolate candy #: lang/json/COMESTIBLE_from_json.py @@ -29806,8 +30771,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "maple syrup candy" msgid_plural "maple syrup candies" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doce de xarope de bordo" +msgstr[1] "doces de xarope de bordo" #. ~ Description for maple syrup candy #: lang/json/COMESTIBLE_from_json.py @@ -29843,8 +30808,8 @@ msgstr "Bolinhos doces e deliciosos, assim como a vovó costumava assar." #: lang/json/COMESTIBLE_from_json.py msgid "maple syrup" msgid_plural "maple syrup" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "xarope de bordo" +msgstr[1] "xarope de bordo" #. ~ Description for maple syrup #: lang/json/COMESTIBLE_from_json.py @@ -29858,8 +30823,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "sugar beet syrup" msgid_plural "sugar beet syrup" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "xarope de beterraba-sacarina" +msgstr[1] "xarope de beterraba-sacarina" #. ~ Description for sugar beet syrup #: lang/json/COMESTIBLE_from_json.py @@ -29910,8 +30875,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "fast-food French fries" msgid_plural "fast-food French fries" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "batatas fritas de fast-food" +msgstr[1] "batatas fritas de fast-food" #. ~ Description for fast-food French fries #: lang/json/COMESTIBLE_from_json.py @@ -29923,8 +30888,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "French fries" msgid_plural "French fries" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "batatas fritas" +msgstr[1] "batatas fritas" #. ~ Description for French fries #: lang/json/COMESTIBLE_from_json.py @@ -29974,8 +30939,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "caramel" msgid_plural "caramel" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "caramelo" +msgstr[1] "caramelo" #. ~ Description for caramel #: lang/json/COMESTIBLE_from_json.py @@ -30025,12 +30990,12 @@ msgstr "" "poderiarealmente usar um pouco de queijo, talvez um pouco de carne bovina." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" +msgid "cheese nachos" +msgid_plural "cheese nachos" msgstr[0] "" msgstr[1] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -30040,12 +31005,26 @@ msgstr "" " Poderia ter um pouco de carne." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "niño nachos" +msgid_plural "niño nachos" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" msgstr[0] "" msgstr[1] "" -#. ~ Description for nachos with meat +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with meat. Could probably use " @@ -30055,42 +31034,28 @@ msgstr "" " Poderia provavelmente usar algum queijo, no entanto." #: lang/json/COMESTIBLE_from_json.py -msgid "niño nachos" -msgid_plural "niño nachos" +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" msgstr[0] "" msgstr[1] "" -#. ~ Description for niño nachos -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." -msgstr "" -" niño nachosSalted chips feitos de tortillas de milho, com carnehumana. " -"Alguns queijos podem melhorar ainda mais." - +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "" msgstr[1] "" -#. ~ Description for niño nachos with cheese -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "" -" niño nachos com queijoSalted chips feitos de tortillas de milho " -"comcarnehumana e sufocada em queijo. Delicioso." - +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" msgstr[0] "" msgstr[1] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -30165,19 +31130,6 @@ msgstr[1] "" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Cachorro quente, servido com chili con carne como cobertura. Yum!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "" -" Cachorro Chili Dogs Um cachorro-quente, servido com chili con " -"cabroncomocobertura. Delicioso." - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -30273,10 +31225,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." +"Cataclysm. It would taste much better prepared." msgstr "" -" cachorro quente cruUma salsicha altamente processada, comum nos " -"jogosdebeisebol antes do cataclismo. O gosto seria muito melhor preparado." #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -30323,6 +31273,24 @@ msgstr "" msgid "raw sausage" msgstr "salsicha crua" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "%ssinistra" +msgstr[1] "%ssinistras" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -30332,6 +31300,13 @@ msgstr "Uma salsicha crua, preparada para fumar ou cozinhar." msgid "sausage" msgstr "linguiça" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -30342,25 +31317,18 @@ msgstr "" msgid "cooked sausage" msgstr "salsicha cozida" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "Uma salsicha pesada que foi cozida." -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "Mannwurst" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "" -" Uma salsicha de porco longa e pesada que foi curada e " -"fumadaparaarmazenamento a longo prazo. Muito gostoso, se você estiver no " -"mercadodecarne humana." - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -30378,6 +31346,21 @@ msgid_plural "bratwursts" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30460,6 +31443,14 @@ msgstr "" msgid "glazed tenderloins" msgstr "lombos envidraçados" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30475,6 +31466,22 @@ msgstr "" msgid "currywurst" msgstr "currywurst" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30488,6 +31495,22 @@ msgstr "" msgid "aspic" msgstr "alfazema" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30573,6 +31596,14 @@ msgstr "" msgid "lunch meat" msgstr "carne de almoço" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30586,6 +31617,22 @@ msgstr "" msgid "bologna" msgstr "Bolonha" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30653,6 +31700,21 @@ msgid_plural "sausage gravies" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30666,6 +31728,22 @@ msgstr "" msgid "pemmican" msgstr "pemmican" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30681,6 +31759,21 @@ msgstr "" msgid "hamburger helper" msgstr "ajudante de hambúrguer" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30705,6 +31798,20 @@ msgid_plural "chilis con carne" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -30779,14 +31886,26 @@ msgstr "moluscos enlatados do quahog do clamChopped na água." msgid "clam chowder" msgstr "ensopado" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." msgstr "" -" Sopa deliciosa e branca, feita de amêijoas e batatas. Um gosto " -"daglóriaperdida da Nova Inglaterra." #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" @@ -30794,6 +31913,13 @@ msgid_plural "baked beans" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -30805,6 +31931,13 @@ msgid_plural "meat fried rice" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -30818,6 +31951,14 @@ msgid_plural "deluxe beans and rice" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30831,6 +31972,21 @@ msgstr "" msgid "meat pie" msgstr "torta de carne" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -30840,6 +31996,21 @@ msgstr "Uma deliciosa torta assada com um delicioso recheio de carne." msgid "meat pizza" msgstr "pizza de carne" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30849,12 +32020,29 @@ msgstr "" " Uma pizza de carne, para todos os carnívoros lá fora. Chock cheio " "decarnepicada e muito temperado." +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30868,6 +32056,13 @@ msgstr "" msgid "canned meat" msgstr "carne enlatada" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30881,6 +32076,13 @@ msgstr "" msgid "salted meat slice" msgstr "fatia de carne salgada" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -30893,6 +32095,21 @@ msgid_plural "spaghetti bolognese" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -30903,6 +32120,22 @@ msgstr "" msgid "lasagne" msgstr "lasanha" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30925,19 +32158,48 @@ msgstr "Tendo sido frito, este SPAM é realmente muito saboroso." msgid "cheeseburger" msgstr "X-Burger" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." +"Cataclysm culinary achievement." msgstr "" -" Um sanduíche de carne picada e queijo com condimentos. O ápice " -"dosucessoculinário pré-cataclismo." #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "hambúrguer" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -30947,6 +32209,21 @@ msgstr "Um sanduíche de carne picada com condimentos." msgid "sloppy joe" msgstr "joe desleixado" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30960,6 +32237,22 @@ msgstr "" msgid "taco" msgstr "taco" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30973,6 +32266,13 @@ msgstr "" msgid "pickled meat" msgstr "carne em conserva" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30984,6 +32284,15 @@ msgstr "" msgid "dehydrated meat" msgstr "carne desidratada" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31012,6 +32321,15 @@ msgid_plural "haggii" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31046,6 +32364,14 @@ msgid_plural "meat temaki" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31084,6 +32410,14 @@ msgstr "" msgid "pelmeni" msgstr "pelmeni" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -31097,371 +32431,20 @@ msgstr "" msgid "homemade burrito" msgstr "" -#. ~ Description for homemade burrito -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A traditional Mexican dish of meat and vegetable stuffing put on a corn " -"tortilla and rolled into a tube shape, like those you find in gas stations " -"but homemade and delicious!" -msgstr "" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "" -" carne humana desidratada Flocos de carne humana desidratada. " -"Comoarmazenamento adequado, este alimento seco permanecerá comestível " -"porumtempo incrivelmente longo." - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "" -" carne humana reidratadaFocos de carne humana reconstituídos, que " -"sãomuitomais agradáveis de comer agora que foram reidratados." - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -" Este tradicional pudim escocês é feito de carne e miudezashumanasmisturadas" -" com farinha de aveia, que é costurada no estômago de umhumano efervida. " -"Surpreendentemente saboroso se você gosta desse tipo decoisa ebastante " -"recheio, é melhor servido com vegetais de raiz cozida euísqueforte." - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "bolota de pirralho" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" -" Preservada e fatiada carne humana. Seu primeiro nome pode ter sidoOscar. " -"Você pode comê-lo frio, como o comedor de pessoas de sangue frio quevocêé." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "caranguejo currywurst" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "" -" Mannwurst coberto de molho de ketchup de caril. Bastante " -"picanteeimpressionante ao mesmo tempo!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "" -" Biscoitos de carne, carne humana e deliciosa sopa de cogumelos " -"todosjuntosem uma massa maravilhosamente gordurosa e saborosa." - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "aspic amoral" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "" -" Um prato em que a carne humana foi colocada em uma gelatina feita apartirde" -" ossos humanos. Murderously delicious - se você gosta desse tipo de coisa." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "prepper pemmican" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "" -" Uma mistura concentrada de gordura e proteína usada como " -"alimentonutritivode alta energia. Composta de sebo, plantas comestíveis e " -"uminfelizprepper." - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "sanduíche slob Pão e carne humana, surpresa!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "" -" sanduíche dudeluxe Um sanduíche de carne humana, legumes e " -"queijocomcondimentos. Banquetear-se com as almas dos seus inimigos " -"esaborososverdes do jardim!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "ajudante hobo" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "" -" Alguns mac e queijo com carne humana moída adicionada. Tão bom " -"écomoassassinato." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "" -" chili con cabron Um guisado picante contendo pimentas, carne humana, " -"tomatee feijão." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "torta de pau" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -" Uma torta de carne com um pequeno soldado, ou talvez cientista, quemsabe. " -"Deus, isso é bom!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "pedir pizza" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "" -" Uma pizza de carne, para todos os canibais que estão por aí. Chock " -"cheiodecarne humana picada e fortemente temperado." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -" Fatia de soylentCarne humana preservada com baixo teor de sódio. " -"Foifervidoe enlatado. Contém a maior parte da nutrição, mas pouco do sabor " -"dacarnecozida." - +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "fatias de simplório salgadas" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "" -" Fatias de carne humana curadas em salmoura e embaladas a vácuo. " -"Salgadomassaboroso em uma pitada." - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" msgstr[0] "" msgstr[1] "" -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "" -" Esparguete spaghrelSpaghetti coberto com um molho de carne humanagrossa. " -"Muito bom se você gosta desse tipo de coisa." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "Lasanha de Luigi" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "" -" Um tipo muito antigo de massa feita com várias camadas de folhas " -"delasanhaalternadas com queijo, molhos e carnes. Feito melhor com " -"carnehumana." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "cheeseburger chump" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "" -" Um sanduíche de carne e queijo humano picado com condimentos. O " -"ápicedosucesso culinário canibalístico pós-cataclismo." - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "bobburger" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "" - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "Um sanduíche é um sanduíche, mas isso é feito com as pessoas!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "taco taco" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -" Um taco feito com carne humana moída em vez de carne moída. Poralgumarazão," -" você pode ouvir um sino tocando à distância." - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "Mannwurst cru" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "" -" Uma salsicha de carne de porco longa e crua que foi preparada para " -"fumaroucozinhar." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "Mannwurst cozido" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "" -" Uma salsicha de\"carne de porco\" pesada e crua que foi cozida. " -"Cheiratãodeliciosa quanto humanamente possível." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "Mannbrat" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "" -" Um tipo de salsicha alemã feita de seres humanos picadinhos e que " -"deveserfrita ou assada. Melhor comê-lo quente e fresco. By the way, " -"usequalquerser humano disponível. Os alemães não são obrigatórios." - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "punk em conserva" - -#. ~ Description for pickled punk +#. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." +"A traditional Mexican dish of meat and vegetable stuffing put on a corn " +"tortilla and rolled into a tube shape, like those you find in gas stations " +"but homemade and delicious!" msgstr "" -" Esta é uma porção de carne humana enlatada e salgada. Saborosa enutritivase" -" você gosta desse tipo de coisa." #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" @@ -32369,11 +33352,8 @@ msgstr "comprimido de refeição óssea com sabor" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" -"Suplemento de cálcio caseiro feito de farinha de osso. Devido a algum " -"adoçante misturado para contrariar a textura pulverulenta e o sabor de " -"cinzas, é quase tão palatável quanto os comprimidos pré-cataclísmicos." #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -33030,7 +34010,7 @@ msgstr "soro de aves" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" @@ -33988,12 +34968,9 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" -" Isto parece um punhado de líquido cor de limão que tomou um conjunto, " -"bemcomo gelatina pré-cataclismo. Tem um aroma forte, mas delicioso, " -"maséclaramente mutado ou de origem alienígena." #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -34070,8 +35047,8 @@ msgstr "Um pedaço de papel. Pode ser usado para incêndios." #: lang/json/COMESTIBLE_from_json.py msgid "canned beans" msgid_plural "beans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "feijões enlatados" +msgstr[1] "feijões enlatados" #. ~ Description for canned beans #: lang/json/COMESTIBLE_from_json.py @@ -34085,8 +35062,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "dried beans" msgid_plural "dried beans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "feijões secos" +msgstr[1] "feijões secos" #. ~ Description for dried beans #: lang/json/COMESTIBLE_from_json.py @@ -34100,8 +35077,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked beans" msgid_plural "cooked beans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "feijões cozidos" +msgstr[1] "feijões cozidos" #. ~ Description for cooked beans #: lang/json/COMESTIBLE_from_json.py @@ -34111,8 +35088,8 @@ msgstr "beans cozidosUm serviço saudável de grandes grãos cozidos do norte." #: lang/json/COMESTIBLE_from_json.py msgid "tofu" msgid_plural "tofu" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tofu" +msgstr[1] "tofu" #. ~ Description for tofu #. ~ Description for fried tofu @@ -34125,14 +35102,14 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "fried tofu" msgid_plural "fried tofu" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tofu frito" +msgstr[1] "tofu frito" #: lang/json/COMESTIBLE_from_json.py msgid "dehydrated tofu" msgid_plural "dehydrated tofu" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tofu desidratado" +msgstr[1] "tofu desidratado" #. ~ Description for dehydrated tofu #: lang/json/COMESTIBLE_from_json.py @@ -34304,14 +35281,14 @@ msgstr "" " comida para cãesEsta é comida para cães. Cheira estranho, mas oscãesparecem" " adorar." -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "ração de gato" msgstr[1] "rações de gato" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "" "Isto é ração para gatos. Tem um cheiro estranho, porem os gatos parecem " @@ -34353,68 +35330,30 @@ msgstr[1] "" msgid "Some nectar. Seeing this item is a bug." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "bebida proteica" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "" msgstr[1] "" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "" -" bebida verde de soja Uma pasta fina de proteína humana refinadamisturadacom" -" água. Embora bastante nutritivo, não é particularmentesaboroso." - +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" -" pó verde de soja, proteína refinada feita de pessoas! Embora " -"sejabastantenutritivo, é impossível desfrutar em sua forma pura, " -"tenteadicionar água." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "batido verde de soylent" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "" -" Uma bebida espessa e saborosa feita a partir de proteína humanapurarefinada" -" e fruta nutritiva." - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "shake de soja verde fortificada" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "" -" Uma bebida espessa e saborosa feita a partir de proteína humanapurarefinada" -" e fruta nutritiva. Foi suplementado com vitaminas emineraisextras" - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "bebida proteica" - #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34430,6 +35369,14 @@ msgid_plural "protein powder" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34440,13 +35387,10 @@ msgstr "" "nutritivo,éimpossível desfrutar em sua forma pura, tente adicionar água." #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "" -msgstr[1] "" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -34462,6 +35406,13 @@ msgstr "" msgid "protein shake" msgstr "shake proteico" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34475,6 +35426,14 @@ msgstr "" msgid "fortified protein shake" msgstr "shake de proteína fortificado" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35327,6 +36286,13 @@ msgid_plural "deluxe sandwiches" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35427,6 +36393,22 @@ msgid_plural "meat sandwiches" msgstr[0] "" msgstr[1] "" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "" +msgstr[1] "" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -36411,15 +37393,6 @@ msgstr "caldo de osso" msgid "A tasty and nutritious broth made from bones." msgstr "Um caldo saboroso e nutritivo feito de ossos." -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "caldo humano" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "Um caldo nutritivo feito de ossos humanos." - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "sopa de vegetais" @@ -36433,6 +37406,13 @@ msgstr "Uma nutritiva e deliciosa sopa de legumes." msgid "meat soup" msgstr "sopa de carne" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -36464,6 +37444,13 @@ msgid_plural "curries with meat" msgstr[0] "curry com carne" msgstr[1] "curry com carne" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -36473,21 +37460,18 @@ msgstr "Apimentado e cheio de pedaços de pimentão e carne! É muito bom." msgid "woods soup" msgstr "sopa de madeiras" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "Uma sopa nutritiva e deliciosa, feita de presentes da natureza." -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "sopa de seiva" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "" -" Uma sopa feita de alguém que é uma refeição muito melhor do que uma pessoa." - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "sopa de macarrão de galinha" @@ -37636,19 +38620,6 @@ msgid "" " resembles spoiled milk." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "massa" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" -"Farinha misturada com água, amassada até virar pasta. Pode ser usada pra " -"fazer pão mais eficientemente do que apenas usando farinha." - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "" @@ -37697,6 +38668,19 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "massa" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" +"Farinha misturada com água, amassada até virar pasta. Pode ser usada pra " +"fazer pão mais eficientemente do que apenas usando farinha." + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "" @@ -37715,8 +38699,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -37731,7 +38715,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -37981,19 +38965,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "cordão resinoso" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "" -" Material de ligação primitivo feito de cordões e cola natural. Use-o para " -"reparar itens feitos de madeira, papel, osso ou quitina." - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -38001,8 +38972,8 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -38026,11 +38997,8 @@ msgstr[1] "anomalias em forma de frutinha" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "" -" Se deixássemos isto como deveria ser, poderíamos simplesmente entrar no " -"Bloom sem ser contestados e participar do Fruto. Não podemos ter isso, " -"podemos?" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -38042,10 +39010,8 @@ msgstr[1] "anomalias em forma de semente" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "" -"Se deixássemos isto como deveria ser, poderíamos apenas entrar no Jardim " -"incontestavelmente e aproveitar a Semente. Não podemos ter isso, podemos?" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -38057,11 +39023,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "" -" gelatina Se deixássemos isto como deveria ser, poderíamossimplesmenteentrar" -" na Torre incontestada e participar do Seiva. Espere, como vocêconseguiu " -"isso?" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -38072,12 +39035,9 @@ msgstr[1] "anomalias em forma de fruta" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" -"Não existimos no momento. Pequeno humano inteligente, sem dúvida depurando " -"para ver isso? Nós não permitiremos que você se junte a nós enquanto " -"estivermos fora." #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -38206,11 +39166,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" -"Algum maldito idiota colocou mel neste sanduíche de manteiga de amendoim, " -"quem em seu juízo perfeito - oh, espere, isso é muito bom. Sem glúten " -"também!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free PB&M sandwich" @@ -38234,21 +39191,16 @@ msgstr "ambrosia de nozes sem lactose" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "" -"Ambrosia deliciosa de nozes. Uma bebida digna dos deuses. Este foi feito com" -" uma alternativa ao leite de vaca." #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "" -"Você acha que isso é farinha de milho... ou farinha de arroz... Ou outra " -"coisa. No entanto, certamente não é farinha de trigo! Mas ainda é útil para " -"assar coisas." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free johnnycake" @@ -38257,11 +39209,9 @@ msgstr "johnnycake sem glúten" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "" -" Todos nós ansiamos por bolo às vezes. Isso não é perfeito, mas é " -"umsaborosoe nutritivo pão frito sem glúten." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit pancake" @@ -38303,12 +39253,9 @@ msgstr[1] "panquecas de frutas sem lactose ou glúten" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" -"Panquecas fofinhas e deliciosas feitas com as únicas coisas que você ainda " -"pode comer. Mas pelo menos tem xarope de bordo real, feito mais doce e " -"saudável com a adição de frutas frescas." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free chocolate pancake" @@ -38349,12 +39296,9 @@ msgstr[1] "rabanadas sem lactose ou glúten" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" -"Fatias de pão sem glúten mergulhadas em uma mistura de leite e ovo sem " -"lactose e fritas. Você nunca pensou que era possível, mas agora você " -"realmente se sente como um pós-milenial." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free biscuit" @@ -38450,10 +39394,8 @@ msgstr "cheeseburger sem glúten" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." +"of pre-Cataclysm culinary achievement." msgstr "" -" Um sanduíche livre de glúten de carne picada e queijo com condimentos. " -"Oápice do sucesso culinário pré-cataclismo." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -38592,11 +39534,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "" -" sanduíche sem graça, sem glúten, sanduíche de molho sem glúten. " -"Nãomuitorecheio mas bate comer apenas o pão ... especialmente se é o " -"tipoerrado depão!" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free waffle" @@ -38604,8 +39543,8 @@ msgstr "waffle sem glúten" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." -msgstr "Waffle sem glúten. É basicamente uma panqueca em forma de hashtag." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "lactose free waffle" @@ -38613,18 +39552,15 @@ msgstr "waffle livre de lactose" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." msgstr "" -" Waffle livre de lactose. É basicamente uma panqueca em forma de hashtag." #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "" -" Waffle livre de glúten e sem lactose. É basicamente uma panqueca em " -"formadehashtag." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit waffle" @@ -38668,38 +39604,38 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "rice milk" msgid_plural "rice milk" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "leite de arroz" +msgstr[1] "leite de arroz" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "" -" Leite de arroz Doce de leite de vaca real, quase tem gosto de " -"sorvetedebaunilha. Estraga rapidamente." +"Mais doce do que leite de vaca, quase com um sabor de sorvete de baunilha. " +"Estraga rapidamente." #: lang/json/COMESTIBLE_from_json.py msgid "coconut water" msgid_plural "coconut water" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "água de coco" +msgstr[1] "água de coco" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "" -" água de cocoC leite de coco, com água adicionada para ir mais longe. " -"Temumgosto ok embora. Estraga rapidamente." +"Água de coco misturada com água comum para render mais. Tem um gosto bom. " +"Estraga rapidamente." #: lang/json/COMESTIBLE_from_json.py msgid "jarred coconut milk" msgid_plural "jarred coconut milk" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "leite de coco envasilhado" +msgstr[1] "leite de coco envasilhado" #. ~ Description for jarred coconut milk #: lang/json/COMESTIBLE_from_json.py @@ -38713,8 +39649,8 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "rice flour" msgid_plural "rice flour" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "farinha de arroz" +msgstr[1] "farinha de arroz" #. ~ Description for rice flour #: lang/json/COMESTIBLE_from_json.py @@ -38855,8 +39791,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "glass bottle" msgid_plural "glass bottles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "garrafa de vidro" +msgstr[1] "garrafas de vidro" #. ~ Description for glass bottle #: lang/json/CONTAINER_from_json.py @@ -38868,8 +39804,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "plastic bottle" msgid_plural "plastic bottles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "garrafa de plástico" +msgstr[1] "garrafas de plástico" #. ~ Description for plastic bottle #: lang/json/CONTAINER_from_json.py @@ -38881,8 +39817,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "small plastic bottle" msgid_plural "small plastic bottles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "garrafa de plástico pequena" +msgstr[1] "garrafas de plástico pequenas" #. ~ Description for small plastic bottle #: lang/json/CONTAINER_from_json.py @@ -38894,8 +39830,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "large plastic bottle" msgid_plural "large plastic bottles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "garrafa de plástico grande" +msgstr[1] "garrafas de plástico grandes" #. ~ Description for large plastic bottle #: lang/json/CONTAINER_from_json.py @@ -38909,8 +39845,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "clay bowl" msgid_plural "clay bowls" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tigela de argila" +msgstr[1] "tigelas de argila" #. ~ Description for clay bowl #: lang/json/CONTAINER_from_json.py @@ -38939,8 +39875,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "small cardboard box" msgid_plural "small cardboard boxes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "caixa de papelão pequena" +msgstr[1] "caixas de papelão pequenas" #. ~ Description for small cardboard box #: lang/json/CONTAINER_from_json.py @@ -38952,20 +39888,22 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "cardboard box" msgid_plural "cardboard boxes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "caixa de papelão" +msgstr[1] "caixas de papelão" #. ~ Description for cardboard box #: lang/json/CONTAINER_from_json.py msgid "" "A sturdy cardboard box, about the size of a banana box. Great for packing." msgstr "" +"Uma caixa de papelão resistente, mais ou menos do tamanho de um engradado de" +" bananas. Ótima para empacotar coisas." #: lang/json/CONTAINER_from_json.py lang/json/furniture_from_json.py msgid "large cardboard box" msgid_plural "large cardboard boxes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "caixa de papelão grande" +msgstr[1] "caixas de papelão grandes" #. ~ Description for large cardboard box #: lang/json/CONTAINER_from_json.py @@ -38973,12 +39911,14 @@ msgid "" "A very large cardboard box, the sort children would have loved to hide in, " "when there were still children." msgstr "" +"Uma caixa de papelão bem grande, do tipo que crianças teriam adorado usar " +"como esconderijo, quando ainda existiam crianças." #: lang/json/CONTAINER_from_json.py msgid "bucket" msgid_plural "buckets" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "balde" +msgstr[1] "baldes" #. ~ Description for bucket #: lang/json/CONTAINER_from_json.py @@ -39014,8 +39954,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "aluminum can" msgid_plural "aluminum cans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lata de alumínio" +msgstr[1] "latas de alumínio" #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py @@ -39025,8 +39965,8 @@ msgstr "Alumínio canAn lata de alumínio, como o refrigerante vem dentro" #: lang/json/CONTAINER_from_json.py msgid "opened aluminum can" msgid_plural "opened aluminum cans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lata de alumínio aberta" +msgstr[1] "latas de alumínio abertas" #. ~ Description for opened aluminum can #: lang/json/CONTAINER_from_json.py @@ -39077,19 +40017,19 @@ msgstr "saco embalado a vácuoEste é um saco de alimentos embalados a vácuo." #: lang/json/CONTAINER_from_json.py msgid "small tin can" msgid_plural "small tin cans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lata de estanho pequena" +msgstr[1] "latas de estanho pequenas" #. ~ Description for small tin can #: lang/json/CONTAINER_from_json.py msgid "A small tin can, like what tuna comes in." -msgstr "" +msgstr "Uma pequena lata de estanho, do tipo que vem com atum." #: lang/json/CONTAINER_from_json.py msgid "small opened tin can" msgid_plural "small opened tin cans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lata de estanho pequena aberta" +msgstr[1] "latas de estanho pequenas abertas" #. ~ Description for small opened tin can #: lang/json/CONTAINER_from_json.py @@ -39097,23 +40037,25 @@ msgid "" "A small tin can, like what tuna comes in. This one is opened and can't be " "easily sealed." msgstr "" +"Uma pequena lata de estanho, do tipo que vem com atum. Esta foi aberta, e " +"não pode ser selada facilmente." #: lang/json/CONTAINER_from_json.py msgid "medium tin can" msgid_plural "medium tin cans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lata de estanho média" +msgstr[1] "latas de estanho médias" #. ~ Description for medium tin can #: lang/json/CONTAINER_from_json.py msgid "A medium tin can, like what soup comes in." -msgstr "" +msgstr "Uma lata de estanho média, do tipo usado para embalar sopa." #: lang/json/CONTAINER_from_json.py msgid "medium opened tin can" msgid_plural "medium opened tin cans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lata de estanho média aberta" +msgstr[1] "latas de estanho médias abertas" #. ~ Description for medium opened tin can #: lang/json/CONTAINER_from_json.py @@ -39121,12 +40063,14 @@ msgid "" "A medium tin can, like what soup comes in. This one is opened and can't be " "easily sealed." msgstr "" +"Uma lata de estanho média, do tipo usado para embalar sopa. Esta foi aberta," +" e não pode ser selada facilmente." #: lang/json/CONTAINER_from_json.py msgid "plastic canteen" msgid_plural "plastic canteens" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "cantil de plástico" +msgstr[1] "cantis de plástico" #. ~ Description for plastic canteen #: lang/json/CONTAINER_from_json.py @@ -39140,8 +40084,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "thermos" msgid_plural "thermoses" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "garrafa térmica" +msgstr[1] "garrafas térmicas" #. ~ Description for thermos #: lang/json/CONTAINER_from_json.py @@ -39236,8 +40180,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "test tube" msgid_plural "test tubes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tubo de ensaio" +msgstr[1] "tubos de ensaio" #. ~ Description for test tube #: lang/json/CONTAINER_from_json.py @@ -39289,8 +40233,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "hip flask" msgid_plural "hip flasks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "frasco de cintura" +msgstr[1] "frascos de cintura" #. ~ Description for hip flask #: lang/json/CONTAINER_from_json.py @@ -39304,8 +40248,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "3L glass jar" msgid_plural "3L glass jars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "jarro de vidro de 3L" +msgstr[1] "jarros de vidro de 3L" #. ~ Description for 3L glass jar #: lang/json/CONTAINER_from_json.py @@ -39317,8 +40261,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "sealed 3L glass jar" msgid_plural "sealed 3L glass jars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "jarro de vidro de 3L selado" +msgstr[1] "jarros de vidro de 3L selados" #. ~ Description for sealed 3L glass jar #: lang/json/CONTAINER_from_json.py @@ -39333,8 +40277,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "glass jar" msgid_plural "glass jars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "jarro de vidro" +msgstr[1] "jarros de vidro" #. ~ Description for glass jar #: lang/json/CONTAINER_from_json.py @@ -39346,8 +40290,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "sealed glass jar" msgid_plural "sealed glass jars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "jarro de vidro selado" +msgstr[1] "jarros de vidro selados" #. ~ Description for sealed glass jar #: lang/json/CONTAINER_from_json.py @@ -39394,8 +40338,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "clay jug" msgid_plural "clay jugs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "jarra de argila" +msgstr[1] "jarras de argila" #. ~ Description for clay jug #: lang/json/CONTAINER_from_json.py @@ -39522,8 +40466,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "small waterskin" msgid_plural "small waterskins" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "odre pequeno" +msgstr[1] "odres pequenos" #. ~ Description for small waterskin #: lang/json/CONTAINER_from_json.py @@ -39537,8 +40481,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "waterskin" msgid_plural "waterskins" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "odre" +msgstr[1] "odres" #. ~ Description for waterskin #: lang/json/CONTAINER_from_json.py @@ -39551,8 +40495,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "large waterskin" msgid_plural "large waterskins" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "odre grande" +msgstr[1] "odres grandes" #. ~ Description for large waterskin #: lang/json/CONTAINER_from_json.py @@ -39566,8 +40510,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "wooden barrel" msgid_plural "wooden barrels" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "barril de madeira" +msgstr[1] "barris de madeira" #. ~ Description for wooden barrel #: lang/json/CONTAINER_from_json.py @@ -39595,8 +40539,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "styrofoam cup" msgid_plural "styrofoam cups" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "copo de isopor" +msgstr[1] "copos de isopor" #. ~ Description for styrofoam cup #: lang/json/CONTAINER_from_json.py @@ -39620,8 +40564,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "condom" msgid_plural "condoms" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "camisinha" +msgstr[1] "camisinhas" #. ~ Description for condom #: lang/json/CONTAINER_from_json.py @@ -39631,11 +40575,23 @@ msgid "" "it's anyone's guess what it's for." msgstr "" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "balão" +msgstr[1] "balões" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" +"Um balão de festa. Poderia ser usado como recipiente improvisado para água." + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lata de estanho grande" +msgstr[1] "latas de estanho grandes" #. ~ Description for large tin can #: lang/json/CONTAINER_from_json.py @@ -39643,12 +40599,14 @@ msgid "" "A large tin can, like what beans come in. Holds a substantial amount of " "food." msgstr "" +"Uma lata grande de estanho, do tipo usado para armazenar feijões. Pode " +"armazenar uma quantidade substancial de comida." #: lang/json/CONTAINER_from_json.py msgid "opened large tin can" msgid_plural "opened large tin cans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lata de estanho grande aberta" +msgstr[1] "latas de estanho grandes abertas" #. ~ Description for opened large tin can #: lang/json/CONTAINER_from_json.py @@ -39656,12 +40614,14 @@ msgid "" "A large tin can, like what beans come in. This one is opened and can't be " "easily sealed." msgstr "" +"Uma lata grande de estanho, do tipo usado para armazenar feijões. Esta foi " +"aberta, e não pode ser selada facilmente." #: lang/json/CONTAINER_from_json.py msgid "survival kit box" msgid_plural "survival kit boxs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "caixa de kit de sobrevivência" +msgstr[1] "caixas de kit de sobrevivência" #. ~ Description for survival kit box #: lang/json/CONTAINER_from_json.py @@ -39669,6 +40629,8 @@ msgid "" "An aluminum box that used to contain a small survival kit. Can hold 1 liter" " of liquid." msgstr "" +"Uma caixa de alumínio que costumava conter um kit de sobrevivência pequeno. " +"Pode armazenar 1 litro de líquido." #: lang/json/CONTAINER_from_json.py msgid "blood draw kit" @@ -39701,8 +40663,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "steel bottle" msgid_plural "steel bottles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "garrafa de aço" +msgstr[1] "garrafas de aço" #. ~ Description for steel bottle #: lang/json/CONTAINER_from_json.py @@ -39713,8 +40675,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "foldable plastic bottle" msgid_plural "foldable plastic bottles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "garrafa de plástico dobrável" +msgstr[1] "garrafas de plástico dobráveis" #. ~ Description for foldable plastic bottle #: lang/json/CONTAINER_from_json.py @@ -39726,8 +40688,8 @@ msgstr "" #: lang/json/CONTAINER_from_json.py msgid "small metal tank" msgid_plural "small metal tanks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tanque pequeno de metal" +msgstr[1] "tanques pequenos de metal" #. ~ Description for small metal tank #: lang/json/CONTAINER_from_json.py @@ -40225,8 +41187,8 @@ msgstr "Um frisbee de plástico feito para jogos ao ar livre." #: lang/json/GENERIC_from_json.py src/artifact.cpp msgid "disc" msgid_plural "discs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "disco" +msgstr[1] "discos" #. ~ Description for disc #: lang/json/GENERIC_from_json.py @@ -40240,8 +41202,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "limestone shard" msgid_plural "limestone shards" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lasca de calcário" +msgstr[1] "lascas de calcário" #. ~ Description for limestone shard #: lang/json/GENERIC_from_json.py @@ -40256,8 +41218,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "rock salt" msgid_plural "rock salt" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "sal de rocha" +msgstr[1] "sal de rocha" #. ~ Description for rock salt #: lang/json/GENERIC_from_json.py @@ -40268,8 +41230,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "rhodonite" msgid_plural "rhodonite" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "rodonita" +msgstr[1] "rodonita" #. ~ Description for rhodonite #: lang/json/GENERIC_from_json.py @@ -40425,12 +41387,14 @@ msgid "" "Radioactive material that used to be a part of some nuclear industry " "equipment. You are yet to find some use for it." msgstr "" +"Material radioativo que costumava fazer parte de algum equipamento de " +"indústria nuclear. Você ainda não sabe o que fazer com isso." #: lang/json/GENERIC_from_json.py msgid "sandbag" msgid_plural "sandbags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "saco de areia" +msgstr[1] "sacos de areia" #. ~ Description for sandbag #: lang/json/GENERIC_from_json.py @@ -40442,8 +41406,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "earthbag" msgid_plural "earthbags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "saco de terra" +msgstr[1] "sacos de terra" #. ~ Description for earthbag #: lang/json/GENERIC_from_json.py @@ -40455,6 +41419,29 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "corpse" msgid_plural "corpses" +msgstr[0] "corpo" +msgstr[1] "corpos" + +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "carcaça" +msgstr[1] "carcaças" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "%s esfolado" +msgstr[1] "%s esfolado" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" msgstr[0] "" msgstr[1] "" @@ -40476,26 +41463,20 @@ msgid "" " so with a gigantic claw." msgstr "" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." -msgstr "" +msgstr "Um corpo humano." #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body of a middle-aged man." -msgstr "" +msgstr "O corpo de um homem de meia idade." #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body of a young woman." -msgstr "" +msgstr "O corpo de uma jovem mulher." #. ~ Description for corpse #: lang/json/GENERIC_from_json.py @@ -40572,6 +41553,36 @@ msgid "" "wound." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "gerador de micro-ondas" +msgstr[1] "geradores de micro-ondas" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" +"Este componente eletrônico é projetado para emitir micro-ondas, para uso em " +"seu microondas." + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -40632,8 +41643,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "coin" msgid_plural "coins" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "moeda" +msgstr[1] "moedas" #. ~ Description for coin #: lang/json/GENERIC_from_json.py @@ -40647,8 +41658,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "family photo" msgid_plural "family photos" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "foto de família" +msgstr[1] "fotos de família" #. ~ Description for family photo #: lang/json/GENERIC_from_json.py @@ -40659,7 +41670,7 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "animal" -msgstr "" +msgstr "animal" #: lang/json/GENERIC_from_json.py msgid "nearby fire" @@ -40671,17 +41682,17 @@ msgstr "vendo isso é um bugmuscle" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "" +msgstr "vento" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "" +msgstr "luz do sol" #: lang/json/GENERIC_from_json.py msgid "metabolism" msgid_plural "metabolisms" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "metabolismo" +msgstr[1] "metabolismos" #: lang/json/GENERIC_from_json.py msgid "a smoking device and a source of flame" @@ -40690,8 +41701,8 @@ msgstr "um aparelho de fumar e uma fonte de fogo" #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "arquivo" +msgstr[1] "arquivos" #. ~ Description for file #: lang/json/GENERIC_from_json.py @@ -40818,8 +41829,8 @@ msgstr "Patch Nomex Um pequeno parafuso de tecido resistente ao fogo Nomex." #: lang/json/GENERIC_from_json.py msgid "superglue" msgid_plural "superglues" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "supercola" +msgstr[1] "supercolas" #. ~ Description for superglue #: lang/json/GENERIC_from_json.py @@ -40873,8 +41884,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "chunk of chitin" msgid_plural "chunks of chitin" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pedaço de quitina" +msgstr[1] "pedaços de quitina" #. ~ Description for chunk of chitin #: lang/json/GENERIC_from_json.py @@ -42553,6 +43564,149 @@ msgstr[1] "" msgid "A sparkling diamond." msgstr "Um diamante cintilante." +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -43583,8 +44737,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "walking cane" msgid_plural "walking canes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bengala" +msgstr[1] "bengalas" #. ~ Description for walking cane #: lang/json/GENERIC_from_json.py @@ -43707,18 +44861,17 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "cestus" msgid_plural "cestuses" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "cestus" +msgstr[1] "cestus" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." msgstr "" -" cestusUm protetor de metal pesado que cobre o punho e aumenta o " -"poderdeimpacto, com acolchoamento robusto por baixo para proteger a " -"mãodousuário." +"Uma luva de couro e faixas para o antebraço, incorporando placas de metal " +"sobre os dedos para aprimorar a força de um soco e a defesa." #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -43796,8 +44949,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "sharpened toothbrush" msgid_plural "sharpened toothbrushes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "escova de dente afiada" +msgstr[1] "escovas de dente afiadas" #. ~ Description for sharpened toothbrush #: lang/json/GENERIC_from_json.py @@ -43808,8 +44961,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "grenade launcher buttstock" msgid_plural "grenade launcher buttstocks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "coronha de lança-granadas" +msgstr[1] "coronhas de lança-granadas" #. ~ Description for grenade launcher buttstock #: lang/json/GENERIC_from_json.py @@ -44520,17 +45673,17 @@ msgstr[1] "" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" #: lang/json/GENERIC_from_json.py @@ -46693,6 +47846,288 @@ msgid_plural ".50 ammo belt linkages" msgstr[0] "" msgstr[1] "" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -46837,15 +48272,43 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "vasilha 40mm" -msgstr[1] "vasilhas 40mm" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for 40mm canister +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "Uma vasilha grande de uma granada 40mm usada." +msgid "A large canister from a spent 40mm cartridge." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -47227,16 +48690,6 @@ msgid_plural "generic silverwares" msgstr[0] "" msgstr[1] "" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -48495,8 +49948,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "baseball bat" msgid_plural "baseball bats" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "taco de beisebol" +msgstr[1] "tacos de beisebol" #. ~ Description for baseball bat #: lang/json/GENERIC_from_json.py @@ -48508,8 +49961,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "aluminum bat" msgid_plural "aluminum bats" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "taco de alumínio" +msgstr[1] "tacos de alumínio" #. ~ Description for aluminum bat #: lang/json/GENERIC_from_json.py @@ -48605,8 +50058,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "mace" msgid_plural "maces" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "maça" +msgstr[1] "maças" #. ~ Description for mace #: lang/json/GENERIC_from_json.py @@ -48859,8 +50312,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "Mjölnir" msgid_plural "Mjölnirs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Mjölnir" +msgstr[1] "Mjölnirs" #. ~ Description for Mjölnir #: lang/json/GENERIC_from_json.py @@ -48896,8 +50349,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "shillelagh" msgid_plural "shillelaghs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "shillelagh" +msgstr[1] "shillelaghs" #. ~ Description for shillelagh #: lang/json/GENERIC_from_json.py @@ -50063,8 +51516,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "light detector" msgid_plural "light detectors" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "detector de luz" +msgstr[1] "detectores de luz" #. ~ Description for light detector #: lang/json/GENERIC_from_json.py @@ -50078,8 +51531,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "glass prism" msgid_plural "glass prisms" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "prisma de vidro" +msgstr[1] "prismas de vidro" #. ~ Description for glass prism #: lang/json/GENERIC_from_json.py @@ -50093,8 +51546,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "small glass tube" msgid_plural "small glass tubes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tubo de vidro pequeno" +msgstr[1] "tubos de vidro pequenos" #. ~ Description for small glass tube #: lang/json/GENERIC_from_json.py @@ -50170,6 +51623,28 @@ msgid "" "twist ties, duct tape, and other random stuff has been used to compensate." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -52027,8 +53502,8 @@ msgstr[1] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -52162,9 +53637,79 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -54354,7 +55899,21 @@ msgstr[1] "" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" #: lang/json/GENERIC_from_json.py @@ -55547,6 +57106,17 @@ msgstr[1] "" msgid "A small book, containing spells created by a novice magician." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -55719,6 +57289,47 @@ msgid "" "hopes to discover a more permanent solution." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -56121,11 +57732,9 @@ msgstr[1] "" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" -"Um skitterbot quebrado. Seus módulos de armas internos foram removidos. " -"Poderia ser desmontado por peças ou trabalhado em um robô recuperado." #. ~ Description for broken skitterbot #: lang/json/GENERIC_from_json.py @@ -56151,11 +57760,9 @@ msgstr[1] "" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Um robô de defesa quebrado. Suas armas internas foram removidas. Poderia ser" -" desmontado por peças ou trabalhado em um robô recuperado." #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -56192,12 +57799,9 @@ msgstr[1] "" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -" frango desalinhado quebrado Um passeador de galinhas quebrado. " -"Suasarmasinternas foram removidas. Poderia ser estripado por peças " -"outrabalhado emum robô recuperado." #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -56809,10 +58413,8 @@ msgstr[1] "" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "" -" quebrada defesa junco de botbroken cowboyA quebrado salvado robô.Poderiaser" -" despojado para peças ou re-crafted." #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -56841,13 +58443,9 @@ msgstr[1] "" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" -" shortcircuit quebrado samuraibroken slapdash paladinbroken " -"desarmadomilitarbotbroken militar treinador robotUm robô instrutor " -"militarquebrado, quebrado e inerte. Este está armado com uma arma de " -"paintballintegrada. Pode ser despojado de peças." #: lang/json/GENERIC_from_json.py msgid "broken military robot" @@ -56858,57 +58456,44 @@ msgstr[1] "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" -" Robô militar quebradoUm robô militar quebrado, quebrado e inerte. " -"Esteestáarmado com uma arma de fogo integrada de 5.56mm. Pode ser " -"despojadodepeças." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" -" Um robô militar quebrado, quebrado e inerte. Este é armado com uma " -"armadefogo integrada de 7.62mm. Pode ser despojado de peças." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" -" Um robô militar quebrado, quebrado e inerte. Este é armado com uma " -"armadefogo integrada de 50 calibres. Pode ser despojado de peças." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" -" Um robô militar quebrado, quebrado e inerte. Este está armado com umaarmade" -" fogo 8x40mm integrada. Pode ser despojado de peças." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" -" Um robô militar quebrado, quebrado e inerte. Este está armado com " -"umaarmaflechette integrada. Pode ser despojado de peças." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" -" Um robô militar quebrado, quebrado e inerte. Este é armado com umlançadorde" -" granadas de 40mm integrado. Pode ser despojado de peças." #: lang/json/GENERIC_from_json.py msgid "broken military flame robot" @@ -56919,11 +58504,9 @@ msgstr[1] "" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" -" Um robô militar quebrado, quebrado e inerte. Este está armado com um lança-" -" chamas integrado. Pode ser despojado de peças." #: lang/json/GENERIC_from_json.py msgid "broken robo-guardian" @@ -56936,11 +58519,13 @@ msgstr[1] "" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "" -" robo-gaurdian quebradoUm robô recuperado quebrado. Poderia ser " -"despojadoourecraft." +" quebrado estridente terrorbroken enganchado nightmarebroken " +"punhokingAquebrado salvado robô. Poderia ser despojado ou recraft." #: lang/json/GENERIC_from_json.py msgid "broken robote deluxe" @@ -56950,10 +58535,8 @@ msgstr[1] "" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "" -" robote quebrado deluxeUm robô de luxo quebrado. Poderia ser " -"despojadoourecraft." #: lang/json/GENERIC_from_json.py msgid "broken robo-protector" @@ -56976,12 +58559,9 @@ msgstr[1] "" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -" robo-protectorbroken quebrado robo-defenderbroken avançado " -"desarmadobotAavançado robô quebrado. Suas armas internas foram removidas. " -"Poderiaserestripado por peças ou trabalhado em um robô recuperado." #: lang/json/GENERIC_from_json.py msgid "broken advanced robot" @@ -56992,38 +58572,30 @@ msgstr[1] "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" -" robô avançado quebradoUm robô avançado quebrado. Este está armado " -"comumemissor laser integrado. Pode ser despojado de peças." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" -" Um robô avançado quebrado. Este está armado com um ejetor " -"deplasmaintegrado. Pode ser despojado de peças." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" -" Um robô avançado quebrado. Este está armado com um eletro- casterintegrado." -" Pode ser despojado de peças." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" -" Um robô avançado quebrado. Este está armado com um projetor EMPintegrado. " -"Pode ser despojado de peças." #: lang/json/GENERIC_from_json.py msgid "broken glittering lady" @@ -57048,11 +58620,9 @@ msgstr[1] "" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "" -"Um robô quebrado. Graças a Deus, finalmente está morto. Poderia ser " -"despojado de peças ou reconstruído." #: lang/json/GENERIC_from_json.py msgid "broken screeching terror" @@ -57072,14 +58642,6 @@ msgid_plural "broken fist kings" msgstr[0] "" msgstr[1] "" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "" -" quebrado estridente terrorbroken enganchado nightmarebroken " -"punhokingAquebrado salvado robô. Poderia ser despojado ou recraft." - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -57215,17 +58777,8 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." -msgstr "" -"Esta massa amorfa parece ter acabado de se desenvolver; suas estruturas " -"internas avançadas atestam a isso. É capaz de locomoção por meio de pressão " -"hidráulica interna, capaz de movimentar cargas substanciais e, em uma " -"exibição espantosa de inteligência, é capaz de manipular tudo o que está " -"ligado a ele, seja baseado em blob ou não, através de pseudópodes " -"estendidos. Você acha que pode ser capaz de manipulá-lo e, através dele, " -"todas as partes anexadas. Mas para fazer isso, você terá que se posicionar " -"para estar em contato com ele; e ele parece inquietantemente disposto a " -"acomodá-lo..." +"you…" +msgstr "" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -57286,6 +58839,12 @@ msgstr "" " ameaça potencial e melhora a eficiência, pois é capaz de rastrear o sol. No" " entanto, isso ocorre ao custode ser proibitivamente pesado e obstrutivo." +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "" +msgstr[1] "" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -57344,13 +58903,9 @@ msgstr[1] "portais estabilizados" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"Você olha para as profundezas aparentemente infinitas deste buraco portátil " -"na realidade, uma frase de um tempo que se foi para sempre ecoa em sua " -"mente. \"Existem duas coisas que são infinitas: o universo e a cleptomania " -"humana.\"" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -58652,6 +60207,17 @@ msgid "" " reload a compatible revolver." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "" @@ -58717,6 +60283,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "carregador AF2011A1" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "" @@ -59040,8 +60617,8 @@ msgstr "" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -60385,13 +61962,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -" Um mistério biológico, esta bolha evoluiu a capacidade de " -"gerareletricidadelentamente através de algum processo desconhecido. Emite " -"umbrilho baixo efosforescente ao fazê-lo. Também é capaz de " -"armazenareletricidade de outrasfontes, mas isso o torna inativo. Parece " -"flexível osuficiente para separar..." #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -60449,25 +62021,6 @@ msgstr "" msgid "pebble hopper" msgstr "funil de seixo" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "carregador AF2011A1" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "" -"Dois carregadores ligados a uma base comum. Exclusivo para o AF2011A1." - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "carregador M1991A1 .38 Super" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "Um carregador de 9 cartuchos para a pistola M1991A1 .38 Super." - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "padrão" @@ -60700,11 +62253,9 @@ msgstr "Mais Edifícios do Fuji" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "" -" Adiciona mais edifícios e mais variações aos edifícios existentes. (Requer " -"Mais Locais)" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -60726,7 +62277,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -60758,12 +62309,9 @@ msgstr "Hidroponia" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" -"Adiciona unidades de hidroponia, que podem ser usadas para cultivar plantas," -" gerando colheitas maiores. Ocasionalmente aparecem em laboratórios ou " -"porões, e você pode construir as suas próprias." #: lang/json/MOD_INFO_from_json.py msgid "Mythical Martial Arts" @@ -60864,10 +62412,8 @@ msgstr "NPCs Mutantes" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "" -" NPCs vagando pelo terreno baldio ocasionalmente terão mutações --- " -"incluindo seus inimigos. Cuidado!" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -60876,9 +62422,8 @@ msgstr "" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61201,11 +62746,9 @@ msgstr "Receitas Bens GF" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "" -" Algumas opções simples de receita alternativa sem glúten e sem lactose. " -"NÃOEXAUSTIVO." #: lang/json/MOD_INFO_from_json.py msgid "Tough Zombies" @@ -61241,12 +62784,9 @@ msgstr "Chave do mapa alternativo" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" -" Altera o mapa expandido para ser mais legível. Os edifícios " -"sãocodificadospor cores por tipo e usam letra inicial de seus nomes em vez " -"de^ v<>." #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -61396,7 +62936,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -61408,7 +62948,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61419,7 +62959,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -61429,7 +62969,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -61508,11 +63048,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." msgstr "" -" Um pato, muitas vezes visto em torno de rios e outras massas deágua. " -"Alimenta-se principalmente de insetos, sementes, raízes e, pré- cataclismo, " -"restos de pão." #: lang/json/MONSTER_from_json.py msgid "goose" @@ -62298,7 +63835,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" #: lang/json/MONSTER_from_json.py @@ -62461,7 +63998,7 @@ msgid_plural "skittering plagues" msgstr[0] "" msgstr[1] "" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "Uma barata gigante infectada, tem se alimentado dos mortos-vivos." @@ -62472,7 +64009,7 @@ msgid_plural "plague nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "Uma barata mutante infectada do tamanho de um rato." @@ -62483,7 +64020,7 @@ msgid_plural "plague vectors" msgstr[0] "" msgstr[1] "" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -62509,7 +64046,7 @@ msgid_plural "giant cockroach nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "Uma barata bebê mutante do tamanho de um rato." @@ -62533,7 +64070,7 @@ msgid_plural "giant bees" msgstr[0] "abelha gigante" msgstr[1] "abelhas gigantes" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -62549,7 +64086,7 @@ msgid_plural "giant centipedes" msgstr[0] "centopeia gigante" msgstr[1] "centopeias gigantes" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -62594,7 +64131,7 @@ msgid_plural "giant mosquitos" msgstr[0] "mosquito gigante" msgstr[1] "mosquitos gigantes" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -62609,7 +64146,7 @@ msgid_plural "giant cellar spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -62626,7 +64163,7 @@ msgid_plural "immature giant cellar spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -62641,7 +64178,7 @@ msgid_plural "giant jumping spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -62657,7 +64194,7 @@ msgid_plural "giant trapdoor spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -62673,7 +64210,7 @@ msgid_plural "giant web spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -62688,7 +64225,7 @@ msgid_plural "fungal spiders" msgstr[0] "aranha fungal" msgstr[1] "aranhas fungais" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -62702,7 +64239,7 @@ msgid_plural "immature giant web spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -62717,7 +64254,7 @@ msgid_plural "giant black widows" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -62732,7 +64269,7 @@ msgid_plural "giant black widow spiderlings" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -62747,7 +64284,7 @@ msgid_plural "giant wolf spiders" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -62762,7 +64299,7 @@ msgid_plural "giant wasps" msgstr[0] "vespa gigante" msgstr[1] "vespas gigantes" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -62778,7 +64315,7 @@ msgid_plural "dermatiks" msgstr[0] "" msgstr[1] "" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -62808,7 +64345,7 @@ msgid_plural "giant ants" msgstr[0] "formiga gigante" msgstr[1] "formigas gigantes" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -62823,7 +64360,7 @@ msgid_plural "giant acidic ants" msgstr[0] "formiga gigante ácida" msgstr[1] "formigas gigantes ácidas" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -62856,7 +64393,7 @@ msgid_plural "acidic queen ants" msgstr[0] "rainha formiga gigante ácida" msgstr[1] "rainhas de formigas gigantes ácidas" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -62874,7 +64411,7 @@ msgid_plural "acidic soldier ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -62891,7 +64428,7 @@ msgid_plural "fungal ants" msgstr[0] "formiga fungal" msgstr[1] "formigas fungais" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -62922,7 +64459,7 @@ msgid_plural "queen ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -62938,7 +64475,7 @@ msgid_plural "soldier ants" msgstr[0] "" msgstr[1] "" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -62953,7 +64490,7 @@ msgid_plural "giant locusts" msgstr[0] "" msgstr[1] "" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -62968,7 +64505,7 @@ msgid_plural "locust nymphs" msgstr[0] "" msgstr[1] "" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -63900,14 +65437,14 @@ msgid_plural "marloss zealots" msgstr[0] "" msgstr[1] "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -63920,7 +65457,7 @@ msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -63938,7 +65475,7 @@ msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -63955,7 +65492,7 @@ msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "" msgstr[1] "" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -63972,7 +65509,7 @@ msgid_plural "mi-gos" msgstr[0] "mi-go" msgstr[1] "mi-gos" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -63994,7 +65531,7 @@ msgid_plural "mi-go slavers" msgstr[0] "mi-go escravagista" msgstr[1] "mi-gos escravagistas" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -64011,7 +65548,7 @@ msgid_plural "mi-go surgeons" msgstr[0] "mi-go cirurgião" msgstr[1] "mi-gos cirurgiões" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -64025,7 +65562,7 @@ msgid_plural "mi-go guards" msgstr[0] "mi-go guarda" msgstr[1] "mi-gos guardas" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -64042,7 +65579,7 @@ msgid_plural "mi-go myrmidons" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -64059,7 +65596,7 @@ msgid_plural "mi-go scouts" msgstr[0] "" msgstr[1] "" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -65815,6 +67352,19 @@ msgid "" "able to see." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -66530,7 +68080,7 @@ msgid_plural "experimental mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -66545,7 +68095,7 @@ msgid_plural "evolved mutants" msgstr[0] "" msgstr[1] "" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -67047,7 +68597,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" @@ -67063,7 +68613,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" @@ -67078,7 +68628,7 @@ msgstr[1] "" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" @@ -67483,7 +69033,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -67498,7 +69048,21 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67927,9 +69491,9 @@ msgstr[1] "" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67941,10 +69505,10 @@ msgstr[1] "" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -67957,7 +69521,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -67971,8 +69535,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" @@ -67986,7 +69550,7 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -68000,10 +69564,10 @@ msgstr[1] "" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68015,9 +69579,9 @@ msgstr[1] "" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -68031,8 +69595,8 @@ msgstr[1] "" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -68044,20 +69608,18 @@ msgstr[1] "" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" -" Um corpo humano com carne azul-clara, crepitando com energiaelétrica. " -"Parece ansioso contar uma coisa." #: lang/json/MONSTER_from_json.py msgid "mr skeltal" @@ -68069,12 +69631,9 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" -" Desprovido inteiramente de carne e órgãos, esse esqueleto ambulante " -"televaao osso. Em sua mão ossuda, segura uma trombeta imaculada, " -"desarmadapelofim do mundo." #: lang/json/MONSTER_from_json.py msgid "minion of skeltal" @@ -68099,10 +69658,8 @@ msgstr[1] "" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" -" Uma casca fumegante é tudo o que resta desse urso outrora orgulhoso. " -"Seusolhos negros olham para você com malícia ... e fome." #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -68433,6 +69990,87 @@ msgid "" "like jaws." msgstr "" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -69004,12 +70642,9 @@ msgstr[1] "robôs de defesa" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" -"Um robô de defesa automatizado ainda ativo devido à sua fonte de energia " -"interna. Este é armado com um bastão de choque elétrico e uma arma de fogo " -"integrada de 9mm." #: lang/json/MONSTER_from_json.py msgid "security robot" @@ -69020,11 +70655,9 @@ msgstr[1] "robôs de segurança" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" -"Um robô de defesa automatizado ainda ativo devido à sua fonte de energia " -"interna. Este é equipado com uma arma de fogo integrada de 9 mm." #: lang/json/MONSTER_from_json.py msgid "riotcontrol robot" @@ -69035,13 +70668,10 @@ msgstr[1] "robôs para controle de manifestações" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" -"Um robô de defesa automatizado ainda ativo devido à sua fonte de energia " -"interna. Este é equipado com um bastão elétrico, spray de gás lacrimogêneo e" -" um lançador integrado de munição não-letal de 40mm." #: lang/json/MONSTER_from_json.py msgid "necco" @@ -69440,13 +71070,9 @@ msgstr[1] "" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" -" Um robô utilitário recuperado convertido em um aspirador automatizado. " -"Elevai sugar itens perdidos do chão e dissolvê-los com suas " -"reservasinternasde ácido. Um ajudante útil para manter o gramado da frente " -"limpo dedetritos ... ou cadáveres." #: lang/json/MONSTER_from_json.py msgid "bee bot" @@ -69509,11 +71135,9 @@ msgstr[1] "" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" -" Isso não funciona ainda. Não construa ... Um medibot recuperado " -"comseusfármacos internos reaproveitados para produzir mutagênico." #: lang/json/MONSTER_from_json.py msgid "party bot" @@ -71088,6 +72712,17 @@ msgstr "" msgid "Ethereal Grasp" msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "" @@ -71509,6 +73144,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "" @@ -73583,6 +75241,19 @@ msgstr "" " estetoscópioEsta é uma ferramenta de audição médica. Use para ouvircoisas. " "De perto." +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -73883,9 +75554,9 @@ msgstr[1] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -73896,7 +75567,7 @@ msgstr[1] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -73909,9 +75580,9 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -73928,7 +75599,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -73941,12 +75612,12 @@ msgstr[1] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." +msgid "Power levels too low for safe bootup…" msgstr "" #. ~ Description for CRIT EM vest (off) @@ -73954,9 +75625,9 @@ msgstr "" msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -73972,7 +75643,7 @@ msgstr "Desligar armadura" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "" #. ~ Description for CRIT EM vest (on) @@ -73981,8 +75652,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74000,7 +75671,7 @@ msgstr "" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -74019,10 +75690,10 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -74277,6 +75948,32 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -74700,8 +76397,8 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "bionic razor" msgid_plural "bionic razors" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "navalha biônica" +msgstr[1] "navalhas biônicas" #: lang/json/TOOL_from_json.py msgid "clairvoyance rod" @@ -74847,12 +76544,13 @@ msgstr "" #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "Carraça." @@ -74934,11 +76632,10 @@ msgstr "granada decodificadorVocê puxa o pino da granada decodificadora." #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" #: lang/json/TOOL_from_json.py @@ -74957,6 +76654,58 @@ msgstr "" "embrevedetonará, liberando uma onda de controle que temporariamente " "converterobôsao seu lado." +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "" +msgstr[1] "" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "Você puxa o pino na granada EMP." + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +" Esta é uma granada que gera um pulso eletromagnético com um " +"bancodecapacitores de baixa indutância descarregado em uma antena de " +"laçoúnico. Use este item para puxar o pino e acender o fusível, " +"transformando-oem umagranada EMP ativa. Você terá então três turnos antes de" +" detonar, criando umcampo EMP que danifica os robôs e drena a energia " +"biônica." + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "" +msgstr[1] "" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "" + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +" Esta granada EMP está ativa e detonará em breve, criando um grande " +"campoEMPque danifica os robôs e drena a energia biônica. Você pode não " +"quererficarsegurando por muito mais tempo." + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -75395,31 +77144,30 @@ msgstr "" "oparadesdobrar para uso." #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" +msgid "EMP bomb" +msgid_plural "EMP bombs" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "Você puxa o pino na granada EMP." +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -" Esta é uma granada que gera um pulso eletromagnético com um " -"bancodecapacitores de baixa indutância descarregado em uma antena de " -"laçoúnico. Use este item para puxar o pino e acender o fusível, " -"transformando-oem umagranada EMP ativa. Você terá então três turnos antes de" -" detonar, criando umcampo EMP que danifica os robôs e drena a energia " -"biônica." #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -75435,29 +77183,24 @@ msgid "" msgstr "" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" msgstr[0] "" msgstr[1] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -" Esta granada EMP está ativa e detonará em breve, criando um grande " -"campoEMPque danifica os robôs e drena a energia biônica. Você pode não " -"quererficarsegurando por muito mais tempo." #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -75964,14 +77707,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -" câmera proUma câmera SLR digital de 35mm (reflex de lente única),comvisores" -" ópticos e digitais, lente zoom com foco automático eestabilizadore flash. " -"Você pode visualizar suas fotos ou transferi-las comum cartão dememória; " -"Funciona com baterias convencionais. Antes docataclismo, vocêpoderia ter " -"tirado fotos de nível profissional usando isso." #: lang/json/TOOL_from_json.py msgid "candle" @@ -76342,8 +78080,8 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "clarinet" msgid_plural "clarinets" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "clarinete" +msgstr[1] "clarinetes" #. ~ Description for clarinet #: lang/json/TOOL_from_json.py @@ -76371,8 +78109,8 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "concrete mixer" msgid_plural "concrete mixers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "betoneira" +msgstr[1] "betoneiras" #. ~ Description for concrete mixer #: lang/json/TOOL_from_json.py @@ -76387,8 +78125,8 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "control laptop" msgid_plural "control laptops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "laptop de controle" +msgstr[1] "laptops de controle" #. ~ Description for control laptop #: lang/json/TOOL_from_json.py @@ -76418,8 +78156,8 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "copper knife" msgid_plural "copper knives" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "faca de cobre" +msgstr[1] "facas de cobre" #. ~ Description for copper knife #: lang/json/TOOL_from_json.py @@ -76530,8 +78268,8 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "crowbar" msgid_plural "crowbars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pé-de-cabra" +msgstr[1] "pés-de-cabra" #. ~ Description for crowbar #: lang/json/TOOL_from_json.py @@ -76657,8 +78395,8 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "dive knife" msgid_plural "dive knives" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "faca de mergulho" +msgstr[1] "facas de mergulho" #. ~ Description for dive knife #: lang/json/TOOL_from_json.py @@ -76788,6 +78526,7 @@ msgstr[0] "" msgstr[1] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -76801,13 +78540,10 @@ msgstr[1] "" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -" tablet de e-ink PCA tablet PC usando uma eficiente tela de tintacolorida. " -"Antes do cataclismo, estes eram dispositivos engenhosos; agora, éumrecurso " -"quase inestimável. Funciona com baterias convencionais." #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -78084,12 +79820,9 @@ msgstr[1] "" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "" -" martelo improvisadoEste é um martelo bruto feito de um pedaço " -"demetalafixado a um bastão. Funciona adequadamente como um martelo, mas " -"naverdadenão pode ser comparado a um bom." #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -79220,21 +80953,6 @@ msgstr "" "Sualâmina pequena e afiada permite golpes de precisão nas " "mãosdoshabilidosos." -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "" -msgstr[1] "" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "" -" par de tesourasEstes são um par de tesouras para trabalhos pesados. " -"Useumatesoura para cortar itens feitos de algodão (como roupas) em trapos." - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -81715,6 +83433,18 @@ msgid "" "distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -84018,6 +85748,21 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "" +" par de tesourasEstes são um par de tesouras para trabalhos pesados. " +"Useumatesoura para cortar itens feitos de algodão (como roupas) em trapos." + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -84199,6 +85944,28 @@ msgid_plural "precision soldererss" msgstr[0] "" msgstr[1] "" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -84396,12 +86163,12 @@ msgstr[1] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -84413,10 +86180,11 @@ msgstr[1] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -84428,7 +86196,7 @@ msgstr[1] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -84441,7 +86209,7 @@ msgstr[1] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -84455,10 +86223,10 @@ msgstr[1] "" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -84471,7 +86239,7 @@ msgstr[1] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -84485,7 +86253,7 @@ msgstr[1] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -85004,7 +86772,7 @@ msgstr[1] "" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" @@ -85017,7 +86785,7 @@ msgstr[1] "" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" @@ -85030,7 +86798,7 @@ msgstr[1] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" @@ -85043,7 +86811,7 @@ msgstr[1] "" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" @@ -85056,8 +86824,8 @@ msgstr[1] "" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85069,8 +86837,8 @@ msgstr[1] "" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85082,7 +86850,7 @@ msgstr[1] "" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" @@ -85095,8 +86863,8 @@ msgstr[1] "" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "" #: lang/json/TOOL_from_json.py @@ -85108,7 +86876,7 @@ msgstr[1] "" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" @@ -85197,23 +86965,18 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." msgstr "" -" Dusk Uma espada longa, feita de um metal muito escuro, quase preto. " -"Pareceter uma vantagem maior do que as lâminas de aço usuais e se sente ... " -"maisconfortável na mão. Enquanto a lâmina é feita deste metal escuro, " -"ocrossguard e o pomo parecem ser feitos de um material mais brilhante, quese" -" sente anormalmente frio ao toque." #. ~ Use action use_message for disarmed defense turret. #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." -msgstr "Erro. Nenhum sistema de armas encontrado." +msgid "Error. No weapon systems found." +msgstr "" #. ~ Description for disarmed defense turret #: lang/json/TOOL_from_json.py @@ -85423,14 +87186,9 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -" Torre de granada de 40 mm militar inativa Uma torre de granada " -"militarinativa. Até 50 granadas de fragmentação padrão de 40 mm serão " -"carregadasautomaticamente do seu inventário para a torre após a ativação. " -"Coloque atorre e ela será identificada como amigável com o seu avançado " -"softwareIFF. Consulte o seu manual de segurança em caso de avaria." #: lang/json/TOOL_from_json.py msgid "inactive military flamethrower turret" @@ -85497,15 +87255,10 @@ msgstr[1] "" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -" inactive advanced railgun turret Uma torre de railgun inativa avançada. " -"Até50 projéteis de trilho padrão serão carregados automaticamente de " -"seuinventário para a torre após a ativação. Coloque a torre e ela " -"seráidentificada como amigável com o seu avançado software IFF. Consulte o " -"seumanual de segurança em caso de avaria." #: lang/json/TOOL_from_json.py msgid "inactive advanced acid turret" @@ -85517,12 +87270,9 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -" torreta de ácido avançado inativo Uma torrente de ácido avançado inativa. " -"Coloque a torre e ela será identificada como amigável com o seu " -"avançadosoftware IFF. Consulte o seu manual de segurança em caso de avaria." #: lang/json/TOOL_from_json.py msgid "inactive advanced EMP turret" @@ -85534,12 +87284,9 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -" Torreta EMP avançada inativa Uma torre EMP avançada inativa. Coloque atorre" -" e ela será identificada como amigável com o seu avançado softwareIFF. " -"Consulte o seu manual de segurança em caso de avaria." #: lang/json/TOOL_from_json.py msgid "inactive advanced electro turret" @@ -85905,14 +87652,10 @@ msgstr[1] "" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" -" aquecedor flutuante inactivo eyebot inactivo Um eyebot " -"recuperadoreaproveitado num aquecedor flutuante. Emite um jato constante de " -"ar quentepara aquecer um espaço fechado. Não é agressivo e não possui " -"sistemas dearmas. Ative este item para implantar o robô." #: lang/json/TOOL_from_json.py msgid "inactive floating furnace" @@ -85923,15 +87666,11 @@ msgstr[1] "" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." msgstr "" -" forno flutuante inativo Um eyebot recuperado reaproveitado em um " -"aquecedorflutuante. Emite um jato constante de ar perigosamente quente para " -"aquecerum espaço fechado. Não é agressivo e não possui sistemas de armas. " -"Ativeeste item para implantar o robô." #: lang/json/TOOL_from_json.py msgid "inactive burning eye" @@ -86003,15 +87742,11 @@ msgstr[1] "" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" -" digestron inativo Um robô utilitário recuperado convertido em um " -"aspiradorautomatizado. Ele vai sugar itens perdidos do chão e dissolvê-los " -"com suasreservas internas de ácido. Não é agressivo e não possui sistemas de" -" armas. Ative este item para implantar o robô." #: lang/json/TOOL_from_json.py msgid "inactive bee-bot" @@ -86049,14 +87784,10 @@ msgstr[1] "" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" -" inactive medibot robô assassino inativo Um robô médico " -"recuperadoreaproveitado em uma máquina de assassinato. Ele atacará alvos " -"hostis comum conjunto de lâminas e uma agulha tóxica. Ative este item para " -"implantaro robô." #: lang/json/TOOL_from_json.py msgid "inactive elixirator" @@ -86100,13 +87831,10 @@ msgstr[1] "" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" -"Um skitterbot recuperado e reaproveitado para caçar animais pequenos. Ele " -"ataca alvos com pinças e um tazer integrado. Use este item para ativar o " -"robô." #: lang/json/TOOL_from_json.py msgid "inactive grab-bot" @@ -86154,12 +87882,9 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" -"Um cyborg recuperado com a cabeça de um necromante zumbi. A cabeça animada " -"mantém algumas de suas habilidades para reviver zumbis. Use este item para " -"ativar o robô." #: lang/json/TOOL_from_json.py msgid "inactive defense robot" @@ -86210,12 +87935,8 @@ msgstr[1] "" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" -" Um paladino de defesa recuperado e reformado com um lança-chamas caseiro e " -"duas lâminas aquecidas. Ative este item, com gasolina em seu inventário, " -"para carregar e ativar o robô... de preferência longe de qualquer coisa " -"inflamável." #: lang/json/TOOL_from_json.py msgid "inactive military robot" @@ -86584,14 +88305,8 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" -" massa crescente de contas geleira de massa gelada crescente Um " -"mistériobiológico, as estruturas internas dessa bolha existem dentro de um " -"conjuntode fluido de baixa densidade que permanece líquido apesar de estar " -"em umestado super-resfriado; ainda possui toda a maleabilidade do seu antigo" -" eu. Fragmentos de gelo continuamente se desprendem dele. Parece flexível " -"osuficiente para separar ..." #: lang/json/TOOL_from_json.py msgid "growing cold mass" @@ -86830,14 +88545,10 @@ msgstr "" #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" -" Um aglomerado de cristais artificiais que se desprenderam de uma matriz " -"dediamante. Enquanto a substância geralmente se decompõe quando separada " -"docatalisador; esse aglomerado parece ser auto-sustentável por " -"algummecanismo desconhecido." #: lang/json/TOOL_from_json.py msgid "diamond matrix" @@ -86848,10 +88559,8 @@ msgstr[1] "" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +"Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "" -" matriz de diamantes Seus sentidos ficam embaçados quando você olha para " -"asprofundezas do centro desta pedra preciosa ..." #. ~ Description for diamond matrix #: lang/json/TOOL_from_json.py @@ -86871,17 +88580,12 @@ msgstr[1] "" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" -" motor de vórtice Um tornado em uma caixa, por assim dizer. Dentro " -"destetanque inócuo contém o culminar da inovação humana em energia limpa, ou" -" umaarma de destruição em massa capaz de acabar com a civilização - ou o " -"queresta dela - fora do mapa. Um mecanismo externo permite que ele " -"sejaconectado a um veículo para torná-lo móvel." #: lang/json/TOOL_from_json.py lang/json/vehicle_part_from_json.py msgid "vortex generator" @@ -86892,17 +88596,12 @@ msgstr[1] "" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" -" gerador de vórtices Um tornado em uma caixa, por assim dizer. Dentro " -"destetanque inócuo contém o culminar da inovação humana em energia limpa, ou" -" umaarma de destruição em massa capaz de acabar com a civilização - ou o " -"queresta dela - fora do mapa. Um mecanismo externo permite que ele seja " -"ligadoa uma bateria para armazenar a energia gerada." #: lang/json/TOOL_from_json.py msgid "control chip" @@ -90342,6 +92041,10 @@ msgstr "Construir Parede de Paliçada" msgid "Build Stone Wall" msgstr "Construir Parede de Pedra" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "" @@ -94121,6 +95824,35 @@ msgid "" "from the inside." msgstr "" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "Iluminou" @@ -94796,11 +96528,9 @@ msgstr "Privação do sono" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "" -" Sua dívida de sono tem aumentado constantemente por um tempo. Você " -"deveriadescançar." #. ~ Apply message for effect(s) 'Sleep Deprived'. #: lang/json/effects_from_json.py @@ -94973,7 +96703,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -94987,14 +96717,8 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" -" Encontrou um novo significado na vida depois da sua morte. Embora ele " -"nuncatenha lhe informado, seus crimes no mundo falecido impediram que " -"eletivesse um lugar real na sociedade. Com a destruição dos " -"registroscriminais existentes, ele se encarregou de provar seu valor para " -"seussemelhantes. Morreu de um ataque cardíaco enquanto estava sozinho em " -"umaviagem muitos anos após o cataclismo." #: lang/json/epilogue_from_json.py msgid "" @@ -95017,19 +96741,12 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " "enact revenge himself." msgstr "" -" Nunca foi conhecido como um indivíduo particularmente corajoso " -"nememocionalmente estável. Seu arrependimento por não ajudar as " -"pessoasdurante os primeiros dias do cataclismo levou-o a tentar o suicídio " -"váriasvezes nos anos que se seguiram. A vida melhorou rapidamente quando ele" -" secasou com outro sobrevivente, mas foi destruído quando sua esposa foi " -"mortapor membros de um misterioso culto do apocalipse. Ele foi morto " -"quandotentou se infiltrar no complexo do culto para se vingar." #: lang/json/epilogue_from_json.py msgid "" @@ -95063,18 +96780,10 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" -" Trabalhou duro após sua morte para organizar seu próprio bando " -"desobreviventes. Fui casar e ter dois filhos que foram criados e " -"ensinaramtodas as habilidades de sobrevivência que eles precisariam. Seu " -"passado, eventualmente, alcançou-o quando ele entrou em conflito com um " -"coronel daVelha Guarda. Desde que fugiu de seu posto como soldado da Guarda " -"Nacionaldurante o cataclismo, ele foi enforcado por deserção, apesar dos " -"protestosde um grande número de sobreviventes que haviam se beneficiado de " -"seuserviço ao longo dos anos." #: lang/json/epilogue_from_json.py msgid "" @@ -95496,7 +97205,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -95533,19 +97242,12 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " "of crimes against humanity." msgstr "" -" Nunca foi conhecido como um indivíduo particularmente corajoso " -"nememocionalmente estável. Sua incapacidade de se conformar emocionalmente " -"àvida após o cataclismo levou-a a tentar o suicídio várias vezes nos anosque" -" se seguiram. Atraída por promessas de renovação e pela perspectiva " -"depertencer a uma nova família, ela se envolveu com um culto carismático. " -"Elaera uma vítima inocente quando soldados da Velha Guarda invadiram " -"ocomplexo por suspeita de crimes contra a humanidade." #: lang/json/epilogue_from_json.py msgid "" @@ -95851,7 +97553,7 @@ msgstr "" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" @@ -96028,17 +97730,11 @@ msgstr "Refugiados" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." msgstr "" -" Os remanescentes dispersos da civilização, esses poucos sortudosconseguiram" -" barricar-se dentro durante os primeiros estágios do cataclismo. Embora " -"temporariamente seguros, eles estão com falta de suprimentos e nãotêm as " -"habilidades necessárias para obter mais. É apenas uma questão detempo antes " -"que eles também se tornem presas de criaturas de outras formas, ou de " -"monstros humanos demais." #: lang/json/fault_from_json.py msgid "Dusty" @@ -96108,6 +97804,20 @@ msgstr "" msgid "You clean your %s." msgstr "" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "" @@ -96131,6 +97841,29 @@ msgstr "" msgid "You eject the spent casing from the %s." msgstr "" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "" @@ -96151,6 +97884,11 @@ msgstr "" msgid "Clean gun" msgstr "" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "" @@ -96665,7 +98403,7 @@ msgstr "órgãos de insetos rasgados" #: lang/json/field_type_from_json.py msgid "gooey scraps" -msgstr "recados pegajosos" +msgstr "restos pegajosos" #: lang/json/field_type_from_json.py msgid "icky mess" @@ -96881,11 +98619,13 @@ msgid "A big, blocky metal device for refrigerating large areas." msgstr "" "Um dispositivo metálico grande e quadrado, para refrigerar grandes áreas." -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "metal rangendo!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "clang" @@ -98743,6 +100483,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "cremalheira de exposição" @@ -99048,11 +100797,11 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "clickity clack… clack… clack" -msgstr "" +msgstr "clickity clack… clack… clack" #: lang/json/furniture_from_json.py msgid "clickity clack… clack" -msgstr "" +msgstr "clickity clack… clack" #: lang/json/furniture_from_json.py msgid "open beaded curtain" @@ -99065,7 +100814,7 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "clickity clack… clack… clack!" -msgstr "" +msgstr "clickity clack… clack… clack!" #: lang/json/furniture_from_json.py msgid "canvas floor" @@ -99681,8 +101430,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -99717,7 +101466,7 @@ msgstr "" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -99728,7 +101477,7 @@ msgstr "" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -99739,7 +101488,7 @@ msgstr "" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -99750,7 +101499,7 @@ msgstr "" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -101848,8 +103597,8 @@ msgstr "" "doombro, como a maioria das pessoas não são heróis de filmes de ação." #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" msgstr[0] "" msgstr[1] "" @@ -102085,6 +103834,19 @@ msgid "" "hammers of the four barrels arranged in a square formation." msgstr "" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -102202,6 +103964,18 @@ msgid "" "quality, durable materials." msgstr "" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -102388,22 +104162,6 @@ msgstr "" "principalmentesubstituída por lançadores mais modernos, a M79 ainda usa " "muitas unidadesem todo o mundo." -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -" Lançador de granadas Mark 19 Um pesado lançador de granadas alimentado " -"porum tripé usado pelo Exército dos EUA desde o início da Guerra Fria até " -"ocataclismo, e se você puder encontrar granadas de 40 mm, talvez até mais." - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -102459,6 +104217,22 @@ msgstr "" msgid "multi" msgstr "multi" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +" Lançador de granadas Mark 19 Um pesado lançador de granadas alimentado " +"porum tripé usado pelo Exército dos EUA desde o início da Guerra Fria até " +"ocataclismo, e se você puder encontrar granadas de 40 mm, talvez até mais." + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -102472,6 +104246,19 @@ msgid "" "shell at a time like most shotguns." msgstr "" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -102775,6 +104562,18 @@ msgstr "" " USP .45 Touro Raging Taurus O Touro Raging Taurus é um revólver de 5 " "tirosem Casull .454. Tem impressionante poder de parada." +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -102815,6 +104614,36 @@ msgid "" "ammunition." msgstr "" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -102958,13 +104787,9 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" -" M2 Browning HMG Uma metralhadora pesada usada pelos militares dos EUA " -"desdeo seu início até o cataclismo, e até mesmo raramente por sobreviventes " -"decataclismo. Seu tamanho e design massivos impossibilitam o uso, a menos " -"quesejam implantados ou montados em um veículo." #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -104562,7 +106387,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -104728,14 +106553,9 @@ msgstr[1] "rifles laser A7" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" -" A7 rifle laser Um estado do rifle laser de arte desenvolvido pela R&D " -"'Aerial Labs'. O desempenho inicial rivalizava com omelhor da Rivtech, com " -"rumores circulando sobre desonestidade corporativa. Embora o cataclismo " -"tenha colocado isso na pilha de cinzas da história, esta arma ainda pode " -"fazer o mesmo com seus inimigos." #: lang/json/gun_from_json.py msgid "V29 laser pistol" @@ -104814,6 +106634,18 @@ msgstr "" " zarabatana Uma zarabatana de madeira, fácil de usar e muito precisa. " "Usadardos como munição." +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -104866,7 +106698,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -104879,7 +106711,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -104893,7 +106725,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -104905,8 +106737,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" #: lang/json/gun_from_json.py @@ -104917,12 +106749,12 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" #: lang/json/gun_from_json.py @@ -104947,11 +106779,11 @@ msgstr[1] "carabinas de pressão" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" #: lang/json/gun_from_json.py @@ -104962,7 +106794,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -104974,8 +106806,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -104988,7 +106820,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -105000,8 +106832,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -105013,7 +106845,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -105042,8 +106874,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" @@ -105182,12 +107014,10 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" -" JHEC M128 O autorevólver M128 Johnson Heavy Equipment Co. M128; todos " -"osoutros não conseguem medir-se. A Johnson Heavy Equipment Co. é " -"umasubsidiária da D & B Minneapolis." #: lang/json/gun_from_json.py msgid "Boomlighter 454" @@ -105287,8 +107117,8 @@ msgstr "" "Doarsenal da liberdade!" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" msgstr[0] "" msgstr[1] "" @@ -105730,12 +107560,9 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" -" Um poderoso eletrolaser desenvolvido por pesquisadores paramilitares não " -"muito antes do cataclismo. Especialmente eficaz contra alvos eletrônicos. " -"Pode ser carregado em estações de energia da SEU." #: lang/json/gun_from_json.py msgid "hand-held laser cannon" @@ -105760,16 +107587,11 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" -"Um rifle de laser de última geração que funciona com energia da SEU. Foi " -"desenvolvido por pesquisadores paramilitares pouco antes do cataclismo. O " -"desempenho inicial rivalizava com as armas balísticas mais avançadas do dia." -" Embora o cataclismo tenha colocado isso na pilha de cinzas da história, " -"esta arma ainda pode fazer o mesmo com seus inimigos." #: lang/json/gun_from_json.py msgid "laser pistol" @@ -105930,6 +107752,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -105959,9 +107785,8 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "" -"Este é um pseudo item para ataques de monstros. Se você ver isso, é um bug." #: lang/json/gun_from_json.py msgid "integral 12 gauge shotgun" @@ -106175,16 +108000,8 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" -" Uma bolha viva se transformou em uma arma autônoma; destinado a seresticado" -" através de uma moldura como uma forma de barreira. Evoluiu acapacidade de " -"gerar constantemente saliências calcificadas que são entãocontroladas por " -"cordões de tração sinuosos. Estes 'dentes' podem então ser usados para " -"trancar e ferir qualquer coisa que seja infelizo suficiente para estar por " -"perto. A membrana externa também se tornousignificativamente mais espessa " -"para suportar seu movimento maisextenuante; embora pareça suficientemente " -"flexível para se separar ..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "gel shooter" @@ -106198,14 +108015,8 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" -" atirador de gel Uma gota viva se transformou em uma arma autônoma. " -"Elevasculha o solo em busca de material, que depois é retirado de nutrição. " -"Orestante é então expulso a uma velocidade significativa em direção " -"aqualquer ameaça próxima. A massa amorfa pode ser moldada e fixada ao " -"seutoque, mas a arma em si é inerte sem algo para controlá-la. Parece " -"flexívelo suficiente para separar ..." #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "frost lancer" @@ -106907,19 +108718,6 @@ msgstr "" "esses recursos o tornam incrivelmente pesado e devem sermontados em uma " "plataforma de suporte para serem disparados." -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "" -" Modelo 10 revólver Um revólver de seis tiros. Tem um cilindro de " -"aberturapara facilitar o recarregamento." - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -106939,54 +108737,6 @@ msgstr "" "podemficar presos após um acidente, mais tarde produzidos comercialmente " "porvárias empresas." -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -" Colt Lightning .45 Uma reprodução moderna de uma espingarda de bomba Colt. " -"Originalmente compartimentada em .44-40, as versões modernas mais " -"comumenteusam .45 Long Colt, complementando o Exército de Ação Única como " -"uma armade tiro de tiro de Cowboy." - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" -" Bond Arms Derringer O Bond Arms Derringer é uma série de pistolas " -"compactasde cano duplo. Mais comumente compartimentada para o Long Colt, 45," -" comcâmaras compridas o bastante para aceitar 400 cápsulas de espingarda." - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" -" .410 espingarda juvenil Uma antiga espingarda de acção rompida, " -"compartimentada em .410. Projetado como uma alternativa de menor recuo paraa" -" bitola 12, é leve e de fabricação simples." - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -107002,50 +108752,6 @@ msgstr "" " tubo preso a um calço, com um martelo para golpear o único círculo " "quesegura." -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "" -" AF2011A1 .38 Super Uma pistola semi-automática de cano duplo. Parece " -"quedois M1911s se fundiram." - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "" -" M1991A1 .38 Super Um M1911 moderno, compartimentado para o cartucho " -"Super38. Pode conseguir uma boa precisão." - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" -" Taurus Raging Judge Magnum O Taurus Raging Juiz Magnum é um revólver de " -"5tiros que está no Casull .454. Ele tem a capacidade de disparar tiros " -"deshot.410 e cartuchos Long Colt .45." - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -108382,7 +110088,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" @@ -108794,6 +110500,18 @@ msgid "" "weapon other than pistols and pump-action guns, if you so want." msgstr "" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -109068,7 +110786,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -109092,9 +110810,9 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -109106,7 +110824,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -109307,20 +111025,6 @@ msgstr "" "fazuma boa arma corpo a corpo, proporcionando ataques de alcance quando " "presoao braço longo ou besta." -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "" -msgstr[1] "" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "" -" Espingarda M6 ASW A espingarda integrada .410 da Arma Sobrevivência " -"daTripulação M6. É inamovível." - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "Você estripa e filtra o peixe" @@ -110967,10 +112671,6 @@ msgstr "Cortar parafusos ou fios" msgid "Heat up food (with it)" msgstr "Aquecer a comida (com ela)" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "Reparo de madeira / de papel / de ossos / de quitina" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "Anexar como toolmod" @@ -111865,6 +113565,11 @@ msgstr "" " Esta roupa executa bem mesmo quando encharcado" " . Isso pode se sentir bem." +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -113034,7 +114739,8 @@ msgstr "Construir Terreno" msgid "Disassemble items" msgstr "Desmontar itens" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "Dormir" @@ -113844,7 +115550,8 @@ msgstr "Ninho de Vespas" msgid "Wasp nest is here." msgstr "Aqui tem um ninho de vespas." -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "Aranhas" @@ -113903,6 +115610,33 @@ msgstr "" msgid "Small pond is here." msgstr "" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "" @@ -113973,7 +115707,7 @@ msgstr "" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "" #. ~ Computer name @@ -114752,6 +116486,16 @@ msgstr "NÃO correr!" msgid "NO Diving!" msgstr "NÃO mergulhe!" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -114890,8 +116634,7 @@ msgid "Emergency Message" msgstr "Mensagem de Emergência" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "Desativar Energia Externa" @@ -115534,7 +117277,7 @@ msgstr "" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -116545,7 +118288,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116568,7 +118311,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -116579,7 +118322,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116588,7 +118331,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -116599,7 +118342,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -116609,7 +118352,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -116620,7 +118363,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -116794,6 +118537,10 @@ msgstr "esfarrapado" msgid "Diamond" msgstr "Diamante" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "Ovo" @@ -117011,8 +118758,8 @@ msgid "Mushroom" msgstr "Cogumelo" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "Água" @@ -118454,7 +120201,7 @@ msgstr "" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" @@ -118598,11 +120345,11 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "" #: lang/json/mission_def_from_json.py @@ -118643,6 +120390,10 @@ msgstr "" msgid "What good does this do me?" msgstr "" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "" @@ -118683,7 +120434,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "" #: lang/json/mission_def_from_json.py @@ -118721,12 +120472,12 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "" #: lang/json/mission_def_from_json.py @@ -118795,7 +120546,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "" #: lang/json/mission_def_from_json.py @@ -118813,7 +120564,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" @@ -118834,7 +120585,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" #: lang/json/mission_def_from_json.py @@ -118842,7 +120593,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "" #: lang/json/mission_def_from_json.py @@ -119243,8 +120994,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "I'm sure the motorpool has a truck battery you could salvage." msgstr "" -" Tenho certeza de que a moto tem uma bateria de caminhão que você " -"poderiasalvar." +" Tenho certeza de que o pátio de veículos tem uma bateria de caminhão que " +"você poderia resgatar." #: lang/json/mission_def_from_json.py msgid "Have you had any luck fabricating it?" @@ -119587,7 +121338,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" @@ -120004,7 +121755,7 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -120335,17 +122086,10 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" -" Então, parece haver meses, talvez anos de experimentos, e esse conjunto " -"dedados deve ser enorme. Servidores de banco de dados grandes o " -"suficientepara abrigá-los superaqueceriam o funcionamento com energia de " -"emergência. Mas eu encontrei comunicações de um laboratório que tinha algum " -"tipo deportal congelante aberto durante o cataclismo, enviando tudo " -"paratemperaturas abaixo de zero. Aposto que os arquivos dentro " -"desselaboratório ainda estão funcionando." #: lang/json/mission_def_from_json.py msgid "" @@ -121947,7 +123691,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -121973,10 +123717,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "Obrigado por tentar... eu acho." - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -122001,7 +123741,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -122041,8 +123781,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -122063,7 +123803,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -122090,7 +123830,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -122105,7 +123845,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -122174,6 +123914,54 @@ msgstr "" msgid "The %1$s tries to slam into , but fails to." msgstr "" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -130388,8 +132176,8 @@ msgstr "História do Sobrevivente" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" -msgstr "Este NPC poderia te contar como eles sobreviveram ao cataclismo" +msgid "This NPC could tell you about how they survived the Cataclysm" +msgstr "" #: lang/json/mutation_from_json.py msgid "Mark of the Seer" @@ -130930,7 +132718,7 @@ msgstr "" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -130997,19 +132785,9 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -"A sua própria presença é mascarada pela natureza. Você é um pouco mais " -"difícil de detectar." - -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" #: lang/json/mutation_from_json.py msgid "Slashers" @@ -131493,7 +133271,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Cyborg" -msgstr "" +msgstr "Ciborgue" #: lang/json/npc_class_from_json.py msgid "Zzzzzt… I… I'm a Cy… BEEEEEP… borg." @@ -131606,7 +133384,7 @@ msgstr "Lutando pelo dólar todo-poderoso." #: lang/json/npc_class_from_json.py lang/json/terrain_from_json.py msgid "intercom" -msgstr "" +msgstr "interfone" #: lang/json/npc_class_from_json.py msgid "Reading this line is a bug" @@ -131642,7 +133420,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -131675,8 +133453,8 @@ msgid "I'm just trying to stay alive." msgstr "Eu só estou tentando ficar vivo." #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." -msgstr "Eu só estou tentando ficar vivo ... e não é tão fácil quanto parece." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Lizard Mutant" @@ -131684,11 +133462,9 @@ msgstr "Mutante de Lagarto" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagéneo lagarto ... este mundo não é mais lugar para " -"humanos, e eu não pretendo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Medical Mutant" @@ -131696,11 +133472,9 @@ msgstr "Mutante Médico" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagénico médico ... este mundo não é mais lugar para " -"humanos, e não pretendo continuar a ser um." #: lang/json/npc_class_from_json.py msgid "Bird Mutant" @@ -131708,11 +133482,9 @@ msgstr "Mutante de Pássaro" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -" Eu estou procurando por mutagênicos de aves ... este mundo não é mais lugar" -" para humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Fish Mutant" @@ -131720,11 +133492,9 @@ msgstr "Peixe mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -" Estou à procura de peixe mutagênico ... este mundo não é mais lugar para " -"humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Beast Mutant" @@ -131732,11 +133502,9 @@ msgstr "Mutante da Besta" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -" Estou procurando mutagênese de besta ... esse mundo não é mais lugar para " -"humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Ursine Mutant" @@ -131744,11 +133512,9 @@ msgstr "Mutante Ursina" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagéneo de ursina ... este mundo não é mais lugar para" -" humanos, e não pretendo continuar a ser um." #: lang/json/npc_class_from_json.py msgid "Feline Mutant" @@ -131756,11 +133522,9 @@ msgstr "Mutante Felino" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou procurando mutagen felino ... este mundo não é mais lugar para " -"humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Lupine Mutant" @@ -131768,11 +133532,9 @@ msgstr "Mutante Lupino" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagéneo lupino ... este mundo não é mais lugar para " -"humanos, e não pretendo continuar a ser um." #: lang/json/npc_class_from_json.py msgid "Cattle Mutant" @@ -131780,11 +133542,9 @@ msgstr "Mutante de Gado" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou procurando por mutagênios no gado ... esse mundo não é mais lugar " -"para humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Insect Mutant" @@ -131792,11 +133552,9 @@ msgstr "Mutante Inseto" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou procurando por mutagênios de insetos ... esse mundo não é mais lugar " -"para humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Plant Mutant" @@ -131804,11 +133562,9 @@ msgstr "Mutante Vegetal" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -" Eu estou procurando por mutagênicos de plantas ... este mundo não é mais " -"lugar para humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Slime Mutant" @@ -131816,11 +133572,9 @@ msgstr "Mutante de Lodo" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagen de limo ... este mundo não é mais lugar para " -"humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Troglobite Mutant" @@ -131828,11 +133582,9 @@ msgstr "Mutante Troglóbio" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagéneo troglóbico ... este mundo não é mais lugar " -"para humanos, e não pretendo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Cephalopod Mutant" @@ -131840,11 +133592,9 @@ msgstr "Mutante Cefalópode" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagéneo cefalópode ... este mundo não é mais lugar " -"para humanos, e não pretendo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Spider Mutant" @@ -131852,11 +133602,9 @@ msgstr "Mutante de Aranha" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagenes de aranha ... este mundo não é mais lugar para" -" humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Rat Mutant" @@ -131864,11 +133612,9 @@ msgstr "Mutante de Rato" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" -" Estou à procura de mutagênese de rato ... este mundo não é mais lugar para " -"humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Mouse Mutant" @@ -131876,11 +133622,9 @@ msgstr "Mutante de Rato" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagenes de ratos ... este mundo não é mais lugar para " -"humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Alpha Mutant" @@ -131888,11 +133632,9 @@ msgstr "Mutante Alfa" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -" Eu estou procurando por um mutagênico alfa ... este mundo não é mais lugar " -"para humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Elfa Mutant" @@ -131900,11 +133642,9 @@ msgstr "Elfa Mutante" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -" Eu estou procurando mutagen elfa ... este mundo não é mais lugar para " -"humanos, e eu não planejo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Chimera Mutant" @@ -131912,11 +133652,9 @@ msgstr "Mutante Quimera" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagéneo quimérico ... este mundo não é mais lugar para" -" humanos, e não pretendo continuar sendo um." #: lang/json/npc_class_from_json.py msgid "Raptor Mutant" @@ -131924,15 +133662,13 @@ msgstr "Mutante Raptor" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -" Estou à procura de mutagéneo de raptor ... este mundo não é mais lugar para" -" humanos, e eu não planejo continuar sendo um." #: lang/json/npc_from_json.py msgid "Brigitte LaCroix" -msgstr "" +msgstr "Brigitte LaCroix" #: lang/json/npc_from_json.py msgid "Tester" @@ -132084,7 +133820,7 @@ msgstr "Merc" #: lang/json/npc_from_json.py msgid "the intercom" -msgstr "" +msgstr "o interfone" #: lang/json/npc_from_json.py msgid "Head of Security" @@ -132096,7 +133832,7 @@ msgstr "U. Rourke" #: lang/json/npc_from_json.py msgid "Free Merchant" -msgstr "" +msgstr "Mercador Livre" #: lang/json/npc_from_json.py msgid "Barber" @@ -134096,7 +135832,7 @@ msgstr "Cofre - tribunal" #: lang/json/overmap_terrain_from_json.py msgid "Vault - Motor Pool" -msgstr "Cofre - piscina para motor" +msgstr "Cofre - Pátio de Veículos" #: lang/json/overmap_terrain_from_json.py msgid "Vault - Visitor Center" @@ -134918,7 +136654,7 @@ msgstr "Heliporto" #: lang/json/overmap_terrain_from_json.py msgid "motor pool" -msgstr "piscina motor" +msgstr "pátio de veículos" #: lang/json/overmap_terrain_from_json.py msgid "repair bay" @@ -135195,13 +136931,10 @@ msgstr "Sobrevivente protegido" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -" No início do cataclismo, você se agachou em um abrigo antiaéreo. Agora, é " -"inverno, e você espera que a coleção de habilidades que aprendeu com todos " -"esses livros possa ajudá-lo a sobreviver." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135212,13 +136945,10 @@ msgstr "Sobrevivente protegido" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -" No início do cataclismo, você se agachou em um abrigo antiaéreo. Agora, é " -"inverno, e você espera que a coleção de habilidades que aprendeu com todos " -"esses livros possa ajudá-lo a sobreviver." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135229,13 +136959,10 @@ msgstr "Milícia Protegida" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -" No início do cataclismo, você se agachou em um abrigo antiaéreo. Agora, é " -"inverno, e você espera que suas armas e as habilidades que você adquiriu " -"possam ajudá-lo a sobreviver." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135246,13 +136973,10 @@ msgstr "Milícia Protegida" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -" No início do cataclismo, você se agachou em um abrigo antiaéreo. Agora, é " -"inverno, e você espera que suas armas e as habilidades que você adquiriu " -"possam ajudá-lo a sobreviver." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135333,13 +137057,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -" O que o deuyl? Você não sabia nada sobre isso, nem o encanto que trouxe a " -"você. No caso de esta acusação de que você precisa para começar a encontrar " -"um novo pavio no mais hediondo cataclismo, o homem tem testemunhado que o " -"dilúvio Noe se esvai em seu cumpridor schippe." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135352,13 +137072,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -" O que o deuyl? Você não sabia nada sobre isso, nem o encanto que trouxe a " -"você. No caso de esta acusação de que você precisa para começar a encontrar " -"um novo pavio no mais hediondo cataclismo, o homem tem testemunhado que o " -"dilúvio Noe se esvai em seu cumpridor schippe." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135474,12 +137190,9 @@ msgstr "Apicultor" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -" Você costumava ser um apicultor profissional. Você teve que abandonar suas " -"preciosas abelhas quando o cataclismo aconteceu, mas pelo menos você " -"conseguiu pegar alguns utensílios e mel." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135491,12 +137204,9 @@ msgstr "Apicultor" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -" Você costumava ser um apicultor profissional. Você teve que abandonar suas " -"preciosas abelhas quando o cataclismo aconteceu, mas pelo menos você " -"conseguiu pegar alguns utensílios e mel." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135507,13 +137217,10 @@ msgstr "Jogador de basquete" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -" Seria o seu primeiro grande jogo, mas depois o cataclismo aconteceu. Graças" -" aos seus pés rápidos, você estava entre os poucos sortudos para sobreviver " -"e escapar das criaturas." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135524,13 +137231,10 @@ msgstr "Jogador de basquete" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -" Seria o seu primeiro grande jogo, mas depois o cataclismo aconteceu. Graças" -" aos seus pés rápidos, você estava entre os poucos sortudos para sobreviver " -"e escapar das criaturas." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -135687,12 +137391,9 @@ msgstr "Mordomo" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -" Você trabalhava em uma casa rica, mas depois do cataclismo eles tiraram " -"férias em família para um lugar desconhecido, deixando você para se defender" -" sozinho." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -135703,12 +137404,9 @@ msgstr "Empregada" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -" Você trabalhava em uma casa rica, mas depois do cataclismo eles tiraram " -"férias em família para um lugar desconhecido, deixando você para se defender" -" sozinho." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136765,14 +138463,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -" Você costumava trabalhar para alguns proprietários de pequenos negócios que" -" faziam pequenos serviços elétricos, e você só estava trabalhando em uma " -"dessas piadas de um abrigo de evacuação quando o cataclismo aconteceu. " -"Infelizmente, você não terminou de fiação nada, exceto o computador - muito " -"gordo que está fazendo agora." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -136785,14 +138478,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -" Você costumava trabalhar para alguns proprietários de pequenos negócios que" -" faziam pequenos serviços elétricos, e você só estava trabalhando em uma " -"dessas piadas de um abrigo de evacuação quando o cataclismo aconteceu. " -"Infelizmente, você não terminou de fiação nada, exceto o computador - muito " -"gordo que está fazendo agora." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -136873,7 +138561,7 @@ msgstr "Vítima De Chuveiro" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -136887,7 +138575,7 @@ msgstr "Vítima De Chuveiro" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -136931,11 +138619,9 @@ msgstr "Dançarino de salão" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -" Você costumava ser uma dançarina de salão antes do cataclismo, e agora você" -" usa suas habilidades para salvar sua vida." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -136946,11 +138632,9 @@ msgstr "Dançarino de salão" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -" Você costumava ser uma dançarina de salão antes do cataclismo, e agora você" -" usa suas habilidades para salvar sua vida." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137867,12 +139551,9 @@ msgstr "Noivo" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -" O cataclismo aconteceu no grande dia e você escapou com nada além de seu " -"traje de casamento. Pés frios? Você gostaria apenas de manter seus pés " -"atados!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137883,12 +139564,9 @@ msgstr "Noiva" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -" O cataclismo aconteceu no grande dia e você escapou com nada além de seu " -"traje de casamento. Pés frios? Você gostaria apenas de manter seus pés " -"atados!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -137970,10 +139648,8 @@ msgstr "Rude Boy" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -" Sua banda de ska se separou depois que o baterista se tornou um zumbi, " -"agora você está sozinho no cataclismo com alguns cigarros e seu mp3 player." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -137985,10 +139661,8 @@ msgstr "Rude Girl" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -" Sua banda de ska se separou depois que o baterista se tornou um zumbi, " -"agora você está sozinho no cataclismo com alguns cigarros e seu mp3 player." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138031,11 +139705,9 @@ msgstr "Condenar" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -" O cataclismo lhe deu uma chance de escapar, mas a liberdade vem com um " -"preço exorbitante." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138046,11 +139718,9 @@ msgstr "Condenar" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "" -" O cataclismo lhe deu uma chance de escapar, mas a liberdade vem com um " -"preço exorbitante." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138487,11 +140157,9 @@ msgstr "Rabino" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -" Você estava celebrando com seu rebanho no templo quando o cataclismo " -"aconteceu. Você com certeza poderia usar um messias agora mesmo!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138502,11 +140170,9 @@ msgstr "Rabino" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -" Você estava celebrando com seu rebanho no templo quando o cataclismo " -"aconteceu. Você com certeza poderia usar um messias agora mesmo!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138712,14 +140378,10 @@ msgstr "Entregador de pizza" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -" Você estava entregando a última pizza da noite para o laboratório local de " -"criogenia quando o cataclismo chegou. Fugindo para o abrigo mais próximo, " -"você se encontra apenas com sua inteligência e algumas sobras de pizza. E " -"eles nem sequer deixaram uma dica!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138731,14 +140393,10 @@ msgstr "Pizza Delivery Girl" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -" Você estava entregando a última pizza da noite para o laboratório local de " -"criogenia quando o cataclismo chegou. Fugindo para o abrigo mais próximo, " -"você se encontra apenas com sua inteligência e algumas sobras de pizza. E " -"eles nem sequer deixaram uma dica!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138861,13 +140519,10 @@ msgstr "Agricultor" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -" Você estava ganhando a vida levantando as colheitas, quando o cataclismo " -"acontecia. Agora, com sua enxada confiável e algumas sementes, é hora de " -"reconstruir a Terra, uma planta de cada vez." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138878,13 +140533,10 @@ msgstr "Agricultor" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -" Você estava ganhando a vida levantando as colheitas, quando o cataclismo " -"acontecia. Agora, com sua enxada confiável e algumas sementes, é hora de " -"reconstruir a Terra, uma planta de cada vez." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -138931,13 +140583,10 @@ msgstr "Vassoura endurecida" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -" Um dos poucos sortudos que escapou do cataclismo, você fez uma vida para si" -" mesmo nas ruínas dos outros. Seja pela força, astúcia ou a sorte, você " -"obteve o melhor equipamento que conseguiu encontrar." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -138948,13 +140597,10 @@ msgstr "Vassoura endurecida" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -" Um dos poucos sortudos que escapou do cataclismo, você fez uma vida para si" -" mesmo nas ruínas dos outros. Seja pela força, astúcia ou a sorte, você " -"obteve o melhor equipamento que conseguiu encontrar." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -139285,16 +140931,11 @@ msgstr "Jr. Survivalista" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -" Seus pais eram malucos que achavam que algum 'cataclismo' estava chegando e" -" insistiram em prepará-lo para isso. Acontece que eles estavam certos. Você " -"não teve a chance de agradecer a eles. A única coisa que você pode fazer por" -" eles agora é o que eles sempre esperaram que você fizesse nos dias sombrios" -" à sua frente: sobreviver." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -139305,16 +140946,11 @@ msgstr "Jr. Survivalista" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -" Seus pais eram malucos que achavam que algum 'cataclismo' estava chegando e" -" insistiram em prepará-lo para isso. Acontece que eles estavam certos. Você " -"não teve a chance de agradecer a eles. A única coisa que você pode fazer por" -" eles agora é o que eles sempre esperaram que você fizesse nos dias sombrios" -" à sua frente: sobreviver." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -140302,7 +141938,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -140319,7 +141955,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -140570,10 +142206,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -140586,10 +142222,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -140601,9 +142237,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -140617,9 +142253,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -140633,7 +142269,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -140647,7 +142283,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -140662,9 +142298,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -140679,9 +142315,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -140695,13 +142331,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -140713,13 +142349,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -140732,8 +142368,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -140748,8 +142384,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -140764,9 +142400,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -140779,9 +142415,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -140793,13 +142429,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -140811,13 +142447,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -140829,10 +142465,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -140844,10 +142480,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -140859,12 +142495,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -140876,12 +142512,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -140893,17 +142529,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -140915,17 +142551,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -140939,9 +142575,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -140955,9 +142591,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -140971,10 +142607,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -140990,10 +142626,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -141008,9 +142644,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -141023,9 +142659,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -141037,11 +142673,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -141053,11 +142690,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -141209,7 +142847,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -141222,7 +142860,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" @@ -141259,7 +142897,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -141272,7 +142910,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -141285,7 +142923,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -141298,7 +142936,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -141366,7 +143004,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -141377,7 +143015,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -141441,7 +143079,7 @@ msgstr "Druída" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -141454,7 +143092,7 @@ msgstr "Druída" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "" @@ -141546,7 +143184,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -141560,7 +143198,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" @@ -141576,7 +143214,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -141591,7 +143229,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" #: lang/json/professions_from_json.py @@ -142667,13 +144305,10 @@ msgstr "Jogador de baseball" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -" Você era um batedor em uma equipe local da liga menor antes do cataclismo. " -"Você escapou com o seu equipamento, mas quanto tempo você pode sobreviver " -"até o seu turno acabar?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -142684,13 +144319,10 @@ msgstr "Jogador de baseball" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -" Você era um batedor em uma equipe local da liga menor antes do cataclismo. " -"Você escapou com o seu equipamento, mas quanto tempo você pode sobreviver " -"até o seu turno acabar?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -142775,11 +144407,9 @@ msgstr "Desperto" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -" Você foi acordado no meio da noite por um barulho. Armado apenas com uma " -"lanterna você foi investigar, agora você enfrenta o cataclismo." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -142790,11 +144420,9 @@ msgstr "Desperto" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -" Você foi acordado no meio da noite por um barulho. Armado apenas com uma " -"lanterna você foi investigar, agora você enfrenta o cataclismo." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -142806,12 +144434,9 @@ msgstr "Ciclista biônico" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -" Seu treinamento e aprimoramento para a competição de ciclismo da Cyber- " -"Olympics lhe deram uma vantagem ao escapar do início do cataclismo. Você " -"pode continuar correndo para sempre?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -142823,12 +144448,9 @@ msgstr "Ciclista biônico" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -" Seu treinamento e aprimoramento para a competição de ciclismo da Cyber- " -"Olympics lhe deram uma vantagem ao escapar do início do cataclismo. Você " -"pode continuar correndo para sempre?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -142839,13 +144461,10 @@ msgstr "Soldador" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -" Você trabalhou como soldador para uma empresa offshore antes do cataclismo." -" Você estava voltando para casa quando aconteceu. Pelo menos você tem as " -"ferramentas do seu ofício." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -142856,13 +144475,10 @@ msgstr "Soldador" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -" Você trabalhou como soldador para uma empresa offshore antes do cataclismo." -" Você estava voltando para casa quando aconteceu. Pelo menos você tem as " -"ferramentas do seu ofício." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -142873,14 +144489,10 @@ msgstr "Sobrevivente Primitivo" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -" Você sabia que o dia chegaria, o dia em que tudo foi para a merda. Você se " -"preparou, não por engrenagem, mas por pura habilidade; Todos aqueles dias na" -" floresta valeram a pena. Se seus antepassados sobreviveram sem tecnologia, " -"você será amaldiçoado se não" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -142891,14 +144503,10 @@ msgstr "Sobrevivente Primitivo" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -" Você sabia que o dia chegaria, o dia em que tudo foi para a merda. Você se " -"preparou, não por engrenagem, mas por pura habilidade; Todos aqueles dias na" -" floresta valeram a pena. Se seus antepassados sobreviveram sem tecnologia, " -"você será amaldiçoado se não" #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py @@ -147424,12 +149032,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -" Quando o apocalipse eclodiu, você foi afunilado em um abrigo próximo. Aqui " -"você viveu, nunca partiu, para que os desconhecidos do mundo exterior não o " -"ferissem. Os suprimentos estão acabando, e pela primeira vez desde o " -"cataclismo, você será forçado a enfrentar o mundo exterior." #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -147438,12 +149042,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -" Quando o apocalipse eclodiu, você foi afunilado em um abrigo próximo. Aqui " -"você viveu, nunca partiu, para que os desconhecidos do mundo exterior não o " -"ferissem. Os suprimentos estão acabando, e pela primeira vez desde o " -"cataclismo, você será forçado a enfrentar o mundo exterior." #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -147511,7 +149111,7 @@ msgstr "Prisão" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -147520,7 +149120,7 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -147624,24 +149224,18 @@ msgstr "Experimento" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Desde o seu nascimento, seu único propósito na vida sempre foi o avanço da " -"ciência genética, voluntariamente ou não. Depois que o cataclismo começou, " -"você saiu do laboratório, e passeou sem rumo, acabando numa floresta." #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"Desde o seu nascimento, seu único propósito na vida sempre foi o avanço da " -"ciência genética, voluntariamente ou não. Depois que o cataclismo começou, " -"você saiu do laboratório, e passeou sem rumo, acabando numa floresta." #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -147888,8 +149482,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Description for scenario 'Lost Faith' for a female character. @@ -147897,8 +149491,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" #. ~ Starting location for scenario 'Lost Faith'. @@ -147927,7 +149521,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Description for scenario 'The Wizard's Apprentice' for a female @@ -147939,7 +149533,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -147965,8 +149559,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -147975,8 +149569,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -148080,9 +149674,9 @@ msgstr "Desafio-FEMA Death Camp" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female @@ -148091,9 +149685,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -149176,6 +150770,11 @@ msgstr "" "alta potência, você provavelmente ficará sem carne! Use uma pistola BB ou " "talvez um rifle .22." +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -149202,11 +150801,26 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." +"impossible unless you have a big tactical advantage." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" msgstr "" -" Se você vir uma grande multidão de zumbis chegando, corra! Tentar lutar " -"contra todos eles é suicídio, a menos que você tenha uma grande vantagem " -"tática." + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "" +" Se você está sendo perseguido por um tesouro de zumbis, tente entrar no " +"metrô e viajar um ou dois quarteirões, depois voltando para cima." #: lang/json/snippet_from_json.py msgid "" @@ -149547,7 +151161,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" @@ -149781,6 +151395,12 @@ msgstr "" "Molotovs ou granadas. Acidentalmente soltá-los quando você pretendia jogá- " "los poderia ser mortal." +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -149836,9 +151456,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" #: lang/json/snippet_from_json.py @@ -149857,6 +151476,12 @@ msgstr "" " Da próxima vez que você visitar uma mercearia, faça um carregamento de " "produtos enlatados. Eles nunca vão mal!" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -149886,14 +151511,6 @@ msgid "" "defense… it's perfect!" msgstr "" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "" -" Se você está sendo perseguido por um tesouro de zumbis, tente entrar no " -"metrô e viajar um ou dois quarteirões, depois voltando para cima." - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -149905,9 +151522,9 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" #: lang/json/snippet_from_json.py @@ -149972,32 +151589,41 @@ msgstr "Uma chave de fenda por dia mantém o escorbuto longe!" #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "" -" Mais fome do que o habitual? Óleos naturais podem ajudar. Não é nada " -"gostoso, mas quem se importa quando comer sua perna é a segunda opção?" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." msgstr "" -" Terreno pode virar a maré de uma batalha, certifique-se de usá-lo contra " -"seus inimigos, para não ser usado contra você." #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" -" As pessoas que passavam pela mina diziam algo sobre mau cheiro. Se você " -"planeja uma visita lá, considere levar uma máscara de gás com você." #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "Conhecimento é poder. Sério, apenas pegue um livro." +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -150076,13 +151702,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" -" Um ferro de solda pode ser o melhor amigo de uma mecânica aspirante. Você " -"também pode cauterizar uma ferida, mas como muitas pessoas morreram como " -"resultado desse tratamento, acho que é um último recurso." #: lang/json/snippet_from_json.py msgid "" @@ -150128,13 +151751,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" -" Eu fui contra as drogas até que eu quase fui morto por um zumbi e estava " -"puxando minha bunda para longe da horda, com nada além de um pó branco que " -"eu peguei daquele zumbi. Me salvou daquela vez." #: lang/json/snippet_from_json.py msgid "" @@ -150164,6 +151784,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -150273,6 +151899,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -150294,6 +151944,13 @@ msgid "" "either, if you catch my drift." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -150346,6 +152003,12 @@ msgid "" " a cold ground." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -150391,7 +152054,7 @@ msgid "Hey there's some pink tablets, take some!" msgstr "" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" msgstr "" #: lang/json/snippet_from_json.py @@ -153233,16 +154896,16 @@ msgid "" msgstr "" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." -msgstr "Conte-me sobre como você sobreviveu ao cataclismo." +msgid "Tell me about how you survived the Cataclysm." +msgstr "" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" -msgstr "Como você sobreviveu ao cataclismo?" +msgid "How did you survive the Cataclysm?" +msgstr "" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" -msgstr "Como foi o cataclismo para você?" +msgid "What was the Cataclysm like for you?" +msgstr "" #: lang/json/snippet_from_json.py msgid "How did you make it through the initial chaos?" @@ -153503,8 +155166,8 @@ msgid "eldritch horror" msgstr "" #: lang/json/snippet_from_json.py -msgid "the cataclysm" -msgstr "o cataclismo" +msgid "the Cataclysm" +msgstr "" #: lang/json/snippet_from_json.py msgid "the apocalypse" @@ -153869,6 +155532,306 @@ msgid "" "Refer to file EXO-M-312 for full report." msgstr "" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -155110,7 +157073,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "" #: lang/json/snippet_from_json.py @@ -159775,10 +161738,8 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" -" \\ 'Agh, para ver a espiral em uma forma tão distorcida! Manipulado por seu" -" movimento Vortex! Sua Graça Perpétua! Sua beleza Manchada ... \"" #: lang/json/snippet_from_json.py msgid "\"My friend died, but at least I made her into a blob turret.\"" @@ -159795,16 +161756,13 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" -" 'Dia 40. Controles quebrados - o reator mágico do carro faz com que ele " -"avance inexoravelmente. Rolos gigantes na frente demolem a floresta. Maine, " -"aqui vou eu.'" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" -msgstr "\\ 'meu carro é um diamante bruto ... literalmente \"" +msgid "\"my car is a diamond in the rough… literally\"" +msgstr "" #: lang/json/snippet_from_json.py msgid "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" @@ -159832,11 +161790,9 @@ msgstr "'um dia, eu serei parte do carro também'" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" -" 'Coloque um pouco de dinamite e metade de uma minhoca em um refrigerante " -"velho ... WHAM! Você vai a algum lugar. \"" #: lang/json/speech_from_json.py msgid "\"Hello?\"" @@ -161462,6 +163418,38 @@ msgstr "YAP!" msgid "WOOF!" msgstr "AU!" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "'Não me faça andar pela prancha." @@ -161570,19 +163558,15 @@ msgstr "Quando o teste terminar, você será perdido." #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" -" Inacreditável. Você, [nome do sujeito aqui], deve ser o orgulho de [cidade " -"natal aqui]!" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" -" Aquela coisa é provavelmente algum tipo de recipiente de esgoto. Vá em " -"frente e esfregue seu rosto nele." #: lang/json/speech_from_json.py msgid "" @@ -161594,11 +163578,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" -" Ninguém vai culpá-lo por desistir. De fato, desistir neste momento é uma " -"resposta perfeitamente razoável." #: lang/json/speech_from_json.py msgid "" @@ -161609,8 +163591,8 @@ msgstr "" "extremo pessimismo." #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" -msgstr "Olá de novo. Para reiterar nosso aviso anterior: [truncado]" +msgid "Hello again. To reiterate our previous warning: [garbled]" +msgstr "" #: lang/json/speech_from_json.py msgid "Weeeeeeeeeeeeeeeeeeeeee[bzzt]" @@ -161692,11 +163674,9 @@ msgstr "Alguém vai ficar muito ferido." #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "" -" Uh oh. Alguém cortou o bolo. Eu lhes disse para esperar por você, mas eles " -"fizeram isso de qualquer maneira." #: lang/json/speech_from_json.py msgid "This is your fault. It didn't have to be like this." @@ -161729,10 +163709,8 @@ msgstr "O que é que foi isso? Você disse alguma coisa?" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "" -" Gostaria apenas de salientar que você recebeu todas as oportunidades para " -"ter sucesso." #: lang/json/speech_from_json.py msgid "What's your point, anyway? Survival?" @@ -161788,11 +163766,9 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" -" Estou checando algumas plantas, e acho ... Sim, bem aqui. Você " -"definitivamente está indo pelo caminho errado." #: lang/json/speech_from_json.py msgid "Are you even listening to me?" @@ -161827,8 +163803,8 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "'O que temos aqui é falta de comunicação." #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" -msgstr "\\ 'E telefone para casa. \"" +msgid "\"E.T. phone home.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"I'm as mad as hell, and I'm not going to take this anymore!\"" @@ -161897,8 +163873,8 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "'Estradas? Onde estamos indo, não precisamos de estradas." #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" -msgstr "\\ 'Prenda seus cintos de segurança. Vai ser uma noite acidentada. \"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgstr "" #: lang/json/speech_from_json.py msgid "" @@ -162269,8 +164245,8 @@ msgid "\"I'm scared!\"" msgstr "\\'Eu estou assustado!\"" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" -msgstr "\\'Algo está errado...\"" +msgid "\"Something's wrong…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"What are you doing?\"" @@ -162297,16 +164273,16 @@ msgid "\"Excuse me?\"" msgstr "\\'Desculpe?\"" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" -msgstr "\\'Eu sou diferente...\"" +msgid "\"I'm different…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" -msgstr "'Obrigado mesmo assim ..." +msgid "\"Thanks anyway…\"" +msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" -msgstr "\\'Me leve com você...\"" +msgid "\"Take me with you…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"You have excellent aim!\"" @@ -162385,8 +164361,8 @@ msgid "\"This time is OUR time.\"" msgstr "'Desta vez é a nossa hora." #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" -msgstr "'A segunda vez é um encanto ..." +msgid "\"Second time's a charm…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Howdy, stranger!\"" @@ -162457,8 +164433,8 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "\\ '[suspiro] Não conte a ninguém sobre isso. \"" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" -msgstr "'Bem, eu tentei. Boa sorte!" +msgid "\"Well, I tried. Best of luck!\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"Hey, safe travels, there.\"" @@ -162753,7 +164729,7 @@ msgid "Cabin" msgstr "Cabine" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "Hospital" @@ -162905,7 +164881,7 @@ msgstr "Fema Camp" msgid "Mansion Entrance" msgstr "Entrada da mansão" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "Mansão" @@ -162979,7 +164955,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -163078,42 +165054,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163824,7 +165800,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -164141,13 +166117,13 @@ msgstr "" " OK, talvez isso me impeça de congelar nesse clima, o que está acontecendo?" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding " -"up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding " +"up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -164237,14 +166213,14 @@ msgstr "Ok, sem movimentos bruscos ..." msgid "Keep your distance!" msgstr "Mantenha distância!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "Esse território é meu, ." - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "Esse território é meu, ." + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "Acalme-se. Eu não vou te machucar." @@ -164298,29 +166274,29 @@ msgid "I don't care." msgstr "Eu não me importo." #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "Eu tenho só um trabalho pra você. Quer ouvir a respeito?" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "Eu tenho mais um trabalho pra você. Quer ouvir a respeito?" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "Eu tenho outros trabalhos pra você. Quer ouvir a respeito deles?" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "Eu tenho mais trabalhos pra você. Quer ouvir a respeito deles?" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "Eu tenho outros trabalhos pra você. Quer ouvir a respeito deles?" +msgid "I have another job for you. Want to hear about it?" +msgstr "Eu tenho mais um trabalho pra você. Quer ouvir a respeito?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "Eu não tenho mais trabalhos para você." +msgid "I just have one job for you. Want to hear about it?" +msgstr "Eu tenho só um trabalho pra você. Quer ouvir a respeito?" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "Eu não tenho nenhum trabalho para você." +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "Eu não tenho mais trabalhos para você." + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -164330,6 +166306,10 @@ msgstr "Ok." msgid "Never mind, I'm not interested." msgstr "Não importa, não estou interessado." +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "Você não está trabalhando em nada pra mim no momento." + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "Qual trabalho?" @@ -164338,10 +166318,6 @@ msgstr "Qual trabalho?" msgid "What about it?" msgstr "O que tem?" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "Você não está trabalhando em nada pra mim no momento." - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "Eu vou fazer isso!" @@ -164559,10 +166535,6 @@ msgstr "Hmm OK." msgid "Thanks!" msgstr "Obrigado!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "Foque na estrada, chapa!" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "Eu tenho alguns motivos pra não lhe dizer." @@ -164587,6 +166559,10 @@ msgstr "Estou com muita sede, me dê algo para beber." msgid "I must focus on the road!" msgstr "Eu preciso focar na estrada!" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "Foque na estrada, chapa!" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Ah ok." @@ -164691,10 +166667,6 @@ msgstr "Não, vamos ficar bem aqui." msgid "On second thought, never mind." msgstr "No segundo pensamento, não importa." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "Não consigo lhe treinar direito enquanto você opera um veículo!" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "Eu tenho alguns motivos para negar que você está treinando." @@ -164707,6 +166679,10 @@ msgstr "Dá um tempo, eu vou te mostrar algo novo depois ..." msgid "I can't train you properly while I'm operating a vehicle!" msgstr "Não consigo lhe treinar direito enquanto opero um veículo!" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "Não consigo lhe treinar direito enquanto você opera um veículo!" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "Não é uma chance sangrenta, eu vou ficar para trás!" @@ -165379,8 +167355,8 @@ msgid "How are you alive?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" -msgstr "O que você fez antes do cataclismo?" +msgid "What did you do before the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -165600,32 +167576,32 @@ msgid "This is a season spring test response." msgstr "Esta é uma resposta de teste de primavera de temporada." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." -msgstr "Este é um dia desde a resposta de teste do cataclismo 30." +msgid "This is a days since Cataclysm 30 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season summer test response." msgstr "Esta é uma resposta de teste da temporada de verão." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." -msgstr "Este é um dia desde a resposta do teste do cataclismo 120." +msgid "This is a days since Cataclysm 120 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season autumn test response." msgstr "Esta é uma resposta de teste de outono de temporada." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." -msgstr "Este é um dia desde a resposta do teste do cataclismo 210." +msgid "This is a days since Cataclysm 210 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season winter test response." msgstr "Esta é uma resposta de teste de inverno de temporada." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." -msgstr "Isso é um dia desde a resposta do teste do cataclismo 300." +msgid "This is a days since Cataclysm 300 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a is day test response." @@ -166143,7 +168119,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" @@ -166506,8 +168482,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" -msgstr "O que você fez quando descobriu o cataclisma?" +msgid "What did you do when you found out about the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -168014,10 +169990,8 @@ msgstr "Não, isso está errado." #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" -" Sim, eu entendo isso. Às vezes sinto que minha existência começou pouco " -"depois do cataclismo." #: lang/json/talk_topic_from_json.py msgid "" @@ -169563,7 +171537,7 @@ msgid "What were you saying before that?" msgstr "O que você estava dizendo antes disso?" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -169602,7 +171576,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "" @@ -169634,8 +171608,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -169662,7 +171636,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169683,14 +171657,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169703,7 +171677,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -169733,7 +171707,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -169743,7 +171717,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -169768,7 +171742,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169821,7 +171795,7 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -169834,7 +171808,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" @@ -169875,8 +171849,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169905,6 +171879,12 @@ msgstr "" msgid "Where is your brother's place?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "" @@ -169969,6 +171949,10 @@ msgid "" " a forage set up." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "" @@ -170290,14 +172274,6 @@ msgstr "" msgid "Tell me about your dad." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." -msgstr "" -" Senhora, eu não sei como diabos você chegou até aqui, mas se você tem algum" -" senso, você sairá enquanto puder." - #: lang/json/talk_topic_from_json.py msgid "" "Sir, I don't know how the hell you got down here but if you have any sense " @@ -170306,6 +172282,14 @@ msgstr "" " Senhor, eu não sei como diabos você chegou aqui, mas se você tem algum " "senso, você sairá enquanto puder." +#: lang/json/talk_topic_from_json.py +msgid "" +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." +msgstr "" +" Senhora, eu não sei como diabos você chegou até aqui, mas se você tem algum" +" senso, você sairá enquanto puder." + #: lang/json/talk_topic_from_json.py msgid "Marshal, I hope you're here to assist us." msgstr "Marechal, espero que esteja aqui para nos ajudar." @@ -170757,12 +172741,12 @@ msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "Já te falei de papelão, amigo? Voc ~ e tem algum?" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -171553,12 +173537,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" -" Gross, não é? Parece pêlos. Eu comecei a crescer em todos os lugares um " -"pouco depois do cataclismo. Não faço ideia do que causou isso. Eu não posso " -"culpá-los por odiarem isso, eu odeio isso." #: lang/json/talk_topic_from_json.py msgid "" @@ -171614,7 +173595,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" @@ -172172,7 +174153,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -174400,14 +176381,14 @@ msgstr "Mantenha civil ou vou trazer a dor." msgid "Just on watch, move along." msgstr "Apenas de relance, siga em frente." -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "Senhora, você realmente não deveria estar viajando por aí." - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "Áspero lá fora, não é?" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "Senhora, você realmente não deveria estar viajando por aí." + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "Eu ouvi dizer que esse lugar era um centro de refugiados..." @@ -175697,12 +177678,9 @@ msgstr "Eu gostaria de contratar seus serviços." #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" -" Fui enviado aqui para ajudar na instalação da fazenda. A maioria de nós não" -" tem habilidades reais que se transferem antes do cataclismo, então as " -"coisas são um pouco de tentativa e erro." #: lang/json/talk_topic_from_json.py msgid "" @@ -176125,7 +178103,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -176144,7 +178122,7 @@ msgstr "Só os insanos prosperarão, acho." #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" @@ -176158,8 +178136,8 @@ msgstr "Bem, então vou andando." #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" #: lang/json/talk_topic_from_json.py @@ -176182,11 +178160,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" -"Aqui? Frutas e afins. Talvez um ou outro equipamento de agricultura, mas " -"você precisa de criptomoedas." #: lang/json/talk_topic_from_json.py msgid "Ok." @@ -176198,9 +178174,9 @@ msgstr "O que são criptomoedas?" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176216,9 +178192,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176247,19 +178223,15 @@ msgstr "Precisa de ajuda com alguma coisa?" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" -" Não, não ... Bem, talvez um pouco. Foi tão destruído aqui como no topo " -"quando eu encontrei, não foi muito difícil de arrumar. Você é bem-vindo para" -" ficar no quarto de hóspedes por algum tempo, apenas não o oculte. Você não " -"é o único scav lá fora." #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "Interessante..." +msgid "Interesting…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -176271,8 +178243,8 @@ msgstr "" " o dinheiro." #: lang/json/talk_topic_from_json.py -msgid "I see..." -msgstr "Entendo..." +msgid "I see…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -176284,8 +178256,8 @@ msgstr "" "mais." #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "Hmm..." +msgid "Hmm…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -176296,16 +178268,16 @@ msgstr "" "sempre poderia usar mais dinheiro." #: lang/json/talk_topic_from_json.py -msgid "Alright..." -msgstr "Tudo bem..." +msgid "Alright…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Not at the moment, check back later perhaps." msgstr "Não no momento, volte talvez mais tarde." #: lang/json/talk_topic_from_json.py -msgid "Sure..." -msgstr "Certo..." +msgid "Sure…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Are you part of the rescue team?" @@ -176324,8 +178296,8 @@ msgid "So are you busting us out of here or what?" msgstr "Então você está nos tirando daqui ou o que?" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." -msgstr "Apertar, . Eu tenho que limpar um caminho." +msgid "Hold tight, . I've got to clear a path." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Pack your bags, . We're going on a trip." @@ -180153,6 +182125,15 @@ msgstr "" msgid "A closed metal gate." msgstr "" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "" @@ -182075,14 +184056,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "tanque com gasolina" +msgid "fuel tank" +msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "distribuidor de gasolina arrebentado" @@ -183969,6 +185959,27 @@ msgstr "suporte de metal pequeno" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "janela" @@ -184403,8 +186414,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -184418,7 +186429,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -184771,7 +186782,7 @@ msgstr "" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "Nenhum" @@ -185558,7 +187569,7 @@ msgstr "Carrinho de sorvete" msgid "Luggage Cart" msgstr "Carrinho de bagagem" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "Carrinho de compras" @@ -188972,11 +190983,9 @@ msgstr "Torre laser LACP" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" -" Um conjunto de faixas contínuas interligadas feitas de blob. Eles podem ser" -" usados no lugar de rodas e proporcionam boa tração e desempenho off-road." #. ~ Description for gel shooter #. ~ Description for snapping ooze @@ -189773,6 +191782,10 @@ msgstr "Vitamina C" msgid "Toxins" msgstr "" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "pressione" @@ -190290,6 +192303,12 @@ msgstr "Não dá para recarregar %s." msgid "You reload the %s." msgstr "Você recarrega %s." +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -191197,6 +193216,10 @@ msgstr "" msgid "The required items are not available to complete this task." msgstr "" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -191610,6 +193633,10 @@ msgstr "" msgid "spoilage" msgstr "deterioração" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -193613,6 +195640,44 @@ msgstr "" msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "Você não está empunhando nada." + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "" + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "" + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "Você está muito cheio para pastar." + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "" + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "Esta grama é muito curta para pastar." + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "Esta grama está morta e muito destruída para pastar." + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "Esta grama está suja de tinta e assim, não comestível." + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "" + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "Você não pode jogar efetivamente enquanto estiver na sua concha." @@ -193650,6 +195715,14 @@ msgstr "Você se concentra poderosamente e seu corpo obedece!" msgid "You can't muster up the effort to throw anything…" msgstr "" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "Descarregar item" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "Você não tem nada para descarregar." + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -194527,18 +196600,13 @@ msgstr "Você se sente animado quando a operação começa." #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" -" Você se sente animado quando o Autodoc se afunda sem dor em você. Você " -"aprecia a visão de bisturis cortando-o em pedaços, mas à medida que a " -"operação avança, de repente você se sente cansado e desmaia." #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" #: src/bionics.cpp @@ -197091,8 +199159,8 @@ msgstr "Isso não parece comestível em sua forma atual." msgid "This is full of dirt after being on the ground." msgstr "Isso está cheio de sujeira depois de estar no chão." -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "Você não pode fazer isso enquanto estiver debaixo d'água." @@ -197975,11 +200043,11 @@ msgstr "" msgid "Dark craftable? %s" msgstr "" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "Fácil" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "Difícil" @@ -198476,6 +200544,10 @@ msgstr "" msgid "Test weather" msgstr "" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "" @@ -198678,7 +200750,7 @@ msgstr "" msgid "Altruism: %d" msgstr "" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "Necessidades:" @@ -199362,386 +201434,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "Você não precisa dormir!" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "Você não pode salvar no modo de defesa!" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "Você sobreviveu à onda %d!" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "Por favor aguarde enquanto o mapa é gerado [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "Opção anterior." - -#: src/defense.cpp -msgid "Next option" -msgstr "Próxima opção" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "Valor da opção de ciclo" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "Ativar opção" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "Você deve escolher ao menos um grupo de monstros!" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "Zumbis especiais" - -#: src/defense.cpp -msgid "Zombies" -msgstr "Zumbies" - -#: src/defense.cpp -msgid "Triffids" -msgstr "Triffids" - -#: src/defense.cpp -msgid "Robots" -msgstr "Robôs" - -#: src/defense.cpp -msgid "Subspace" -msgstr "Subespaço" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "Comida" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "Mercenários" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "MODO DE DEFESA" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "Pressione teclas de direção para navegar, ENTER para mudar" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "Cenário:" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "Localização:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "Dificuldade Inicial:" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "A dificuldade da primeira onda." - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "Dificuldade da Onda:" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "O aumento de dificuldade para cada onda." - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "Tempo entre Ondas:" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "O tempo, em minutos, entre ondas." - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "Ondas entre Caravanas:" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "O número de ondas entre caravanas." - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "Dinheiro Inicial:" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "A quantidade de dinheiro que o jogador inicia com." - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "Dinheiro para a 1º Onda:" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "O dinheiro ganho pela primeira onda." - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "Aumento de Dinheiro:" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "O aumento do prêmio de cada onda." - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "Seleção de Inimigo:" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "Personalizado" - -#: src/defense.cpp -msgid "Medium" -msgstr "Médio" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "Shaun dos Mortos" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "Madrugada dos Mortos" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "Oito perninhas de pernas" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "Dia dos Triffids" - -#: src/defense.cpp -msgid "Skynet" -msgstr "Skynet" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "O Chamado de Cthulhu" - -#: src/defense.cpp -msgid "A custom game." -msgstr "Um jogo personalizado." - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "Monstros fáceis e muito dinheiro." - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "Monstros mais duros. Você tem que comer." - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "Todos os monstros. Você tem que comer e beber." - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "Defenda um bar contra zumbis clássicos. Fácil e divertido." - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "Zumbis clássicos. Mais devagar e mais realista." - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "Divertida luta de aranha em ritmo acelerado!" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "Defenda sua mansão contra os triffids." - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "Os robôs decidiram que os humanos são o inimigo!" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "Evite legiões de horrores horríveis." - -#: src/defense.cpp -msgid "Public Works" -msgstr "Obras Públicas" - -#: src/defense.cpp -msgid "Megastore" -msgstr "Super Mercado" - -#: src/defense.cpp -msgid "Bar" -msgstr "Bar" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "Uma entrada e muitos quartos. Alguns suprimentos médicos." - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "Construção facilmente fortificável. Muitas ferramentas úteis." - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "Um grande edifício com vários fornecimentos." - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "Um pequeno prédio com muito álcool." - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "Uma casa grande com muitos quartos." - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "Realmente não compre nada?" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "Você não pode pagar por esses itens!" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "" -msgstr[1] "" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "Você solta alguns itens." - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "Armas corpo a corpo" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "Armas de longo alcance" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "Munição" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "Componentes de construção e construção" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "Comida & Drogas" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "Roupa & Armadura" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "Ferramentas, Armadilhas & Granadas" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "Pressione ? para ajuda." - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "Seu Dinheiro: %s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "Onda %d: " - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "Invasão de %s!" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "Ataque de %s!" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "%s do Inferno!" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -200324,53 +202016,53 @@ msgstr "Aquela erva era o saco de engasgar de shiz-nittlebam." #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "Força +%d; " +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "Força %d; " +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "Destreza +%d; " +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "Destreza %d; " +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "Percepção +%d; " +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "Percepção %d; " +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "Inteligência +%d; " +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "Inteligência %d; " +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "Velocidade +%d; " +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "Velocidade %d; " +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -201360,7 +203052,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -201996,7 +203689,8 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -202201,7 +203895,8 @@ msgstr "Selecione uma expansão:" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." msgstr "" #: src/faction_camp.cpp @@ -202461,6 +204156,26 @@ msgstr "" msgid "(You wonder if your companions are fit to work on their own…)" msgstr "" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -203250,7 +204965,8 @@ msgstr "" msgid "Without extra fuel it will burn for between %s to %s." msgstr "" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "" @@ -203758,40 +205474,6 @@ msgstr "" msgid "%s helps with this task…" msgstr "" -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "" - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "" - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "Você está muito cheio para pastar." - -#: src/game.cpp -msgid "You eat the grass." -msgstr "" - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "Esta grama é muito curta para pastar." - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "Esta grama está morta e muito destruída para pastar." - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "Esta grama está suja de tinta e assim, não comestível." - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "" - #: src/game.cpp msgid "Change side for item" msgstr "Alterar o lado do item" @@ -203820,6 +205502,11 @@ msgstr "" msgid "You can't reload a %s!" msgstr "" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "" + #: src/game.cpp msgid "Reload item" msgstr "Recarregar item" @@ -203828,18 +205515,6 @@ msgstr "Recarregar item" msgid "You have nothing to reload." msgstr "Você não tem nada para recarregar." -#: src/game.cpp -msgid "Unload item" -msgstr "Descarregar item" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "Você não tem nada para descarregar." - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "Você não está empunhando nada." - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -203924,6 +205599,13 @@ msgstr "Não é possível encontrar o objeto agarrado." msgid "You cannot board a vehicle whilst riding." msgstr "" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "" @@ -204598,11 +206280,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "Seu inventário está vazio." -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "" - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "ENCUMBRANCE" @@ -204741,8 +206418,8 @@ msgid "CBM" msgstr "CBM" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "ENERGIA" +msgid "ENERGY (kJ)" +msgstr "" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -204967,12 +206644,12 @@ msgstr "Item de coldre" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" +msgid "Choose an item to put into your %s" msgstr "" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." +msgid "You have no items you could put into your %s." msgstr "" #: src/game_inventory.cpp src/iuse.cpp @@ -205211,6 +206888,398 @@ msgstr "Tutorial" msgid "Defense" msgstr "Defesa" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "Você não precisa dormir!" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "Você não pode salvar no modo de defesa!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "Você sobreviveu à onda %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "Por favor aguarde enquanto o mapa é gerado [%2d%%]" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "Opção anterior." + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "Próxima opção" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "Valor da opção de ciclo" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "Ativar opção" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "Você deve escolher ao menos um grupo de monstros!" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "Zumbis especiais" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "Zumbies" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "Triffids" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "Robôs" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "Subespaço" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "Comida" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "Mercenários" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "MODO DE DEFESA" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "Cenário:" + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "Localização:" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "Dificuldade Inicial:" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "A dificuldade da primeira onda." + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "Dificuldade da Onda:" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "O aumento de dificuldade para cada onda." + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "Tempo entre Ondas:" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "O tempo, em minutos, entre ondas." + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "Ondas entre Caravanas:" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "O número de ondas entre caravanas." + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "Dinheiro Inicial:" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "A quantidade de dinheiro que o jogador inicia com." + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "Dinheiro para a 1º Onda:" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "O dinheiro ganho pela primeira onda." + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "Aumento de Dinheiro:" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "O aumento do prêmio de cada onda." + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "Seleção de Inimigo:" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "Personalizado" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "Médio" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "Shaun dos Mortos" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "Madrugada dos Mortos" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "Oito perninhas de pernas" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "Dia dos Triffids" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "Skynet" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "O Chamado de Cthulhu" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "Um jogo personalizado." + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "Monstros fáceis e muito dinheiro." + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "Monstros mais duros. Você tem que comer." + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "Todos os monstros. Você tem que comer e beber." + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "Defenda um bar contra zumbis clássicos. Fácil e divertido." + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "Zumbis clássicos. Mais devagar e mais realista." + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "Divertida luta de aranha em ritmo acelerado!" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "Defenda sua mansão contra os triffids." + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "Os robôs decidiram que os humanos são o inimigo!" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "Evite legiões de horrores horríveis." + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "Obras Públicas" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "Super Mercado" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "Bar" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "Uma entrada e muitos quartos. Alguns suprimentos médicos." + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "Construção facilmente fortificável. Muitas ferramentas úteis." + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "Um grande edifício com vários fornecimentos." + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "Um pequeno prédio com muito álcool." + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "Uma casa grande com muitos quartos." + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "Realmente não compre nada?" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "Você não pode pagar por esses itens!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "" +msgstr[1] "" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "Você solta alguns itens." + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "Armas corpo a corpo" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "Armas de longo alcance" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "Munição" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "Componentes de construção e construção" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "Comida & Drogas" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "Roupa & Armadura" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "Ferramentas, Armadilhas & Granadas" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "Pressione ? para ajuda." + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "Seu Dinheiro: %s" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "Onda %d: " + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "Invasão de %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "Ataque de %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "%s do Inferno!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "Tem um idiota no caminho!" @@ -205558,6 +207627,10 @@ msgstr "" msgid "You may want to deactivate these before you sleep." msgstr "Você pode querer desativá-los antes de dormir." +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -210559,7 +212632,7 @@ msgstr "" msgid "That %s doesn't have room to expand." msgstr "" -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "" @@ -210643,78 +212716,6 @@ msgstr "" msgid "Your %s disappears!" msgstr "" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "" -msgstr[1] "" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "" -msgstr[1] "" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -210730,6 +212731,21 @@ msgid_plural "%s blood" msgstr[0] "" msgstr[1] "" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "" @@ -211327,7 +213343,7 @@ msgstr "Não há nada para ser alimentado aqui." msgid "Modify what?" msgstr "Modifique o que?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "Você não tem esse item!" @@ -212390,6 +214406,10 @@ msgstr "Caça-minas" msgid "Lights on!" msgstr "Luzes acesas!" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -212816,10 +214836,6 @@ msgid "You need a mechanics skill of 2 to use this repair kit." msgstr "" " Você precisa de uma habilidade mecânica de 2 para usar este kit de reparo." -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "Selecione a arma de fogo para reparar" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "Isso não é uma arma de fogo!" @@ -212870,25 +214886,6 @@ msgstr "Você não tem ferramentas compatíveis." msgid "You cancel unloading the tool." msgstr "Você cancela o descarregamento da ferramenta." -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "Você não pode ver para reparar!" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "" -" Você precisa de uma habilidade de fabricação de 1 para usar este kit de " -"reparo." - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "Selecione o item para reparar" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "" - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "" @@ -213138,31 +215135,6 @@ msgstr "Você tropeçou na proteção do firmware e o cartão apagou seus dados! msgid " on " msgstr "" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -213976,6 +215948,14 @@ msgstr "" " Seu conserto quase quebra o multi-fogão! Felizmente, ainda funciona, mas é " "melhor parar de brincar com isso." +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "" + #: src/iuse.cpp msgid "Using cable:" msgstr "Usando o cabo:" @@ -214004,14 +215984,6 @@ msgstr "" msgid "You attach the cable to the solar pack." msgstr "" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "" @@ -216524,12 +218496,9 @@ msgid "Congratulations, you won!" msgstr "Parabéns, você ganhou!" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "Max:" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "Min:" +#, c-format +msgid "Min: %d Max: %d" +msgstr "" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -217374,6 +219343,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr " Jogar Agora!" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" + #: src/main_menu.cpp msgid "No templates found!" msgstr "Nenhuma amostra encontrada!" @@ -217601,6 +219598,14 @@ msgstr "" msgid "DANGER! MINEFIELD!" msgstr "PERIGO! CAMPO MINADO!" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -217733,20 +219738,9 @@ msgid "You're violently teleported!" msgstr "Você é violentamente teletransportado!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "As abelhas te picam!" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "As abelhas te picam várias vezes!" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "As abelhas te picam muitas vezes!" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "As abelhas picam você em todo o seu corpo!" +#, c-format +msgid "The bees sting you in %s!" +msgstr "" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -217910,6 +219904,17 @@ msgid_plural "Skills" msgstr[0] "Habilidade" msgstr[1] "Habilidades" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" +msgstr[1] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "Habilidade Requer: " @@ -222715,6 +224720,10 @@ msgstr "" msgid "Acid sprays out of %s as it is hit!" msgstr "" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" + #: src/monexamine.cpp msgid "zombie slave" msgstr "escravo zumbi" @@ -225668,8 +227677,9 @@ msgid "I have news." msgstr "Eu tenho notícias." #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "Sim, vamos retomar o treinamento" +#, c-format +msgid "Yes, let's resume training %s" +msgstr "" #: src/npctalk.cpp #, c-format @@ -226384,6 +228394,16 @@ msgstr "" "Se falso, irá fazer com que o jogador largue itens novos que o façam " "ultrapassar o limite de peso." +#: src/options.cpp +msgid "Dangerous running" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" + #: src/options.cpp msgid "Safe mode" msgstr "Modo de segurança" @@ -228740,7 +230760,7 @@ msgstr "Buscar termo:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" @@ -229180,6 +231200,10 @@ msgstr "" msgid "Heat :" msgstr "" +#: src/panels.cpp +msgid "Deaf!" +msgstr "Surdo!" + #: src/panels.cpp msgid "Underground" msgstr "Subterrâneo" @@ -229238,10 +231262,6 @@ msgstr "" msgid "Lighting:" msgstr "Iluminação:" -#: src/panels.cpp -msgid "Deaf!" -msgstr "Surdo!" - #: src/panels.cpp msgid "Weapon :" msgstr "" @@ -230268,6 +232288,11 @@ msgstr "Emendar qual falha?" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -230728,82 +232753,73 @@ msgstr "VELOCIDADE" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "" -msgstr[1] "" +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "" -msgstr[1] "" +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "" -msgstr[1] "" +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "" -msgstr[1] "" +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " +msgid "Dodge skill: %+.1f\n" msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " +msgid "Melee attack rolls: %+d%%\n" msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." +"Head encumbrance has no effect; it simply limits how much you" +" can put on." msgstr "" -" O ônus da cabeça não tem efeito; simplesmente limita o quanto você pode " -"colocar." #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "Cobrir a boca tornará mais difícil respirar e recuperar o fôlego." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." msgstr "" -" O ônus do braço afeta o custo de resistência de ataques corpo a corpo e a " -"precisão com armas à distância." #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "Reduz a velocidade na qual você pode manipular ou manipular itens \n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" +msgid "Dexterity when throwing items: %+.1f\n" msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." +msgid "Reduced gun aim speed: %.1f" msgstr "" #: src/player_display.cpp @@ -230905,8 +232921,8 @@ msgstr "" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" #: src/player_display.cpp @@ -231661,6 +233677,16 @@ msgstr "" msgid "'s %s misfires with a muffled click!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -231701,6 +233727,16 @@ msgstr "" msgid "'s %s is damaged by their shot!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -231899,6 +233935,10 @@ msgstr "Objetivo preciso" msgid "[%c] to take precise aim and fire." msgstr "" +#: src/ranged.cpp +msgid "turrets" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -232330,7 +234370,7 @@ msgstr "Ouviu %s!" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." +msgid "From your position you hear %1$s" msgstr "" #: src/sounds.cpp @@ -233444,18 +235484,6 @@ msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "" msgstr[1] "" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" - #: src/veh_interact.cpp msgid "Select part" msgstr "Selecione parte" @@ -235768,6 +237796,10 @@ msgstr "Ensolarado" msgid "Cloudy" msgstr "Nublado" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "" + #: src/weather_data.cpp msgid "Drizzle" msgstr "Chuvisco" diff --git a/lang/po/ru.po b/lang/po/ru.po index ab680017e985e..83dcee69f93f1 100644 --- a/lang/po/ru.po +++ b/lang/po/ru.po @@ -1,7 +1,6 @@ # Translators: # Артем Анисимов , 2018 # Daniil Bolotov, 2018 -# Алексей , 2018 # Disillusion Ds , 2018 # Daniel , 2018 # Kio Ned , 2018 @@ -40,7 +39,6 @@ # Eila Attwood , 2019 # Gamp Forest, 2019 # Jin Velddrinn, 2019 -# korick3 korick3 , 2019 # Fran faов , 2019 # Александр , 2019 # Artem Baranov , 2019 @@ -49,7 +47,6 @@ # Jose , 2019 # Darkon Rabbit, 2019 # Михаил Семенчин , 2019 -# Arex , 2019 # Anton Dumov , 2019 # flin4 , 2019 # Aquilo, 2019 @@ -58,19 +55,20 @@ # Victor_U , 2019 # Brett Dong , 2019 # Alexey Mostovoy , 2019 -# Midas , 2019 # Vlasov Vitaly , 2019 # Антон Бурмистров <22.valiant@gmail.com>, 2019 # WX , 2019 # Ivan Ivanov , 2019 -# Fedor Makarov , 2019 +# Arex , 2019 +# korick3 korick3 , 2019 +# Midas , 2019 # 8street, 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: 8street, 2019\n" "Language-Team: Russian (https://www.transifex.com/cataclysm-dda-translators/teams/2217/ru/)\n" @@ -1897,7 +1895,7 @@ msgstr "моющее средство" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." +msgid "A popular pre-Cataclysm washing powder." msgstr "Популярный докатаклизменный стиральный порошок." #: lang/json/AMMO_from_json.py @@ -2247,6 +2245,19 @@ msgstr "" "Масло, горящее без копоти, предназначенное для использования в масляных " "лампах." +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "моторное масло" +msgstr[1] "моторное масло" +msgstr[2] "моторное масло" +msgstr[3] "моторное масло" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "Масло, применяемое в автомобильных двигателях." + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -2430,6 +2441,69 @@ msgstr "" "и стимулирующими препаратами. Набор используется в специализированном " "медицинском оборудовании, поэтому препараты из него нельзя ввести вручную." +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "граната 40 мм сигнальная" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "" +"40-мм сигнальная ракета. Сгорает примерно за минуту, оставляя позади себя " +"дымовой след." + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "" +"40-мм граната, детонирующая со световой вспышкой и громким хлопком. Это " +"ослепляет, оглушает и дезориентирует каждого, кто оказывается в радиусе " +"поражения." + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "граната 40 мм зажигательная" +msgstr[1] "гранаты 40 мм зажигательные" +msgstr[2] "гранат 40 мм зажигательных" +msgstr[3] "гранаты 40 мм зажигательные" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "40-мм граната с небольшим зарядом легковоспламеняющегося вещества." + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "граната 40 мм дымовая" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "40-мм граната, предназначенная для создания дымовой завесы." + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "граната 40мм жакан" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "" +"40-мм снаряд с массивной пулей. Похоже, пора прощаться со своим плечом." + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "патрон 10 мм Auto FMJ" @@ -3340,145 +3414,133 @@ msgid ".40 S&W JHP, reloaded" msgstr "патрон .40 S&W JHP переснаряжённый" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "граната 40 мм" +msgid "40x46mm grenade" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "граната 40 мм травматическая" +msgid "40x46mm M1006" +msgstr "" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." msgstr "" -"Нелетальная 40-мм граната с резиновыми пулями, больно бьющими по цели и " -"вызывающими дезориентацию. Способна покалечить или убить." #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "граната 40 мм оглушающая" +msgid "40x46mm M433" +msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "40-мм граната с оглушающим зарядом." +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "граната 40 мм сигнальная" +msgid "40x46mm M576" +msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." msgstr "" -"40-мм сигнальная ракета. Сгорает примерно за минуту, оставляя позади себя " -"дымовой след." #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "граната 40 мм светошумовая" +msgid "40x46mm M651" +msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x46mm buckshot" msgstr "" -"40-мм граната, детонирующая со световой вспышкой и громким хлопком. Это " -"ослепляет, оглушает и дезориентирует каждого, кто оказывается в радиусе " -"поражения." +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "граната 40 мм флешеттная" +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." +msgstr "" -#. ~ Description for 40mm flechette #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." -msgstr "40мм граната с бронебойными стреловидными поражающими элементами." +msgid "40x46mm slug" +msgstr "" +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "граната 40 мм осколочная" +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." +msgstr "" -#. ~ Description for 40mm frag #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." +msgid "40x46mm flechette" msgstr "" -"40-мм осколочная граната с небольшим зарядом взрывчатки и большим " -"количеством поражающих элементов." +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "граната 40 мм зажигательная" -msgstr[1] "гранаты 40 мм зажигательные" -msgstr[2] "гранат 40 мм зажигательных" -msgstr[3] "гранаты 40 мм зажигательные" +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "" -#. ~ Description for 40mm incendiary #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." -msgstr "40-мм граната с небольшим зарядом легковоспламеняющегося вещества." +msgid "40x53mm M1001" +msgstr "" + +#. ~ Description for 40x53mm M1001 +#: lang/json/AMMO_from_json.py +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "граната 40 мм картечь" +msgid "40x53mm M430A1" +msgstr "" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." msgstr "" -"40-мм граната с мощным зарядом дроби. Предназначена в качестве альтернативы " -"дробовикам для штурма баррикад и других препятствий." #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "граната 40 мм дымовая" +msgid "40x53mm buckshot" +msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "40-мм граната, предназначенная для создания дымовой завесы." +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "граната 40 мм слезоточивая" -msgstr[1] "гранаты 40 мм слезоточивые" -msgstr[2] "гранат 40 мм слезоточивых" -msgstr[3] "гранаты 40 мм слезоточивые" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." msgstr "" -"40-мм граната со слезоточивым газом. При взрыве выпускает облако " -"сильнодействующего выводящего из строя газа." #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "граната 40мм жакан" +msgid "40x53mm flechette" +msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." +msgid "An improvised 40x53mm flechette load containing 100 steel darts." msgstr "" -"40-мм снаряд с массивной пулей. Похоже, пора прощаться со своим плечом." #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -5497,11 +5559,11 @@ msgstr[3] "серебро" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "" -"Мягкий, блестящий металл. До Катаклизма он довольно прилично стоил, но " -"теперь его ценность значительно упала." +"Мягкий, блестящий металл. До Катаклизма он был довольно дорогим, но теперь " +"его ценность значительно упала." #: lang/json/AMMO_from_json.py msgid "small metal sheet" @@ -6167,15 +6229,6 @@ msgstr "" msgid "plutonium cell" msgstr "плутониевая батарейка" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "" -"Свободный заряд батареи. Может быть перемещен в заряжаемый аккумулятор, но " -"после этого не может быть извлечен." - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -6254,11 +6307,11 @@ msgstr "импульсный патрон" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" "Шнековый магазин с экспансивными пулями из особого сплава, ускоряемыми " -"зарядом в капсюле. Не самая смертоносная штука, но всё ещё несёт убойную " +"зарядом в капсюле. Не самая смертоносная штука, но всё ещё несёт убойную " "мощь, вдобавок не нужно беспокоиться, что шальной выстрел нанесёт урон " "окружению." @@ -6871,20 +6924,6 @@ msgid "" msgstr "" "Тяжёлые свинцовые шарики, используются в качестве боеприпасов для пращи." -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "костяной болт" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "" -"Заострённый болт с оперением, вырезан из кости. Он лёгкий, наносит приличный" -" урон и довольно точен. Имеет хороший шанс уцелеть после выстрела." - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -7435,10 +7474,10 @@ msgstr[3] "корм для сгустка" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" "Эта смесь различных органических веществ содержит всё необходимое для " -"здоровья сгустка слизи. Вы думаете…" +"здоровья сгустка слизи. Вы думаете…" #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -7904,11 +7943,11 @@ msgstr[3] "костюм кочевника" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "" -"Самодельный костюм, сделанный из докатаклизменной одежды. Предназначен для " -"дальних походов. В нём уйма места для хранения вещей." +"Самодельный костюм, сделанный из докатаклизменной одежды. Предназначен для " +"дальних походов. В нём уйма места для хранения вещей." #: lang/json/ARMOR_from_json.py msgid "light nomad gear" @@ -7921,12 +7960,12 @@ msgstr[3] "лёгкий костюм кочевника" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "" "Лёгкий самодельный костюм из докатаклизменной одежды, предназначенный для " -"дальних летних походов. По сравнению с обычным костюмом кочевника в нём " +"дальних летних походов. По сравнению с обычным костюмом кочевника, в нём " "меньше места для хранения и легче броня." #: lang/json/ARMOR_from_json.py @@ -8002,11 +8041,11 @@ msgstr[3] "костюм добытчика" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." msgstr "" "Крепкий костюм добытчика, сделанный из доведённого до ума докатаклизменного " -"защитного снаряжения. В нём уйма места для хранения вещей." +"защитного снаряжения. В нём уйма места для хранения вещей." #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -13182,7 +13221,7 @@ msgstr "Здоровенные штаны из меха." #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" +msgid_plural "faux fur pants" msgstr[0] "штаны из искусственного меха" msgstr[1] "штанов из искусственного меха" msgstr[2] "штанов из искусственного меха" @@ -15299,11 +15338,11 @@ msgstr "Простой белый зубон для занятий боевым #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" +msgid_plural "violin cases" msgstr[0] "чехол для скрипки" msgstr[1] "чехла для скрипки" msgstr[2] "чехлов для скрипки" -msgstr[3] "чехол для скрипки" +msgstr[3] "чехлы для скрипки" #. ~ Description for violin case #: lang/json/ARMOR_from_json.py @@ -16129,11 +16168,11 @@ msgstr[3] "гигантский инновационный рюкзак" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." msgstr "" -"Огромный тканевый рюкзак, сделанный перед катаклизмом в основном шутки ради." -" Он всё ещё довольно нелепый, но может хранить много вещей." +"Огромный тканевый рюкзак, сделанный перед катаклизмом, в основном, шутки " +"ради. Он всё ещё довольно нелепый, но может хранить много вещей." #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -17689,6 +17728,166 @@ msgstr "" " зубов. С трудом помещаются во рту, но выглядят очень блестяще. Для того, " "чтоб выглядеть как высококлассный гангста-рэпер." +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "накладные гранатовые зубы" +msgstr[1] "накладные гранатовые зубы" +msgstr[2] "накладных гранатовых зубов" +msgstr[3] "накладные гранатовые зубы" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" +"Поддельные зубы, инкрустированные гранатовым камнем. Надеваются поверх " +"основных зубов. Очень блестящие." + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -18815,6 +19014,636 @@ msgstr "" "Глянцевый чёрный хвост, обвешанный маленькими пластиковыми бусинками. " "Размахивается позади вас при ходьбе." +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -19473,13 +20302,9 @@ msgstr[3] "маски К.Р.И.Т" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" -"Стандартная маска К.Р.И.Т с покрытием из кевлара для дополнительной защиты. " -"Фильтры обеспечивают приемлемую защиту от окружающей среды, но не " -"предназначены для длительного использования. Имеется простой встроенный " -"интерфейс." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT boots" @@ -19492,15 +20317,11 @@ msgstr[3] "пары ботинок К.Р.И.Т" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" -"Стандартные ботинки К.Р.И.Т. Высокотехнологичный гель обеспечивает комфорт и" -" гигиену ступней во время длительных миссий, в то же время защищая от ударов" -" и жары извне. Сетка из суперсплава и резина защищают ещё и от химических " -"веществ. Однако ботинки довольно тяжёлые." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT LA boots" @@ -19513,14 +20334,11 @@ msgstr[3] "пары легких ботинок К.Р.И.Т" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" -"Облегчённые ботинки К.Р.И.Т на основе стандартных. Этот вариант разработан " -"для миссий в тёплом климате. Такие ботинки во многом схожи со стандартными, " -"но легче за счёт уменьшенной защиты." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT fingertip-less gloves" @@ -19533,13 +20351,10 @@ msgstr[3] "пары перчаток без пальцев К.Р.И.Т" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" -"Стандартные перчатки К.Р.И.Т с сеткой из суперсплава. Предназначены для " -"генномодифицированных солдат и/или мутантов. Обеспечивают удобное обращение " -"с предметами и умеренную защиту." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT fingertip-less liners" @@ -19552,13 +20367,10 @@ msgstr[3] "пары перчаток-подкладок К.Р.И.Т без па #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" -"Стандартные перчатки К.Р.И.Т из неопрена и резиновой сетки для утепления. " -"Предназначены для генномодифицированных солдат и/или мутантов. Обеспечивают " -"удобное обращение с предметами и умеренную защиту." #: lang/json/ARMOR_from_json.py msgid "CRIT backpack" @@ -19571,15 +20383,11 @@ msgstr[3] "рюкзаки К.Р.И.Т" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." msgstr "" -"Стандартный рюкзак К.Р.И.Т. Он разработан на основе рюкзака MOLLE, но " -"меньше по размеру и сочетает вместимость и удобство ношения, а также " -"включает кобуру для большого оружия. Вытаскивать и вкладывать оружие " -"довольно неудобно даже с магнитными клипсами, но всё приходит с опытом." #: lang/json/ARMOR_from_json.py msgid "CRIT chestrig" @@ -19609,12 +20417,10 @@ msgstr[3] "пары поножей К.Р.И.Т" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" -"Стандартные поножи К.Р.И.Т, простые и прочные. Не сковывают движений, а " -"подкладка сохраняет тепло в холодных условиях." #: lang/json/ARMOR_from_json.py msgid "pair of CRIT arm guards" @@ -19628,11 +20434,9 @@ msgstr[3] "пары наручей К.Р.И.Т" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" -"Пара наручей из суперсплава с неопреновой подкладкой и резиновой изоляцией. " -"Очень прочные и защищают от повреждений, но удивительно тяжёлые." #: lang/json/ARMOR_from_json.py msgid "CRIT web belt" @@ -19645,9 +20449,9 @@ msgstr[3] "пояса К.Р.И.Т" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." -msgstr "Стандартный пояс К.Р.И.Т, чтобы придерживать штаны и хранить оружие." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." +msgstr "" #: lang/json/ARMOR_from_json.py msgid "CRIT infantry duster" @@ -19660,12 +20464,10 @@ msgstr[3] "пехотные пыльники К.Р.И.Т" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" -"Толстый пыльник с резиновой изоляцией. Немного неудобный, но защитит от " -"любого противопехотного электрического разряда. Есть несколько карманов." #: lang/json/ARMOR_from_json.py msgid "CRIT Engineering Suit" @@ -19679,14 +20481,10 @@ msgstr[3] "инженерные костюмы К.Р.И.Т" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" -"Воздухонепроницаемый гибкий костюм из композитных волокон и сегментированных" -" бронепластин. Сложная система оцифровывает предметы и помещает их в личную " -"карманную вселенную для хранения, а встроенные суставные храповики " -"генерируют энергию для питания интерфейса." #: lang/json/ARMOR_from_json.py msgid "CRIT Armored Anomaly Suit" @@ -19699,16 +20497,11 @@ msgstr[3] "бронекостюмы для аномалий К.Р.И.Т" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" -"Относительно простая броня. Костюм из композитных волокон и химзащитный " -"комбинезон, укреплённые стратегически размещёнными сегментированными " -"пластинами кевлара. Костюм очень лёгкий и хорошо оберегает владельца от " -"гибели, в то же время превосходно защищая от внешней среды и радиационного " -"излучения." #: lang/json/ARMOR_from_json.py msgid "CRIT drop leg pouch" @@ -19739,18 +20532,13 @@ msgstr[3] "накладки для брони К.Р.И.Т" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" -"Разнообразные пластины, защитные элементы и регулируемые застёжки, вместе " -"составляющие прочный костюм для ношения поверх другой брони. Стальные " -"пластины и кевларовые листы перекрывают широкие зазоры в броне. Этот тяжёлый" -" костюм спроектирован ради максимальной безопасности, жертвуя комфортом, " -"поэтому двигаться в нём тяжело, но защищает он превосходно. " #: lang/json/ARMOR_from_json.py msgid "pair of CRIT Enforcer docks" @@ -19763,16 +20551,12 @@ msgstr[3] "пары ножных накладок К.Р.И.Т" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" -"Металлические пластины, грубо изогнутые по форме огромных стоп. " -"Пристёгиваются к обычной обуви и защищают ноги от повреждений. Они неудобные" -" и выглядят безобразно в отличие от большинства снаряжения К.Р.И.Т, но очень" -" пригодятся посреди поля боя." #: lang/json/ARMOR_from_json.py msgid "CRIT Soldier Suit" @@ -19785,15 +20569,11 @@ msgstr[3] "солдатские костюмы К.Р.И.Т" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" -"Современная броня. Вес минимален благодаря стратегически размещённым " -"пластинам из суперсплава, остальные участки покрыты кевларом. Имеется мягкая" -" неопреновая подкладка для комфорта. И самое важное, его можно носить под " -"другой бронёй." #: lang/json/ARMOR_from_json.py msgid "CRIT Lone Wolf Series Armor" @@ -19807,14 +20587,10 @@ msgstr[3] "броня К.Р.И.Т Одинокий волк" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" -"Матово-чёрная броня с устаревшими неудобными пластинами поверх мягкого " -"кевларового костюма. Усовершенствована новыми разработками. Эта тяжёлая " -"броня определённо защитит вас почти ото всего. Просто убедитесь, что вы " -"действительно сумеете в ней ходить." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T blouse" @@ -19827,42 +20603,34 @@ msgstr[3] "блузки К.Р.И.Т" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" -"Стандартная блузка К.Р.И.Т. Прочная, лёгкая и с широкими карманами. " -"Супергибкий неопрен согревает в холодную погоду, а благодаря обтекаемому " -"дизайну блузка не слишком броская. Спереди и сзади есть застёжки-молнии, " -"чтобы быстро надеть или снять её." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" -msgstr[0] "штаны К.Р.И.Т" -msgstr[1] "штанов К.Р.И.Т" -msgstr[2] "штанов К.Р.И.Т" -msgstr[3] "штаны К.Р.И.Т" +msgid_plural "C.R.I.T trousers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" -"Стандартные штаны К.Р.И.Т. Прочные, лёгкие и с широкими карманами. " -"Супергибкий неопрен согревает в холодную погоду." #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" -"Брюки К.Р.И.Т. Благодаря минималистичному обтекаемому дизайну очень лёгкие и" -" с карманами. Супергибкий неопрен согревает в холодную погоду." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T helmet liner" @@ -19874,8 +20642,8 @@ msgstr[3] "подшлемники К.Р.И.Т" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." -msgstr "Стандартный подшлемник К.Р.И.Т. Хранит котелок в тепле." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T shoes" @@ -19887,25 +20655,23 @@ msgstr[3] "пары ботинков К.Р.И.Т" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." -msgstr "Изящная пара ботинок, приятных на вид." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" -msgstr[0] "пара перчаток разведчика К.Р.И.Т" -msgstr[1] "пары перчаток разведчика К.Р.И.Т" -msgstr[2] "пар перчаток разведчика К.Р.И.Т" -msgstr[3] "пары перчаток разведчика К.Р.И.Т" +msgid_plural "pairs of C.R.I.T rec gloves" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" -"Стандартные перчатки разведчика К.Р.И.Т. Это облегающие обтекаемые перчатки " -"сделаны из хлопка с неопреновой подкладкой для теплоты и удобства." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T web belt" @@ -19918,10 +20684,9 @@ msgstr[3] "пояса К.Р.И.Т" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" -"Стандартный пояс К.Р.И.Т, чтобы придерживать штаны и хранить инструменты." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T rec duster" @@ -19934,12 +20699,10 @@ msgstr[3] "пыльники разведчика К.Р.И.Т" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" -"Длинный водонепроницаемый пыльник. Комфорт и функциональность в изящной " -"обтекаемой форме. Есть несколько карманов." #: lang/json/ARMOR_from_json.py msgid "C.R.I.T rec hat" @@ -19953,12 +20716,9 @@ msgstr[3] "шапки разведчика К.Р.И.Т" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" -"Стандартная водонепроницаемая шапка разведчика К.Р.И.Т, изящная и " -"функциональная, достаточно толстая, чтобы защитить от непогоды. Выполнена в " -"том же обтекаемом стиле, что и остальное снаряжение К.Р.И.Т." #: lang/json/ARMOR_from_json.py msgid "CRIT canteen" @@ -20084,10 +20844,11 @@ msgstr[2] "омеднённых браслетов" msgstr[3] "омеднённые браслеты" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "" "Браслет с выгравированными рунами. Вы ощущаете лёгкое мистическое дуновение," " когда смотрите на него. Он пригодится для пропитывания материалов маной." @@ -20100,15 +20861,6 @@ msgstr[1] "посеребрённых браслета" msgstr[2] "посеребрённых браслетов" msgstr[3] "посеребрённые браслеты" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" -"Браслет с выгравированными рунами. Вы ощущаете лёгкое мистическое дуновение," -" когда смотрите на него. Он пригодится для пропитывания материалов маной." - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -20481,11 +21233,11 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" -msgstr[0] "сумка из плоти" -msgstr[1] "сумки из плоти" -msgstr[2] "сумок из плоти" -msgstr[3] "сумки из плоти" +msgid_plural "flesh pouches" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #. ~ Description for flesh pouch #: lang/json/ARMOR_from_json.py @@ -20498,6 +21250,21 @@ msgstr "" "щупалец хватают и удерживают всё, что вы положите внутрь. Она движется и " "сокращается, чтобы минимизировать скованность." +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -22993,7 +23760,7 @@ msgstr[3] "КБМ: Ионный перегрузочный генератор" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" "Мощный ионный генератор, имплантированный в грудную клетку. Генерирует " @@ -25341,6 +26108,138 @@ msgid "" "goblins, and trolls." msgstr "Забавная коллекция фольклора про фей, гоблинов и троллей." +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -25872,9 +26771,8 @@ msgstr[3] "эротический роман" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." msgstr "" -"Низкопробная литература, сокрытая под маской повести избитой тематики." #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -26073,6 +26971,11 @@ msgid "" "We are so tired of men\n" "And motor-power." msgstr "" +"«Эндимион» Дэна Симмонса. В начале книги напечатано стихотворение Д.Г. Лоуренса:\n" +"\n" +"Дайте нам богов, о дайте нам богов!\n" +"Мы так устали от людей с их\n" +"лошадиными силами." #: lang/json/BOOK_from_json.py msgid "" @@ -26770,10 +27673,10 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" -"«Несчастье родиться» Эмиля Чорана. Должно быть, эту книгу напечатали за " +"«Несчастье родиться» Эмиля Чорана. Должно быть, эту книгу напечатали за " "десятилетия до Катаклизма — её обложка довольно истрепалась." #: lang/json/BOOK_from_json.py @@ -28629,7 +29532,7 @@ msgid_plural "copies of The Weapons of Asgard and Beyond" msgstr[0] "«Оружие Асгарда и за его пределами»" msgstr[1] "«Оружие Асгарда и за его пределами»" msgstr[2] "«Оружие Асгарда и за его пределами»" -msgstr[3] "копии «Оружие Асгарда и за его пределами»" +msgstr[3] "«Оружие Асгарда и за его пределами»" #. ~ Description for {'str': 'The Weapons of Asgard and Beyond', 'str_pl': #. 'copies of The Weapons of Asgard and Beyond'} @@ -28660,19 +29563,10 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" -"Флаер-рекламка какой-то конфеты. На нём нарисован летящий человечек из сплошной карамели, он в ужасе смотрит на вас. «Сахарок — первая в мире конфета размером с человека! Настоящее ли вы чудовище? Сумеете ли его съесть?»\n" -" На обороте есть несколько наспех нацарапанных слов:\n" -" «Здравствуй, дитя моё, и добро пожаловать в этот мир. Мир, где тебе будет хорошо при следующих условиях: \n" -"1) Никогда не касайся воды, она растворит тебя! \n" -"2) Держись подальше от людей с ясными глазами, они очень опасны! (Не обращай внимания на людей с чёрными глазами, они безвредны.) \n" -"3) Научись готовить карамельную мазь, только ею ты сможешь залечить свои раны.\n" -" Я ещё столько хочу тебе рассказать, но мне пора, пока ещё не слишком поздно. Я сделал тебе друга, чтобы у тебя была компания, будь с ним добр. \n" -" Я тебя люблю,\n" -" — Ф.»." #: lang/json/BOOK_from_json.py msgid "The Weapons of Asgard" @@ -28704,11 +29598,9 @@ msgstr[3] "«Взлом роботов для веселья и прибыли» #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "" -"Книга о незаконном получении, перепрограммировании и модификации роботов. В " -"ней есть много полезных пошаговых руководств и примеров чертежей." #: lang/json/BOOK_from_json.py msgid "Popular Robotics" @@ -28962,6 +29854,19 @@ msgstr[3] "солёная вода" msgid "Water with salt added. Not good for drinking." msgstr "Вода с солью. Непригодна для питья." +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "мыльная вода" +msgstr[1] "мыльная вода" +msgstr[2] "мыльная вода" +msgstr[3] "мыльная вода" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "Вода с добавлением мыла. Непригодна для питья." + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -29692,12 +30597,9 @@ msgstr[3] "самогон" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "" -"Только крепчайший, чистейший, старый добрый самогон, перегнанный из кукурузы" -" и сахара. С гарантией заставит вас забыть обо всём этом катаклизме, или вы " -"получаете своё зрение обратно." #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -29844,6 +30746,87 @@ msgstr[3] "односолодовый виски" msgid "Only the finest whiskey straight from the bung." msgstr "Только лучший виски прямо из под пробки." +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "модный бомж" @@ -30458,12 +31441,11 @@ msgid "" "crusted up inside the muscle, as if trying to form another organism. Still," " seems digestible at least, if you cook it and remove the worst parts." msgstr "" -"Мясо сильно мутировавшего животного. Имеет странную рыхлую губчатую текстуру" -" и пахнет… В основном, нормально. В нём есть странные включения и " -"образования, которые вообще не кажутся естественными: внутри мышц вросли " -"кусочки костей покрытые волосами, которые словно бы сформировались сами по " -"себе. Тем не менее это, вроде бы, съедобно, если вы приготовите его и " -"удалите худшие части." +"Мясо сильно мутировавшего животного. У него неприятная рыхлая губчатая " +"текстура, а пахнет оно... почти как обычно. В нём есть странные " +"неестественные волокна и образования: волосы и кусочки костей внутри мышц, " +"будто бы там пытался развиться другой организм. Тем не менее это кажется " +"съедобным, если его приготовить и удалить самые мерзкие части." #: lang/json/COMESTIBLE_from_json.py msgid "scrap of mutant meat" @@ -30482,9 +31464,9 @@ msgid "" "the worst parts." msgstr "" "Крошечные кусочки мяса мутировавшего животного. Они пахнут несколько странно" -" и в них присутствуют волосы и кусочки костей, которые выглядят так, словно " -"они выросли внутри самой мышцы. Тем не менее, они кажутся, вроде бы, " -"съедобными, если вы приготовите и удалите худшие части." +" и в них попадаются волосы и кусочки костей, которые выглядят так, словно " +"они выросли внутри самой мышцы. Тем не менее, они кажутся съедобными, если " +"их приготовить и удалить самые мерзкие части." #: lang/json/COMESTIBLE_from_json.py msgid "mutant humanoid meat" @@ -30498,10 +31480,10 @@ msgid "" "tissue lodged in it that clearly don't belong. You'd have to be crazy or " "starving to eat this." msgstr "" -"Только что вырезанный из тела сильно мутировавшего существа, внешне " -"гуманоидного вида. В нем есть странные кусочки меха и другие ткани, которых " -"быть не должно. Вы должны быть сумасшедшими или очень голодным, чтобы съесть" -" это." +"Кусок мяса, только что вырезанный из тела мутанта неприятно гуманоидного " +"вида. В нём попадаются странные кусочки меха и другие ткани, которых там " +"точно быть не должно. Нужно быть сумасшедшим или умирать с голоду, чтобы это" +" съесть." #: lang/json/COMESTIBLE_from_json.py msgid "cooked cretin" @@ -30569,9 +31551,9 @@ msgid "" " spongy texture, but otherwise tastes… mostly normal. Hopefully you got all" " the bits of hair and bone out…" msgstr "" -"Это приготовленный кусок мяса мутировавшего животного. У него странная " -"губчатая структура, но вкус… В основном, нормальный. Надеюсь, вы вытащили " -"все волосы и кусочки костей…" +"Это приготовленный кусок мяса мутировавшего животного. У него неприятная " +"губчатая структура, но вкус… почти нормальный. Вы надеетесь, что вырезали " +"все волосы и кусочки костей..." #: lang/json/COMESTIBLE_from_json.py msgid "cooked scrap of mutant meat" @@ -30677,6 +31659,24 @@ msgstr[1] "вяленого мяса" msgstr[2] "вяленого мяса" msgstr[3] "вяленое мясо" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "вяленая человечина" +msgstr[1] "вяленой человечины" +msgstr[2] "вяленой человечины" +msgstr[3] "вяленая человечина" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30702,25 +31702,32 @@ msgstr "" "всегда хочется пить." #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "вяленая человечина" -msgstr[1] "вяленой человечины" -msgstr[2] "вяленой человечины" -msgstr[3] "вяленая человечина" +msgid "smoked meat" +msgstr "копчёное мясо" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "" -"Солёная сушёная человеческая плоть, которая не портится очень долгое время, " -"но от которой всегда хочется пить." +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "копчёное мясо" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -30748,19 +31755,6 @@ msgstr "" "Вкусная рыба, которая хорошо прокоптилась, чтобы храниться в течение долгого" " времени. Её можно ещё раз закоптить, чтобы полностью высушить." -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "копчёный лох" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "" -"Сильно подкопчённая часть человеческого тела. Долго хранится и недурна на " -"вкус, если, конечно, вам нравится подобная еда." - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -31503,15 +32497,15 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "heavy cream" msgid_plural "heavy cream" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "жирные сливки" +msgstr[1] "жирные сливки" +msgstr[2] "жирные сливки" +msgstr[3] "жирные сливки" #. ~ Description for heavy cream #: lang/json/COMESTIBLE_from_json.py msgid " Cream that has been skimmed from the top of raw milk left to sit." -msgstr "" +msgstr "Сливки, снятые с верхней части свежего молока и сжирнённые." #: lang/json/COMESTIBLE_from_json.py msgid "apple cider" @@ -32421,8 +33415,8 @@ msgstr "кладка бритвокогтя" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." -msgstr "Горсть яиц бритвокогтя. Деликатес пост-Катаклизма." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." +msgstr "Горсть яиц бритвокогтя. Деликатес пост-Катаклизма." #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -33906,14 +34900,14 @@ msgstr "" "говядины." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" -msgstr[0] "начос с сыром" -msgstr[1] "начос с сыром" -msgstr[2] "начос с сыром" -msgstr[3] "начос с сыром" +msgid "cheese nachos" +msgid_plural "cheese nachos" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -33923,22 +34917,14 @@ msgstr "" " мяса." #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" -msgstr[0] "начос с мясом" -msgstr[1] "начос с мясом" -msgstr[2] "начос с мясом" -msgstr[3] "начос с мясом" - -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "" -"Солёные чипсы из кукурузной тортильи, теперь с мясом! Можно добавить немного" -" сыра." +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" @@ -33947,15 +34933,34 @@ msgstr[1] "начос Нино" msgstr[2] "начос Нино" msgstr[3] "начос Нино" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." msgstr "" -"Солёные чипсы из кукурузной тортильи с человечиной. Немного сыра поможет " -"сделать ЭТО чуточку вкуснее." +"Солёные чипсы из кукурузной тортильи, теперь с мясом! Можно добавить немного" +" сыра." +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" @@ -33964,24 +34969,17 @@ msgstr[1] "начос Нино с сыром" msgstr[2] "начос Нино с сыром" msgstr[3] "начос Нино с сыром" -#. ~ Description for niño nachos with cheese -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "" -"Солёные чипсы из кукурузной тортильи с человечиной, покрытые сыром. " -"Вкуснятина." - +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "начос с мясом и сыром" -msgstr[1] "начос с мясом и сыром" -msgstr[2] "начос с мясом и сыром" -msgstr[3] "начос с мясом и сыром" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -34059,19 +35057,6 @@ msgstr[3] "чили-дог" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Хот-дог, подаваемый с соусом «Чили Кон Карне». Ням!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "чили-дог с человечиной" -msgstr[1] "чили-дога с человечиной" -msgstr[2] "чили-догов с человечиной" -msgstr[3] "чили-дог с человечиной" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "Хот-дог, подаваемый с соусом чили кон каброн. Восхитительно." - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -34176,10 +35161,10 @@ msgstr[3] "неготовые хот-доги" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." +"Cataclysm. It would taste much better prepared." msgstr "" -"Сильно переработанная сосиска, до катаклизма была распространена на " -"бейсбольных матчах. Будет гораздо вкуснее, если подогреть." +"Сильно переработанная сосиска, до Катаклизма была распространена на " +"бейсбольных матчах. Будет гораздо вкуснее, если подогреть." #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -34224,12 +35209,34 @@ msgstr "солодово-молочный шарик" msgid "" "Crunchy sugar in chocolate capsules. The malt gives them a distinct, yet " "delicious flavor." -msgstr "" +msgstr "Хрустящий сахар в шоколадной оболочке. Не грусти, похрусти!" #: lang/json/COMESTIBLE_from_json.py msgid "raw sausage" msgstr "сырая колбаса" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -34239,6 +35246,15 @@ msgstr "Здоровая сырая колбаса, которую можно з msgid "sausage" msgstr "колбаса" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -34248,24 +35264,20 @@ msgstr "Колбаса, закопчённая для длительного х msgid "cooked sausage" msgstr "приготовленная колбаса" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "Здоровая приготовленная колбаса." -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "копчита вурст" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "" -"Очень длинная трансгендерная колбаса, закопчённая для долгосрочного " -"хранения. Очень вкусный продукт из человечины, если вы в теме." - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -34287,6 +35299,25 @@ msgstr[1] "братвурста" msgstr[2] "братвурстов" msgstr[3] "братвурст" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34371,6 +35402,16 @@ msgstr "" msgid "glazed tenderloins" msgstr "глазированная вырезка" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34385,6 +35426,26 @@ msgstr "" msgid "currywurst" msgstr "карри колбаса" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34397,6 +35458,26 @@ msgstr "" msgid "aspic" msgstr "заливное" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34488,6 +35569,16 @@ msgstr "Вкусная порция хрустящей жареной рыбы msgid "lunch meat" msgstr "мясной обед" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34501,6 +35592,26 @@ msgstr "" msgid "bologna" msgstr "болонская колбаса" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34570,6 +35681,25 @@ msgstr[1] "сосиски с соусом" msgstr[2] "сосисок с соусом" msgstr[3] "сосиска с соусом" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "колбаса с подливкой" +msgstr[1] "колбасы с подливкой" +msgstr[2] "колбасы с подливкой" +msgstr[3] "колбаса с подливкой" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34583,6 +35713,26 @@ msgstr "" msgid "pemmican" msgstr "пеммикан" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34598,6 +35748,25 @@ msgstr "" msgid "hamburger helper" msgstr "макароны по-флотски" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34624,6 +35793,24 @@ msgstr[1] "соуса чили с мясом" msgstr[2] "соусов чили с мясом" msgstr[3] "соус чили с мясом" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -34701,14 +35888,30 @@ msgstr "Нарезанные моллюски в воде." msgid "clam chowder" msgstr "клэм-чаудер" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." msgstr "" -"Вкусный и сытный белый суп из моллюсков и картофеля. Забытый вкус славной " -"Новой Англии." #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" @@ -34718,6 +35921,15 @@ msgstr[1] "тушёных фасоли" msgstr[2] "тушёных фасоли" msgstr[3] "тушёная фасоль" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -34731,6 +35943,15 @@ msgstr[1] "риса с мясом" msgstr[2] "риса с мясом" msgstr[3] "рис с мясом" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -34744,6 +35965,16 @@ msgstr[1] "шикарного риса с бобами" msgstr[2] "шикарного риса с бобами" msgstr[3] "шикарный рис с бобами" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34757,6 +35988,25 @@ msgstr "" msgid "meat pie" msgstr "мясной пирог" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -34766,6 +36016,25 @@ msgstr "Вкусная выпечка с мясной начинкой." msgid "meat pizza" msgstr "мясная пицца" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34774,6 +36043,15 @@ msgid "" msgstr "" "Мясная пицца, для настоящих хищников. Содержит много мяса и острых приправ." +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" @@ -34782,6 +36060,16 @@ msgstr[1] "шикарных омлета" msgstr[2] "шикарных омлетов" msgstr[3] "шикарный омлет" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34793,6 +36081,15 @@ msgstr "Взбитые яйца со вкусными добавками." msgid "canned meat" msgstr "мясные консервы" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "ломтик сойлента" +msgstr[1] "ломтика сойлента" +msgstr[2] "ломтиков сойлента" +msgstr[3] "ломтик сойлента" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34806,6 +36103,15 @@ msgstr "" msgid "salted meat slice" msgstr "солёный мясной кусочек" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -34821,6 +36127,25 @@ msgstr[1] "спагетти с соусом болоньезе" msgstr[2] "спагетти с соусом болоньезе" msgstr[3] "спагетти с соусом болоньезе" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -34830,6 +36155,26 @@ msgstr "Спагетти, покрытые густым мясным соусо msgid "lasagne" msgstr "лазанья" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34852,19 +36197,56 @@ msgstr "Ветчина очень вкусная, если хорошо прож msgid "cheeseburger" msgstr "чизбургер" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." +"Cataclysm culinary achievement." msgstr "" -"Сэндвич из мяса и сыра с приправами. До Катаклизма был вершиной кулинарного " -"искусства." #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "гамбургер" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -34874,6 +36256,25 @@ msgstr "Сэндвич из мяса с приправами." msgid "sloppy joe" msgstr "неряха Джо" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "манвич" +msgstr[1] "манвича" +msgstr[2] "манвичей" +msgstr[3] "манвич" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34886,6 +36287,26 @@ msgstr "" msgid "taco" msgstr "тако" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34899,6 +36320,15 @@ msgstr "" msgid "pickled meat" msgstr "маринованное мясо" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34909,6 +36339,17 @@ msgstr "Порция засолённого консервированного msgid "dehydrated meat" msgstr "сушёное мясо" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34939,6 +36380,17 @@ msgstr[1] "хаггиса" msgstr[2] "хаггисов" msgstr[3] "хаггис" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -34976,6 +36428,16 @@ msgstr[1] "темаки с мясом" msgstr[2] "темаки с мясом" msgstr[3] "темаки с мясом" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35015,6 +36477,16 @@ msgstr "" msgid "pelmeni" msgstr "пельмени" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35028,6 +36500,15 @@ msgstr "" msgid "homemade burrito" msgstr "домашний буррито" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -35039,379 +36520,6 @@ msgstr "" "скатанная в трубку. Обычно такими торговали на автозаправках, но этот " "буррито приготовлен по-домашнему и просто восхитителен!" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "сушёная человечина" -msgstr[1] "сушёной человечины" -msgstr[2] "сушёной человечины" -msgstr[3] "сушёная человечина" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "" -"Сушёные кусочки человечины. При правильном хранении эта высушенная еда будет" -" оставаться съедобной невероятно долго." - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "регидрированная человечина" -msgstr[1] "регидрированной человечины" -msgstr[2] "регидрированной человечины" -msgstr[3] "регидрированная человечина" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "" -"Восстановленные кусочки человечины, которые приятнее есть в таком, нежели в " -"сушёном, виде." - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "человеческий хаггис" -msgstr[1] "человеческих хаггиса" -msgstr[2] "человеческих хаггисов" -msgstr[3] "человеческий хаггис" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"Традиционное шотландское блюдо из человеческого мяса и потрохов, смешанных с" -" овсянкой, сваренное в человеческом же желудке. На удивление вкусное (если " -"вам по нраву такие вещи) и довольное сытное, это блюдо подаётся с варёными " -"овощами и крепким виски. " - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "человеческая болонская колбаса" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "" -"Консервированная и нарезанная человеческая плоть. \n" -"Её имя, возможно, было Оскар. \n" -"Её можно есть холодной, ведь вы хладнокровный людоед." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "Колбаса в соусе карри" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "" -"Человеческая колбаса в соусе карри. Довольно острая и впечатляющая " -"одновременно!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "колбаса с подливкой" -msgstr[1] "колбасы с подливкой" -msgstr[2] "колбасы с подливкой" -msgstr[3] "колбаса с подливкой" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "" -"Бисквит, человечина и вкуснейший грибной суп, спрессованные в удивительно " -"жирную и вкусную кашу." - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "заливное из человечины" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "" -"Блюдо, в котором человеческое мясо находится в желе из бульона на " -"человеческих костях. Смертельно вкусно — если такие вещи вам по душе." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "пеммикан выживальщика" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "" -"Концентрированная смесь жира и белка, используемая как высокопитательная " -"пища. Состоит из жира, съедобных растений и какого-то неудачливого товарища." - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "«ленивый» сэндвич" -msgstr[1] "«ленивых» сэндвича" -msgstr[2] "«ленивых» сэндвичей" -msgstr[3] "«ленивый» сэндвич" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "Сюрприз! Хлеб и человечина." - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "бутербрат" -msgstr[1] "бутербрата" -msgstr[2] "бутербратов" -msgstr[3] "бутербрат" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "" -"Сэндвич из человечины, овощей и сыра с приправами. Насыщайтесь душами ваших " -"врагов, а также вкусной зеленью с огорода!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "макароны с человечиной" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "" -"Макароны с сыром и фаршем из человечины. Так вкусно, что ради этого можно и " -"убить." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "чили кон каброн" -msgstr[1] "чили кон каброн" -msgstr[2] "чили кон каброн" -msgstr[3] "чили кон каброн" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "Острое рагу из перца чили, человечины, томатов и фасоли." - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "пирог с человечиной" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -"Мясной пирог из солдатика или, может, из учёного, кто знает. Боже, как " -"хорошо!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "каверзная пицца" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "" -"Мясная пицца, для настоящих каннибалов. Содержит много мяса и острых " -"приправ." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "ломтик сойлента" -msgstr[1] "ломтика сойлента" -msgstr[2] "ломтиков сойлента" -msgstr[3] "ломтик сойлента" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -"Подсоленное человеческое мясо. Сварено и законсервировано. Сохранило " -"большинство питательных веществ, но вкус мяса почти не чувствуется. " - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "солёные кусочки простака" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "" -"Обваленные в соли кусочки человечины в вакуумной упаковке. Солёные, вкусно, " -"если по чуть-чуть." - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "спагетти из подлеца" -msgstr[1] "спагетти из подлеца" -msgstr[2] "спагетти из подлеца" -msgstr[3] "спагетти из подлеца" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "" -"Спагетти с толстым слоем соуса из человечины. Очень вкусно, если вам " -"нравятся подобные вещи." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "лазанья с Луиджи" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "" -"Давно известный вид мучных изделий, состоящих из чередующихся слоёв лазаньи," -" сыра, соуса и мяса. Рецепт улучшен человеческим мясом." - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "человекбургер" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "" -"Сэндвич из человечины и сыра с приправами. До катаклизма был вершиной " -"кулинарного искусства каннибалов." - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "боббургер" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "" -"В этом гамбургере содержится даже больше четырёх процентов человечины, " -"разрешённых Минздравом." - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "манвич" -msgstr[1] "манвича" -msgstr[2] "манвичей" -msgstr[3] "манвич" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "Выглядит как самый обычный сэндвич, но он сделан из людей!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "Тио Тако" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -"Тако, в котором вместо говяжьего фарша используется фарш из человечины. По " -"необъяснимой причине вы слышите доносящийся до вас колокольный звон." - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "сырая копчита вурст" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "" -"Здоровая сырая колбаса из человечины, которую можно закоптить или " -"приготовить." - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "приготовленная копчита вурст" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "" -"Здоровая приготовленная колбаса из человечины. Приготовлено по-человечески." - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "человекобратвурст" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "" -"Немецкая колбаса из мелко порубленного зажаренного или запечённого " -"человеческого мяса. Лучше всего есть с пылу с жару. Кстати говоря, её можно " -"делать и не только из немцев." - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "маринованая человечина" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "" -"Плавающая в рассоле человеческая плоть. Вкусная и питательная, если вам " -"нравятся подобные вещи." - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -35464,9 +36572,9 @@ msgid "" "infection. It's the safest way to cure any infections you might have. One " "dose lasts twelve hours." msgstr "" -"Отпускаемое по рецепту антибактериальное средство, предназначенное для " -"предотвращения или прекращения развития инфекции. Это самый быстрый и " -"надёжный способ вылечить любую инфекцию. Одна доза действует 12 часов." +"Мощное антибактериальное средство, предназначенное для предотвращения или " +"прекращения развития инфекции. Это самый быстрый и надёжный способ вылечить " +"любую инфекцию. Одна доза действует 12 часов." #: lang/json/COMESTIBLE_from_json.py msgid "antifungal drug" @@ -36361,11 +37469,8 @@ msgstr "таблетка из костной муки подслащённая" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "" -"Самодельный препарат кальция, изготовленный из костной муки. Добавленный " -"подсластитель может скомпенсировать порошкообразную текстуру и вкус пепла, " -"ставя эти таблетки почти вровень с докатаклизменными препаратами." #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -36586,9 +37691,10 @@ msgid "" "but can treat any bacterial infections you may encounter. One dose lasts " "twelve hours." msgstr "" -"Отпускаемое по рецепту антибактериальное средство, предназначенное для " -"предотвращения или прекращения развития инфекции. Это самый быстрый и " -"надёжный способ вылечить любую инфекцию. Одна доза действует 12 часов." +"Отпускаемое по рецепту мощное антибактериальное средство, предназначенное " +"для предотвращения или прекращения развития инфекции. Содержит почти " +"токсичную дозу антибиотика, однако может вылечить практически любую " +"бактериальную инфекцию. Одна доза действует 12 часов." #: lang/json/COMESTIBLE_from_json.py msgid "MRE entree" @@ -37052,11 +38158,11 @@ msgstr "сыворотка птицы" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" -"Высококонцентрированный мутаген цвета неба до апокалипсиса. Требуется шприц " -"для инъекции… Если вы, конечно, решитесь на это." +"Высококонцентрированный мутаген цвета докатаклизменного неба. Требуется " +"шприц для инъекции… Если вы, конечно, решитесь на это." #: lang/json/COMESTIBLE_from_json.py msgid "cattle serum" @@ -37595,8 +38701,8 @@ msgstr[3] "миндальная мякоть" msgid "" "Pulp left over after making almond milk. It's gritty and incredibly bland." msgstr "" -"Мякоть, оставшаяся после приготовления миндального молока. Она шершавая и " -"невероятно невкусная." +"Мякоть, оставшаяся после приготовления миндального молока. Зернистая и " +"невероятно пресная." #: lang/json/COMESTIBLE_from_json.py msgid "roasted almonds" @@ -37878,8 +38984,8 @@ msgid "" "A serving of acorns that have been hulled, chopped, and boiled in water " "before being thoroughly toasted until dry. Filling and nutritious." msgstr "" -"Порция жёлудей, которые были очищены от скорлупы, нарезаны и сварены в воде," -" прежде чем поджариться до полного высыхания. Сытно и питательно." +"Порция желудей, очищенных от скорлупы, измельчённых, сваренных и тщательно " +"поджаренных до высушивания. Сытно и питательно." #: lang/json/COMESTIBLE_from_json.py msgid "foie gras" @@ -38102,12 +39208,12 @@ msgstr[3] "желе марло" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "" "Похоже на жидкость лимонного цвета, которая загустилась подобно " -"докатаклизменному желе. У неё сильный, но сладкий аромат, но это явно или " -"результат мутаций, или что-то неземного происхождения." +"докатаклизменному желе. У неё сильный, но сладкий аромат, но это явно или " +"результат мутаций, или что-то, неземного происхождения." #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -38464,7 +39570,7 @@ msgstr[3] "собачий корм" msgid "This is food for dogs. It smells strange, but dogs seem to love it." msgstr "Собачий корм. Пахнет странно, но собакам, похоже, нравится." -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "кошачий корм" @@ -38473,7 +39579,7 @@ msgstr[2] "кошачьих кормов" msgstr[3] "кошачий корм" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "Кошачий корм. Пахнет странно, но кошкам, похоже, нравится." @@ -38522,6 +39628,11 @@ msgstr[3] "нектар" msgid "Some nectar. Seeing this item is a bug." msgstr "Нектар. Если вы видите это — это баг." +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "протеиновый напиток" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" @@ -38530,63 +39641,20 @@ msgstr[1] "напитка из зелёного сойлента" msgstr[2] "напитков из зелёного сойлента" msgstr[3] "напиток из зелёного сойлента" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "" -"Мелкодисперсная суспензия рафинированного человеческого белка, смешанного с " -"водой. Питательно, но невкусно." - +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" -msgstr[0] "сойлентовый зеленый порошок" -msgstr[1] "сойлентовый зеленый порошок" -msgstr[2] "сойлентовый зеленый порошок" -msgstr[3] "сойлентовый зеленый порошок" - -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" -"Сырой очищенный белок, сделанный из людей! Довольно питательный. В чистом " -"виде есть его невозможно, попробуйте добавить воды." - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "коктейль из зелёного сойлента" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "" -"Густой и вкусный напиток, сделанный из чистого рафинированного человеческого" -" протеина и питательных фруктов." - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "обогащённый коктейль из зелёного сойлента" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "" -"Густой и вкусный напиток, сделанный из чистого рафинированного человеческого" -" протеина и питательных фруктов. Также дополнительно обогащён витаминами и " -"минералами." - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "протеиновый напиток" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py @@ -38605,6 +39673,16 @@ msgstr[1] "протеиновых порошока" msgstr[2] "протеиновых порошков" msgstr[3] "протеиновый порошок" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "сойлентовый зеленый порошок" +msgstr[1] "сойлентовый зеленый порошок" +msgstr[2] "сойлентовый зеленый порошок" +msgstr[3] "сойлентовый зеленый порошок" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -38615,15 +39693,10 @@ msgstr "" "невозможно, попробуйте добавить воды." #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "экстренный протеиновый рацион" -msgstr[1] "экстренных протеиновых рациона" -msgstr[2] "экстренных протеиновых рационов" -msgstr[3] "экстренные протеиновые рационы" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -38648,6 +39721,15 @@ msgstr "" msgid "protein shake" msgstr "протеиновый коктейль" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "коктейль из зелёного сойлента" +msgstr[1] "коктейля из зелёного сойлента" +msgstr[2] "коктейлей из зелёного сойлента" +msgstr[3] "коктейли из зелёного сойлента" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -38661,6 +39743,16 @@ msgstr "" msgid "fortified protein shake" msgstr "обогащённый протеиновый коктейль" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "обогащённый коктейль из зелёного сойлента" +msgstr[1] "обогащённых коктейля из зелёного сойлента" +msgstr[2] "обогащённых коктейлей из зелёного сойлента" +msgstr[3] "обогащённый коктейль из зелёного сойлента" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -39583,6 +40675,15 @@ msgstr[1] "шикарных сэндвича" msgstr[2] "шикарных сэндвичей" msgstr[3] "шикарный сэндвич" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "шикарный сэндвич" +msgstr[1] "шикарных сэндвича" +msgstr[2] "шикарных сэндвичей" +msgstr[3] "шикарные сэндвичи" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -39698,6 +40799,26 @@ msgstr[1] "мясных сэндвича" msgstr[2] "мясных сэндвичей" msgstr[3] "мясной сэндвич" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "«ленивый» сэндвич" +msgstr[1] "«ленивых» сэндвича" +msgstr[2] "«ленивых» сэндвичей" +msgstr[3] "«ленивый» сэндвич" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -40828,15 +41949,6 @@ msgstr "костный бульон" msgid "A tasty and nutritious broth made from bones." msgstr "Вкусный и питательный бульон из костей." -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "бульон из человечины" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "Питательный бульон из человеческих костей." - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "овощной суп" @@ -40850,6 +41962,15 @@ msgstr "Вкусный и сытный овощной суп." msgid "meat soup" msgstr "мясной суп" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "суп «из дурака»" +msgstr[1] "супа «из дурака»" +msgstr[2] "супов «из дурака»" +msgstr[3] "супы «из дурака»" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -40885,6 +42006,15 @@ msgstr[1] "карри с мясом" msgstr[2] "карри с мясом" msgstr[3] "карри с мясом" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -40894,22 +42024,20 @@ msgstr "Пряная пища с кусочками перца и мяса. Оч msgid "woods soup" msgstr "лесной суп" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "Вкусный и питательный суп, сделанный из даров природы." -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "Суп из «дурака»" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "" -"Суп, приготовленный из того, кого гораздо приятнее съесть, нежели с ним " -"общаться." - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "куриный суп с лапшой" @@ -42159,19 +43287,6 @@ msgstr "" "Питательная таблетка, растворённая в воде для подавления её вкуса. На вкус " "определённо как прокисшее молоко." -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "тесто" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "" -"Мука, смешанная в водой и размятая в вязкую пасту. Из теста можно выпекать " -"хлеб эффективнее, чем просто из муки." - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "солнечная роса" @@ -42230,6 +43345,19 @@ msgstr "" "эффект, но всё так же хорошо устраняющий боль. Может быть использован для " "анестезии при установке бионик." +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "тесто" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "" +"Мука, смешанная в водой и размятая в вязкую пасту. Из теста можно выпекать " +"хлеб эффективнее, чем просто из муки." + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "мутаген вампира" @@ -42248,11 +43376,11 @@ msgstr "сыворотка вампира" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" "Высококонцентрированный смолисто-чёрный мутаген с серебряными крупинками, " -"напоминающий звёздное ночное небо. Требуется шприц для инъекции… если вы, " +"напоминающий звёздное ночное небо. Требуется шприц для инъекции… Если вы, " "конечно, решитесь на это." #: lang/json/COMESTIBLE_from_json.py @@ -42267,12 +43395,12 @@ msgstr "сыворотка вендиго" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" "Высококонцентрированный мутаген цвета торфа с блестящими зелёными " -"крупинками, напоминающий о деревьях. Требуется шприц для инъекции… если вы, " -"конечно, решитесь на это." +"крупинками, напоминающий о деревьях. Требуется шприц для инъекции… Если " +"вы, конечно, решитесь на это." #: lang/json/COMESTIBLE_from_json.py msgid "SpOreos" @@ -42468,9 +43596,9 @@ msgid "" " heart to dangerous levels. Drinking this in danger or at critical " "condition may be lethal." msgstr "" -"Эта плохо пахнущая жидкость стимулирует регенерацию нежити ускоряя ваше " +"Эта плохо пахнущая жидкость стимулирует регенерацию нежити, ускоряя ваше " "сердце до опасных значений. Употребление этого в опасности или критическом " -"состоянии может быть смертельным" +"состоянии может быть смертельным." #: lang/json/COMESTIBLE_from_json.py msgid "potion of Improved Twisted Restoration" @@ -42484,7 +43612,7 @@ msgid "" "condition may be lethal. Improved infusion techniques lessen the strain of " "the process." msgstr "" -"Эта плохо пахнущая жидкость стимулирует регенерацию нежити ускоряя ваше " +"Эта плохо пахнущая жидкость стимулирует регенерацию нежити, ускоряя ваше " "сердце до опасных значений. Употребление этого в опасности или критическом " "состоянии может быть смертельным. Улучшенные методы введения уменьшают " "нагрузку процесса." @@ -42547,8 +43675,8 @@ msgid "" "same way as other meat, making it obvious that it still retains some magical" " properties." msgstr "" -"Мясо поверженного дракона. Похоже что оно не реагирует на готовку как " -"обычное мясо, очевидно что оно сохраняет некоторые магические свойства." +"Мясо поверженного дракона. Похоже, его нельзя готовить как обычное мясо; оно" +" всё ещё сохраняет некоторые магические свойства." #: lang/json/COMESTIBLE_from_json.py msgid "scream mushroom" @@ -42560,20 +43688,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "Грибы, собранные с мертвого крикуна. Можно использовать для зелий." -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "просмолённый шнур" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "" -"Примитивный связующий материал, сделанный из шнурков и природного клея. " -"Используйте его для ремонта вещей, сделанных из дерева, бумаги, кости или " -"хитина." - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "труп некко" @@ -42581,10 +43695,10 @@ msgstr "труп некко" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" -"Труп некко, сейчас очень напоминающий огромную вафельку Некко. Не помешает " +"Труп некко, сейчас очень напоминает огромную вафельку Некко. Не помешает " "откусить кусочек, верно?" #: lang/json/COMESTIBLE_from_json.py @@ -42612,10 +43726,10 @@ msgstr[3] "ягодовидная аномалия" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "" "Если мы оставим это, как есть, можно просто пройти в грибное соцветие без " -"всяких сомнений и вкусить плод. Мы не можем этого, не так ли?" +"всяких сомнений и вкусить плод. Мы не можем этого, не так ли?" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -42629,10 +43743,10 @@ msgstr[3] "семявидная аномалия" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "" "Если мы оставим это, как есть, можно просто пройти в грибной сад без всяких " -"сомнений и вкусить семена. Мы не можем этого, не так ли?" +"сомнений и вкусить семена. Мы не можем этого, не так ли?" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -42646,10 +43760,10 @@ msgstr[3] "желе марло" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "" "Если мы оставим это, как есть, можно просто пройти в грибной шпиль без " -"всяких сомнений и вкусить сок. Стоп, как бы вы вообще ПОЛУЧИЛИ это?" +"всяких сомнений и вкусить сок. Стоп, как бы вы вообще ПОЛУЧИЛИ это?" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -42662,12 +43776,12 @@ msgstr[3] "плодовидная аномалия" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." msgstr "" -"Сейчас мы не существуем. Маленький умник, наверняка пользуешься отладкой, " -"чтобы увидеть это сообщение? Мы не разрешаем тебе присоединиться к нам, пока" -" нас модифицируют." +"Сейчас мы не существуем. Маленький умник, наверняка пользуешься отладкой, " +"чтобы увидеть это сообщение? Мы не разрешаем тебе присоединиться к нам, " +"пока нас модифицируют." #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -42808,10 +43922,10 @@ msgstr[3] "бутерброд с арахисовым маслом и мёдом #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" "Какой-то конченный идиот положил мёд на арахисовое масло, да что он о себе " -"ду…- хотя, довольно вкусно. Не содержит глютен." +"ду… — хотя, довольно вкусно. Не содержит глютен." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free PB&M sandwich" @@ -42837,20 +43951,20 @@ msgstr "амброзия из орехов гикори (без лактозы)" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "" -"Вкусная амброзия из орехов гикори. Напиток, достойный богов. Изготовлено из " -"альтернативы коровьему молоку." +"Вкусная амброзия из орехов гикори. Напиток, достойный богов. Изготовлено " +"из альтернативы коровьему молоку." #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "" -"Вы думаете, это кукурузная… или рисовая мука… Или что-то ещё. Однако, " -"конечно, это не пшеничная мука! Впрочем, годится для выпечки." +"Вы думаете, это кукурузная... Или рисовая мука... Или что-то ещё. Однако," +" конечно, это не пшеничная мука! Впрочем, годится для выпечки." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free johnnycake" @@ -42859,11 +43973,11 @@ msgstr "кукурузная лепёшка (без глютена)" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "" -"Всем нам иногда хочется пирога. Он не идеален, но это вкусная и питательная " -"обжаренная хлебная лепёшка. Не содержит глютен." +"Всем нам иногда хочется пирога. Он не идеален, но это вкусная и питательная" +" обжаренная хлебная лепёшка. Не содержит глютен." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit pancake" @@ -42911,12 +44025,12 @@ msgstr[3] "блинчик с фрукт. начинкой (без глютена #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "" "Пышные вкусные блинчики, приготовлены из продуктов, которые вы всё ещё " -"можете есть. Но по крайней мере с настоящим кленовым сиропом и фруктовой " -"начинкой. Не содержит глютен. Не содержит лактозы." +"можете есть. Но, по крайней мере, с настоящим кленовым сиропом и фруктовой " +"начинкой. Не содержит глютен. Не содержит лактозы." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free chocolate pancake" @@ -42963,12 +44077,12 @@ msgstr[3] "французский тост (без глютена) (без ла #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "" -"Кусок хлеба, вымоченный в молочно-яичной смеси и затем запечённый. Вы " +"Кусок хлеба, вымоченный в молочно-яичной смеси и затем запечённый. Вы " "никогда не думали, что это возможно, но теперь вы действительно чувствуете " -"себя как пост тысячелетия. Не содержит глютен. Не содержит лактозы." +"себя ребёнком. Не содержит глютен. Не содержит лактозы." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free biscuit" @@ -43062,10 +44176,10 @@ msgstr "чизбургер (без глютена)" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." +"of pre-Cataclysm culinary achievement." msgstr "" -"Сэндвич из мяса и сыра с приправами. До Катаклизма был вершиной кулинарного " -"искусства. Не содержит глютен." +"Сэндвич из мяса и сыра с приправами. До Катаклизма был вершиной кулинарного" +" искусства. Не содержит глютен." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -43220,10 +44334,10 @@ msgstr[3] "«скучный» сэндвич (без глютена)" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "" -"Простой сэндвич с соусом. Не очень питателен, но это лучше, чем есть просто " -"хлеб… особенно если это «неправильный» тип хлеба! Не содержит глютен." +"Простой сэндвич с соусом. Не очень питателен, но это лучше, чем есть просто" +" хлеб... Особенно, если это «неправильный» тип хлеба! Не содержит глютен." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free waffle" @@ -43231,8 +44345,9 @@ msgstr "вафля (без глютена)" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." -msgstr "Просто блинчик с оттиском на поверхности. Не содержит глютен." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgstr "" +"Просто вафельный блинчик с рифлёной поверхностью. Не содержит глютен." #: lang/json/COMESTIBLE_from_json.py msgid "lactose free waffle" @@ -43240,17 +44355,18 @@ msgstr "вафля (без лактозы)" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." -msgstr "Просто блинчик с оттиском на поверхности. Не содержит лактозы." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgstr "" +"Просто вафельный блинчик с рифлёной поверхностью. Не содержит лактозы." #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "" -"Просто блинчик с оттиском на поверхности. Не содержит глютен. Не содержит " -"лактозы." +"Просто вафельный блинчик с рифлёной поверхностью. Не содержит глютен. Не " +"содержит лактозы." #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit waffle" @@ -43302,10 +44418,10 @@ msgstr[3] "рисовое молоко" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "" -"Слаще, чем цельное коровье молоко, почти похоже на ванильное мороженое. " +"Слаще, чем цельное коровье молоко, почти похоже на ванильное мороженое. " "Быстро портится." #: lang/json/COMESTIBLE_from_json.py @@ -43319,11 +44435,11 @@ msgstr[3] "кокосовая вода" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "" -"Кокосовое молочко с добавлением воды, чтобы хватило подольше. Вкус всё тот " -"же. Быстро портится." +"Кокосовое молочко с добавлением воды, чтобы хватило подольше. Вкус всё тот " +"же. Быстро портится." #: lang/json/COMESTIBLE_from_json.py msgid "jarred coconut milk" @@ -44385,6 +45501,21 @@ msgstr "" "варежка без большого пальца. Годится как импровизированная ёмкость для воды," " но мы всё равно все знаем, для чего он нужен на самом деле." +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "воздушный шар" +msgstr[1] "воздушных шара" +msgstr[2] "воздушных шаров" +msgstr[3] "воздушные шары" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" +"Детский воздушный шарик. Может быть использован как самодельный контейнер " +"для воды." + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -45309,6 +46440,35 @@ msgstr[1] "трупа" msgstr[2] "трупов" msgstr[3] "труп" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -45331,15 +46491,7 @@ msgstr "" "Сильно изуродованный рассечённый труп. Что бы его ни убило, у него есть " "гигантские клешни." -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "человеческий труп" -msgstr[1] "человеческих трупа" -msgstr[2] "человеческих трупов" -msgstr[3] "человеческие трупы" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "Мёртвое человеческое тело." @@ -45440,6 +46592,44 @@ msgid "" "wound." msgstr "Почти обезглавленный труп. Непонятно, что могло нанести такую рану." +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "магнетрон" +msgstr[1] "магнетрона" +msgstr[2] "магнетронов" +msgstr[3] "магнетроны" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" +"Этот электрический компонент предназначен для излучения микроволн в " +"микроволновой печи." + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "ударно-волновой излучатель" +msgstr[1] "ударно-волновых излучателя" +msgstr[2] "ударно-волновых излучателей" +msgstr[3] "ударно-волновые излучатели" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" +"Это большое устройство состоит, в основном, из двух медных трубок, одна с " +"обмоткой, другая побольше, со взрывчаткой внутри. При правильном подрыве " +"взрывчатого вещества, устройство вырабатывает большое количество " +"электрической энергии за очень короткое время." + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -45501,7 +46691,7 @@ msgstr "" #. ~ Description for {'str': 'deck of cards', 'str_pl': 'decks of cards'} #: lang/json/GENERIC_from_json.py msgid "A deck of 52 playing cards." -msgstr "Колода 52 игральных карт" +msgstr "Колода из 52 игральных карт." #: lang/json/GENERIC_from_json.py msgid "coin" @@ -45608,17 +46798,17 @@ msgstr "" msgid "MATERIAL: T-SUBSTRATE" msgid_plural "MATERIAL: T-SUBSTRATEs" msgstr[0] "МАТЕРИАЛ: Т-ПОДЛОЖКА" -msgstr[1] "МАТЕРИАЛА: Т-ПОДЛОЖКА" -msgstr[2] "МАТЕРИАЛОВ: Т-ПОДЛОЖКА" -msgstr[3] "МАТЕРИАЛЫ: Т-ПОДЛОЖКА" +msgstr[1] "МАТЕРИАЛ: Т-ПОДЛОЖКА" +msgstr[2] "МАТЕРИАЛ: Т-ПОДЛОЖКА" +msgstr[3] "МАТЕРИАЛ: Т-ПОДЛОЖКА" #: lang/json/GENERIC_from_json.py msgid "HAADF MICROGRAPH: T-SUBSTRATE" msgid_plural "HAADF MICROGRAPH: T-SUBSTRATEs" msgstr[0] "HAADF МИКРОСКОПИЯ: Т-ПОДЛОЖКА" -msgstr[1] "HAADF МИКРОСКОПИИ: Т-ПОДЛОЖКА" -msgstr[2] "HAADF МИКРОСКОПИЙ: Т-ПОДЛОЖКА" -msgstr[3] "HAADF МИКРОСКОПИИ: Т-ПОДЛОЖКА" +msgstr[1] "HAADF МИКРОСКОПИЯ: Т-ПОДЛОЖКА" +msgstr[2] "HAADF МИКРОСКОПИЯ: Т-ПОДЛОЖКА" +msgstr[3] "HAADF МИКРОСКОПИЯ: Т-ПОДЛОЖКА" #: lang/json/GENERIC_from_json.py msgid "foodplace loyalty card" @@ -47716,6 +48906,175 @@ msgstr[3] "алмаз" msgid "A sparkling diamond." msgstr "Сверкающий алмаз." +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "гранат" +msgstr[1] "граната" +msgstr[2] "гранатов" +msgstr[3] "гранаты" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "Сверкающий гранат." + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "аметист" +msgstr[1] "аметиста" +msgstr[2] "аметистов" +msgstr[3] "аметисты" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "Сверкающий аметист." + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "аквамарин" +msgstr[1] "аквамарина" +msgstr[2] "аквамаринов" +msgstr[3] "аквамарины" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "Сверкающий аквамарин." + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "изумруд" +msgstr[1] "изумруда" +msgstr[2] "изумрудов" +msgstr[3] "изумруды" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "Сверкающий изумруд." + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "александрит" +msgstr[1] "александрита" +msgstr[2] "александритов" +msgstr[3] "александриты" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "Сверкающий александрит." + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "жемчуг" +msgstr[1] "жемчуг" +msgstr[2] "жемчуг" +msgstr[3] "жемчуг" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "Блестящая жемчужина." + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "рубин" +msgstr[1] "рубина" +msgstr[2] "рубинов" +msgstr[3] "рубины" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "Сверкающий рубин." + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "хризолит" +msgstr[1] "хризолита" +msgstr[2] "хризолитов" +msgstr[3] "хризолиты" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "Сверкающий хризолит." + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "сапфир" +msgstr[1] "сапфира" +msgstr[2] "сапфиров" +msgstr[3] "сапфиры" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "Сверкающий сапфир." + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "опал" +msgstr[1] "опала" +msgstr[2] "опалов" +msgstr[3] "опалы" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "Блестящий опал." + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "турмалин" +msgstr[1] "турмалина" +msgstr[2] "турмалинов" +msgstr[3] "турмалины" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "Сверкающий турмалин." + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "цитрин" +msgstr[1] "цитрина" +msgstr[2] "цитринов" +msgstr[3] "цитрины" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "Сверкающий цитрин." + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "топаз" +msgstr[1] "топаза" +msgstr[2] "топазов" +msgstr[3] "топазы" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "Сверкающий голубой топаз." + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -47959,8 +49318,8 @@ msgid "" "What was once a wonderfully addictive tube of dried tobacco leaf is now just a smelly piece of trash. What a tragedy!\n" "The leftover tobacco in a few of these could probably be used to roll another cigarette. If you're willing to go that far…" msgstr "" -"То, что раньше было чудесной трубочкой высушенного табачного листа, в настоящее время лишь вонючая кучка мусора. Какая трагедия!\n" -"Остатки табака, вероятно, могут быть использованы, чтобы скрутить ещё одну сигаретку. Если вы готовы зайти так далеко…" +"Когда-то восхитительная трубочка из сушёных табачных листьев, а теперь всего лишь вонючий мусор. Какая трагедия!\n" +"Из остатков табака в нескольких таких можно скрутить ещё одну сигаретку. Если вы готовы зайти настолько далеко…" #. ~ Use action msg for joint. #: lang/json/GENERIC_from_json.py @@ -49050,11 +50409,11 @@ msgstr[3] "цестус" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." msgstr "" -"Обмотка кожаными ремнями на руках для их защиты и увеличения степени " -"травматичности удара. Между ремнями вложены тяжёлые полоски металла." +"Обмотка из кожи для руки и ладони с металлическими вставками на костяшках " +"для улучшения силы удара и защиты." #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -49380,10 +50739,10 @@ msgstr[3] "записки" #: lang/json/GENERIC_from_json.py msgid "FEMA evacuation pamphlet" msgid_plural "FEMA evacuation pamphlets" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "брошюра по выживанию МЧС" +msgstr[1] "брошюры по выживанию МЧС" +msgstr[2] "брошюр по выживанию МЧС" +msgstr[3] "брошюры по выживанию МЧС" #. ~ Description for FEMA evacuation pamphlet #: lang/json/GENERIC_from_json.py @@ -49394,6 +50753,11 @@ msgid "" "\n" "In the event that you have been evacuated under violent circumstances, FEMA recommends taking cover in the shelter's basement until help arrives. Remember: if you leave the shelter, we cannot find you to take you to safety." msgstr "" +"Добро пожаловать в Аварийное убежище для выживания. Мы надеемся, что ваше пребывание здесь будет коротким и комфортным. Предусмотрены аварийное одеяло, куртка повышенной заметности, противогаз, продовольствие и вода на один день, а также аварийная зажигалка и фонарик. В шкафах имеются дополнительные припасы, если на объекте превышена запланированная вместимость. Эти ресурсы проверяются и обновляются МЧС на регулярной основе, но если вы обнаружите, что некоторые предметы отсутствуют, обратитесь к инспектору МЧС при первой же возможности.\n" +"\n" +"Пожалуйста, подождите в убежище, пока не прибудет официальный транспорт для эвакуации, который отвезёт вас домой или, в случае серьезной катастрофы, к ближайшему пункту сбора при эвакуации.\n" +"\n" +"В случае, если вы были эвакуированы по причине боевых действий, МЧС рекомендует укрыться в подвале убежища, пока не прибудет помощь. Помните: если вы покинете убежище, мы не сможем найти вас, чтобы отвезти вас в безопасное место." #: lang/json/GENERIC_from_json.py msgid "leaf spring" @@ -49958,22 +51322,22 @@ msgstr[3] "маленькие танковые гусеницы" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "Маленькие танковые гусеницы, наподобие тех, что у мини-танка «Бигль»." -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "шасси турели" -msgstr[1] "шасси турели" -msgstr[2] "шасси турели" -msgstr[3] "шасси турели" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "внутреннее шасси турели" +msgstr[1] "внутренние шасси турели" +msgstr[2] "внутренних шасси турели" +msgstr[3] "внутренние шасси турели" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." +"skeleton of a turret." msgstr "" -"То, что останется, если удалить все движущиеся части и электронику. Скелет и" -" броня турели." +"То, что останется, если удалить все движущиеся части и электронику. Скелет " +"турели." #: lang/json/GENERIC_from_json.py msgid "tripod chassis" @@ -50213,7 +51577,7 @@ msgid "" "special feature, water from the RTG containment area can be used, giving the" " coffee a very special kick. The Curie-G is illegal in most countries." msgstr "" -"Кофейник Кюри-G от КаппаТех. Известный благодаря радиоактивному устройству, " +"Кофейник Кюри-G от КаппаТех. Знаменит благодаря радиоактивному устройству, " "нагревающему воду для кофе. Обычно вода нагревается посредством запасённой " "энергии и далее превращается в простой кофе. Однако специальной функцией " "можно использовать воду из камеры с РИТЭГ, что сделает кофе особенным. " @@ -50566,10 +51930,10 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "rising cream jar" msgid_plural "rising cream jars" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "банка готовящихся сливок" +msgstr[1] "банки готовящихся сливок" +msgstr[2] "банок готовящихся сливок" +msgstr[3] "банки готовящихся сливок" #. ~ Use action msg for rising cream jar. #: lang/json/GENERIC_from_json.py @@ -50577,11 +51941,13 @@ msgid "" "You examine the batch and see that the cream has risen to the top, so you " "seal the jar up for storage." msgstr "" +"Вы осматриваете банку и видите, что сливки готовы, поэтому закрываете банку " +"для хранения." #. ~ Use action not_ready_msg for rising cream jar. #: lang/json/GENERIC_from_json.py msgid "The cream has not risen yet." -msgstr "" +msgstr "Сливки ещё не готовы." #. ~ Description for rising cream jar #: lang/json/GENERIC_from_json.py @@ -50589,14 +51955,16 @@ msgid "" "This jar contains raw milk separating into cream. You can seal up the jar " "once the process is completed." msgstr "" +"Эта банка содержит свежее молоко, разделяющееся на сливки. Вы можете " +"закатать банку после завершения процесса." #: lang/json/GENERIC_from_json.py msgid "milk cream jar" msgid_plural "milk cream jars" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "банка молочных сливок" +msgstr[1] "банки молочных сливок" +msgstr[2] "банок молочных сливок" +msgstr[3] "банки молочных сливок" #. ~ Description for milk cream jar #: lang/json/GENERIC_from_json.py @@ -50604,6 +51972,8 @@ msgid "" "This jar contains raw milk separated into cream. It is sealed until you are" " ready to use it." msgstr "" +"Эта банка содержит сливки, сделанные из свежего молока. Она закатана до тех" +" пор, пока вы не будете готовы её использовать." #: lang/json/GENERIC_from_json.py msgid "fishing hook" @@ -52475,6 +53845,363 @@ msgstr[1] "сцепки патронной ленты .50" msgstr[2] "сцепок патронной ленты .50" msgstr[3] "сцепка патронной ленты .50" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "обычный шаблон предмета" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "мыльница" +msgstr[1] "мыльницы" +msgstr[2] "мыльниц" +msgstr[3] "мыльницы" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" +"Неглубокая чашка для хранения куска мыла. У неё есть отверстия, чтобы вода " +"стекала из чашки. Не самый впечатляющий предмет." + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "бритва" +msgstr[1] "бритвы" +msgstr[2] "бритв" +msgstr[3] "бритвы" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "Бритва с удобной ручкой. С ней бриться много проще." + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "зубная щётка" +msgstr[1] "зубные щётки" +msgstr[2] "зубных щёток" +msgstr[3] "зубные щётки" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "Пластиковая щетка с мягкой щетиной для чистки зубов." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" +"Пластиковая щетка с мягкой щетиной для чистки зубов. Она имеет дешевую " +"сменную ручку и, вероятно, предназначена для одноразового использования." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" +"Комбинированная зубная щетка с массажёром для дёсен. У неё эргономичная " +"силиконовая ручка. Роскошна!" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" +"Пластиковая щетка с мягкой щетиной для чистки зубов. Сине-белый узор на " +"ручке символизирует чистоту." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" +"Короткая зубная щетка, предназначенная для детей. На ручке у неё изображён " +"мультяшный пони с огромными глазами." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" +"Короткая зубная щетка, предназначенная для детей. На ручке у неё изображёна" +" ухмыляющаяся красная гоночная тачка." + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "расчёска" +msgstr[1] "расчёски" +msgstr[2] "расчёсок" +msgstr[3] "расчёски" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "Инструмент для укладки волос." + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" +"Инструмент для укладки волос. На кончиках имеются круглые защитные насадки." + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" +"Старомодное устройство для расчёсывания волос с ручкой из искусственного " +"дерева." + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" +"Мягенькая приятная расчёска. Выглядит современно,благодаря блестящему " +"хромированному дизайну." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" +"Аляповатая детская расчёстка. Мультяшный кит на ручке выглядит достаточно " +"дружелюбным." + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "бигуди" +msgstr[1] "бигуди" +msgstr[2] "бигуди" +msgstr[3] "бигуди" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" +"Мягкий пластиковый цилиндр, на который можно накрутить прядь волос, чтобы " +"завить их." + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "зубная нить" +msgstr[1] "зубные нити" +msgstr[2] "зубных нитей" +msgstr[3] "зубные нити" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" +"Почти двадцать три метра тонкой вощёной нити, намотанной на пластиковую " +"катушку. Идеально подходит для выковыривания кусочков копчёного мяса из " +"зубов. Разберите, чтобы использовать нить для чего-нибудь ещё." + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "гребень" +msgstr[1] "гребня" +msgstr[2] "гребней" +msgstr[3] "гребни" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "Инструмент с зубцами для ухода за волосами." + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "У этого, некогда первозданного, гребня отломано несколько зубцов." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "Инструмент с зубцами для ухода за волосами. Узкий, чёрный и строгий." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" +"Расчёска из мягкого пластика. Черепаховый рисунок заставляет её казаться " +"антикварной." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" +"Расчёска, которая складывается на шарнире, в случае, если вы хотите " +"выглядеть как бриолинщик." + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "вантуз" +msgstr[1] "вантуза" +msgstr[2] "вантузов" +msgstr[3] "вантузы" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" +"Инструмент с резиновым наконечником для прочистки труб или дубинка для " +"начинающего выжившего." + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "профессиональный вантуз" +msgstr[1] "профессиональных вантуза" +msgstr[2] "профессиональных вантузов" +msgstr[3] "профессиональные вантузы" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" +"Имеет полую пластиковую туалетную присоску, способную сжиматься как " +"гармошка. Он эффективен по своему прямому назначению и никуда не годен в " +"качестве оружия." + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "туалетная бумага" +msgstr[1] "туалетная бумага" +msgstr[2] "туалетная бумага" +msgstr[3] "рулоны туалетной бумаги" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "Роскошный пережиток цивилизации." + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" +"Представьте самую тонкую, самую одноразовую бумагу, которую вы могли бы " +"видеть. Теперь представьте что-нибудь ещё более тонкое." + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" +"Это стёганный двухслойный рулон туалетной бумаги. Выглядит очень неуместно " +"в разграбленных домах." + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "Эта марка туалетной бумаги полностью растворяется в воде!" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" +"На каждом отдельном листочке напечатано изображение вашего самого нелюбимого" +" политика." + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" +"Роскошный пережиток цивилизации. Хотя, особо не такой роскошный, благодаря " +"частичкам необработанных деревянных отходов." + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "фен" +msgstr[1] "фена" +msgstr[2] "фенов" +msgstr[3] "фены" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" +"Этот инструмент сушит волосы, пропуская воздух через горячую спираль. Без " +"действующей электросети — бесполезный хлам." + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "щипцы для завивки" +msgstr[1] "щипцы для завивки" +msgstr[2] "щипцов для завивки" +msgstr[3] "щипцы для завивки" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" +"Щипцы из термостойкой керамики. Когда они подключены к розетке, достаточно " +"нагреваются, чтобы завить волосы. Жаль, что нет электричества." + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "туалетный ёршик" +msgstr[1] "туалетных ёршика" +msgstr[2] "туалетных ёршиков" +msgstr[3] "туалетные ёршики" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" +"Зомби нельзя запугать или унизить, поэтому эта жесткая щётка полезна только " +"для чистки унитазов." + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -52640,17 +54367,53 @@ msgid "An empty casing from a 10mm Auto round." msgstr "Пустая гильза от патрона 10 мм Авто." #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "гильза 40 мм" -msgstr[1] "гильзы 40 мм" -msgstr[2] "гильз 40 мм" -msgstr[3] "гильза 40 мм" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "гильза 40x46 мм M212" +msgstr[1] "гильзы 40x46 мм M212" +msgstr[2] "гильз 40x46 мм M212" +msgstr[3] "гильзы 40x46 мм M212" + +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing +#: lang/json/GENERIC_from_json.py +msgid "A large canister from a spent 40mm cartridge." +msgstr "Большая гильза от стреляного 40 мм снаряда." + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "гильза 40x46 мм M118" +msgstr[1] "гильзы 40x46 мм M118" +msgstr[2] "гильз 40x46 мм M118" +msgstr[3] "гильзы 40x46 мм M118" -#. ~ Description for 40mm canister #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "Большая гильза от 40-мм гранаты." +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "гильза 40x46 мм M199" +msgstr[1] "гильзы 40x46 мм M199" +msgstr[2] "гильз 40x46 мм M199" +msgstr[3] "гильзы 40x46 мм M199" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "гильза 40x46 мм M195" +msgstr[1] "гильзы 40x46 мм M195" +msgstr[2] "гильз 40x46 мм M195" +msgstr[3] "гильзы 40x46 мм M195" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "гильза 40x53 мм M169" +msgstr[1] "гильзы 40x53 мм M169" +msgstr[2] "гильз 40x53 мм M169" +msgstr[3] "гильзы 40x53 мм M169" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -53083,9 +54846,9 @@ msgid "" "religious figure. On the back, there is a text that faintly reads 'New " "England Church Community'." msgstr "" -"Это маленькая картина размером с пластиковую карточку, с изображением " -"духовного лица. На обороте есть текст, который гласит «Церковное сообщество " -"Новой Англии»." +"Это маленькая картинка размером с пластиковую карточку с религиозным " +"образом. На обороте есть текст, который гласит «Церковное сообщество Новой " +"Англии»." #: lang/json/GENERIC_from_json.py msgid "generic silverware" @@ -53095,16 +54858,6 @@ msgstr[1] "обычного столового серебра" msgstr[2] "обычного столового серебра" msgstr[3] "обычное столовое серебро" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "обычный шаблон предмета" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -55573,9 +57326,9 @@ msgid "" "requires a larger baldric or scabbard, compared to smaller swords. It seems" " a bit too bendy." msgstr "" -"Это тонкий колющий меч, напоминающий длинный меч, своего рода предшественник" -" рапиры. Требует для ношения большую перевязь или ножны, по сравнению с " -"мечами меньших размеров. Довольно погнутый." +"Это тонкий колющий меч, своего рода предшественник рапиры. Требует для " +"ношения большую перевязь или ножны, по сравнению с мечами меньших размеров. " +"Довольно погнутый." #. ~ Description for estoc #: lang/json/GENERIC_from_json.py @@ -56464,7 +58217,7 @@ msgid "" "Stop giggling. This is a tiny plastic valve, get your mind out of the " "gutter." msgstr "" -"Хватит хихикать. Это маленький пластиковый клапан. Перестаньте думать ниже " +"Хватит хихикать. Это маленький пластиковый краник. Оставьте ваш юмор ниже " "пояса." #: lang/json/GENERIC_from_json.py @@ -56537,6 +58290,32 @@ msgstr "" "знанием дела скомпенсировано узелками, изолентой и прочими подручными " "средствами." +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "степлер" +msgstr[1] "степлера" +msgstr[2] "степлеров" +msgstr[3] "степлеры" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "Степлер для сшивания листов бумаги вместе." + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "ручка" +msgstr[1] "ручки" +msgstr[2] "ручек" +msgstr[3] "ручки" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "Пластиковая шариковая ручка." + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -58645,13 +60424,9 @@ msgstr[3] "Криптокоины" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" -"PrepNet активно участвовало в уклонении от уплаты налогов, используя " -"неотслеживаемые интернет-валюты. Если бы это движение выросло, оно могло бы " -"нанести ущерб налоговой базе США, но катаклизм случился первым. Это " -"материальные монеты с выбитыми на них последовательностями случайных чисел." #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py msgid "vehicle refrigerator" @@ -58821,15 +60596,90 @@ msgstr[3] "складные атомные маслобойки" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" -"Ривтех Чурминатор 4000 — единственная маслобойка, запрещенная 13 " -"религиозными сектами. Ножки в настоящее время сложены для транспортировки. В" -" отличие от стандартной маслобойки, в которой требуется сливки, эта " -"маслобойка требует только свежего молока, соли и здорового отношения к " -"светящимся объектам." #: lang/json/GENERIC_from_json.py msgid "hydraulic gauntlet" @@ -60812,7 +62662,7 @@ msgstr "Удлинить жезл" #. 'springstaves(baton)'}. #: lang/json/GENERIC_from_json.py msgid "You snap open your springstaff into staff mode." -msgstr "Вы удлинили жезлопосох, теперь это посох, поручик." +msgstr "Вы удлинили жезлопосох, теперь это посох." #. ~ Description for {'str': 'springstaff(baton)', 'str_pl': #. 'springstaves(baton)'} @@ -61372,8 +63222,8 @@ msgid "" "A long sucking apparatus harvested from stirge corpse. Makes a poor melee " "weapon." msgstr "" -"Длинный сосущий хоботок, срезанный с туловища кровопийцы. Годится для " -"создания скверного оружия ближнего боя." +"Длинный сосущий хоботок, срезанный с мёртвого кровопийцы. Посредственное " +"оружие." #: lang/json/GENERIC_from_json.py msgid "black dragon scale" @@ -61549,8 +63399,8 @@ msgid "" "legendary dragon, Fafnir. Once said to have cleaved Regin's anvil in half, " "the edge is impeccable." msgstr "" -"Грам, меч Сигурда. По слухам, этим мечом был убил легендарный дракон Фафнир." -" Так же говорят, что этот меч расколол наковальню Реджина пополам, лезвие " +"Грам, меч Сигурда. По слухам, этим мечом был убит легендарный дракон Фафнир." +" Говорят, когда-то этот меч рассёк пополам наковальню Регина. Лезвие " "безупречно." #: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py @@ -61607,9 +63457,24 @@ msgstr[3] "Свитки Невидимости" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." msgstr "" -"Свет не будет иметь с вами дело, если вы так захотите. Станьте невидимкой!" #: lang/json/GENERIC_from_json.py msgid "Scroll of Smite" @@ -62881,7 +64746,7 @@ msgid "" "short time." msgstr "" "Вы излучаете конусное рентгеновское поле, которое волшебным образом " -"позволяют вам увидеть эту область на короткое время." +"позволяет вам увидеть эту область на короткое время." #: lang/json/GENERIC_from_json.py msgid "Scroll of Clairvoyance" @@ -62913,8 +64778,8 @@ msgid "" "surrounded by hot, solid rock. It shatters upon impact, spraying shards of " "rock and lava everywhere." msgstr "" -"Земля разверзается под вами, чтобы запустить вулканическую бомбу: шар лавы, " -"окруженный горячей, твёрдой мантией. Он разрушается при попадании, " +"Вы раскалываете землю под собой, чтобы запустить вулканическую бомбу: шар " +"лавы, окруженный горячим твёрдым камнем. Он разрушается при попадании, " "разбрызгивая лаву и осколки камня повсюду." #: lang/json/GENERIC_from_json.py @@ -63106,6 +64971,19 @@ msgstr[3] "Невзрачная книга заклинаний" msgid "A small book, containing spells created by a novice magician." msgstr "Маленькая книжка с заклинаниями начинающего колдуна." +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -63330,6 +65208,53 @@ msgstr "" "разным заклинаниям, временно повышающим некоторые чувства в надежде отыскать" " более постоянное решение." +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -63774,11 +65699,9 @@ msgstr[3] "сломанный роботов-жуков (разоружено)" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "" -"Сломанный робот-жук. Его внутренние модули вооружения удалены. Можно " -"разобрать на запчасти или отремонтировать." #. ~ Description for broken skitterbot #: lang/json/GENERIC_from_json.py @@ -63806,11 +65729,9 @@ msgstr[3] "сломанный оборонный робот (разоружен #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Сломанный оборонный робот. Его внутренние модули вооружения удалены. Можно " -"разобрать на запчасти или отремонтировать." #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -63852,11 +65773,9 @@ msgstr[3] "сломанный робоцып (разоружено)" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Сломанный робоцып. Его внутренние модули вооружения удалены. Можно разобрать" -" на запчасти или отремонтировать." #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -64561,9 +66480,8 @@ msgstr[3] "сломанный мусорный ковбой" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "" -"Сломанный трофейный робот. Можно разобрать на запчасти или отремонтировать." #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -64600,11 +66518,9 @@ msgstr[3] "сломанный военный робот-тренер" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "" -"Сломанный военный робот-тренер. Теперь разбитый и неактивный. Вооружён " -"встроенным оружием для пейнтбола. Можно разобрать на запчасти." #: lang/json/GENERIC_from_json.py msgid "broken military robot" @@ -64617,56 +66533,44 @@ msgstr[3] "сломанный военный робот" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "" -"Сломанный военный робот. Теперь разбитый и неактивный. Вооружён встроенным " -"оружием 5,56 мм. Можно разобрать на запчасти." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "" -"Сломанный военный робот. Теперь разбитый и неактивный. Вооружён встроенным " -"оружием 7,62 мм. Можно разобрать на запчасти." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "" -"Сломанный военный робот. Теперь разбитый и неактивный. Вооружён встроенным " -"оружием .50 калибра. Можно разобрать на запчасти." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "" -"Сломанный военный робот. Теперь разбитый и неактивный. Вооружён встроенным " -"оружием 8х40 мм. Можно разобрать на запчасти." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "" -"Сломанный военный робот. Теперь разбитый и неактивный. Вооружён встроенным " -"оружием флешетты. Можно разобрать на запчасти." #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "" -"Сломанный военный робот. Теперь разбитый и неактивный. Вооружён встроенным " -"гранатомётом 40 мм. Можно разобрать на запчасти." #: lang/json/GENERIC_from_json.py msgid "broken military flame robot" @@ -64679,11 +66583,9 @@ msgstr[3] "сломанный военный робот-огнемётчик" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "" -"Сломанный военный робот. Теперь разбитый и неактивный. Вооружён встроенным " -"огнемётом. Можно разобрать на запчасти." #: lang/json/GENERIC_from_json.py msgid "broken robo-guardian" @@ -64698,8 +66600,10 @@ msgstr[3] "сломанные роботы-стражи" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "" "Сломанный трофейный робот. Можно разобрать на запчасти или отремонтировать." @@ -64713,9 +66617,8 @@ msgstr[3] "сломанный робот-делюкс" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "" -"Сломанный робот-делюкс. Можно разобрать на запчасти или отремонтировать." #: lang/json/GENERIC_from_json.py msgid "broken robo-protector" @@ -64744,11 +66647,9 @@ msgstr[3] "сломанный улучшенный робот (разоруже #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "" -"Сломанный улучшенный робот. Его внутренние модули вооружения удалены. Можно " -"разобрать на запчасти или отремонтировать." #: lang/json/GENERIC_from_json.py msgid "broken advanced robot" @@ -64761,38 +66662,30 @@ msgstr[3] "сломанный улучшенный робот" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "" -"Сломанный улучшенный робот. Вооружён встроенным лазерным излучателем. Можно " -"разобрать на запчасти." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "" -"Сломанный улучшенный робот. Вооружён встроенным плазменным излучателем. " -"Можно разобрать на запчасти." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "" -"Сломанный улучшенный робот. Вооружён встроенным электро излучателем. Можно " -"разобрать на запчасти." #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "" -"Сломанный улучшенный робот. Вооружён встроенным ЭМИ излучателем. Можно " -"разобрать на запчасти." #: lang/json/GENERIC_from_json.py msgid "broken glittering lady" @@ -64823,11 +66716,9 @@ msgstr[3] "сломанные цепные ужасы" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "" -"Сломанный трофейный робот. Слава богу, наконец он мёртв. Можно разобрать на " -"запчасти или отремонтировать." #: lang/json/GENERIC_from_json.py msgid "broken screeching terror" @@ -64853,13 +66744,6 @@ msgstr[1] "сломанных кулачных короля" msgstr[2] "сломанных кулачных королей" msgstr[3] "сломанный кулачный король" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "" -"Сломанный трофейный робот. Можно разобрать на запчасти или отремонтировать." - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -65018,17 +66902,8 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." -msgstr "" -"Эта аморфная масса, похоже, окончательно развилась; её усовершенствованные " -"внутренние структуры свидетельствуют об этом. Способна к передвижению " -"благодаря внутреннему гидравлическому давлению, способна двигать большие " -"грузы, и, показывая поразительный интеллект, способна управлять чем-либо " -"основанным на структуре сгустков, к чему присоединится или иным способом, с " -"помощью длинных ложноножек. Вы думаете, что смогли бы управлять этим, и " -"через него, всеми присоединёнными частями. Хотя сделав это, вы должны будете" -" присоединить себя тоже к общей массе; вам это кажется расслабляюще " -"желанным, вы мечтаете слиться в одно целое…" +"you…" +msgstr "" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -65095,6 +66970,14 @@ msgstr "" "возможности поворачиваться за солнцем. Однако конструкция становится " "непомерно тяжёлой." +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "шасси турели" +msgstr[1] "шасси турели" +msgstr[2] "шасси турели" +msgstr[3] "шасси турели" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -65157,13 +67040,9 @@ msgstr[3] "стабилизированные порталы" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"По мере того, как вы всматриваетесь в кажущиеся бесконечными глубины этой " -"портативной дыры в реальности, фраза из давно ушедших времен всплывает в " -"вашем мозгу: «Есть две бесконечные вещи: вселенная и человеческая " -"клептомания»." #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -65364,7 +67243,7 @@ msgstr "Предметы: огнестр. оружие" #. ~ Description for Loot: Guns #: lang/json/LOOT_ZONE_from_json.py msgid "Destination for guns, bows and similar wearpons." -msgstr "Место для оружия, луков и прочих похожих штук." +msgstr "Место для огнестрельного оружия, луков и прочих похожих предметов." #: lang/json/LOOT_ZONE_from_json.py msgid "Loot: Magazines" @@ -65467,7 +67346,7 @@ msgstr "Предметы: бионика" #. ~ Description for Loot: Bionics #: lang/json/LOOT_ZONE_from_json.py msgid "Destination for Compact Bionics Modules, a.k.a. CBMS." -msgstr "Место для Компактных Бионических Модулей, аки КБМ." +msgstr "Место для Компактных Бионических Модулей, или КБМ." #: lang/json/LOOT_ZONE_from_json.py msgid "Loot: V.Parts" @@ -66443,7 +68322,7 @@ msgstr "" #: lang/json/MAGAZINE_from_json.py msgid "HK417 magazine" -msgstr "магазин HK417" +msgstr "HK417 магазин" #. ~ Description for HK417 magazine #: lang/json/MAGAZINE_from_json.py @@ -66452,7 +68331,7 @@ msgstr "Двухрядный коробчатый магазин на 20 пат #: lang/json/MAGAZINE_from_json.py msgid "HK417 compact magazine" -msgstr "компактный магазин HK417" +msgstr "HK417 компактный магазин" #. ~ Description for HK417 compact magazine #: lang/json/MAGAZINE_from_json.py @@ -66476,7 +68355,7 @@ msgstr "" #: lang/json/MAGAZINE_from_json.py msgid "AR-10 magazine" -msgstr "магазин AR-10" +msgstr "AR-10 магазин" #. ~ Description for AR-10 magazine #: lang/json/MAGAZINE_from_json.py @@ -66588,6 +68467,17 @@ msgstr "" "Эта обойма вмещает 5 патронов калибра .357 Магнум или .38 Особый и позволяет" " быстро перезаряжать барабан револьвера." +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "Kel-Tec P3AT магазин" @@ -66660,6 +68550,17 @@ msgstr "" "Компактный стальной коробчатый магазин на 6 патронов для использования с " "пистолетом Taurus Spectrum." +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "AF2011A1 магазин" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "M1991 .38 Супер магазин" @@ -67007,11 +68908,9 @@ msgstr ".454 обойма на 5 патронов" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." msgstr "" -"Эта обойма для быстрой перезарядки совместимого револьвера вмещает 5 " -"патронов калибра .454 или .45 Кольт." #: lang/json/MAGAZINE_from_json.py msgid "H&K 4.6mm extended magazine" @@ -67567,7 +69466,7 @@ msgstr "" #: lang/json/MAGAZINE_from_json.py msgid "P320 9x19mm magazine" -msgstr "P320 9x19mm магазин" +msgstr "P320 9x19 мм магазин" #. ~ Description for P320 9x19mm magazine #: lang/json/MAGAZINE_from_json.py @@ -67576,7 +69475,7 @@ msgstr "Двухрядный коробчатый магазин на 17 пат #: lang/json/MAGAZINE_from_json.py msgid "Hi-Power 9x19mm 13-round magazine" -msgstr "Hi-Power 9x19mm магазин на 13 патронов" +msgstr "Hi-Power 9x19 мм магазин на 13 патронов" #. ~ Description for Hi-Power 9x19mm 13-round magazine #: lang/json/MAGAZINE_from_json.py @@ -67586,7 +69485,7 @@ msgstr "" #: lang/json/MAGAZINE_from_json.py msgid "Hi-Power 9x19mm 15-round magazine" -msgstr "Hi-Power 9x19mm магазин на 15 патронов" +msgstr "Hi-Power 9x19 мм магазин на 15 патронов" #. ~ Description for Hi-Power 9x19mm 15-round magazine #: lang/json/MAGAZINE_from_json.py @@ -67605,7 +69504,7 @@ msgstr "Стальной коробчатый магазин на 8 патрон #: lang/json/MAGAZINE_from_json.py msgid "PPQ 9x19mm 10-round magazine" -msgstr "PPQ 9x19mm магазин на 10 патронов" +msgstr "PPQ 9x19 мм магазин на 10 патронов" #. ~ Description for PPQ 9x19mm 10-round magazine #: lang/json/MAGAZINE_from_json.py @@ -67614,7 +69513,7 @@ msgstr "Стальной коробчатый магазин на 10 патро #: lang/json/MAGAZINE_from_json.py msgid "PPQ 9x19mm 15-round magazine" -msgstr "PPQ 9x19mm магазин на 15 патронов" +msgstr "PPQ 9x19 мм магазин на 15 патронов" #. ~ Description for PPQ 9x19mm 15-round magazine #: lang/json/MAGAZINE_from_json.py @@ -67623,7 +69522,7 @@ msgstr "Стальной коробчатый магазин на 15 патро #: lang/json/MAGAZINE_from_json.py msgid "PPQ 9x19mm 17-round magazine" -msgstr "PPQ 9x19mm магазин на 17 патронов" +msgstr "PPQ 9x19 мм магазин на 17 патронов" #. ~ Description for PPQ 9x19mm 17-round magazine #: lang/json/MAGAZINE_from_json.py @@ -68408,13 +70307,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"Загадка природы, этот сгусток слизи развил в себе способность медленно " -"вырабатывать электричество, благодаря какому-то неизвестному процессу. При " -"этом он излучает слабое фосфоресцирующие свечение. Он также способен " -"сохранять электроэнергию от других источников, но это делает его неактивным." -" Он выглядит достаточно податливым, чтобы его разорвать…" #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -68472,26 +70366,6 @@ msgstr "" msgid "pebble hopper" msgstr "бункер для гальки" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "AF2011A1 магазин" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "" -"Два магазина, прикреплённых к общему основанию. Только для пистолета " -"AF2011A1." - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "M1991A1 .38 Супер магазин" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "Магазин на 9 патронов для пистолета M1991A1 .38 Супер." - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "по умолчанию" @@ -68730,11 +70604,9 @@ msgstr "Больше зданий Фуджи" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" msgstr "" -"Добавляет больше зданий и вариантов существующих построек. (Требует мод " -"Больше локаций)" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -68757,7 +70629,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -68791,12 +70663,9 @@ msgstr "Гидропоника" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "" -"Добавляет блок гидропоники — место, в котором раз в сезон можно выращивать " -"урожай. Иногда попадается в лабораториях или подвалах. Или постройте его " -"сами." #: lang/json/MOD_INFO_from_json.py msgid "Mythical Martial Arts" @@ -68899,10 +70768,8 @@ msgstr "NPC-мутанты" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" +"included. Beware!" msgstr "" -"Неигровые персонажи, включая недружественных, могут иметь мутации. " -"Берегитесь!" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -68911,12 +70778,9 @@ msgstr "Мой Сладкий Катаклизм" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" msgstr "" -"Катаклизм и так хорош, но почему бы его не подсластить? Как насчёт погулять " -"по миру в виде сахарной фигурки с питомцем-вафелькой?" #: lang/json/MOD_INFO_from_json.py msgid "NPC traits" @@ -69235,11 +71099,9 @@ msgstr "Безглютеновые рецепты от Бена" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "" -"Несколько опций альтернативных простых рецептов без глютена и без лактозы. " -"НЕ ПОЛНЫЙ СПИСОК." #: lang/json/MOD_INFO_from_json.py msgid "Tough Zombies" @@ -69275,12 +71137,9 @@ msgstr "Альтернативные символы карты" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." msgstr "" -"Делает глобальную карту более читабельной. Строения окрашиваются в " -"зависимости от их типа и используют первую букву своего названия вместо " -"^v<>." #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -69434,11 +71293,9 @@ msgstr "значок видит-ли-игрока, HitButton_iso" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" -"Добавляет значок-индикатор, если существо видит игрока. Для изометрического " -"тайлсета HitButton." #: lang/json/MOD_INFO_from_json.py msgid "sees-player icon, +attitude" @@ -69448,10 +71305,8 @@ msgstr "значок видит-ли-игрока, +отношение" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" -"Добавляет значок с отношением, если существо видит игрока, и значок мыслей, " -"если нет. Для тайлсета Live/Dead people." #: lang/json/MOD_INFO_from_json.py msgid "sees-player icon, -attitude" @@ -69461,10 +71316,8 @@ msgstr "значок видит-ли-игрока, -отношение" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" -"Добавляет значок с отношением, если существо видит игрока, и ничего, если " -"нет. Для тайлсета Live/Dead people." #: lang/json/MOD_INFO_from_json.py msgid "sees-player icon, retrodays" @@ -69473,11 +71326,9 @@ msgstr "значок видит-ли-игрока, retrodays" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" -"Добавляет значок, если существо видит игрока. Предназначен для тайлсета " -"retrodays." #: lang/json/MOD_INFO_from_json.py msgid "SpeedyDex" @@ -69564,11 +71415,8 @@ msgstr[3] "утки" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." msgstr "" -"Обычная кряква, каких часто можно наблюдать рядом с реками и другими " -"водоёмами. Питается в основном насекомыми, корешками и (до Катаклизма) " -"кусочками хлеба." #: lang/json/MONSTER_from_json.py msgid "goose" @@ -70556,10 +72404,8 @@ msgstr[3] "карпы" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" -"Золотистый обыкновенный карп. Вкус его мяса нравится не всем, но после " -"катаклизма не приходится воротить нос." #: lang/json/MONSTER_from_json.py msgid "grass carp" @@ -70752,7 +72598,7 @@ msgstr[1] "бегущих чумы" msgstr[2] "бегущих чумы" msgstr[3] "бегущая чума" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "Гигантский заражённый таракан, пожирающий трупы нежити." @@ -70765,7 +72611,7 @@ msgstr[1] "личинки чумы" msgstr[2] "личинок чумы" msgstr[3] "личинки чумы" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "Заражённый таракан-мутант размером с крысу." @@ -70778,7 +72624,7 @@ msgstr[1] "переносчика чумы" msgstr[2] "переносчиков чумы" msgstr[3] "переносчики чумы" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -70809,7 +72655,7 @@ msgstr[1] "личинки гигантского таракана" msgstr[2] "личинок гигантского таракана" msgstr[3] "личинки гигантского таракана" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "Детёныш мутировавшего таракана размером с крысу." @@ -70839,7 +72685,7 @@ msgstr[1] "гигантских пчелы" msgstr[2] "гигантских пчёл" msgstr[3] "гигантские пчёлы" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -70856,7 +72702,7 @@ msgstr[1] "гигантских многоножки" msgstr[2] "гигантских многоножек" msgstr[3] "гигантские многоножки" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -70907,7 +72753,7 @@ msgstr[1] "гигантских комара" msgstr[2] "гигантских комаров" msgstr[3] "гигантские комары" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -70924,7 +72770,7 @@ msgstr[1] "гигантских подвальных паука" msgstr[2] "гигантских подвальных пауков" msgstr[3] "гигантские подвальные пауки" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -70943,7 +72789,7 @@ msgstr[1] "молодых гигантских подвальных паука" msgstr[2] "молодых гигантских подвальных пауков" msgstr[3] "молодые гигантские подвальные пауки" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -70961,7 +72807,7 @@ msgstr[1] "гигантских паука-скакуна" msgstr[2] "гигантских пауков-скакунов" msgstr[3] "гигантские пауки-скакуны" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -70978,7 +72824,7 @@ msgstr[1] "гигантских паука-гнездовика" msgstr[2] "гигантских пауков-гнездовиков" msgstr[3] "гигантские пауки-гнездовики" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -70995,7 +72841,7 @@ msgstr[1] "гигантских паука-ткача" msgstr[2] "гигантских пауков-ткачей" msgstr[3] "гигантские пауки-ткачи" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -71012,7 +72858,7 @@ msgstr[1] "грибных паука" msgstr[2] "грибных пауков" msgstr[3] "грибные пауки" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -71031,7 +72877,7 @@ msgstr[1] "молодых гигантских паука-ткача" msgstr[2] "молодых гигантских пауков-ткачей" msgstr[3] "молодые гигантские пауки-ткачи" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -71048,7 +72894,7 @@ msgstr[1] "гигантских чёрных вдовы" msgstr[2] "гигантских чёрных вдов" msgstr[3] "гигантские чёрные вдовы" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -71063,7 +72909,7 @@ msgstr[1] "молодых гигантских чёрных вдовы" msgstr[2] "молодых гигантских чёрных вдов" msgstr[3] "молодые гигантские чёрные вдовы" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -71080,7 +72926,7 @@ msgstr[1] "гигантских паука-волка" msgstr[2] "гигантских пауков-волков" msgstr[3] "гигантские пауки-волки" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -71097,7 +72943,7 @@ msgstr[1] "гигантских осы" msgstr[2] "гигантских ос" msgstr[3] "гигантские осы" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -71114,7 +72960,7 @@ msgstr[1] "дерматика" msgstr[2] "дерматиков" msgstr[3] "дерматики" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -71146,7 +72992,7 @@ msgstr[1] "гигантских муравья" msgstr[2] "гигантских муравьёв" msgstr[3] "гигантские муравьи" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -71163,7 +73009,7 @@ msgstr[1] "гигантских кислотных муравья" msgstr[2] "гигантских кислотных муравьёв" msgstr[3] "гигантские кислотные муравьи" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -71199,7 +73045,7 @@ msgstr[1] "матки кислотных муравьёв" msgstr[2] "маток кислотных муравьёв" msgstr[3] "матки кислотных муравьёв" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -71218,7 +73064,7 @@ msgstr[1] "кислотных муравья-солдата" msgstr[2] "кислотных муравьёв-солдат" msgstr[3] "кислотные муравьи-солдаты" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -71237,7 +73083,7 @@ msgstr[1] "грибных муравья" msgstr[2] "грибных муравьёв" msgstr[3] "грибные муравьи" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -71272,7 +73118,7 @@ msgstr[1] "муравьиных матки" msgstr[2] "муравьиных маток" msgstr[3] "муравьиные матки" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -71290,7 +73136,7 @@ msgstr[1] "муравья-солдата" msgstr[2] "муравьёв-солдат" msgstr[3] "муравьи-солдаты" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -71307,7 +73153,7 @@ msgstr[1] "гигантской саранчи" msgstr[2] "гигантской саранчи" msgstr[3] "гигантская саранча" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -71324,7 +73170,7 @@ msgstr[1] "личинки саранчи" msgstr[2] "личинок саранчи" msgstr[3] "личинки саранчи" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -72430,7 +74276,7 @@ msgstr[1] "фанатика Марло" msgstr[2] "фанатиков Марло" msgstr[3] "фанатики Марло" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " @@ -72439,7 +74285,7 @@ msgstr "" "Её глаза пусты, изо рта капает пена, она бормочет гимны в религиозном " "экстазе." -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -72456,7 +74302,7 @@ msgstr[1] "Меха-Разведчика Х-03: 'Призрак'" msgstr[2] "Мехов-Разведчиков Х-03: 'Призрак'" msgstr[3] "Мехи-Разведчики Х-03: 'Призрак'" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -72484,7 +74330,7 @@ msgstr[1] "Боевых Меха Х-02 'Пехотинец'" msgstr[2] "Боевых Мехов Х-02 'Пехотинец'" msgstr[3] "Боевые Мехи Х-02 'Пехотинец'" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -72509,7 +74355,7 @@ msgstr[1] "Меха-Погрузчика Х-01: 'Силач'" msgstr[2] "Мехов-Погрузчиков Х-01: 'Силач'" msgstr[3] "Мехи-Погрузчики Х-01: 'Силач'" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -72534,7 +74380,7 @@ msgstr[1] "ми-го" msgstr[2] "ми-го" msgstr[3] "ми-го" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -72558,7 +74404,7 @@ msgstr[1] "поработителя ми-го" msgstr[2] "поработителей ми-го" msgstr[3] "поработители ми-го" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -72584,7 +74430,7 @@ msgstr[1] "хирурга ми-го" msgstr[2] "хирургов ми-го" msgstr[3] "хирурги ми-го" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -72603,7 +74449,7 @@ msgstr[1] "охранника ми-го" msgstr[2] "охранников ми-го" msgstr[3] "охранники ми-го" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -72627,7 +74473,7 @@ msgstr[1] "стража ми-го" msgstr[2] "стражей ми-го" msgstr[3] "стражи ми-го" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -72652,7 +74498,7 @@ msgstr[1] "разведчика ми-го" msgstr[2] "разведчиков ми-го" msgstr[3] "разведчики ми-го" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -74427,10 +76273,10 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "wretched puker" msgid_plural "wretched pukers" -msgstr[0] "убогая задница" -msgstr[1] "убогие задницы" -msgstr[2] "убогих задниц" -msgstr[3] "убогие задницы" +msgstr[0] "убогий блевун" +msgstr[1] "убогих блевуна" +msgstr[2] "убогих блевунов" +msgstr[3] "убогие блевуны" #. ~ Description for wretched puker #: lang/json/MONSTER_from_json.py @@ -74439,8 +76285,8 @@ msgid "" "materials have unified into its skin and wounds around it reeks in black " "goo." msgstr "" -"Выродившийся труп, дрожащий во время ходьбы. Мусор и рухлядь прилипли к его " -"коже, а раны вокруг пахнут черной липкостью." +"Разлагающийся труп, трясущийся при ходьбе. В его кожу глубоко вросли мусор и" +" отбросы, а из ран сочится чёрная слизь." #: lang/json/MONSTER_from_json.py msgid "acidic zombie" @@ -74703,6 +76549,21 @@ msgstr "" "человеческие уши. Спереди есть тонкие щели — вероятно, зомби способен " "видеть." +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -75551,7 +77412,7 @@ msgstr[1] "экспериментальных мутанта" msgstr[2] "экспериментальных мутантов" msgstr[3] "экспериментальные мутанты" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -75560,7 +77421,7 @@ msgid "" "humanity." msgstr "" "Бесформенная смесь человека и животного. Безобразная фигура в рваном " -"комбинезоне, покрытое мехом. Зловещие клыки, когти и безумие в тусклых " +"комбинезоне, покрытая мехом. Зловещие клыки, когти и безумие в тусклых " "жёлтых глазах — свидетельства, что в нём не осталось ничего человеческого." #: lang/json/MONSTER_from_json.py @@ -75571,7 +77432,7 @@ msgstr[1] "эволюционировавших мутанта" msgstr[2] "эволюционировавших мутантов" msgstr[3] "эволюционировавшие мутанты" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -76141,15 +78002,10 @@ msgstr[3] "автономные M2HB CROWS II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" -"Система дистанционного управления огнём от M153 CROWS II, улучшенная " -"автономным программным обеспечением. До катаклизма в американской армии были" -" тысячи таких систем, и их ценили за возможность вести бой с чем угодно " -"вплоть до лёгкой бронетехники без риска для оператора. Этот экземпляр " -"оснащён M2HB." #: lang/json/MONSTER_from_json.py msgid "M249 autonomous CROWS II" @@ -76164,14 +78020,9 @@ msgstr[3] "автономные M249 CROWS II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" -"Система дистанционного управления огнём от M153 CROWS II, улучшенная " -"автономным программным обеспечением. До катаклизма в американской армии были" -" тысячи таких систем, и их ценили за возможность вести бой с чем угодно " -"вплоть до лёгкой бронетехники без риска для оператора. Этот экземпляр " -"оснащён M249." #: lang/json/MONSTER_from_json.py msgid "M240 autonomous CROWS II" @@ -76186,14 +78037,9 @@ msgstr[3] "автономные M240 CROWS II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" -"Система дистанционного управления огнём от M153 CROWS II, улучшенная " -"автономным программным обеспечением. До катаклизма в американской армии были" -" тысячи таких систем, и их ценили за возможность вести бой с чем угодно " -"вплоть до лёгкой бронетехники без риска для оператора. Этот экземпляр " -"оснащён M240." #: lang/json/MONSTER_from_json.py msgid "anklebiter" @@ -76677,7 +78523,7 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -76694,7 +78540,23 @@ msgstr[3] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -77180,13 +79042,10 @@ msgstr[3] "некроморфы-мечники" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "" -"Ужасно изуродованное человеческое тело. Его руки подняты наготове над " -"головой, из них растут два здоровенных клинка. Существо крадётся с какой-то " -"жуткой целью." #: lang/json/MONSTER_from_json.py msgid "Weak Slasher Necromorph" @@ -77199,14 +79058,11 @@ msgstr[3] "слабые некроморфы-мечники" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" -"Ужасно изуродованное человеческое тело. Из его рук только-только выросли два" -" тонких клинка. Из-за кошмарной пасти без челюсти и зияющей дырки во лбу у " -"вас мурашки по коже. Существо ковыляет медленно и неуклюже." #: lang/json/MONSTER_from_json.py msgid "Waster Necromorph" @@ -77220,12 +79076,9 @@ msgstr[3] "токсичные некроморфы" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" -"Существо в тяжёлой штурмовой броне. Зловещий зелёный свет струится под " -"шлемом из запавших глазниц и разинутого рта. Из его рук растут странные " -"заострённые шипы, так что с этим противником стоит считаться." #: lang/json/MONSTER_from_json.py msgid "Leaper Necromorph" @@ -77239,14 +79092,10 @@ msgstr[3] "некроморфы-прыгуны" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" -"В этом существе едва можно узнать когда-то человеческое тело. Оно ползает на" -" брюхе и с невероятной силой прыгает вперёд. На непрестанно рычащем " -"изуродованном лице видны длинные клыки, способные легко разрывать плоть. " -"Нижняя половина тела слилась в большой шипастый хвост." #: lang/json/MONSTER_from_json.py msgid "Twitcher Necromorph" @@ -77260,14 +79109,10 @@ msgstr[3] "судорожные некроморфы" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" -"Этот труп спастически перемещается взад и вперёд с удивительной скоростью, " -"из его ладоней растут узкие лезвия. Он держится довольно прямо, когда " -"спокоен, и при внимательном рассмотрении заметно, что он когда-то был " -"оператором Прибора О.Т.П К.Р.И.Т." #: lang/json/MONSTER_from_json.py msgid "Pack Necromorph" @@ -77280,15 +79125,11 @@ msgstr[3] "стайные некроморфы" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" -"Визжащий мутировавший ребёнок-лицо. Его лицо почти пустое, за исключением " -"затёкших глаз и разинутого рта с болтающимися по бокам кусками плоти. Из его" -" плеч тянутся бесполезные на вид отростки, оканчивающиеся в руках с острыми " -"когтями." #: lang/json/MONSTER_from_json.py msgid "Puker Necromorph" @@ -77301,16 +79142,12 @@ msgstr[3] "некроморфы-блевуны" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" -"Весьма искалеченный труп, покрытый зияющими язвами. Его болтающиеся руки с " -"давно отвалившимися кистями покрыты зазубринами, способными легко проткнуть " -"вашу плоть. Липкая пенящаяся жёлтая слизь течёт из его открытых внутренних " -"органов по направлению к челюсти и с шипением капает на землю." #: lang/json/MONSTER_from_json.py msgid "Animate Arm" @@ -77323,11 +79160,9 @@ msgstr[3] "ожившие руки" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" -"Оторванная рука, медленно ползущая вперёд. Время от времени из обрубка " -"вырываются дико машущие щупальца." #: lang/json/MONSTER_from_json.py msgid "Dullahan" @@ -77340,23 +79175,18 @@ msgstr[3] "Дуллаханы" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" -"Медленно ковыляющее безголовое тело. Этот страшный труп одет в узорчатый " -"доспех и бредёт со зловещей уверенностью. Из его правой руки проросло " -"длинное щупальце, злобно размахивающее в воздухе." #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" -"Человеческое тело с бледно-синей плотью, по которому бегают разряды " -"электрического тока. Страстно жаждущий сказать вам кое-что." #: lang/json/MONSTER_from_json.py msgid "mr skeltal" @@ -77370,12 +79200,9 @@ msgstr[3] "Мистеры Дудцы" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" -"У этого ходячего скелета нет ни плоти, ни органов, и он пугает вас до " -"костей. В своей костлявой руке он держит исправную духовую трубу, уцелевшую " -"в апокалипсисе." #: lang/json/MONSTER_from_json.py msgid "minion of skeltal" @@ -77403,10 +79230,8 @@ msgstr[3] "дымчатые медведи" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "" -"Дымящая оболочка это всё, что осталось от некогда гордого медведя. Его " -"чёрные глаза смотрят на вас со злобой… и голодом." #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -77805,6 +79630,97 @@ msgstr "" "злобным зелёным светом. Его морда напоминает череп, а с кинжалоподобных " "клыков капает кислота." +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -77866,10 +79782,10 @@ msgid "" "liquid, and the weirdly humanoid figure is covered in sharp blue-black " "triangular plates." msgstr "" -"Зловещий глаз выглядывает из темноты, и его свет намекает на странный ум и " -"нервирующую недоброжелательность Глаз сочится какой-то розоватой жидкостью, " -"а странная гуманоидная фигура покрыта острыми сине-черными треугольными " -"пластинками." +"Крупный зловещий глаз выглядывает из темноты, его свечение намекает на " +"странный разум и тревожащую недоброжелательность Глаз сочится какой-то " +"розоватой жидкостью, а странно гуманоидное тело покрыто острыми сине-чёрными" +" треугольными пластинками." #. ~ Attack message of monster "krabgek"'s spell "necrotic_gaze" #: lang/json/MONSTER_from_json.py @@ -77939,8 +79855,8 @@ msgid "" "Monstrous, green-skinned humanoid. Trolls are renowned for their thick " "hides and natural regenerative ability." msgstr "" -"Чудовищный зеленокожий гуманоид. Тролли известны толстой шкурой и " -"естественной способностью к регенерации." +"Чудовищный зеленокожий гуманоид. Тролли известны толстой шкурой и природной " +"способностью к регенерации." #: lang/json/MONSTER_from_json.py msgid "stirge" @@ -78469,12 +80385,9 @@ msgstr[3] "оборонные роботы" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" -"Автоматический оборонный робот, всё ещё активен, благодаря своему " -"внутреннему источнику питания. Вооружён электрическим оружием и встроенным " -"огнестрельным оружием 9 мм." #: lang/json/MONSTER_from_json.py msgid "security robot" @@ -78487,11 +80400,9 @@ msgstr[3] "робохранники" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" -"Автоматический оборонный робот, всё ещё активен, благодаря своему " -"внутреннему источнику питания. Вооружён встроенным оружием 9 мм." #: lang/json/MONSTER_from_json.py msgid "riotcontrol robot" @@ -78504,13 +80415,10 @@ msgstr[3] "роботы осназа" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" -"Автоматический оборонный робот, всё ещё активен, благодаря своему " -"внутреннему источнику питания. Вооружён электрическим оружием, распылителем " -"слезоточивого газа и встроенным 40-мм гранатомётом с шумовыми гранатами." #: lang/json/MONSTER_from_json.py msgid "necco" @@ -78960,13 +80868,9 @@ msgstr[3] "автоклавы" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" -"Восстановленный хозяйственный робот, переоборудованный в вакуумный " -"очиститель. Он всасывает в себя вещи с земли и растворяет их с помощью своих" -" запасов кислоты. Эффективный помощник в вопросе содержания вашего двора " -"чистым от мусора… или трупов." #: lang/json/MONSTER_from_json.py msgid "bee bot" @@ -79037,11 +80941,9 @@ msgstr[3] "эликсираторы" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" -"Это больше не работает. Не стройте это… Отремонтированный медбот со своим " -"личным производством лекарств, переделанный под производство мутагена." #: lang/json/MONSTER_from_json.py msgid "party bot" @@ -80783,6 +82685,17 @@ msgstr "Ослепляющая вспышка" msgid "Ethereal Grasp" msgstr "Эфирная хватка" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "Защитная аура" @@ -81224,6 +83137,29 @@ msgstr "" "Этот ритуал создаёт маленький камешек, наполненный магией кельвинистов. Эту " "руну можно применять в рецептах как катализатор." +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "Волшебная ракета" @@ -82182,8 +84118,8 @@ msgid "" "A featureless, disc-shaped device mounted on a harness. The words " "\"X.E.D.R.A\" and \"5-point anchor\" are inscribed on its front and back." msgstr "" -"Безликое дискообразное устройство, установленное на жгуте. Слова «X.E.D.R.A»" -" и «5-точечный якорь» нанесены на его передней и задней части." +"Невзрачное дисковидное устройство, прикреплённое к лямкам. Спереди и сзади " +"написано «X.E.D.R.A» и «5-точечный якорь»." #: lang/json/TOOL_ARMOR_from_json.py msgid "5-point anchor (on)" @@ -82205,8 +84141,8 @@ msgid "" "The harness' shoulder mounted LED glows with a soft green hue. Theres no " "further indication of anything happening." msgstr "" -"Светодиодный индикатор подвески на плечах светится мягким зеленым оттенком. " -"Нет никаких признаков того, что что-то происходит." +"Светодиодный индикатор на плече горит мягким зелёным светом. Больше ничего " +"не указывает, что что-то происходит." #: lang/json/TOOL_ARMOR_from_json.py msgid "phase immersion suit" @@ -82241,11 +84177,11 @@ msgid "" "unparalleled environmental protection, both in this Earth and beyond. Use " "it to turn it on." msgstr "" -"Этот продвинутый костюм, покрытый взаимосвязанными пластинами из " -"светоотражающего металла, напоминает как броню, так и скафандр астронавта. " -"Разработанный, чтобы защитить своего владельца в других измерениях, он " -"обладает беспрецедентной защитой от окружающей среды, как на Земле, так и за" -" ее пределами. Используйте его, чтобы включить." +"Этот продвинутый костюм, покрытый сцепленными пластинами из блестящего " +"металла, одновременно похож на латный доспех и космический скафандр. " +"Разработанный для защиты своего владельца в других измерениях, он обладает " +"беспрецедентной защитой от окружающей среды, как на Земле, так и за ее " +"пределами. Используйте его, чтобы включить." #: lang/json/TOOL_ARMOR_from_json.py msgid "phase immersion suit (on)" @@ -82267,9 +84203,9 @@ msgid "" "resembles both plate armor and an astronaut's spacesuit. It is turned on, " "and continually draining power. Use it to turn it off." msgstr "" -"Этот продвинутый костюм, покрытый взаимосвязанными пластинами из " -"светоотражающего металла, напоминает как броню, так и скафандр астронавта. " -"Он включен и постоянно тратит энергию. Используйте его, чтобы выключить." +"Этот продвинутый костюм, покрытый сцепленными пластинами из блестящего " +"металла, одновременно похож на латный доспех и космический скафандр. Он " +"включен и постоянно тратит энергию. Используйте его, чтобы выключить." #: lang/json/TOOL_ARMOR_from_json.py msgid "rebreather mask" @@ -83510,6 +85446,21 @@ msgstr "" "Медицинский прибор. Устройство для прослушивания чего-либо с близкого " "расстояния." +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -83875,13 +85826,10 @@ msgstr[3] "приборы О.Т.П К.Р.И.Т" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" -"Стандартный Прибор Общей Технической Поддержки. Это устройство подключается " -"к спинному мозгу, улучшает работу мышц и обеспечивает основную информацию об" -" окружении." #: lang/json/TOOL_ARMOR_from_json.py msgid "CRIT gasmask (off)" @@ -83893,8 +85841,8 @@ msgstr[3] "противогазы К.Р.И.Т (выкл)" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." -msgstr "ЭЛТ-дисплей шлема загружается…" +msgid "C.R.T HUD booting up…" +msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py @@ -83906,15 +85854,10 @@ msgstr "Слишком низкий уровень мощности для бе msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" -"Усовершенствованный противогаз спецназа К.Р.И.Т, полный первоклассной " -"электроники. Покрыт кевларом, чтобы голова владельца оставалась на месте. " -"Различные фильтры и высокотехнологичные штучки обеспечивают повышенную " -"подачу кислорода и безопасность даже под бомбардировкой. Имеется встроенный " -"переключаемый интерфейс для управления возможностями." #: lang/json/TOOL_ARMOR_from_json.py msgid "CRIT gasmask (on)" @@ -83932,12 +85875,10 @@ msgstr "ЭЛТ-дисплей шлема отключается." #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" -"Усовершенствованный противогаз спецназа К.Р.И.Т. Он сейчас включён и тратит " -"энергию на интерфейс, базовое ночное зрение и прочие защитные элементы." #: lang/json/TOOL_ARMOR_from_json.py msgid "CRIT EM vest (off)" @@ -83949,28 +85890,23 @@ msgstr[3] "бронежилеты К.Р.И.Т (выкл)" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." -msgstr "Бронежилет К.Р.И.Т активируется…" +msgid "C.R.I.T EM booting up…" +msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." -msgstr "Слишком низкий уровень мощности для безопасной загрузки…" +msgid "Power levels too low for safe bootup…" +msgstr "" #. ~ Description for CRIT EM vest (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" -"Бронежилет Улучшенного Передвижения К.Р.И.Т для спецназа, пронизанный " -"высокотехнологичными волокнами и активными сервоприводами. Защищает " -"владельца и помогает двигаться ценой высокого потребления энергии. Обычно " -"такие носит спецназ К.Р.И.Т из-за лёгкости и манёвренности. Включите для " -"дополнительной защиты и ускорения передвижения." #: lang/json/TOOL_ARMOR_from_json.py msgid "CRIT EM vest (on)" @@ -83987,8 +85923,8 @@ msgstr "Выключить броню" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." -msgstr "бронежилет К.Р.И.Т отключается…" +msgid "C.R.I.T E.M powering off…" +msgstr "" #. ~ Description for CRIT EM vest (on) #: lang/json/TOOL_ARMOR_from_json.py @@ -83996,15 +85932,9 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" -"Бронежилет Улучшенного Передвижения К.Р.И.Т для спецназа, пронизанный " -"высокотехнологичными волокнами, активными сервоприводами, а также " -"генератором, качающим кристаллическую жидкость для защиты владельца от " -"большинства боевых опасностей ценой высокого потребления энергии. Обычно " -"такие носит спецназ К.Р.И.Т из-за лёгкости и манёвренности. Сейчас он в " -"режиме костюма и быстро потребляет энергию УБП." #: lang/json/TOOL_ARMOR_from_json.py msgid "CRIT helmet (off)" @@ -84023,11 +85953,9 @@ msgstr "Вы включили %s." #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" -"Стандартный шлем К.Р.И.Т. Защищает котелок. Имеется стальная сетка с " -"подкладкой для защиты и согревания шеи, а также тактический фонарик." #: lang/json/TOOL_ARMOR_from_json.py msgid "CRIT helmet (on)" @@ -84046,14 +85974,11 @@ msgstr "Вы выключаете %s." #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" -"Стандартный шлем К.Р.И.Т. Защищает котелок. Имеется стальная сетка с " -"подкладкой для защиты и согревания шеи, а также тактический фонарик. Сейчас " -"фонарик включён и потребляет энергию." #: lang/json/TOOL_ARMOR_from_json.py msgid "magic leather belt" @@ -84074,10 +85999,10 @@ msgstr[3] "" #: lang/json/TOOL_ARMOR_from_json.py msgid "Megingjörð" msgid_plural "Megingjörðs" -msgstr[0] "Мегеньльöрð" -msgstr[1] "Мегеньльöрðа" -msgstr[2] "Мегеньльöрðов" -msgstr[3] "Мегеньльöрðы" +msgstr[0] "Мегингьорд" +msgstr[1] "Мегингьорда" +msgstr[2] "Мегингьордов" +msgstr[3] "Мегингьорды" #. ~ Description for Megingjörð #: lang/json/TOOL_ARMOR_from_json.py @@ -84356,6 +86281,36 @@ msgid "" "throwing knife into your hand on activation." msgstr "" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -85037,12 +86992,13 @@ msgstr "Вы уже и так выдернули чеку у %s, попробу #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "Тик." @@ -85140,16 +87096,11 @@ msgstr "Вы выдернули чеку гранаты-шифратора." #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" -"Эта модифицированная электромагнитная граната создана для взлома чипов " -"управления роботами, а не уничтожения их. На некоторое время переводит " -"роботов на вашу сторону, до тех пор пока система не перезапустится. " -"Активируйте, чтобы выдернуть чеку и перевести гранату в боевое положение." #: lang/json/TOOL_from_json.py msgid "active scrambler grenade" @@ -85169,6 +87120,60 @@ msgstr "" "создастся управляющая волна, временно обращающая на вашу сторону роботов, " "попавших в зону поражения." +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "ЭМИ граната" +msgstr[1] "ЭМИ гранаты" +msgstr[2] "ЭМИ гранат" +msgstr[3] "ЭМИ граната" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "Вы выдернули чеку электромагнитной гранаты." + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +"Граната, генерирующая электромагнитный импульс разрядкой низкоиндуктивных " +"конденсаторов в петлевую антенну. Активируйте её, чтобы выдернуть чеку и " +"зажечь запал. У вас будет три хода до детонации. Взрыв создаст ЭМИ, который " +"разрушает роботов и поглощает бионическую энергию." + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "ЭМИ граната (активно)" +msgstr[1] "ЭМИ гранаты (активно)" +msgstr[2] "ЭМИ гранат (активно)" +msgstr[3] "ЭМИ граната (активно)" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "Вы уже и так выдернули чеку у %s, попробуйте теперь бросить." + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"Электромагнитная (ЭМГ) граната с выдернутой чекой, должна скоро взорваться, " +"создав поле электромагнитного излучения, которое выводит из строя " +"роботехнику и бионические импланты. Не тяните с броском!" + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -85666,31 +87671,32 @@ msgstr "" "важные части тела. Активируйте, чтобы развернуть для использования." #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "ЭМИ граната" -msgstr[1] "ЭМИ гранаты" -msgstr[2] "ЭМИ гранат" -msgstr[3] "ЭМИ граната" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "Вы выдернули чеку электромагнитной гранаты." +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -"Граната, генерирующая электромагнитный импульс разрядкой низкоиндуктивных " -"конденсаторов в петлевую антенну. Активируйте её, чтобы выдернуть чеку и " -"зажечь запал. У вас будет три хода до детонации. Взрыв создаст ЭМИ, который " -"разрушает роботов и поглощает бионическую энергию." #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -85708,31 +87714,26 @@ msgid "" msgstr "Седло, которое можно повесить на прирученное ездовое животное." #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "ЭМИ граната (активно)" -msgstr[1] "ЭМИ гранаты (активно)" -msgstr[2] "ЭМИ гранат (активно)" -msgstr[3] "ЭМИ граната (активно)" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "Вы уже и так выдернули чеку у %s, попробуйте теперь бросить." +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"Электромагнитная (ЭМГ) граната с выдернутой чекой, должна скоро взорваться, " -"создав поле электромагнитного излучения, которое выводит из строя " -"роботехнику и бионические импланты. Не тяните с броском!" #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -86286,14 +88287,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -"35-мм цифровая однообъективная зеркальная камера с оптическим и цифровым " -"видоискателем, вспышкой и трансфокатором с автофокусом и стабилизатором. Вы " -"можете просматривать на ней фотографии или переносить их с помощью карты " -"памяти. Работает на обычных батарейках. До Катаклизма вы могли бы делать " -"фотографии профессионального уровня с её помощью." #: lang/json/TOOL_from_json.py msgid "candle" @@ -86365,9 +88361,9 @@ msgid "" "vibrate together to slice just about anything from turkey to ham… even " "zombies!" msgstr "" -"Электрорезка для мяса, работающая от батареек. Имеет два зубчатых лезвия, " -"одновременно вибрирующих, позволяя нарезать всё что угодно, от индейки до " -"ветчины… Даже зомби!" +"Электрорезка для мяса, работающая от батареек. У неё есть два вибрирующих " +"зазубренных лезвия, чтобы нарезать всё что угодно, от индейки до ветчины… и " +"даже зомби!" #: lang/json/TOOL_from_json.py msgid "electric carver (on)" @@ -87199,6 +89195,7 @@ msgstr[2] "" msgstr[3] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -87214,13 +89211,10 @@ msgstr[3] "планшет на э-чернилах" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "" -"Планшетный ПК, использующий практичный цветной экран на электронных " -"чернилах. До Катаклизма это были лишь модные гаджеты; сейчас это практически" -" бесценное сокровище. Работает на обычных батарейках." #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -88627,12 +90621,9 @@ msgstr[3] "самодельный молоток" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "" -"Это грубый молоток, сделанный из куска металла, закреплённого на палке. Им " -"можно пользоваться как молотком, но он никогда не сравнится с настоящим " -"инструментом." #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -89902,23 +91893,6 @@ msgstr "" "Маленький и очень острый нож, используемый в хирургии. В умелых руках его " "небольшое острое лезвие позволяет наносить очень точные удары." -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "ножницы" -msgstr[1] "ножниц" -msgstr[2] "ножниц" -msgstr[3] "ножницы" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "" -"Длинные крепкие ножницы. Используйте ножницы, чтобы разрезать предметы из " -"хлопка (например, одежду) на тряпки." - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -92784,6 +94758,20 @@ msgstr "" "сработавшего при деактивации переключателя. Может служить только как " "приманка." +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -93899,12 +95887,11 @@ msgid "" "Thrusting the sharpened tip into a foe and activating the momentary switch " "will deliver a painful electric shock." msgstr "" -"Модификации, сделанные для этой фехтовальной рапиры, могут быть не " -"спортивными, но они могут дать вам преимущество в сегодняшнем финальном " -"соревновании. Была дополнительно изолированна рукоять и электрошокер " -"высокого напряжения был прикреплен к гарде, подключенный проводом к " -"наконечнику. Касание заостренного наконечника противника при нажатии кнопки " -"вызовет болезненный удар током." +"Может, улучшения этой фехтовальной шпаги и неспортивные, но дадут вам " +"преимущество в нынешнем финальном соревновании. Рукоять покрыта " +"дополнительной изоляцией, а к гарде прикреплён высоковольтный шокер, " +"соединённый проводом к кончику шпаги. Если вонзить наконечник в противника и" +" нажать кнопку, жертва получит болезненный удар током." #: lang/json/TOOL_from_json.py msgid "electrified saber" @@ -93924,12 +95911,11 @@ msgid "" "sharpened tip into a foe and activating the momentary switch will deliver a " "painful electric shock." msgstr "" -"Модификации, сделанные для этой фехтовальной сабли, могут быть не " -"спортивными, но они могут дать вам преимущество в сегодняшнем финальном " -"соревновании. Электрошокер высокого напряжения был прикреплен к гарде и " -"подключен проводом к острию, а также была дополнительно изолированна " -"рукоять. Касание заостренного наконечника противника при нажатии кнопки " -"вызовет болезненный удар током." +"Может, улучшения этой фехтовальной сабли и неспортивные, но дадут вам " +"преимущество в нынешнем финальном соревновании. Рукоять покрыта " +"дополнительной изоляцией, а к гарде прикреплён высоковольтный шокер, " +"соединённый проводом к кончику сабли. Если вонзить наконечник в противника и" +" нажать кнопку, жертва получит болезненный удар током." #. ~ Description for broadsword #: lang/json/TOOL_from_json.py @@ -95013,9 +96999,8 @@ msgid "" "This is a radio with a transmitting unit. You could use it to contact " "someone who also has one. Unfortunately no one seems to use those nowadays…" msgstr "" -"Это радио с передатчиком. Вы можете использовать его, чтобы связаться с кем-" -"то, у кого есть такое же . К сожалению, похоже никто не использует их в " -"настоящее время…" +"Радио с передатчиком. С его помощью можно связаться с кем-то, у кого есть " +"такое же устройство. К сожалению, сейчас ими уже никто не пользуется..." #: lang/json/TOOL_from_json.py msgid "remote vehicle controller" @@ -95409,6 +97394,23 @@ msgstr "" "обманывайтесь её мелкими габаритами; это мощный инструмент, способный очень " "быстро что-нибудь раскрутить. Это не игрушка!" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "ножницы" +msgstr[1] "ножниц" +msgstr[2] "ножниц" +msgstr[3] "ножницы" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "" +"Длинные крепкие ножницы. Используйте ножницы, чтобы разрезать предметы из " +"хлопка (например, одежду) на тряпки." + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -95615,6 +97617,32 @@ msgstr[1] "точных паяльника" msgstr[2] "точных паяльников" msgstr[3] "точные паяльники" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -95872,19 +97900,13 @@ msgstr[3] "кухонные наборы К.Р.И.Т" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" -"Раскладной стандартный кухонный набор К.Р.И.Т, разработанный для удобной " -"переноски на основе обычного армейского набора. Он сделан из тонких листов " -"нержавеющего суперсплава с керамической облицовкой. К сожалению, в такой " -"компактной форме нет места для больших аккумуляторов, зато имеется " -"встроенная небольшая солнечная батарея. А ещё в нём есть смехотворно " -"маленькие вилколожка и лож-лопаточка!" #: lang/json/TOOL_from_json.py msgid "CRIT service knife" @@ -95897,16 +97919,12 @@ msgstr[3] "табельные ножи К.Р.И.Т" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" -"Стандартный нож К.Р.И.Т. Гарда выполнена в виде кастета, а на конце рукояти " -"есть маленький крючковатый рычаг для отпирания простых замков и разбивания " -"голов. Благодаря матовому чёрному покрытию нож не блестит в полумраке, а " -"заострённый кончик позволяет пробивать лёгкую броню. Вы по какой-то причине " -"ощущаете… связь с ним." #: lang/json/TOOL_from_json.py msgid "CRIT Knuckledusters" @@ -95919,11 +97937,9 @@ msgstr[3] "кастеты К.Р.И.Т" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" -"Кастеты К.Р.И.Т для ближнего боя. Не слишком отличаются от обычных, кроме " -"как по весу." #: lang/json/TOOL_from_json.py msgid "CRIT Reso-blade" @@ -95936,13 +97952,10 @@ msgstr[3] "резонирующие клинки К.Р.И.Т" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" -"Холодное оружие К.Р.И.Т. Лезвие из углеродистой стали покрыто неизвестными " -"рунами. Странно, но клинок вовсе не острый, а при пристальном обследовании " -"чувствуется гудение заключённой внутри энергии." #: lang/json/TOOL_from_json.py msgid "Dragon Slayer" @@ -95955,17 +97968,12 @@ msgstr[3] "Драконоубийцы" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" -"Шедевральное оружие НИОКР К.Р.И.Т. Нелепо крупное лезвие из углеродистой " -"стали покрыто неизвестными рунами, вы ощущаете гудение заключённой внутри " -"энергии. Вы ощущаете неуязвимость, даже просто проводя пальцами по оружию. " -"Клинок скорее похож на железную болванку, нежели на меч. Он… сможете ли вы " -"носить его?" #: lang/json/TOOL_from_json.py msgid "CRIT entrenching tool" @@ -95978,13 +97986,10 @@ msgstr[3] "сапёрные лопатки К.Р.И.Т" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" -"Стандартная складная лопатка К.Р.И.Т. Благодаря встроенной вибрационной " -"системе, получающей энергию от движений пользователя, маленькая лопатка " -"копает землю как большая лопата." #: lang/json/TOOL_from_json.py msgid "CRIT night stick" @@ -95997,11 +98002,9 @@ msgstr[3] "тонфы К.Р.И.Т" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" -"Стандартная тонфа К.Р.И.Т. Она достаточно длинная, а закруглённый кончик " -"позволяет наносить более мощный удар по сравнению с цилиндрической дубинкой." #: lang/json/TOOL_from_json.py msgid "companion potato" @@ -96055,9 +98058,9 @@ msgstr "" msgid "heat cube (torch on)" msgid_plural "heat cubes (torch on)" msgstr[0] "тепловой кубик (зажжён)" -msgstr[1] "тепловых кубика (зажжёны)" -msgstr[2] "тепловых кубиков (зажжёны)" -msgstr[3] "тепловые кубики (зажжёны)" +msgstr[1] "тепловых кубика (зажжены)" +msgstr[2] "тепловых кубиков (зажжены)" +msgstr[3] "тепловые кубики (зажжены)" #. ~ Use action msg for heat cube (torch on). #: lang/json/TOOL_from_json.py @@ -96071,7 +98074,7 @@ msgid "" " flame that does not burn." msgstr "" "Тепловой куб включен в режиме факела, в котором он излучает тепло и яркое " -"пламя, которое не жжот." +"необжигающее пламя." #: lang/json/TOOL_from_json.py msgid "skeleton key of opening" @@ -96639,11 +98642,9 @@ msgstr[3] "Биомантские руны" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "" -"На этом магическом камешке эмблема разорванной плоти и костей. Он нужен " -"биомантам, чтобы влить магию в своё искусство." #: lang/json/TOOL_from_json.py msgid "Technomancer rune" @@ -96656,11 +98657,9 @@ msgstr[3] "Техномантские руны" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "" -"На этом магическом камешке эмблема часового механизма и зубчатых колёс. Он " -"нужен техномантам, чтобы влить магию в своё искусство." #: lang/json/TOOL_from_json.py msgid "Magus rune" @@ -96673,11 +98672,9 @@ msgstr[3] "" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "" -"На этом магическом камешке эмблема кристалла и сфер маны. Он нужен магам, " -"чтобы влить магию в своё искусство." #: lang/json/TOOL_from_json.py msgid "Earthshaper rune" @@ -96690,11 +98687,9 @@ msgstr[3] "Земная руна" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "" -"На этом магическом камешке эмблема стали и камней. Он нужен повелителям " -"земли, чтобы влить магию в своё искусство." #: lang/json/TOOL_from_json.py msgid "Kelvinist rune" @@ -96707,11 +98702,9 @@ msgstr[3] "Кельвинистская руна" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "" -"На этом магическом камешке эмблема льда и огня. Он нужен кельвинистам, чтобы" -" влить магию в своё искусство." #: lang/json/TOOL_from_json.py msgid "Stormshaper rune" @@ -96724,11 +98717,9 @@ msgstr[3] "Буревые руны" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "" -"На этом магическом камешке эмблема молнии и грозовых туч. Он нужен " -"повелителям бурь, чтобы влить магию в своё искусство." #: lang/json/TOOL_from_json.py msgid "Druid rune" @@ -96741,11 +98732,9 @@ msgstr[3] "Друидические руны" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "" -"На этом магическом камешке эмблема природы и деревьев. Он нужен друидам, " -"чтобы влить магию в своё искусство." #: lang/json/TOOL_from_json.py msgid "Animist rune" @@ -96758,11 +98747,9 @@ msgstr[3] "Анимистские руны" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "" -"На этом магическом камешке эмблема Призывателей. Он нужен анимистам, чтобы " -"влить магию в своё искусство." #: lang/json/TOOL_from_json.py msgid "alchemist rune" @@ -96775,13 +98762,10 @@ msgstr[3] "алхимические руны" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "" -"На этом магическом камешке эмблема алхимии и зелий. Руна универсальна, но " -"отсутствие настроенности на какую-либо школу препятствует созданию более " -"сложных рецептов." #: lang/json/TOOL_from_json.py msgid "finger firelighter" @@ -96889,22 +98873,18 @@ msgstr[3] "Сумерки" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." msgstr "" -"Длинный меч из очень тёмного, почти чёрного металла. Его лезвие кажется " -"больше, чем у обычных стальных клинков и ощущается… удобнее в руке. Хотя сам" -" клинок из тёмного металла, гарда и навершие эфеса сделаны из более светлого" -" материала, необычно холодного на ощупь." #. ~ Use action use_message for disarmed defense turret. #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." -msgstr "Ошибка. Не найдены оружейные системы." +msgid "Error. No weapon systems found." +msgstr "" #. ~ Description for disarmed defense turret #: lang/json/TOOL_from_json.py @@ -97133,14 +99113,9 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Неактивная военная гранатометная турель. После активации из инвентаря " -"автоматически загружаются 50 стандартных 40 мм разрывных гранат. Установите " -"турель, и она будет дружественна вам с помощью своего усовершенствованного " -"программного обеспечения IFF. В случае сбоя обратитесь к руководству по " -"безопасности." #: lang/json/TOOL_from_json.py msgid "inactive military flamethrower turret" @@ -97214,14 +99189,10 @@ msgstr[3] "неактивные продвинутые рельсопушечн msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" -"Неактивная продвинутая рельсопушечная турель. После активации из инвентаря " -"автоматически загружаются 50 рельсовых выстрелов. Установите турель, и она " -"будет дружественна вам с помощью своего усовершенствованного программного " -"обеспечения IFF. В случае сбоя обратитесь к руководству по безопасности." #: lang/json/TOOL_from_json.py msgid "inactive advanced acid turret" @@ -97235,12 +99206,9 @@ msgstr[3] "неактивная продвинутая кислотная тур #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Неактивная продвинутая рельсопушечная турель. Установите турель, и она будет" -" дружественна вам с помощью своего усовершенствованного программного " -"обеспечения IFF. В случае сбоя обратитесь к руководству по безопасности." #: lang/json/TOOL_from_json.py msgid "inactive advanced EMP turret" @@ -97254,12 +99222,9 @@ msgstr[3] "неактивная продвинутая ЭМИ турель" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" -"Неактивная продвинутая ЭМИ турель. Установите турель, и она будет " -"дружественна вам с помощью своего усовершенствованного программного " -"обеспечения IFF. В случае сбоя обратитесь к руководству по безопасности." #: lang/json/TOOL_from_json.py msgid "inactive advanced electro turret" @@ -97649,13 +99614,10 @@ msgstr[3] "неактивный парящий нагреватель" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" -"Восстановленный глазобот, переоборудованный в летающий обогреватель. " -"Производит постоянную струю тепла для прогрева закрытого помещения. Не " -"агрессивен и не имеет никакого оружия. Активируйте, чтобы развернуть робота." #: lang/json/TOOL_from_json.py msgid "inactive floating furnace" @@ -97668,15 +99630,11 @@ msgstr[3] "неактивная летающая печь" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." msgstr "" -"Восстановленный глазобот, переоборудованный в летающий нагреватель. " -"Производит постоянную струю очень горячего воздуха для прогрева закрытого " -"помещения. Не агрессивен и не имеет никакого оружия. Активируйте, чтобы " -"развернуть робота." #: lang/json/TOOL_from_json.py msgid "inactive burning eye" @@ -97755,15 +99713,11 @@ msgstr[3] "неактивный автоклав" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" -"Восстановленный хозяйственный робот, переоборудованный в вакуумный " -"очиститель. Он всасывает в себя вещи с земли и растворяет их с помощью своих" -" запасов кислоты. Не агрессивен и не обладает оружием. Активируйте для " -"развертывания робота." #: lang/json/TOOL_from_json.py msgid "inactive bee-bot" @@ -97807,13 +99761,10 @@ msgstr[3] "неактивный робот ассасин" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" -"Восстановленный медбот, переоборудованный в машину для убийств. Он будет " -"атаковать враждебные цели с помощью набора лезвий и иглой с токсинами. " -"Активируйте для развертывания робота." #: lang/json/TOOL_from_json.py msgid "inactive elixirator" @@ -97862,12 +99813,10 @@ msgstr[3] "неактивный ловец крыс" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" -"Восстановленный робот-жук, переоборудованный в охотника на мелкую добычу. " -"Атакует клешнями и встроенным тазером. Активируйте для развертывания робота." #: lang/json/TOOL_from_json.py msgid "inactive grab-bot" @@ -97923,12 +99872,9 @@ msgstr[3] "неактивный некрокиборг" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" -"Восстановленный киборг, к которому приделали голову зомби-некроманта. " -"Одушевленная голова сохраняет часть своей способности поднимать зомби. " -"Активируйте для развертывания робота." #: lang/json/TOOL_from_json.py msgid "inactive defense robot" @@ -97986,11 +99932,8 @@ msgstr[3] "неактивный стремительный паладин" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" -"Восстановленный оборонительный робот с самодельным огнеметом и двумя жгуче " -"горячими лезвиями. Активируйте его с бензином в инвентаре, чтобы зарядить и " -"развернуть робота… желательно подальше от всего воспламеняющегося." #: lang/json/TOOL_from_json.py msgid "inactive military robot" @@ -98398,12 +100341,8 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" -"Биологическая загадка. Внутренности этого сгустка погружены в жидкость " -"низкой плотности, остающуюся жидкой несмотря на переохлаждённое состояние, и" -" при этом сгусток весьма пластичен. Кусочки льда постоянно отслаиваются от " -"тела. Кажется, сгусток достаточно податливый, чтобы его можно было оторвать…" #: lang/json/TOOL_from_json.py msgid "growing cold mass" @@ -98674,14 +100613,10 @@ msgstr "Алмазная масса разрушается на части в в #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" -"Гроздь искусственных кристаллов, отколовшихся от алмазной матрицы. Обычно " -"вещество полностью разрушается, когда отделяется от катализатора; но эта " -"масса, похоже, способна существовать самостоятельно благодаря некоему " -"неизвестному механизму. " #: lang/json/TOOL_from_json.py msgid "diamond matrix" @@ -98694,7 +100629,7 @@ msgstr[3] "алмазная матрица" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." +"Your senses dull as you gaze into the depths of this gemstone's center…" msgstr "" "Ваши чувства тускнеют, пока вы вглядываетесь в глубины этого драгоценного " "камня…" @@ -98720,16 +100655,16 @@ msgstr[3] "вихревых двигателей" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" -"Так сказать, торнадо в коробке. Внутри этого безобидного бака находится либо" -" венец человеческой мысли в области энергетики, либо величайшее оружие " +"Так сказать, торнадо в коробке. Внутри этого безобидного бака находится " +"либо венец человеческой мысли в области энергетики, либо величайшее оружие " "массового уничтожения, способное стереть с лица земли целую цивилизацию — " -"или то, что от неё осталось. Внешний механизм позволяет крепить его в " +"или то, что от неё осталось. Внешний механизм позволяет крепить его в " "машине." #: lang/json/TOOL_from_json.py lang/json/vehicle_part_from_json.py @@ -98743,16 +100678,16 @@ msgstr[3] "вихревой генератор" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" -"Так сказать, торнадо в коробке. Внутри этого безобидного бака находится либо" -" венец человеческой мысли в области энергетики, либо величайшее оружие " +"Так сказать, торнадо в коробке. Внутри этого безобидного бака находится " +"либо венец человеческой мысли в области энергетики, либо величайшее оружие " "массового уничтожения, способное стереть с лица земли целую цивилизацию — " -"или то, что от неё осталось. Внешний механизм позволяет подключить его к " +"или то, что от неё осталось. Внешний механизм позволяет подключить его к " "аккумуляторам для сохранения вырабатываемой энергии." #: lang/json/TOOL_from_json.py @@ -98950,9 +100885,8 @@ msgid "" "A pair of small rail wheels. It fits small railroad rails found in places " "like amusement parks. Mostly for hobby purposes rather then transportation." msgstr "" -"Пара маленьких железнодорожных колёс. Они подходят для небольших " -"железнодорожных рельсов, например, как в парках развлечений. Скорее для " -"хобби, а не транспортировки." +"Пара маленьких железнодорожных колёс. Они подходят для небольших рельс, " +"например, как в парках развлечений. Скорее хобби, нежели транспорт." #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py msgid "motorbike wheel" @@ -101872,7 +103806,7 @@ msgstr "Ближний и дальний бой затруднены." #: lang/json/bodypart_from_json.py src/armor_layers.cpp msgid "L. Arm" -msgstr "L. Рука" +msgstr "Л. Рука" #: lang/json/bodypart_from_json.py msgid "Arms" @@ -102350,6 +104284,10 @@ msgstr "Строить частокол" msgid "Build Stone Wall" msgstr "Строить каменную стену" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "Строить стену из сухой кладки" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "Строить низкую стену" @@ -102476,7 +104414,7 @@ msgstr "Поставить книжный шкаф" #: lang/json/construction_from_json.py msgid "Build Entertainment Center" -msgstr "Строить \"стенку\"" +msgstr "Строить развлекательный центр" #: lang/json/construction_from_json.py msgid "Build Locker" @@ -102972,7 +104910,7 @@ msgstr "Построить терминал радиовышки." #: lang/json/construction_from_json.py msgid "Build Log Stool" -msgstr "Строить пенёк" +msgstr "Строить стул-пенёк" #: lang/json/construction_from_json.py msgid "Convert Fridge Power Supply" @@ -106132,6 +108070,37 @@ msgstr "" "Ваша нервная система работает со сбоями, почти как будто она разрывается " "изнутри." +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "Ужасная еда" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "Еда, которую вы едите, отвратительна." + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "Унылая еда" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "Питание ничем другим, кроме отвратительной пищи, вас расстраивает." + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "Депрессивная еда" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" +"Конечно, вы живы, но разве это жизнь — есть отвратительную пищу изо дня в " +"день?" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "Освещён" @@ -106811,9 +108780,9 @@ msgstr "Недостаток сна" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." -msgstr "Вы слишком долго не спали. Вам следует поспать." +msgstr "Вы слишком долго не спали. Вам следует поспать." #. ~ Apply message for effect(s) 'Sleep Deprived'. #: lang/json/effects_from_json.py @@ -106973,9 +108942,9 @@ msgstr "" " Стал самоучкой химиком и медиком. Работа в конечном счёте привела его к" " жизни в полной зависимости от морфия и алкоголя. Однажды ночью у него " "случилась передозировка, когда он остался без присмотра. Местное население, " -"которому он помог, заявило, \"Встреча с этим человеком вероятно была лучшей " -"вещью, которая произошла с нами за эти годы... Нельзя вернуться, если " -"потерял всякую надежду.\"" +"которому он помог, заявило, \"Встреча с этим человеком, вероятно, была " +"лучшей вещью, которая произошла с нами за эти годы... Нельзя вернуться, если" +" потерял всякую надежду.\"" #: lang/json/epilogue_from_json.py msgid "" @@ -107002,7 +108971,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -107022,7 +108991,7 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" " Нашёл новый смысл жизни после вашей смерти. Несмотря на то, что он " "никогда не рассказывал вам, былые преступления в погибшем мире мешали ему " @@ -107050,7 +109019,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " @@ -107096,17 +109065,17 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" " Упорно работал после вашей смерти, чтобы организовать свою собственную " -"группу выживших. Женился, вырастил двоих детей и обучил их всем навыку " -"выживания, какие только могли пригодиться. Его прошлое в конечном счёте " -"настигло его, когда он не поладил с полковником Старой гвардии. Поскольку во" -" время Катаклизма он был солдатом Национальной Гвардии и покинул свой пост, " -"его повесили за дезертирство, несмотря на протесты большого количества " -"выживших, которым он помог за все эти годы." +"группу выживших. Женился, вырастил двоих детей и обучил их всем навыку " +"выживания, какие только могли пригодиться. Его прошлое в конечном счёте " +"настигло его, когда он не поладил с полковником Старой гвардии. Поскольку " +"во время Катаклизма он был солдатом Национальной Гвардии и покинул свой " +"пост, его повесили за дезертирство, несмотря на протесты большого количества" +" выживших, которым он помог за все эти годы." #: lang/json/epilogue_from_json.py msgid "" @@ -107414,8 +109383,8 @@ msgid "" " Died en route to California, deliriously dreaming of a better life as " "he was slowly devoured by spiders." msgstr "" -" По дороге в Калифорнию, безумно мечтая о лучшей жизни, был убит и " -"медленно сожран пауками." +" Умер по пути в Калифорнию. Он бредил о лучшей жизни, пока его медленно " +"пожирали пауки." #: lang/json/epilogue_from_json.py msgid "" @@ -107424,7 +109393,7 @@ msgid "" "chance." msgstr "" " После вашей смерти он безуспешно пытался справиться с одиночеством. Был" -" до беспамятства пьян, когда группа зомби нашла его укрытие и не оставило " +" до беспамятства пьян, когда группа зомби нашла его укрытие и не оставила " "ему шансов." #: lang/json/epilogue_from_json.py @@ -107601,7 +109570,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -107610,10 +109579,10 @@ msgid "" msgstr "" " Сбилась с пути ещё задолго до того, как она встретила вас. Катаклизм " "дал ей шанс отказаться от своих порочных деяний, которые довели её до " -"тюрьмы... Шанс, которым она не воспользовалась. После вашей смерти она " -"продолжила наживаться на тех, в ком видела слабость. По слухам, она ограбила" -" дюжины выживальщиков, забрав всё их имущество и оставив умирать посреди " -"наводнивших землю ужасов. Исход её судьбы неизвестен." +"тюрьмы... Шанс, которым она не воспользовалась. После вашей смерти она " +"продолжила наживаться на тех, в ком видела слабость. По слухам, она " +"ограбила дюжины выживальщиков, забрав всё их имущество и оставив умирать " +"посреди наводнивших землю ужасов. Исход её судьбы неизвестен." #: lang/json/epilogue_from_json.py msgid "" @@ -107649,7 +109618,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " @@ -108039,7 +110008,7 @@ msgstr "Центр 01" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" @@ -108227,7 +110196,7 @@ msgstr "Беженцы" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." @@ -108310,6 +110279,20 @@ msgstr "Чистить нагар чёрного пороха" msgid "You clean your %s." msgstr "Вы почистили %s." +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "Почистить нагар чёрного пороха и смазать" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "Вы почистили и смазали %s." + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "Стреляная гильза в каморе" @@ -108325,14 +110308,40 @@ msgstr "" #. ~ name of mending method for fault 'Spent casing in chamber' #: lang/json/fault_from_json.py msgid "Eject spent casing" -msgstr "" +msgstr "Извлечь гильзу" #. ~ success message for mending method 'Eject spent casing' of fault 'Spent #. casing in chamber' #: lang/json/fault_from_json.py #, python-format msgid "You eject the spent casing from the %s." +msgstr "Вы извлекли гильзу из %s." + +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "Не смазано" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." msgstr "" +"Либо это оружие совсем новое и поставляется без смазки, либо оно было " +"недавно почищено и не смазано. В любом случае, без смазки оно не будет " +"должным образом работать и даже может быть повреждено." + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "Смазать" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "Вы смазали %s." #: lang/json/fault_from_json.py msgid "Fouling" @@ -108360,6 +110369,11 @@ msgstr "" msgid "Clean gun" msgstr "Почистить оружие" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "Почистить и смазать оружие" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "Порванный приводной ремень" @@ -109089,11 +111103,13 @@ msgid "A big, blocky metal device for refrigerating large areas." msgstr "" "Здоровенный угловатый металлический аппарат для охлаждения больших комнат." -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "скрежет металла!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "лязг!" @@ -110987,7 +113003,7 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "entertainment center" -msgstr "стенка" +msgstr "развлекательный центр" #. ~ Description for entertainment center #: lang/json/furniture_from_json.py @@ -111144,6 +113160,15 @@ msgstr "" "Металлический ящик на верхушке деревянного столбика. Почту уже давно не " "приносили. Непохоже, чтоб её скоро снова начали приносить." +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "вешалка для одежды" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "Вешалка, на которую можно повесить одежду." + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "стеллаж" @@ -112150,11 +114175,9 @@ msgstr "атомная маслобойка на подставке" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" -"Атомная маслобойка Ривтех в развернутом состоянии. Гудит угрожающе. Готова " -"принять свежее молоко и соль. Если не превратит весь мир в труху." #. ~ Description for vehicle refrigerator #: lang/json/furniture_from_json.py @@ -112192,11 +114215,9 @@ msgstr "гидропонная установка с семенами" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" -"Автономная гидропонная установка для выращивания сельскохозяйственных " -"растений в комнатных условиях. Содержит посаженные семена." #: lang/json/furniture_from_json.py msgid "hydroponics unit with seedling" @@ -112205,11 +114226,9 @@ msgstr "гидропонная установка с рассадой" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" -"Автономная гидропонная установка для выращивания сельскохозяйственных " -"растений в комнатных условиях. Содержит рассаду." #: lang/json/furniture_from_json.py msgid "hydroponics unit with mature plant" @@ -112218,11 +114237,9 @@ msgstr "гидропонная установка с взрослым расте #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" -"Автономная гидропонная установка для выращивания сельскохозяйственных " -"растений в комнатных условиях. Содержит взрослое растение." #: lang/json/furniture_from_json.py msgid "hydroponics unit with harvestable plant" @@ -112231,11 +114248,9 @@ msgstr "гидропонная установка с урожаем" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" -"Автономная гидропонная установка для выращивания сельскохозяйственных " -"растений в комнатных условиях. Содержит взрослое растение, готовое к сбору." #: lang/json/furniture_from_json.py msgid "hydroponics heater" @@ -114612,12 +116627,12 @@ msgstr "" "поскольку большинство людей не являются героями боевиков." #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" -msgstr[0] "самопал .308" -msgstr[1] "самопала .308" -msgstr[2] "самопалов .308" -msgstr[3] "самопал .308" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/gun_from_json.py msgid "" @@ -114909,6 +116924,24 @@ msgstr "" "напоминающий Mossberg Brownie. Использует вращающийся боёк для стрельбы из " "всех своих четырёх стволов, расположенных квадратом." +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" +"Шестизарядный револьвер, производимый с 1899 года и известный как самый " +"популярный пистолет XX века. Имеет откидной цилиндр для облегчения " +"перезарядки." + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -115069,6 +117102,22 @@ msgstr "" "Очень компактный пистолет .380 калибра. Предназначен для скрытого ношения и " "выполнен из прочных высококачественных материалов." +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" +"Двуствольный полуавтоматический пистолет итальянского происхождения, " +"стреляющий дуплетом, прообраз пистолета M1911." + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -115294,24 +117343,6 @@ msgstr "" " во время войны во Вьетнаме. Хотя по большей части модель и вытеснена " "современными аналогами, M79 по-прежнему широко используется во всём мире." -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "гранатомёт Mark 19" -msgstr[1] "гранатомёта Mark 19" -msgstr[2] "гранатомётов Mark 19" -msgstr[3] "гранатомёт Mark 19" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"Тяжёлый станковый гранатомёт с ленточным питанием. Использовался армией США " -"начиная с холодной войны вплоть до Катаклизма, а возможно и после, если вам " -"удастся найти несколько 40-мм гранат." - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -115371,6 +117402,24 @@ msgstr "" msgid "multi" msgstr "множ." +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "гранатомёт Mark 19" +msgstr[1] "гранатомёта Mark 19" +msgstr[2] "гранатомётов Mark 19" +msgstr[3] "гранатомёт Mark 19" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"Тяжёлый станковый гранатомёт с ленточным питанием. Использовался армией США " +"начиная с холодной войны вплоть до Катаклизма, а возможно и после, если вам " +"удастся найти несколько 40-мм гранат." + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -115389,6 +117438,24 @@ msgstr "" "Калашникова, что и автомат АК47. В отличие от большинства дробовиков, " "заряжаемых по одному патрону за раз, заряжается целым магазином." +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" +"Одноствольный переломный дробовик, рассчитанный на патрон .410 дробь. " +"Разработан для меньшей отдачи, как альтернатива 12 калибру, лёгкий и прост в" +" производстве.ружьеружьеружье" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -115762,6 +117829,22 @@ msgstr "" "Taurus Raging Bull — пятизарядный револьвер под калибр .454 Casull. Обладает" " впечатляющей останавливающей мощью." +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "Taurus Raging Judge Magnum" +msgstr[1] "Taurus Raging Judge Magnum" +msgstr[2] "Taurus Raging Judge Magnum" +msgstr[3] "Taurus Raging Judge Magnum" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" +"Taurus Raging Judge Magnum — пятизарядный револьвер под калибр .454 Casull." +" В нём могут применяться боеприпасы калибров .410 дробь и .45 Colt." + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -115818,6 +117901,47 @@ msgstr "" "века. Очень точный и мощный для того времени, переоборудован для стрельбы " "современными бездымными боеприпасами." +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "Дерринджер Bond Arms" +msgstr[1] "Дерринджера Bond Arms" +msgstr[2] "Дерринджеры Bond Arms" +msgstr[3] "Дерринджеры Bond Arms" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" +"Bond Arms Derringer — серия многоствольных компактных пистолетов. В " +"основном, под патрон калибра .45 Colt, но поскольку ствольная коробка " +"довольно длинная, также подходят патроны для дробовика калибра .410 дробь." + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" +"Современная копия помповой винтовки Кольт. Первоначально рассчитанную на " +"калибр .44-40, современные версии используют более распространённый калибр " +".45 Long Colt; дополняет револьвер Single Action Army, во время соревнований" +" по ковбойской стрельбе из стрелкового оружия." + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -115991,12 +118115,12 @@ msgstr[3] "M2НВ Браунинг HMG" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." msgstr "" -"Тяжёлый пулемёт, стоявший на вооружении американской армии до наступления " -"Катаклизма. Редко встречается в настоящее время. Огромный вес и размер не " -"позволяют использовать его без установки на штатив или на технику." +"Тяжёлый станковый пулемёт, послуживший американской армии и даже некоторым " +"выжившим после Катаклизма. Из-за огромного веса и размера его нельзя " +"использовать без установки на штатив или на технику." #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -117570,9 +119694,9 @@ msgid "" "action means this is much less likely to jam." msgstr "" "Шестиствольная картечница Гатлинга, приводимая в движение электромотором с " -"самодельным тканевым ремнём. Даже собранная правильно, она всё равно похожа " -"на громоздкого зверя, а шесть отдельных стволов затрудняют точное " -"прицеливание. Внешний привод даёт гораздо меньшую вероятности заклинивания." +"самодельным тканевым ремнём. Неуклюжая даже после установки на основание, из" +" шести раздельных стволов трудно прицеливаться. Из-за внешнего привода будет" +" заклинивать гораздо реже." #: lang/json/gun_from_json.py msgid "Browning Auto 5" @@ -117630,12 +119754,11 @@ msgid "" "Combat Shotgun, the Benelli M4 is one of the finest combat shotguns " "available." msgstr "" -"Первый полуавтоматический дробовик Benelli, использующей для перезарядки " -"энергию отдачи пороховых газов с двойным поршнем для повышенной надежности " -"при различных применениях. Имеет складной приклад, который уменьшает длину " -"почти на 8 дюймов. Benelli M4 является одним из лучших доступных боевых " -"дробовиков. Принят на вооружение в 1999 году спец. силами как боевой " -"дробовик M1014." +"Первый дробовик Benelli с отводом пороховых газов и двойным поршнем для " +"повышенной надёжности при стрельбе различными патронами. Складной приклад " +"уменьшает длину почти на 20 сантиметров. Benelli M4 является одним из лучших" +" доступных боевых дробовиков. Принят на вооружение в 1999 году спец. силами " +"как боевой дробовик M1014." #: lang/json/gun_from_json.py msgid "Mossberg 500 Field" @@ -117651,9 +119774,9 @@ msgid "" " for military use. It is noted for its high durability and low recoil. " "This one is fitted with a 28 inch barrel with sight rib." msgstr "" -"Mossberg 500 является известным помповым дробовиком, которым нередко " -"пользуются военные. Стоит отметить его высокую надёжность и слабую отдачу." -" Этот экземпляр оснащен 28-дюймовым стволом с прицельной планкой." +"Mossberg 500 - популярный помповый дробовик, которым нередко пользуются " +"военные. Стоит отметить его высокую надёжность и слабую отдачу. Этот " +"экземпляр оснащён 70-сантиметровым стволом с прицельной планкой." #: lang/json/gun_from_json.py msgid "Mossberg 500 Security" @@ -117669,9 +119792,9 @@ msgid "" " for military use. It is noted for its high durability and low recoil. " "This one is fitted with an 18.5 inch barrel." msgstr "" -"Mossberg 500 является известным помповым дробовиком, которым нередко " -"пользуются военные. Стоит отметить его высокую надёжность и слабую отдачу." -" Этот экземпляр оснащен стволом длинной 18,5 дюймов." +"Mossberg 500 - популярный помповый дробовик, которым нередко пользуются " +"военные. Стоит отметить его высокую надёжность и слабую отдачу. Этот " +"экземпляр оснащён стволом длинной 46 сантиметров." #: lang/json/gun_from_json.py msgid "Mossberg 590A1" @@ -117688,8 +119811,8 @@ msgid "" " tube for easier cleaning and maintenance." msgstr "" "Mossberg 590A1 — это военная и полицейская версия Mossberg 500. Он оснащен " -"более тяжелым стволом, байонетным наконечником и другим трубчатым магазином " -"для облегчения очистки и обслуживания." +"более тяжелым стволом, штыковым слотом и особым трубчатым магазином для " +"облегчения очистки и обслуживания." #: lang/json/gun_from_json.py msgid "Mossberg 930 SPX" @@ -117706,10 +119829,10 @@ msgid "" "Affordable pricing and decent ergonomics make this a popular entry-level " "3-gun shotgun." msgstr "" -"Это полуавтоматическое оружие Mossberg включает в себя газовый компенсатор " -"для снижения отдачи, открытый прицел и установленную на заводе планку " -"Пикатинни. Доступная цена и достойная эргономика делают его популярным " -"дробовиком начального уровня для спортивной стрельбы." +"Полуавтоматический Mossberg с газовым компенсатором для снижения отдачи, " +"ружейным прицелом и предустановленной планкой Пикатинни. Доступная цена и " +"достойная эргономика делают его популярным дробовиком начального уровня для " +"спортивной стрельбы." #: lang/json/gun_from_json.py msgid "double-barrel pipe shotgun" @@ -117758,11 +119881,10 @@ msgid "" "agencies alike thanks to its high accuracy and muzzle velocity. This one is" " a 28 inch barreled model for hunting fowl and game." msgstr "" -"Благодаря более чем 10 миллионам произведенных единиц, является одним из " -"самых популярных дробовиков на рынке гражданского оружия. Ремингтон 870 " -"пользуется признанием как охотников, так и полицейских за высокую кучность и" -" убойную силу. Эта модель с 28-дюймовым стволом для охоты на птицу и мелкую" -" дичь." +"Один из самых популярных дробовиков на рынке гражданского оружия - " +"изготовлено более 10 миллионов единиц. Ремингтон 870 пользуется признанием " +"как охотников, так и полицейских за высокую кучность и убойную силу. Эта " +"модель с 70-сантиметровым стволом для охоты на птицу и мелкую дичь." #: lang/json/gun_from_json.py msgid "Remington 870 MCS" @@ -117780,11 +119902,11 @@ msgid "" "doors you might come across. The grip's design makes for controllable yet " "unpleasant recoil, and the barrel lacks any sights." msgstr "" -"Этот модульный боевой дробовик Ремингтон 870 c 10-дюймовым стволом и без " -"приклада, приспособленный для взлома. Он достаточно мал, чтобы носить его в" -" качестве второго оружия, особенно для того, чтобы вскрывать любые " -"неприятные двери, с которыми вы можете столкнуться. Конструкция рукоятки " -"обеспечивает управляемую, но неприятную отдачу, а ствол не имеет мушки." +"Модульный боевой дробовик Ремингтон 870 c 25-сантиметровым стволом и без " +"приклада, приспособленный для штурмовых операций. Он достаточно мал для " +"ношения в качестве запасного оружия, особенно при вламывании в любые " +"подозрительные помещения. Конструкция рукояти обеспечивает управляемую, но " +"неприятную отдачу, а на стволе нет мушек." #: lang/json/gun_from_json.py msgid "Remington 870 express" @@ -117801,10 +119923,10 @@ msgid "" "agencies alike thanks to its high accuracy and muzzle velocity. This one is" " an 18.5 inch barreled defensive model." msgstr "" -"Благодаря более чем 10 миллионам произведенных единиц, является одним из " -"самых популярных дробовиков на рынке гражданского оружия. Ремингтон 870 " -"пользуется признанием как охотников, так и полицейских за высокую кучность и" -" убойную силу. Эта модель с 18,5-дюймовым стволом используется для защиты." +"Один из самых популярных дробовиков на рынке гражданского оружия - " +"изготовлено более 10 миллионов единиц. Ремингтон 870 пользуется признанием " +"как охотников, так и полицейских за высокую кучность и убойную силу. Эта " +"модель с 46-сантиметровым стволом предназначена для самообороны." #: lang/json/gun_from_json.py msgid "Remington 1100 competiton" @@ -117829,7 +119951,7 @@ msgstr "" "правоохранительных органов, охотников и участников соревнований. Был самым " "продаваемым самозарядным дробовиком в истории США. Это модель для " "соревнований с никелевым и тефлоновым покрытием, с полноразмерным трубчатым " -"магазином и 30-дюймовым стволом." +"магазином и 75-сантиметровым стволом." #: lang/json/gun_from_json.py msgid "shotgun revolver" @@ -117866,8 +119988,8 @@ msgstr "" "Сайга-12 — дробовик, спроектированный по одной схеме с автоматом Калашникова" " АК-47. В отличие от большинства дробовиков, он заряжается магазином, а не " "по одному патрону. Одна из последних разработок Михаила Калашникова. Сайга " -"была популярна на соревнованиях по дробовому оружию в открытом дивизионе, " -"пока не был запрещён исполнительным приказом её импорт." +"была популярна на стрелковых соревнованиях по дробовому оружию, пока её " +"импорт не был законодательно запрещён." #: lang/json/gun_from_json.py msgid "double barrel shotgun" @@ -117913,18 +120035,18 @@ msgstr[3] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." msgstr "" -"Являясь скорее револьвером-переростком, чем дробовиком, Cobray Streetsweeper" -" плохо продавался, прежде чем был признан разрушительным устройством. Его " -"цилиндр приводится в движение качающейся рукояткой и не может быть " -"перезаряжен вручную. Последняя гильза или неиспользованные патроны " -"вынимаются только с помощью стержня-экстрактора на стволе. Как " -"продемонстрировал технический отдел ATF, уникальный дизайн этого дробовика " -"позволяет расстреливать все 12 снарядов менее чем за 3 секунды." +"Скорее револьвер-переросток, нежели дробовик. Cobray Streetsweeper " +"продавался очень плохо, пока не прославился разрушительной силой. Цилиндр " +"приводится в движение качающейся рукояткой, и его нельзя переснарядить " +"вручную. Последняя гильза или неиспользованные патроны вынимаются только с " +"помощью стержня-экстрактора на стволе. Как продемонстрировал технический " +"отдел ATF, уникальный дизайн этого дробовика позволяет расстреливать все 12 " +"патронов менее чем за 3 секунды." #: lang/json/gun_from_json.py msgid "3-round" @@ -117946,10 +120068,10 @@ msgid "" "semi-automatic firearm, with an arm stabilizing hook for one handed " "shooting." msgstr "" -"Внушающий и устрашающий на вид, SPAS 12 имел сомнительную честь быть " -"объявленным разрушительным устройством и был запрещён к импорту, что " -"добавляет ему еще больше привлекательности. Это полуавтоматическое " -"огнестрельное помповое ружьё имеет стабилизатор для стрельбы с одной руки." +"Зловещий и устрашающий на вид SPAS 12 получил сомнительную славу " +"разрушительного устройства и был запрещён к импорту, что только добавило ему" +" привлекательности. Это полуавтоматическое огнестрельное помповое ружьё " +"имеет стабилизатор для стрельбы с одной руки." #: lang/json/gun_from_json.py msgid "Tavor TS12" @@ -117968,11 +120090,11 @@ msgid "" "provided for mounting sights." msgstr "" "Это дробовик системы булл-пап израильского производства IWI. Имеет " -"трехтрубчатый поворотный магазин, автоматика работает на принципе отвода " -"пороховых газов. Можно зарядить до 15 патронов, благодаря рациональному " -"использованию места. Как и многие другие современные разработки IWI, эта " -"больше похожа на научно-фантастическую винтовку, чем на огнестрельное " -"оружие. Для крепления прицелов предусмотрена встроенная верхняя планка." +"трёхтрубчатый поворотный магазин, автоматика работает на принципе отвода " +"пороховых газов. Благодаря рациональному использованию места можно зарядить" +" до 15 патронов. Как и многие другие современные разработки IWI, эта больше" +" похожа на фантастическую винтовку, чем на огнестрельное оружие. Для " +"крепления прицелов предусмотрена встроенная верхняя планка." #: lang/json/gun_from_json.py msgid "USAS 12" @@ -117998,10 +120120,10 @@ msgstr "" #: lang/json/gun_from_json.py msgid "1887 bootleg shotgun" msgid_plural "1887 bootleg shotguns" -msgstr[0] "1887 нелецензированный дробовик" -msgstr[1] "1887 нелецензированных дробовика" -msgstr[2] "1887 нелецензированных дробовиков" -msgstr[3] "1887 нелецензированные дробовики" +msgstr[0] "1887 нелицензированный дробовик" +msgstr[1] "1887 нелицензированных дробовика" +msgstr[2] "1887 нелицензированных дробовиков" +msgstr[3] "1887 нелицензированные дробовики" #: lang/json/gun_from_json.py msgid "" @@ -118035,10 +120157,10 @@ msgid "" "will have to suffice." msgstr "" "Винчестер 1897 был одним из первых коммерчески успешных помповых дробовиков." -" Благодаря своей «окопной» конфигурации, он стал очень романтичным " -"американским символом первой мировой войны. Со ствольным кожухом, байонетом" -" и 17 дюймовым штык-ножом, этот дробовик, несомненно, выглядит устрашающе. " -"Сейчас уже не нужно расчищать окопы, но городок, заражённый зомби, тоже " +" Благодаря своей «окопной» конфигурации он стал очень романтичным " +"американским символом Первой Мировой Войны. Этот дробовик выглядит весьма " +"устрашающе со ствольным кожухом, штыком и 40-сантиметровым штык-ножом. " +"Сейчас уже не нужно расчищать окопы, но заражённый зомби городок тоже " "подойдет." #: lang/json/gun_from_json.py @@ -118136,14 +120258,14 @@ msgstr[3] "лазерная винтовка A7" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" "Великолепная лазерная винтовка, разработанная исследовательским " -"подразделением R&D «Aerial Labs». По слухам, распространяемым корпорацией, " -"по своим начальным характеристикам конкурировала с лучшими образцами " -"вооружения Ривтех. Хотя Катаклизм отправил всё это на свалку истории, тем не" -" менее это оружие может сделать то же самое с вашими врагами." +"подразделением «Aerial Labs». По слухам, распространяемым корпорацией, по " +"своим начальным характеристикам конкурировала с лучшими образцами вооружения" +" Ривтех. Хотя Катаклизм отправил всё это на свалку истории, это оружие " +"может сделать то же самое с вашими врагами." #: lang/json/gun_from_json.py msgid "V29 laser pistol" @@ -118230,6 +120352,20 @@ msgstr "" "Духовая трубка из дерева. Очень точная и легко используемая. В качестве " "боеприпасов используются дротики." +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "биобластер" +msgstr[1] "биобластера" +msgstr[2] "биобластеров" +msgstr[3] "биобластеры" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -118297,14 +120433,10 @@ msgstr[3] "лазерные пистолеты К.Р.И.Т" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" -"Экспериментальное маломощное оружие в разработке НИОКР К.Р.И.Т. Относительно" -" слабый, но точный лазерный пистолет. Двуствольный дизайн компенсирует " -"недостаток убойной силы. Благодаря суперсплаву он достаточно легковесный и " -"удобный в прицеливании." #: lang/json/gun_from_json.py msgid "CRIT Chain Laser" @@ -118316,14 +120448,11 @@ msgstr[3] "цепные лазеры К.Р.И.Т" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." msgstr "" -"Проверенный любимец из пекла НИОКР. Основан на идее одного из исследователей" -" примотать три лазерных пистолета на ручную дрель. Это оружие относительно " -"легковесное для своего энергопотребления и причиняемых разрушений." #: lang/json/gun_from_json.py msgid "CRIT Laser Carbine" @@ -118335,11 +120464,9 @@ msgstr[3] "лазерные карабины К.Р.И.Т" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" -"Лёгкое лазерное ружьё, разработанное НИОКР К.Р.И.Т для испытания прорыва в " -"технологии лучевого вооружения." #: lang/json/gun_from_json.py msgid "CRIT Energy Rifle" @@ -118351,11 +120478,9 @@ msgstr[3] "энергоружья К.Р.И.Т" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" -"Тяжёлое энергетическое ружьё, разработанное НИОКР К.Р.И.Т. для испытания " -"прорыва в технологии гибридного вооружения." #: lang/json/gun_from_json.py msgid "CRIT CQB Standard Issue" @@ -118367,19 +120492,13 @@ msgstr[3] "Руководство К.Р.И.Т по рукопашному бою #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" -"Простое комбинированное оружие. Военный полуавтоматический карабин сочетает " -"универсальность среднедальнего 9 мм и мощь дробовика 12 калибра. Чтобы " -"отдать должное ближнему бою, приклад увеличивает силу ударов владельца, а " -"крепкая конструкция и тонфоподобная рукоять способны проломить голову " -"противнику. Из-за встроенного магазина оружие очень неудобно перезаряжать, " -"но и обойма не выскочит в неудобный момент." #: lang/json/gun_from_json.py msgid "CRIT Fire Glove" @@ -118408,17 +120527,12 @@ msgstr[3] "пневморужья" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" -"Поразительно мощная пневматическая винтовка, хорошо подходящая для охоты на " -"мелкую дичь. Стреляет пульками из свинца или сплава, достигая неплохой " -"убойной силы при каждом выстреле. Она довольно точная и приближается по " -"урону к .22, но переламывающийся ствол требует некоторой силы для " -"перезарядки." #: lang/json/gun_from_json.py msgid "Plasma Cutter" @@ -118430,11 +120544,9 @@ msgstr[3] "плазменные резаки" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" -"Экспериментальный режущий инструмент в разработке НИОКР К.Р.И.Т. Он " -"испускает чрезвычайно горячую волну плазмы, способную рассекать материалы." #: lang/json/gun_from_json.py msgid "Rivet Driver" @@ -118446,14 +120558,11 @@ msgstr[3] "заклёпочные пистолеты" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" -"Экспериментальный инструмент двойного назначения в разработке НИОКР К.Р.И.Т." -" Он стреляет обычными гвоздями, однако перед выстрелом удлиняет их за долю " -"секунды, так что при столкновении хрупкая ножка разлетается в осколки." #: lang/json/gun_from_json.py msgid "Line Gun" @@ -118465,12 +120574,9 @@ msgstr[3] "линейные плазменные резаки" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" -"Экспериментальный режущий инструмент высокой мощности в разработке НИОКР " -"К.Р.И.Т. Он испускает широкую линию чрезвычайно горячей волнв плазмы, " -"способной рассекать плотные материалы." #: lang/json/gun_from_json.py msgid "Pulse Rifle" @@ -118482,13 +120588,10 @@ msgstr[3] "импульсные ружья" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" -"Экспериментальное трёхствольное дозвуковое ружьё в разработке НИОКР К.Р.И.Т." -" Прекрасно для замкнутых помещений и против толп противников. Стреляет " -"патронами из особого сплава, мгновенно раскрывающимися при попадании." #: lang/json/gun_from_json.py msgid "Ripper" @@ -118500,11 +120603,9 @@ msgstr[3] "потрошители К.Р.И.Т" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" -"Экспериментальная электромагнитная пила в разработке НИОКР К.Р.И.Т. " -"Прекрасно подходит для резки на расстоянии." #: lang/json/gun_from_json.py msgid "em field saw" @@ -118532,12 +120633,10 @@ msgstr[3] "Пыщь-Пушки" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" -"С этой штучкой вы можете ПЫЩИТЬ пулями. ВЫПЫЩИТЕ их прям во всех зомби, " -"халков, пауков и сраных голых землекопов." #: lang/json/gun_from_json.py msgid "SVS-24" @@ -118626,10 +120725,10 @@ msgstr "" #: lang/json/gun_from_json.py msgid "Modified CW-24" msgid_plural "Modified CW-24" -msgstr[0] "Модифицированая CW-24" -msgstr[1] "Модифицированые CW-24" -msgstr[2] "Модифицированых CW-24" -msgstr[3] "Модифицированые CW-24" +msgstr[0] "Модифицированная CW-24" +msgstr[1] "Модифицированные CW-24" +msgstr[2] "Модифицированных CW-24" +msgstr[3] "Модифицированные CW-24" #: lang/json/gun_from_json.py msgid "" @@ -118644,10 +120743,10 @@ msgstr "" #: lang/json/gun_from_json.py msgid "Modified CW-24M" msgid_plural "Modified CW-24M" -msgstr[0] "Модифицированая CW-24M" -msgstr[1] "Модифицированые CW-24M" -msgstr[2] "Модифицированых CW-24M" -msgstr[3] "Модифицированые CW-24M" +msgstr[0] "Модифицированная CW-24M" +msgstr[1] "Модифицированные CW-24M" +msgstr[2] "Модифицированных CW-24M" +msgstr[3] "Модифицированные CW-24M" #: lang/json/gun_from_json.py msgid "CWD-63" @@ -118693,12 +120792,10 @@ msgstr[3] "JHEC M128s" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" -"M128 авторевольвер компании «Johnson Heavy Equipment Co.»; остальные " -"модификации револьвера не оправдали надежд. «JHEC» — дочерняя компания «D&B»" -" Миннеаполис." #: lang/json/gun_from_json.py msgid "Boomlighter 454" @@ -118809,12 +120906,12 @@ msgstr "" "1776: прямо со склада оружия свободы!" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" -msgstr[0] "карабин L.T." -msgstr[1] "карабина L.T." -msgstr[2] "карабинов L.T." -msgstr[3] "карабин L.T." +msgid "L.T. carbine" +msgid_plural "L.T. carbines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/gun_from_json.py msgid "" @@ -119305,13 +121402,12 @@ msgstr "" #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "" -"Этот мощный электролазер, разработанный военизированной компанией R&D " -"незадолго до событий Катаклизма, особенно эффективен против целей, " -"оснащённых электроникой, и заряжается от бесперебойного источника питания " -"на электростациях." +"Этот мощный электролазер, разработанный военным исследовательским " +"подразделением незадолго до Катаклизма. Особенно эффективен против целей, " +"оснащённых электроникой. Заряжается от станции УБП." #: lang/json/gun_from_json.py msgid "hand-held laser cannon" @@ -119340,18 +121436,16 @@ msgstr[3] "лазерные винтовки" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" -"Эта высокотехнологичная лазерная винтовка, работающая на энергии " -"бесперебойного источника питания, была представлена военизированной " -"компанией R&D незадолго до событий Катаклизма и уже по первоначальным " -"показателям работоспособности составила конкуренцию самым передовым образцам" -" баллистического оружия того дня. Несмотря на то, что дальнейшие разработки " -"в этой области были погребены в куче пепла, это оружие все еще может сделать" -" то же самое с вашими врагами." +"Высокотехнологичная лазерная винтовка, работающая от УБП. Разработана " +"военным исследовательским подразделением незадолго до Катаклизма. По своим " +"характеристикам она соперничала с наиболее продвинутым баллистическим " +"оружием того времени. Хотя Катаклизм отправил всё это на свалку истории, " +"это оружие может сделать то же самое с вашими врагами." #: lang/json/gun_from_json.py msgid "laser pistol" @@ -119502,7 +121596,7 @@ msgid "" msgstr "" "Похожий на широкий меч фалькату, этот изогнутый клинок имеет прикрепленный к" " обуху короткоствольный помповый дробовик. Предназначен для нанесения как " -"первого так и добивающих ударов." +"первого, так и последнего удара." #: lang/json/gun_from_json.py msgid "shotcestus" @@ -119551,6 +121645,10 @@ msgstr "" "Магически созданный изукрашенный лук из прочной гибкой древесины. Когда вы " "оттягиваете тетиву, появляется такая же магически вызванная стрела." +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -119584,8 +121682,8 @@ msgstr[3] "базовое робооружие" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." -msgstr "Это псевдовещь для атак монстров. Если вы ее видите, значит это баг." +"This is a pseudo item for monster attacks. If you see this, it's a bug." +msgstr "" #: lang/json/gun_from_json.py msgid "integral 12 gauge shotgun" @@ -119837,14 +121935,8 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" -"Живой сгусток, превращённый в автономное оружие. Предназначен для " -"вытягивания вдоль рамы наподобие барьера. Он развил способность постоянно " -"отращивать твердые наросты, управляемые гибкими волокнами. Эти «зубы» " -"хватают и ранят всех, кому не повезло оказаться поблизости. Внешняя мембрана" -" стала заметно толще для обеспечения таких мощных рывков. Сгусток достаточно" -" пластичный, чтобы его можно было оторвать…" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "gel shooter" @@ -119860,14 +121952,8 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" -"Живой сгусток, превращённый в автономное оружие. Передвигается по земле и " -"извлекает питательные вещества. Остатки с большой скоростью выбрасываются в " -"направлении любой угрозы. Этой аморфной массе можно придать форму и " -"присоединить куда-нибудь, но само по себе оружие неактивно без чего-то, что " -"могло бы им управлять. Сгусток достаточно пластичный, чтобы его можно было " -"оторвать…" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "frost lancer" @@ -120629,21 +122715,6 @@ msgstr "" "особенности делают её невероятно громоздкой и её необходимо смонтировать на " "опорную раму для стрельбы." -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "револьвер Model 10" -msgstr[1] "револьвера Model 10" -msgstr[2] "револьверов Model 10" -msgstr[3] "револьвер Model 10" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "" -"6-зарядный револьвер. Имеет поворотно-откидной барабан для лёгкой " -"перезарядки." - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -120665,60 +122736,6 @@ msgstr "" "военных самолетов, которых могло выбросить после крушения. Позже выпущены " "коммерческие варианты различными компаниями." -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "Colt Lightning .45" -msgstr[1] "Colt Lightning .45" -msgstr[2] "Colt Lightning .45" -msgstr[3] "Colt Lightning .45" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -"Современная репродукция помповой винтовки Кольт. Первоначально рассчитанную " -"на калибр .44-40, современные версии используют более распространённый " -"калибр .45 Long Colt; дополняет револьвер Single Action Army, во время " -"соревнований по ковбойской стрельбе из стрелкового оружия." - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "Дерринджер Bond Arms" -msgstr[1] "Дерринджера Bond Arms" -msgstr[2] "Дерринджеры Bond Arms" -msgstr[3] "Дерринджеры Bond Arms" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" -"Bond Arms Derringer — серия двухствольных компактных пистолетов. Широко " -"распространены модели под калибр .45 Long Colt, также подходят довольно " -"длинные патроны для дробовика калибра .410 дробь." - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] "лёгкий дробовик .410" -msgstr[1] "лёгких дробовика .410" -msgstr[2] "лёгких дробовиков .410" -msgstr[3] "лёгкий дробовик .410" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" -"Дробовик старого образца с переломным затвором, рассчитанный на патрон .410 " -"дробь. Разработан для меньшей отдачи, как альтернатива 12 калибру, лёгкий и " -"прост в производстве." - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -120735,55 +122752,6 @@ msgstr "" "Самодельный дробовик под патрон .410 дробь. Сделан из куска трубы, " "прикрученной к рукояти, заряжается одним патроном." -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] ".38 Super" -msgstr[1] ".38 Super" -msgstr[2] ".38 Super" -msgstr[3] ".38 Super" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "" -"Двухствольный полуавтоматический пистолет. Выглядит как два спаренных " -"пистолета M1911." - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38 Супер магазин" -msgstr[1] "M1991A1 .38 Супер магазина" -msgstr[2] "M1991A1 .38 Супер магазинов" -msgstr[3] "M1991A1 .38 Супер магазин" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "" -"Современный пистолет M1911, рассчитанный под патрон .38 Super. Можно " -"добиться хорошей точности." - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "Taurus Raging Judge Magnum" -msgstr[1] "Taurus Raging Judge Magnum" -msgstr[2] "Taurus Raging Judge Magnum" -msgstr[3] "Taurus Raging Judge Magnum" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" -"Taurus Raging Judge Magnum — пятизарядный револьвер под калибр .454 Casull. " -"В нём могут применяться боеприпасы калибров .410 дробь и .45 Long Colt." - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -122291,7 +124259,7 @@ msgstr "" "Винтовочный прицел 3-18x44. Поправки на ветер и подъём настраиваются с шагом" " 1/10 мрад. Этот прицел удивительно небольшой и лёгкий для такого " "увеличения. Модифицирован и настроен для установки практически на любое " -"оружие, по желанию, кроме пистолетов и пистолет-пулемётов." +"оружие, кроме пистолетов и пистолет-пулемётов." #: lang/json/gunmod_from_json.py msgid "ACOG scope" @@ -122322,9 +124290,9 @@ msgid "" "crosshair. This one was modified and customized to mount on pretty much any" " weapon other than pistols, if you so want." msgstr "" -"Оптический прицел 4x32 TA01 Advanced Combat Optical Gunsight с перекрестием " -"с тритиевой подсветкой. Был допилен для установки практически на любое " -"оружие, кроме пистолетов, если вы этого хотите." +"Продвинутый оптический прицел 4x32 TA01 с перекрестием с тритиевой " +"подсветкой. Модифицирован для установки практически на любое оружие, кроме " +"пистолетов." #: lang/json/gunmod_from_json.py msgid "RS1219 scope" @@ -122356,12 +124324,9 @@ msgstr[3] "простые оптические прицелы" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" -"Простой самодельный оптический прицел, по сути, маленькая подзорная трубочка" -" с целиком. Не так хорош, как те, что были сделаны до катаклизма. " -"Увеличивает вес, но повышает точность." #: lang/json/gunmod_from_json.py msgid "telescopic pistol sight" @@ -122597,11 +124562,10 @@ msgid "" "was modified and customized to mount on pretty much any weapon, if you so " "want." msgstr "" -"Сошки обычно используются на винтовках и пулемётах, чтобы улучшить контроль " -"над отдачей. Несмотря на то, что они значительно улучшают контроль отдачи, " -"они могут использоваться только на определённых поверхностях и медленно " -"разворачиваются. Были допилены для установки практически на любое оружие, " -"если вы этого хотите." +"Сошки обычно используются на винтовках и пулемётах для стабилизации оружия. " +"Несмотря на значительное улучшение контроля отдачи, разворачиваются медленно" +" и годятся только для определённых поверхностей. Модифицированы для " +"установки практически на любое оружие." #: lang/json/gunmod_from_json.py msgid "combination gun shotgun" @@ -122654,10 +124618,10 @@ msgstr "" #: lang/json/gunmod_from_json.py msgid "modified forward grip" msgid_plural "modified forward grips" -msgstr[0] "модифицированая передняя рукоять" -msgstr[1] "модифицированых передних рукояти" -msgstr[2] "модифицированых передних рукоятей" -msgstr[3] "модифицированые передние рукояти" +msgstr[0] "модифицированная передняя рукоять" +msgstr[1] "модифицированных передних рукояти" +msgstr[2] "модифицированных передних рукоятей" +msgstr[3] "модифицированные передние рукояти" #: lang/json/gunmod_from_json.py msgid "" @@ -122667,7 +124631,7 @@ msgid "" msgstr "" "Это передняя рукоять, улучшающая контроль над отдачей. Менее эффективна, чем" " сошки, но может использоваться в любой ситуации. Модифицирована для " -"установки практически на любое оружие, по желанию." +"установки практически на любое оружие." #: lang/json/gunmod_from_json.py msgid "integrated bayonet" @@ -122788,10 +124752,10 @@ msgstr "" #: lang/json/gunmod_from_json.py msgid "modified M203" msgid_plural "modified M203s" -msgstr[0] "модифицированый M203 подствольник" -msgstr[1] "модифицированых M203 подствольника" -msgstr[2] "модифицированых M203 подствольников" -msgstr[3] "модифицированые M203 подствольники" +msgstr[0] "модифицированный M203 подствольник" +msgstr[1] "модифицированных M203 подствольника" +msgstr[2] "модифицированных M203 подствольников" +msgstr[3] "модифицированные M203 подствольники" #: lang/json/gunmod_from_json.py msgid "" @@ -122803,8 +124767,7 @@ msgstr "" "Гранатомёт M203 был первоначально разработан для использования с винтовкой " "М-16, но сейчас может быть установлен практически на любую винтовку. " "Позволяет зарядить 40-мм гранату. Модифицирован и настроен для установки " -"практически на любое оружие, по желанию, кроме пистолетов и пистолет-" -"пулемётов." +"практически на любое оружие, кроме пистолетов и пистолет-пулемётов." #: lang/json/gunmod_from_json.py msgid "M320 GLM" @@ -122828,10 +124791,10 @@ msgstr "" #: lang/json/gunmod_from_json.py msgid "modified M320 GLM" msgid_plural "modified M320 GLMs" -msgstr[0] "модифицированый M320 GLM подствольник" -msgstr[1] "модифицированых M320 GLM подствольника" -msgstr[2] "модифицированых M320 GLM подствольников" -msgstr[3] "модифицированые M320 GLM подствольники" +msgstr[0] "модифицированный M320 GLM подствольник" +msgstr[1] "модифицированных M320 GLM подствольника" +msgstr[2] "модифицированных M320 GLM подствольников" +msgstr[3] "модифицированные M320 GLM подствольники" #: lang/json/gunmod_from_json.py msgid "" @@ -122844,8 +124807,22 @@ msgstr "" "M320 гранатомётный модуль предлагает функциональность больших гранатомётов в" " очень маленьком корпусе ценой снижения точности. Можно прикрепить к " "винтовке или в сочетании с прикладом использовать как отдельное оружие. " -"Модифицирован и настроен для установки практически на любое оружие, по " -"желанию, кроме пистолетов и дробовиков." +"Модифицирован и настроен для установки практически на любое оружие, кроме " +"пистолетов и дробовиков." + +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" @@ -122867,10 +124844,10 @@ msgstr "" #: lang/json/gunmod_from_json.py msgid "modified masterkey shotgun" msgid_plural "modified masterkey shotguns" -msgstr[0] "модифицированый подствольный дробовик" -msgstr[1] "модифицированых подствольных дробовика" -msgstr[2] "модифицированых подствольных дробовиков" -msgstr[3] "модифицированые подствольные дробовики" +msgstr[0] "модифицированный подствольный дробовик" +msgstr[1] "модифицированных подствольных дробовика" +msgstr[2] "модифицированных подствольных дробовиков" +msgstr[3] "модифицированные подствольные дробовики" #: lang/json/gunmod_from_json.py msgid "" @@ -122881,7 +124858,7 @@ msgid "" msgstr "" "Небольшой дробовик, который крепится к стволу большинства винтовок. Магазин " "рассчитан на четыре патрона. Модифицирован и настроен для установки " -"практически на любое оружие, по желанию, кроме пистолетов и дробовиков." +"практически на любое оружие, кроме пистолетов и дробовиков." #: lang/json/gunmod_from_json.py msgid "40mm pipe launcher" @@ -122938,10 +124915,10 @@ msgstr "" #: lang/json/gunmod_from_json.py msgid "modified RM121 aux shotgun" msgid_plural "modified RM121 aux shotguns" -msgstr[0] "модифицированый подствольный дробовик RM121" -msgstr[1] "модифицированых подствольных дробовика RM121" -msgstr[2] "модифицированых подствольных дробовиков RM121" -msgstr[3] "модифицированые подствольные дробовики RM121" +msgstr[0] "модифицированный подствольный дробовик RM121" +msgstr[1] "модифицированных подствольных дробовика RM121" +msgstr[2] "модифицированных подствольных дробовиков RM121" +msgstr[3] "модифицированные подствольные дробовики RM121" #: lang/json/gunmod_from_json.py msgid "" @@ -122976,10 +124953,10 @@ msgstr "" #: lang/json/gunmod_from_json.py msgid "modified underslung shotgun" msgid_plural "modified underslung shotguns" -msgstr[0] "модифицированый подствольный дробовик" -msgstr[1] "модифицированых подствольных дробовика" -msgstr[2] "модифицированых подствольных дробовиков" -msgstr[3] "модифицированые подствольные дробовики" +msgstr[0] "модифицированный подствольный дробовик" +msgstr[1] "модифицированных подствольных дробовика" +msgstr[2] "модифицированных подствольных дробовиков" +msgstr[3] "модифицированные подствольные дробовики" #: lang/json/gunmod_from_json.py msgid "" @@ -122988,8 +124965,8 @@ msgid "" " was modified and customized to mount on pretty much any weapon other than " "pistols, if you so want." msgstr "" -"Короткое ружьё с двумя стволами, которое может быть установлено под стволом " -"многих винтовок. Стреляет двумя зарядами дроби, после чего нуждается в " +"Короткое ружьё с двумя стволами, которое можно прикрепить под стволом многих" +" винтовок. Стреляет двумя зарядами дроби, после чего нуждается в " "перезарядке. Модифицирован и настроен для установки практически на любое " "оружие, кроме пистолетов." @@ -123167,11 +125144,9 @@ msgstr[3] "Пусковые ракетные установки" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" -"Короткий ствол для стрельбы сигнальными ракетами. Он неудобно расположен и " -"куда менее точный, чем обычная ракетница." #: lang/json/gunmod_from_json.py msgid "CQB SI shotgun" @@ -123198,13 +125173,10 @@ msgstr[3] "затыльники с крюком" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" -", Ложа военного класса, которая складывается, уменьшая объем оружия. Её " -"развесовка и поворотный крюк, охватывающий плечо, обеспечивает хорошую " -"стабильность." #: lang/json/gunmod_from_json.py msgid "diffracting lens" @@ -123217,12 +125189,9 @@ msgstr[3] "дифракционные линзы" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" -"Набор оптики для лазерного оружия, благодаря которому лазерный луч " -"расщепляется на несколько лучей меньшей мощности. Это увеличивает урон при " -"стрельбе в упор, но значительно снижает дальность выстрела." #: lang/json/gunmod_from_json.py msgid "tactical flashlight" @@ -123445,22 +125414,6 @@ msgstr "" "хорошим оружием ближнего боя, обеспечивающим дальность атаки при " "прикреплении к длинноствольному оружию или арбалету." -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "дробовик M6 ASW" -msgstr[1] "дробовика M6 ASW" -msgstr[2] "дробовиков M6 ASW" -msgstr[3] "дробовик M6 ASW" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "" -"Интегрированный подствольный дробовик .410 для M6 Aircrew Survival Weapon. " -"Эта модификация неустранима." - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "Вы разделываете рыбу и снимаете с неё филе." @@ -125686,10 +127639,6 @@ msgstr "Вырезать болты или провода" msgid "Heat up food (with it)" msgstr "Разогреть еду (с помощью прибора)" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "Чинить вещь из дерева/бумаги/кости/хитина" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "Прикрепить как мод. инструмента" @@ -126579,6 +128528,11 @@ msgstr "" "Этот предмет одежды остаётся в порядке даже при " "намокании. Может улучшить самочувствие." +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -127754,7 +129708,8 @@ msgstr "Строить" msgid "Disassemble items" msgstr "Разобрать предметы" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "Спать" @@ -128566,7 +130521,8 @@ msgstr "Осиное гнездо" msgid "Wasp nest is here." msgstr "Тут осиное гнездо." -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "Пауки" @@ -128625,6 +130581,33 @@ msgstr "Пруд" msgid "Small pond is here." msgstr "Тут маленький пруд." +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "Залежи глины" @@ -128695,8 +130678,8 @@ msgstr "Трупы" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." -msgstr "Несчастные из числа миллиардов жертв Катаклизма." +msgid "Some unfortunates from the billions lost in the Cataclysm." +msgstr "" #. ~ Computer name #: lang/json/mapgen_from_json.py @@ -129481,6 +131464,16 @@ msgstr "Не бегать!" msgid "NO Diving!" msgstr "Не нырять!" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -129618,8 +131611,7 @@ msgid "Emergency Message" msgstr "Экстренное сообщение" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "Отключить внешний источник энергии" @@ -130352,13 +132344,10 @@ msgstr "Держать позицию" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" -"Вы отважно защищаетесь, и никакой угрозе не сдвинуть вас с места.\n" -"\n" -"+2 попытки блока, -1 навык Уклонения, блокируемый урон снижается на 50%% Силы." #: lang/json/martial_art_from_json.py msgid "Tactical Retreat" @@ -130997,15 +132986,15 @@ msgid "" "extra damage and your attacks do more damage if you are not holding " "anything." msgstr "" -"Тхэквондо — это национальный корейский вид спорта, он использовался в армии " +"Тхэквондо — это национальный корейский вид спорта, он применялся в армии " "Южной Кореи в 20-ом веке. Фокусируется на ударах ногами, поэтому не получает" -" никаких преимуществ от использования любых видов оружия. Также включает " -"силовые тренировки. Чем вы сильнее, тем больше урона можете заблокировать, а" -" ваши атаки наносят больше урона, если вы ничего не держите." +" никаких преимуществ от любых видов оружия. Также включает силовые " +"тренировки. Чем вы сильнее, тем больше урона можете заблокировать, а ваши " +"атаки наносят больше урона, если вы ничего не держите." #: lang/json/martial_art_from_json.py msgid "Taekwondo Stance" -msgstr "Тхэквондо Стойка" +msgstr "Стойка Тхэквондо" #. ~ Description of buff 'Taekwondo Stance' for martial art 'Taekwondo' #: lang/json/martial_art_from_json.py @@ -131015,13 +133004,13 @@ msgid "" "\n" "Blocked damage decreased by 50%% of Strength." msgstr "" -"Использование ног для атаки освобождает руки для лучшей защиты.\n" +"Атаки ногами освобождают руки для лучшей защиты.\n" "\n" "Блокируемый урон снижается на 50%% Силы." #: lang/json/martial_art_from_json.py msgid "Unhindered" -msgstr "Беспрепятственный" +msgstr "Неудержимость" #. ~ Description of buff 'Unhindered' for martial art 'Taekwondo' #: lang/json/martial_art_from_json.py @@ -131065,7 +133054,7 @@ msgid "" "\n" "+1 Block attempts, blocked damage reduced by 100%% Perception." msgstr "" -"Вы сфокусированы на защите и предсказывает атаки своих противников.\n" +"Вы сфокусированы на защите и предсказываете атаки своих противников.\n" "\n" "+1 попытка блока, блокируемый урон снижается на 100%% Восприятия." @@ -131565,8 +133554,8 @@ msgstr "Интенсивный бой К.Р.И.Т" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" -msgstr "Дополнительный урон и бронебойность за стек. Максимум 5 стеков" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgstr "" #: lang/json/martial_art_from_json.py msgid "C.R.I.T Calculation" @@ -131589,12 +133578,9 @@ msgstr "Обезвреживание К.Р.И.Т" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" -"Защитный стиль, основанный на оглушающих ударах, бросках и сбивании с ног. " -"Каждая атака увеличивает вашу броню на 0.125 и даёт другие боевые бонусы, " -"основанные на характеристиках." #: lang/json/martial_art_from_json.py msgid "C.R.I.T Buildup" @@ -131603,8 +133589,8 @@ msgstr "Готовность К.Р.И.Т" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" -msgstr "+0.05 брони и другие небольшие бонусы на стек. Максимум 10 стеков." +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgstr "" #: lang/json/martial_art_from_json.py msgid "C.R.I.T Guard" @@ -131612,9 +133598,8 @@ msgstr "Страж К.Р.И.Т" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" -"+1 брони. СИЛ обеспечивает точность и небольшой дробящий проникающий урон." #: lang/json/martial_art_from_json.py msgid "C.R.I.T CQB" @@ -131624,10 +133609,8 @@ msgstr "Рукопашный бой К.Р.И.Т" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" -"Защитный стиль, основанный на быстрых ударах и пронзающих уколах. Каждая " -"атака добавляет множество боевых бонусов. 25 процентов дробящего урона." #: lang/json/martial_art_from_json.py msgid "C.R.I.T Tenacity" @@ -131636,10 +133619,8 @@ msgstr "Настойчивость К.Р.И.Т" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" -"+Скорости Атаки и другие небольшие бонусы на основе ЛОВ на стек. Максимум 5 " -"стеков." #: lang/json/martial_art_from_json.py msgid "C.R.I.T Initiative" @@ -131649,10 +133630,8 @@ msgstr "Инициатива К.Р.И.Т" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" -"ЛОВ обеспечивает уклонение, точность и колюще-режущий урон с небольшой " -"бронебойностью. 50% дробящего урона." #: lang/json/martial_art_from_json.py msgid "Panzer Kunst" @@ -131835,6 +133814,10 @@ msgstr "лохмотья" msgid "Diamond" msgstr "алмаз" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "яйцо" @@ -132052,8 +134035,8 @@ msgid "Mushroom" msgstr "гриб" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "вода" @@ -133068,8 +135051,8 @@ msgid "" "Man… you're a goddamn machine. It was a pleasure working with you. You " "know, you may just change our little neck of the world if you keep this up." msgstr "" -"Мужик... Ты чёртова машина. Приятно иметь с тобой дело. Знаешь, ты можешь " -"изменить наш маленький уголок мира, если продолжишь в том же духе." +"Ничего себе... Ты чёртова машина. Было приятно поработать вместе. Знаешь, " +"ты можешь изменить наш маленький уголок мира, если продолжишь в том же духе." #: lang/json/mission_def_from_json.py msgid "I don't think that was quite a hundred dead zeds." @@ -133115,8 +135098,8 @@ msgid "" "Don't risk torching the building it may be hiding in if it has a basement. " "The sucker may still be alive under the rubble and ash." msgstr "" -"Не рискуй жечь здание, если в нём есть подвал, там можно спрятаться. " -"Недоноски могут до сих пор быть живыми под обломками и пеплом." +"Не рискуй жечь здание, если в нём есть подвал, там можно спрятаться. Под " +"обломками и пеплом могут оставаться живые ублюдки." #: lang/json/mission_def_from_json.py msgid "May that bastard never get up again." @@ -133164,7 +135147,7 @@ msgstr "Ну что ж, я бы тоже не вызвался добровол #: lang/json/mission_def_from_json.py msgid "I'd carry a shotgun at least, it sounded pretty big." -msgstr "Прихвати хотя бы дробовик, он хотя бы громкий." +msgstr "Я б взял с собой как минимум дробовик, звучит внушительно." #: lang/json/mission_def_from_json.py msgid "" @@ -133566,11 +135549,9 @@ msgstr "Докажите, что умеете выживать" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" -"Докажите, что вы выживальщик — проживите 10 дней в постапокалипсисе и " -"вернитесь к тому, кто дал вам это задание." #: lang/json/mission_def_from_json.py msgid "It's hard to tell who actually has the skills to survive these days..." @@ -133743,12 +135724,12 @@ msgstr "" "запас." #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." -msgstr "Не думаю, что я спасён…" +msgid "I don't feel saved…" +msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." -msgstr "Передай моей семье, что я люблю их…" +msgid "Tell my family that I love them…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Find an anvil" @@ -133790,6 +135771,10 @@ msgstr "" msgid "What good does this do me?" msgstr "И что толку?" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "Найти Криса Ишервуда" @@ -133834,8 +135819,8 @@ msgstr "" " работал над новой бронёй для лошадей, держи новенький прототип." #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." -msgstr "Я надеюсь, с ним не случится то же, что с Барри…" +msgid "I hope he didn't meet Barry's fate…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Free Barry from the mysterious structure" @@ -133877,16 +135862,13 @@ msgstr "Готов?" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" -"Оно даже выше, чем я помню, нам нужно искать пленников. Я оставил семье " -"записку, когда мы ушли. Если мы выживем, они должны привести хижину в " -"порядок, чтоб ты мог переехать туда, если хочешь остаться." #: lang/json/mission_def_from_json.py -msgid "Well it was here..." -msgstr "Что ж, оно было там…" +msgid "Well it was here…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Gather 50 dandelions" @@ -133962,8 +135944,8 @@ msgstr "" "подарочек." #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." -msgstr "Мне нужно найти кого-то, кто получше знаком с лесом…" +msgid "I'll have to find someone more at home in the forest…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Find and capture a cat" @@ -133981,11 +135963,9 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" -"Спасибо! Пожалуйста, поспеши! Возьми эту клетку, чтобы можно было поймать " -"кошку." #: lang/json/mission_def_from_json.py msgid "I didn't want to use chemicals on these rats." @@ -134007,18 +135987,16 @@ msgstr "Удалось найти кошку?" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" -"Огромное спасибо, я хочу тебе отдать копию своих заметок по природной " -"медицине. Я назову эту милую зверушку Джошуа." #: lang/json/mission_def_from_json.py msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "Чего?! Ты врёшь, я знаю! Где моя клетка, ты её вообще вернул?" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." -msgstr "О нет! Наверно, они слишком ловкие для тебя…" +msgid "Oh no! I guess they are too nimble for you…" +msgstr "" #: lang/json/mission_def_from_json.py msgid "Gather 120 Stones" @@ -134828,10 +136806,9 @@ msgstr "Но это не она." #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" -"Не знаю, смогу ли я выжить в катаклизме без моей особенной банки с жижей." #: lang/json/mission_def_from_json.py msgid "Bring an acoustic guitar" @@ -135319,20 +137296,12 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " "which isn't good for that much yet, but it would help us to reclaim the bay." msgstr "" -"Если ты и правда хочешь протянуть руку помощи, то нам бы не помешал кто-" -"нибудь для зачистки мертвецов в задней комнате. В первые дни Катаклизма мы " -"боялись и нос высунуть отсюда, поэтому складывали наших мертвецов и зомби, " -"которых нам удалось убить, в закрытую заднюю комнату. Наш многообещающий " -"лидер тоже пал… Он превратился во что-то ужасное. Убей их всех и " -"удостоверься, что они нас больше не потревожат. Много заплатить мы не " -"сможем, если не считать нашей внутренней валюты, от которой пока проку мало," -" но ты поможешь нам отбить комнату." #: lang/json/mission_def_from_json.py msgid "Please be careful, we don't need any more deaths." @@ -135702,16 +137671,10 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" -"Итак, здесь, похоже, месяцы, может быть, годы экспериментов, так что набор " -"данных должен быть огромным. Подходящие серверы баз данных перегрелись бы, " -"работая на аварийной электросети. Но я нашел сообщения из лаборатории, в " -"которой во время катаклизма был открыт какой-то замораживающий портал, " -"охладивший всё до температур ниже нуля. Держу пари, что архивы внутри этой " -"лаборатории все еще работают." #: lang/json/mission_def_from_json.py msgid "" @@ -136821,8 +138784,8 @@ msgid "" "Cars can be found in traffic jams along roads or in parking lots… I'm sure " "you can find a few." msgstr "" -"Машины могут быть найдены в пробка вдоль дорог или на автомобильных " -"стоянках... Я уверен, ты найдёшь их." +"Машин полно в пробках на дорогах или на автомобильных стоянках... Я уверен, " +"ты найдёшь их." #: lang/json/mission_def_from_json.py msgid "Do you have the car batteries?" @@ -137416,10 +139379,8 @@ msgstr "Мне нужно 50 меховых шкур." #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" -"Я должен содержать сад, но по ночам я шью зимнюю одежду. Не мог бы ты найти " -"около 50 шкур для меня?" #: lang/json/mission_def_from_json.py msgid "Don't forget to tell me when you have them." @@ -137446,10 +139407,6 @@ msgstr "" "Я действительно ценю твою помощь. Не волнуйся, я не отпущу тебя с пустыми " "руками." -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "Спасибо за попытку… Я думаю." - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "Не беспокойся, это не так важно." @@ -137474,10 +139431,8 @@ msgstr "Мука позволила бы мне разбавить однооб #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" -"Спасибо, что принял эту просьбу. Иначе, я мог бы убить незнакомца за " -"бутерброд. Ха-ха, шутка." #: lang/json/mission_def_from_json.py msgid "Just let me know if you change your mind." @@ -137505,12 +139460,12 @@ msgstr "Да и не важно, мне не срочно." #: lang/json/mission_def_from_json.py msgid "Gallon Jugs" -msgstr "Галлонные бутылки" +msgstr "4.5-литровые Бутылки" #. ~ Description for mission 'Gallon Jugs' #: lang/json/mission_def_from_json.py msgid "Find 5 gallon jugs." -msgstr "Найди 5 одногаллонных бутылок." +msgstr "Найди 5 бутылок по 4.5 литра." #: lang/json/mission_def_from_json.py msgid "I need storage for various liquid products when the fruits come in." @@ -137518,12 +139473,9 @@ msgstr "Мне нужно хранить различные жидкие про #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" -"Каждый сезон мы производим очень много фруктов. Из части мы делаем сок, а из" -" другой части алкоголь. Мне нужны легкие ёмкости, чтобы отправлять это " -"караваном." #: lang/json/mission_def_from_json.py msgid "Thank you for accepting. I'm almost out after the last caravan." @@ -137536,16 +139488,15 @@ msgstr "Наверное, мне придётся делать ёмкости и #: lang/json/mission_def_from_json.py msgid "" "Gallon jugs are not that rare to find. They are commonly found in kitchens." -msgstr "Одногаллонные бутылки не так уж и редки. Они обычно бывают на кухнях." +msgstr "Бутылки по 4.5 литра не так уж и редки. Они обычно бывают на кухнях." #: lang/json/mission_def_from_json.py msgid "Do you have those jugs now?" msgstr "Принес бутылки?" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" -"Я благодарен за помощь, которую ты оказал. У меня есть еще одна задача." #: lang/json/mission_def_from_json.py msgid "Faulty CBMs" @@ -137574,9 +139525,8 @@ msgstr "Спасибо за помощь. Очень любезно с твое #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" -"Эти материалы часто находятся в опасных зонах. Я понимаю твоё решение." #: lang/json/mission_def_from_json.py msgid "" @@ -137590,11 +139540,9 @@ msgstr "Принёс КБМ?" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" -"Я благодарен за помощь, которую ты оказал. Думаю, что в ближайшее время нам " -"понадобится что-то ещё." #. ~ 1$s is monster name, 2$s bodypart in accusative #: lang/json/monster_attack_from_json.py src/monattack.cpp @@ -137661,6 +139609,54 @@ msgstr "%1$s пытается обрушиться на вас, но прома msgid "The %1$s tries to slam into , but fails to." msgstr "%1$s пытается обрушиться на , но безуспешно." +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -139509,9 +141505,9 @@ msgid "" "will make you very visible in the dark, ideal to attract a partner during " "mating season." msgstr "" -"Фотофор вырос из вашей головы, вы можете заставить его мягко светиться. Это " -"сделает вас очень заметным в темноте, идеально подходит для привлечения " -"партнера во время брачного сезона." +"Из вашей головы растёт фотофор, вы можете заставить его мягко светиться. Это" +" очень выдаёт вас в темноте, но идеально подходит для привлечения партнера " +"во время брачного сезона." #: lang/json/mutation_from_json.py msgid "Photophore" @@ -139520,7 +141516,7 @@ msgstr "Фотофор" #. ~ Description for Photophore #: lang/json/mutation_from_json.py msgid "Your can make your photophore glow brightly." -msgstr "Вы можете заставить ваш фотофор светиться ярко." +msgstr "Ваш фотофор может ярко светиться." #: lang/json/mutation_from_json.py msgid "Good Hearing" @@ -145952,7 +147948,7 @@ msgid "" "is off-limits to you, even if your life depended on it." msgstr "" "То ли по своему хотению, то ли из-за детской травмы, путешествие на " -"транспортных средствах для вас неприёмлемо, даже если от этого зависит ваша " +"транспортных средствах для вас неприемлемо, даже если от этого зависит ваша " "жизнь." #: lang/json/mutation_from_json.py @@ -145965,8 +147961,8 @@ msgstr "История Выжившего" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" -msgstr "Этот NPC может рассказать вам, как он пережил катаклизм." +msgid "This NPC could tell you about how they survived the Cataclysm" +msgstr "" #: lang/json/mutation_from_json.py msgid "Mark of the Seer" @@ -146482,11 +148478,9 @@ msgstr "Рукопашная подготовка К.Р.И.Т" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" -"Вы прошли курс тренировок по защите. За каждый успешный удар вы получаете " -"разные небольшие боевые бонусы в зависимости от ваших характеристик." #: lang/json/mutation_from_json.py msgid "Shadow Meld" @@ -146553,19 +148547,9 @@ msgstr "Природный дар" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." -msgstr "Сама природа скрывает ваше присутствие. Вас немного сложнее заметить." - -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." msgstr "" -"Что-то в вашем внешнем виде успокаивает животных, и они безотчётно доверяют " -"вам. Это работает только с обычными животными." #: lang/json/mutation_from_json.py msgid "Slashers" @@ -147233,7 +149217,7 @@ msgid "Gardener" msgstr "Садовник" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -147266,8 +149250,8 @@ msgid "I'm just trying to stay alive." msgstr "Я просто пытаюсь остаться в живых." #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." -msgstr "Я просто пытаюсь остаться в живых… и это не так легко, как кажется." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Lizard Mutant" @@ -147275,11 +149259,9 @@ msgstr "Мутант-ящерица" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген ящерицы… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Medical Mutant" @@ -147287,11 +149269,9 @@ msgstr "Мутант медицины" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу медицинский мутаген… этот мир больше не место для обычных людей, и я " -"не планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Bird Mutant" @@ -147299,11 +149279,9 @@ msgstr "Мутант-птица" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Я ищу мутаген птиц… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Fish Mutant" @@ -147311,11 +149289,9 @@ msgstr "Мутант-рыба" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Я ищу мутаген рыб… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Beast Mutant" @@ -147323,11 +149299,9 @@ msgstr "Мутант-зверь" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Я ищу мутаген зверя… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Ursine Mutant" @@ -147335,11 +149309,9 @@ msgstr "Мутант-медведь" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген медведя… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Feline Mutant" @@ -147347,11 +149319,9 @@ msgstr "Мутант-кошка" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген кошки… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Lupine Mutant" @@ -147359,11 +149329,9 @@ msgstr "Мутант-собака" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген волка… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Cattle Mutant" @@ -147371,11 +149339,9 @@ msgstr "Мутант-бык" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген быка… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Insect Mutant" @@ -147383,11 +149349,9 @@ msgstr "Мутант-насекомое" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген насекомых… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Plant Mutant" @@ -147395,11 +149359,9 @@ msgstr "Мутант-растение" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Я ищу мутаген растений… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Slime Mutant" @@ -147407,11 +149369,9 @@ msgstr "Мутант-слизь" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Я ищу мутаген слизней… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Troglobite Mutant" @@ -147419,11 +149379,9 @@ msgstr "Мутант-троглобит" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -"Я ищу мутаген троглобита… этот мир больше не место для обычных людей, и я не" -" планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Cephalopod Mutant" @@ -147431,11 +149389,9 @@ msgstr "Мутант-цефалопод" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." msgstr "" -"Я ищу мутаген моллюска… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Spider Mutant" @@ -147443,11 +149399,9 @@ msgstr "Мутант-паук" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген паука… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Rat Mutant" @@ -147455,11 +149409,9 @@ msgstr "Мутант-крыса" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." msgstr "" -"Я ищу мутаген крысы… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Mouse Mutant" @@ -147467,11 +149419,9 @@ msgstr "Мышиный Мутант" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Я ищу мышиный мутаген… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Alpha Mutant" @@ -147479,11 +149429,9 @@ msgstr "Мутант-альфа" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." msgstr "" -"Я ищу мутаген альфы… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Elfa Mutant" @@ -147491,11 +149439,9 @@ msgstr "Мутант-эльфа" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." msgstr "" -"Я ищу мутаген эльфа… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Chimera Mutant" @@ -147503,11 +149449,9 @@ msgstr "Мутант-химера" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген химеры… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_class_from_json.py msgid "Raptor Mutant" @@ -147515,11 +149459,9 @@ msgstr "Мутант-раптор" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." msgstr "" -"Я ищу мутаген раптора… этот мир больше не место для обычных людей, и я не " -"планирую оставаться таким." #: lang/json/npc_from_json.py msgid "Brigitte LaCroix" @@ -150854,13 +152796,10 @@ msgstr "Укрывшийся выживальщик" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"В начале Катаклизма ты засел в бомбоубежище. Теперь пришла зима, и ты " -"надеешься, что все те разношёрстные навыки, изученные тобой по книгам, " -"помогут тебе выжить." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -150871,13 +152810,10 @@ msgstr "Укрывшаяся выживальщица" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "" -"В начале Катаклизма ты засела в бомбоубежище. Теперь пришла зима, и ты " -"надеешься, что все те разношёрстные навыки, изученные тобой по книгам, " -"помогут тебе выжить." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -150888,12 +152824,10 @@ msgstr "Укрывшийся ополченец" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Как только начался Катаклизм, ты укрылся в бомбоубежище. Настала зима, и ты " -"надеешься, что приобретённые навыки и оружие помогут тебе выжить." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -150904,12 +152838,10 @@ msgstr "Укрывшаяся ополченка" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "" -"Как только начался Катаклизм, ты укрылась в бомбоубежище. Настала зима, и ты" -" надеешься, что приобретённые навыки и оружие помогут тебе выжить." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -150990,13 +152922,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"Каково диавола? Ты ничево не ведаешь ни о сём странном месте, ни о " -"нечестивой ворожбе, каковая извела тебе сюда. Имеючи токмо сии запасы, ты " -"должон найтить способ выжить в худшем катаклизме, каковой же узревал " -"человек с поры Потопа да ковчега Ноева." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151009,13 +152937,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" -"Каково диавола? Ты ничево не ведаешь ни о сём странном месте, ни о " -"нечестивой ворожбе, каковая извела тебе сюда. Имеючи токмо сии запасы, ты " -"должна найтить способ выжить в худшем катаклизме, каковой же узревал человек" -" с поры Потопа да ковчега Ноева." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151127,12 +153051,9 @@ msgstr "Пчеловод" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Раньше ты был профессиональным пчеловодом. Когда разразился Катаклизм, тебе " -"пришлось отказаться от своих драгоценных пчёл, но, по крайней мере, удалось " -"захватить кое-какую утварь и мёд." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151144,12 +153065,9 @@ msgstr "Пчеловод" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "" -"Раньше ты была профессиональным пчеловодом. Когда разразился Катаклизм, тебе" -" пришлось отказаться от своих драгоценных пчёл, но, по крайней мере, удалось" -" захватить кое-какую утварь и мёд." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151160,13 +153078,10 @@ msgstr "Баскетболист" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"Это должна была быть твоя первая крупная игра, когда произошёл Катаклизм. " -"Благодаря своим быстрым ногам, ты был в числе немногих счастливчиков, кому " -"удалось спастись от тех существ." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151177,13 +153092,10 @@ msgstr "Баскетболистка" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "" -"Это должна была быть твоя первая крупная игра, когда произошёл Катаклизм. " -"Благодаря своим быстрым ногам, ты была в числе немногих счастливчиков, кому " -"удалось спастись от тех существ." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151342,11 +153254,9 @@ msgstr "Дворецкий" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Ты работал на богатую семью, но после Катаклизма они отбыли на семейный " -"отпуск в неизвестном направлении, предоставив заботиться самому о себе." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151357,11 +153267,9 @@ msgstr "Горничная" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "" -"Ты работала на богатую семью, но после Катаклизма они отбыли на семейный " -"отпуск в неизвестном направлении, предоставив заботиться самой о себе." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151378,14 +153286,14 @@ msgid "" "blacked out. You just woke up in this place… Are you even on earth anymore?" msgstr "" "Вы шли по дороге ночью, пытаясь уйти от ужасов города, когда услышали " -"пронзительный крик в темноте. Когда вы повернулись, чтобы посмотреть, " -"внезапно почувствовали жгучую боль в голове и потеряли сознание. Вы только " -"что проснулись в этом месте... Вы, вообще, на земле?" +"зовущий голос по тьме. Вы подошли посмотреть, внезапно ощутили жгучую " +"головную боль и потеряли сознание. Вы только что проснулись в этом месте... " +"вы вообще всё ещё на Земле?" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Captive" -msgstr "Пленник" +msgstr "Пленница" #. ~ Profession (Captive) description #: lang/json/professions_from_json.py @@ -151397,9 +153305,9 @@ msgid "" "blacked out. You just woke up in this place… Are you even on earth anymore?" msgstr "" "Вы шли по дороге ночью, пытаясь уйти от ужасов города, когда услышали " -"пронзительный крик в темноте. Когда вы повернулись, чтобы посмотреть, " -"внезапно почувствовали жгучую боль в голове и потеряли сознание. Вы только " -"что проснулись в этом месте... Вы, вообще, на земле?" +"зовущий голос по тьме. Вы подошли посмотреть, внезапно ощутили жгучую " +"головную боль и потеряли сознание. Вы только что проснулись в этом месте... " +"вы вообще всё ещё на Земле?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151415,9 +153323,9 @@ msgid "" "heavy and you're not so sure anymore. You might be the one in need of a " "rescue now." msgstr "" -"Вы были подготовлены. Вы решили найти и спасти своих друзей. Но теперь, " -"когда вы идёте по этим странным коридорам, атмосфера становится тяжелой и вы" -" больше ни в чём не уверены. Возможно вы тот, кого надо спасать сейчас." +"Вы подготовились. Вы решили найти и спасти своих друзей. Но теперь вы в этих" +" странных коридорах, воздух становится гуще, и вы больше ни в чём не " +"уверены. Возможно, это вас нужно спасать." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -151433,9 +153341,9 @@ msgid "" "heavy and you're not so sure anymore. You might be the one in need of a " "rescue now." msgstr "" -"Вы были подготовлены. Вы решили найти и спасти своих друзей. Но теперь, " -"когда вы идёте по этим странным коридорам, атмосфера становится тяжелой и вы" -" больше ни в чём не уверены. Возможно вы та, кого надо спасать сейчас." +"Вы подготовились. Вы решили найти и спасти своих друзей. Но теперь вы в этих" +" странных коридорах, воздух становится гуще, и вы больше ни в чём не " +"уверены. Возможно, это вас нужно спасать." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -151644,7 +153552,7 @@ msgid "" "monsters that want you dead. Your equipment is basic, but versatile - and " "with your skills, more than you need… except your canteen's run out!" msgstr "" -"Ты обучен выживанию вдали от цивилизации. Похоже, что твои навыки сильно " +"Ты обучена выживанию вдали от цивилизации. Похоже, что твои навыки сильно " "пригодятся, поскольку теперь цивилизация полна монстров, которые хотят твоей" " смерти. Твоё снаряжение весьма простое, но универсальное, а с твоими-то " "навыками этого более чем достаточно… Кроме тех случаев, когда фляга пуста!" @@ -152434,13 +154342,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Ты часто выполнял электротехнические работы для небольших компаний. Так " -"случилось, что когда произошёл Катаклизм, ты как раз менял проводку в одном " -"из этих пародий на убежище. К сожалению, ты успел довести проводку только до" -" компьютера… как много же пользы он теперь принесёт." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -152453,13 +154357,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "" -"Ты часто выполняла электротехнические работы для небольших компаний. Так " -"случилось, что когда произошёл Катаклизм, ты как раз меняла проводку в одном" -" из этих пародий на убежище. К сожалению, ты успела довести проводку только " -"до компьютера… как много же пользы он теперь принесёт." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -152538,12 +154438,10 @@ msgstr "Жертва душа" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" -"Когда настал Катаклизм, ты принимал приятный горячий душ! Тебе едва удалось " -"выбежать с куском мыла и самой наиполезнейшей вещью на земле… Полотенцем." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -152554,12 +154452,10 @@ msgstr "Жертва душа" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" -"Когда настал Катаклизм, ты принимал приятный горячий душ! Тебе едва удалось " -"выбежать с куском мыла и самой наиполезнейшей вещью на земле… Полотенцем." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -152600,11 +154496,9 @@ msgstr "Балерун" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"До Катаклизма ты занимался бальными танцами, а сейчас используешь эти " -"навыки, чтобы спасти свою жизнь." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -152615,11 +154509,9 @@ msgstr "Балерина" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "" -"До Катаклизма ты занималась бальными танцами, а сейчас используешь эти " -"навыки, чтобы спасти свою жизнь." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -153534,12 +155426,9 @@ msgstr "Жених" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"Катаклизм случился в день свадьбы, и ты спасся, не сохранив ничего, кроме " -"своего свадебного наряда. Замёрзли ноги? Лишь бы они не были отделены от " -"тела!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -153550,12 +155439,9 @@ msgstr "Невеста" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "" -"Катаклизм случился в день свадьбы, и ты спаслась, не сохранив ничего, кроме " -"своего свадебного наряда. Замёрзли ноги? Лишь бы они не были отделены от " -"тела!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -153635,10 +155521,8 @@ msgstr "Руди" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Твоя cка-группа распалась после того, как барабанщик стал зомби, и теперь ты" -" одиноко бродишь по миру после Катаклизма с сигаретами и mp3-плеером." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -153650,10 +155534,8 @@ msgstr "Руди" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "" -"Твоя cка-группа распалась после того, как барабанщик стал зомби, и теперь ты" -" одиноко бродишь по миру после Катаклизма с сигаретами и mp3-плеером." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -153694,9 +155576,9 @@ msgstr "Заключённый" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." -msgstr "Катаклизм дал тебе шанс сбежать, но цена свободы непомерно высока." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -153707,9 +155589,9 @@ msgstr "Заключённая" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." -msgstr "Катаклизм дал тебе шанс сбежать, но цена свободы непомерно высока." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -154169,11 +156051,9 @@ msgstr "Раввин" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Ты был вместе со своей паствой в храме, когда разразился Катаклизм. Прямо " -"сейчас мессия вам бы не помешал!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -154184,11 +156064,9 @@ msgstr "Рабанит" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "" -"Ты была вместе со своей паствой в храме, когда разразился Катаклизм. Прямо " -"сейчас мессия вам бы не помешал!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -154392,13 +156270,10 @@ msgstr "Разносчик пиццы" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Когда произошёл Катаклизм, ты доставлял последнюю пиццу в местную криогенную" -" лабораторию. Добежав до ближайшего укрытия, тебе удалось сохранить только " -"рассудок и немного оставшейся пиццы. Даже чаевых не оставили!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -154410,14 +156285,10 @@ msgstr "Разносчица пиццы" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"Когда произошёл Катаклизм, ты доставляла последнюю пиццу в местную " -"криогенную лабораторию. Добежав до ближайшего укрытия, тебе удалось " -"сохранить только рассудок и немного оставшейся пиццы. Даже чаевых не " -"оставили!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -154535,13 +156406,10 @@ msgstr "Фермер" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Ты зарабатывал на жизнь за счёт выращивания урожая, когда разразился " -"Катаклизм. Теперь, с помощью верной мотыги и семян, пора восстанавливать " -"Землю, по растению за раз." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -154552,13 +156420,10 @@ msgstr "Фермерша" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"Ты зарабатывала на жизнь за счёт выращивания урожая, когда разразился " -"Катаклизм. Теперь, с помощью верной мотыги и семян, пора восстанавливать " -"Землю, по растению за раз." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -154603,13 +156468,10 @@ msgstr "Закалённый старьёвщик" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Один из немногих счастливчиков, уцелевших в Катаклизме, ты построил свою " -"жизнь на чужих развалинах. С помощью силы, хитрости или удачи ты заполучил " -"лучшее снаряжение, какое только смог найти." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -154620,13 +156482,10 @@ msgstr "Закалённая старьёвщица" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "" -"Одна из немногих счастливчиков, уцелевших в Катаклизме, ты построила свою " -"жизнь на чужих развалинах. С помощью силы, хитрости или удачи ты заполучила " -"лучшее снаряжение, какое только смогла найти." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -154945,15 +156804,11 @@ msgstr "Выживальщик-младший" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Твои родители были сумасшедшими выживальщиками, ожидавшими какой-то " -"«Катаклизм», и настоятельно тебя к нему готовили. Похоже, они были правы. У " -"тебя не было возможности поблагодарить их. Ты можешь сделать для них только " -"то, чего они всегда ожидали от тебя при наступлении тёмных времён: выжить." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -154964,15 +156819,11 @@ msgstr "Выживальщица-младшая" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"Твои родители были сумасшедшими выживальщиками, ожидавшими какой-то " -"«Катаклизм», и настоятельно тебя к нему готовили. Похоже, они были правы. У " -"тебя не было возможности поблагодарить их. Ты можешь сделать для них только " -"то, чего они всегда ожидали от тебя при наступлении тёмных времён: выжить." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156021,14 +157872,8 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" -"Вы работали на верхушке башни, откуда открывался отличный вид на армагеддон;" -" падающие с небес полосы света, расцветающие грибовидными облаками, " -"показались вам крошечной вспышкой на горизонте, когда закрылись ваши " -"оптические регуляторы. Вы поспешили в укрытие, пока взрывная волна не снесла" -" вас с высоты. Теперь вам могут пригодиться бионические импланты, " -"предусмотренные контрактом…" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156044,14 +157889,8 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" -"Вы работали на верхушке башни, откуда открывался отличный вид на армагеддон;" -" падающие с небес полосы света, расцветающие грибовидными облаками, " -"показались вам крошечной вспышкой на горизонте, когда закрылись ваши " -"оптические регуляторы. Вы поспешили в укрытие, пока взрывная волна не снесла" -" вас с высоты. Теперь вам могут пригодиться бионические импланты, " -"предусмотренные контрактом…" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156363,16 +158202,11 @@ msgstr "Кадет К.Р.И.Т" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" -"Ты проходил ускоренное обучение, чтобы стать офицером К.Р.И.Т в предстоящей " -"войне. Призыв к оружию прибыл, когда всех твоих товарищей уже растерзали. В " -"панике ты схватил что могла и успел улизнуть, прежде чем присоединиться к " -"всё ещё шевелящимся останкам своих друзей. Теперь только твои мозги и годы " -"обучения позволят тебе выжить в этом Катаклизме." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156384,16 +158218,11 @@ msgstr "Кадет К.Р.И.Т" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" -"Ты проходила ускоренное обучение, чтобы стать офицером К.Р.И.Т в предстоящей" -" войне. Призыв к оружию прибыл, когда всех твоих товарищей уже растерзали. В" -" панике ты схватила что могла и успела улизнуть, прежде чем присоединиться к" -" всё ещё шевелящимся останкам своих друзей. Теперь только твои мозги и годы " -"обучения позволят тебе выжить в этом Катаклизме." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156404,17 +158233,12 @@ msgstr "Уборщик К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" -"*Вздох* Твоя жизнь была полным дерьмом. В поисках лучшего места ты наконец " -"нашёл работу в К.Р.И.Т… работу уборщика. Платили неплохо, вдобавок тебе хотя" -" бы удавалось тайком посмотреть на всякие крутые штуки. После устранения " -"всего второстепенного персонала ты оказался ни с чем, кроме выданной " -"униформы и своего оборудования." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156425,17 +158249,12 @@ msgstr "Уборщица К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" -"*Вздох* Твоя жизнь была полным дерьмом. В поисках лучшего места ты наконец " -"нашла работу в К.Р.И.Т… работу уборщицы. Платили неплохо, вдобавок тебе хотя" -" бы удавалось тайком посмотреть на всякие крутые штуки. После устранения " -"всего второстепенного персонала ты оказалась ни с чем, кроме выданной " -"униформы и своего оборудования." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156446,13 +158265,10 @@ msgstr "Старший сержант К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" -"Ты был старшим сержантом и каждый день передавал приказы своему отряду. " -"Когда начался Катаклизм, твоё мастерство снова и снова помогало беречь " -"время, пока всё не превратилось в хаос." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156463,13 +158279,10 @@ msgstr "Старший сержант К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" -"Ты была старшим сержантом и каждый день передавала приказы своему отряду. " -"Когда начался Катаклизм, твоё мастерство снова и снова помогало беречь " -"время, пока всё не превратилось в хаос." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156481,18 +158294,12 @@ msgstr "Пехотинец К.Р.И.Т" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" -"Ты был частью пехоты; первый приступал к работе, зачищал передовую " -"оперативную базу и возвращался, чтоб расслабиться с товарищами. Но кошмарная" -" ухмылка Катаклизма прервала те славные деньки. Заражённые прорвали ваши " -"ряды как бумагу, а затем появились иноземные монстры. Ты теперь один и в " -"бегах, хватит ли тебе сил выжить, или же эти адские пустоши — лишь страшная " -"метафора смерти?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156504,18 +158311,12 @@ msgstr "Пехотинец К.Р.И.Т" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" -"Ты была частью пехоты; первая приступала к работе, зачищала передовую " -"оперативную базу и возвращалась, чтоб расслабиться с товарищами. Те деньки " -"закончились с кошмарной ухмылкой Катаклизма. Заражённые прорвали ваши ряды " -"как бумагу, а затем появились иноземные монстры. Ты теперь одна и в бегах, " -"хватит ли тебе сил выжить, или же эти адские пустоши — лишь страшная " -"метафора смерти?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156526,21 +158327,14 @@ msgstr "Боевой медик К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" -"Ты был ботаном отряда — боевой медик, обученный встречам с необъяснимым. " -"Однако твоей главной задачей было беречь товарищей в целости. Несколько " -"недель ты шастал в аду вдоль и поперёк и следил, чтобы все выжили. Во время " -"перестрелки между нежитью и взбунтовавшимися роботами правительственного ИИ " -"тебя бросили как приманку. Ты убежал, но хватит ли тебе сил выжить, или ты " -"станешь частью орды и будешь преследовать своих товарищей за их " -"непростительный грех?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156551,21 +158345,14 @@ msgstr "Боевой медик К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" -"Ты была ботанкой отряда — боевой медик, обученная встречам с необъяснимым. " -"Однако твоей главной задачей было беречь товарищей в целости. Несколько " -"недель ты шастала в аду вдоль и поперёк и следила, чтобы все выжили. Во " -"время перестрелки между нежитью и взбунтовавшимися роботами " -"правительственного ИИ тебя бросили как приманку. Ты убежала, но хватит ли " -"тебе сил выжить, или ты станешь частью орды и будешь преследовать своих " -"товарищей за их непростительный грех?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156577,15 +158364,11 @@ msgstr "Пулемётчик К.Р.И.Т" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" -"Тебе поручили создавать мёртвые зоны и обеспечивать подавительный огонь. " -"Когда начался Катаклизм, твой верный пулемёт не смог сдержать чудовищную " -"волну мертвецов, и твой отряд был уничтожен. Теперь ты один и в бегах, " -"хватит ли тебе сил выжить, или этот адский ландшафт подавит тебя?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156597,15 +158380,11 @@ msgstr "Пулемётчица К.Р.И.Т" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" -"Тебе поручили создавать мёртвые зоны и обеспечивать подавительный огонь. " -"Когда начался Катаклизм, твой верный пулемёт не смог сдержать чудовищную " -"волну мертвецов, и твой отряд был уничтожен. Теперь ты одна и в бегах, " -"хватит ли тебе сил выжить, или этот адский ландшафт подавит тебя?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156617,14 +158396,10 @@ msgstr "Командир К.Р.И.Т" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" -"Ты был высокопоставленным офицером и особенно в боях не участвовал, разве " -"что тебе очень хотелось. Однако твоя харизма и острый ум помогли тебе " -"вскарабкаться по карьере и поддерживать товарищей. Помогут ли они сейчас, " -"когда всё улетело в дыру?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156636,14 +158411,10 @@ msgstr "Командир К.Р.И.Т" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" -"Ты была высокопоставленным офицером и особенно в боях не участвовала, разве " -"что тебе очень хотелось. Однако твоя харизма и острый ум помогли тебе " -"вскарабкаться по карьере и поддерживать товарищей. Помогут ли они сейчас, " -"когда всё улетело в дыру?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156654,20 +158425,14 @@ msgstr "Силовик К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" -"Рекомендуется СИЛ 10. Ты обладаешь полномочиями маршала США. Над тобой " -"подшучивали, что ты всего лишь охранник с крутым значком. Ты посмеивался, " -"потому что потом ты облачался в снаряжение и отправлялся на место операции. " -"Пока ты проводил время на базе, ты оттачивал свои навыки и получил особые " -"импланты для облегчения работы за смешную цену в виде вечной работы " -"«охранником». Время поработать, хотя похоже, что миссия немного усложнилась." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156678,20 +158443,14 @@ msgstr "Силовик К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" -"Рекомендуется СИЛ 10. Ты обладаешь полномочиями маршала США. Над тобой " -"подшучивали, что ты всего лишь охранник с крутым значком. Ты посмеивалась, " -"потому что потом ты облачалась в снаряжение и отправлялсь на место операции." -" Пока ты проводила время на базе, ты оттачивала свои навыки и получил особые" -" импланты для облегчения работы за смешную цену в виде вечной работы " -"«охранником». Время поработать, хотя похоже, что миссия немного усложнилась." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156702,16 +158461,11 @@ msgstr "Одинокий волк К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" -"Рекомендуется СИЛ 10. Ты — с головы до пят бронированный громила с " -"полномочиями маршала США. Тебя посылали как армию из одного бойца, " -"способного на что угодно, ты пробирался на поле боя и в одиночку уничтожал " -"целые батальоны благодаря хитрой стратегии или грубой силе. Время надрать " -"задницы." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156722,16 +158476,11 @@ msgstr "Одинокая волчица К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" -"Рекомендуется СИЛ 10. Ты — с головы до пят бронированная громила с " -"полномочиями маршала США. Тебя посылали как армию из одного бойца, " -"способного на что угодно, ты пробиралась на поле боя и в одиночку уничтожала" -" целые батальоны благодаря хитрой стратегии или грубой силе. Время надрать " -"задницы." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156742,19 +158491,13 @@ msgstr "Спецназовец К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" -"Рекомендуется СИЛ 10. Ты был элитным бойцом Команды по Разведке и " -"Исследованию Тайн и катастроф. Блуждающий призрак, встречавшийся с " -"необычными опасностями, что позволило твоей организации оставить мировые " -"державы на десятилетия позади. Твой отряд был одним из первых, высаженных в " -"Новой Англии в эпицентре для сдерживания надвигающейся вспышки и сбора " -"информации для командования. Удачи, солдат." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156765,19 +158508,13 @@ msgstr "Спецназовец К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" -"Рекомендуется СИЛ 10. Ты была элитным бойцом Команды по Разведке и " -"Исследованию Тайн и катастроф. Блуждающий призрак, встречавшийся с " -"необычными опасностями, что позволило твоей организации оставить мировые " -"державы на десятилетия позади. Твой отряд был одним из первых, высаженных в " -"Новой Англии в эпицентре для сдерживания надвигающейся вспышки и сбора " -"информации для командования. Удачи, солдат." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156788,26 +158525,18 @@ msgstr "Выживальщик К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" -msgstr "" -"Ты был элитным разведчиком К.Р.И.Т. Ты прослыл первоклассным выживальщиком " -"после недель, проведённых в тылу врага, когда ты продержался при помощи " -"камней, палок и растений. Однако ты перепил (20 стаканов) в местном баре и " -"подрался со своим командиром (вырубил его), тебя разжаловали и отправили в " -"лес со всем снаряжением, устроив суд выживанием. После часа поисков укрытия " -"по радио объявили, что миру внезапно настаёт конец. Конечно, им было некогда" -" тебя возвращать, так что улыбнись. Пожалуй, больше пить не стоит; но на " -"этот раз у тебя хотя бы есть настоящие инструменты!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156818,26 +158547,18 @@ msgstr "Выживальщица К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" -msgstr "" -"Ты была элитным разведчиком К.Р.И.Т. Ты прослыла первоклассной выживальщицей" -" после недель, проведённых в тылу врага, когда ты продержалась при помощи " -"камней, палок и растений. Однако ты перепила (20 стаканов) в местном баре и " -"подралась со своим командиром (вырубила его), тебя разжаловали и отправили в" -" лес со всем снаряжением, устроив суд выживанием. После часа поисков укрытия" -" по радио объявили, что миру внезапно настаёт конец. Конечно, им было " -"некогда тебя возвращать, так что улыбнись. Пожалуй, больше пить не стоит; но" -" на этот раз у тебя хотя бы есть настоящие инструменты!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156850,14 +158571,10 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" -"Ты проходил курсы по выживанию в Новой Англии, когда случился Катаклизм, а " -"инструктор так и не пришёл на очередное занятие. Ты застрял в карантинной " -"зоне месте со стандартным снаряжением, хотелось бы тебе пушку получше. " -"Похоже, теперь ты точно узнаешь кое-что про выживание!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156870,14 +158587,10 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" -"Ты проходила курсы по выживанию в Новой Англии, когда случился Катаклизм, а " -"инструктор так и не пришёл на очередное занятие. Ты застряла в карантинной " -"зоне месте со стандартным снаряжением, хотелось бы тебе пушку получше. " -"Похоже, теперь ты точно узнаешь кое-что про выживание!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156890,20 +158603,13 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" -"Тебе, как и другим, предложили примкнуть к административному аппарату " -"К.Р.И.Т, чтобы уйти от горьких воспоминаний и былых травм после долгих лет " -"мужественной защиты своих товарищей. Ты прошёл программу переподготовки, и " -"после долгого времени вне боёв твои навыки заметно упали, но заученная " -"мышечная память так просто не уходит. И снова в твоих ушах звенят крики " -"товарищей, а отвратительные воспоминания лезут наружу. Сможешь ли ты " -"превозмочь надвигающийся парализующий ужас?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156916,20 +158622,13 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" -"Тебе, как и другим, предложили примкнуть к административному аппарату " -"К.Р.И.Т, чтобы уйти от горьких воспоминаний и былых травм после долгих лет " -"мужественной защиты своих товарищей. Ты прошла программу переподготовки, и " -"после долгого времени вне боёв твои навыки заметно упали, но заученная " -"мышечная память так просто не уходит. И снова в твоих ушах звенят крики " -"товарищей, а отвратительные воспоминания лезут наружу. Сможешь ли ты " -"превозмочь надвигающийся парализующий кошмар?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156941,14 +158640,10 @@ msgstr "Инженер К.Р.И.Т" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" -"Тебя направили починить несколько лабораторных комплексов в Новой Англии и " -"показать остальным исследователям новое оружие, над которым ты работал. " -"Когда настал Катаклизм, опробовать оружие стало проще, но с остальным всё " -"похуже. Время искать укрытие!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156960,14 +158655,10 @@ msgstr "Инженер К.Р.И.Т" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" -"Тебя направили починить несколько лабораторных комплексов в Новой Англии и " -"показать остальным исследователям новое оружие, над которым ты работала. " -"Когда настал Катаклизм, опробовать оружие стало проще, но с остальным всё " -"похуже. Время искать укрытие!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -156978,17 +158669,13 @@ msgstr "Ночной Скиталец К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" -"Твоя база в Новой Англии пала под нечестивым натиском Катаклизма. Однако, " -"будучи первоклассным учёным отдела НИОКР, ты выбрал путь медленной мутации " -"во что-то большее, нежели человек. Пусть состав и был несовершенен, но твоё " -"старое хрупкое тело стало намного сильнее. Новая плоть теперь твоя, обнажи " -"клыки и сражайся до следующего рассвета." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -156999,17 +158686,13 @@ msgstr "Ночной Скиталец К.Р.И.Т" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" -"Твоя база в Новой Англии пала под нечестивым натиском Катаклизма. Однако, " -"будучи первоклассным учёным отдела НИОКР, ты выбрала путь медленной мутации " -"во что-то большее, нежели человек. Пусть состав и был несовершенен, но твоё " -"старое хрупкое тело стало намного сильнее. Новая плоть теперь твоя, обнажи " -"клыки и сражайся до следующего рассвета." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -157100,18 +158783,18 @@ msgstr "Гренадер" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "There's no kill like overkill." -msgstr "Что не убийство, то перебор." +msgstr "Только в клочья, не иначе." #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Military Grenadier" -msgstr "Гренадерша" +msgstr "Гренадёрша" #. ~ Profession (female Military Grenadier) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "There's no kill like overkill." -msgstr "Что не убийство, то перебор." +msgstr "Только в клочья, не иначе." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -157149,7 +158832,7 @@ msgstr "Единственный легкий день был вчера." #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Operator Recon" -msgstr "Разведчик" +msgstr "Разведчица" #. ~ Profession (female Operator Recon) description #: lang/json/professions_from_json.py @@ -157166,11 +158849,9 @@ msgstr "Снайпер спецназначения" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" -"Вы провели дни, сражаясь с вражеским снайпером, затем он просто… Умер. Но не" -" совсем." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -157181,11 +158862,9 @@ msgstr "Снайперша спецназначения" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "" -"Вы провели дни, сражаясь с вражеским снайпером, затем он просто… Умер. Но не" -" совсем." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -157222,11 +158901,9 @@ msgstr "Боец под прикрытием" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" -"Вы преследовали свою цель в течение нескольких месяцев, и теперь он зомби. " -"Он вас опередил." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -157237,41 +158914,35 @@ msgstr "Боец под прикрытием" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" -"Вы преследовали свою цель в течение нескольких месяцев, и теперь он зомби. " -"Он вас опередил." #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Operator CBRN" -msgstr "Боец CBRN" +msgstr "Боец РХБЗ" #. ~ Profession (male Operator CBRN) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" -"Химическое оружие? Есть. Биологическая опасность? Есть. Ядерная война? Есть." -" Похоже, идеальная работа для вас!" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Operator CBRN" -msgstr "Боец CBRN" +msgstr "Боец РХБЗ" #. ~ Profession (female Operator CBRN) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" -"Химическое оружие? Есть. Биологическая опасность? Есть. Ядерная война? Есть." -" Похоже, идеальная работа для вас!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -157335,8 +159006,8 @@ msgstr "Боевой ангел" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." -msgstr "Боевой киборг, извлечённый со странной свалки…" +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -157346,8 +159017,8 @@ msgstr "Боевой ангел" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." -msgstr "Боевой киборг, извлечённая со странной свалки…" +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -157418,9 +159089,9 @@ msgstr "Друид" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." -msgstr "Древний круг друидов сгинул в катаклизме. Природа должна жить." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -157431,9 +159102,9 @@ msgstr "Друид" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." -msgstr "Древний круг друидов сгинул в катаклизме. Природа должна жить." +msgstr "" #. ~ Profession (male Priest) description #: lang/json/professions_from_json.py @@ -157551,12 +159222,9 @@ msgstr "Начинающий Некромант" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" -"Вы всегда должны были скрывать свою магию, так как она не была приемлемым " -"типом магии в мире волшебников, но с наступлением катаклизма вам придется " -"пустить в ход все средства." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -157568,12 +159236,9 @@ msgstr "Начинающий Некромант" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "" -"Вы всегда должны были скрывать свою магию, так как она не была приемлемым " -"типом магии в мире волшебников, но с наступлением катаклизма вам придется " -"пустить в ход все средства." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -157587,11 +159252,8 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" -"Ты был сыном метеоролога и всегда интересовался погодой. Недавно ты понял, " -"что погодой можно управлять при помощи волшебства! К сожалению, по мере " -"развития событий ты недолго наслаждался своими способностями…" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -157605,11 +159267,8 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "" -"Ты была дочерью метеоролога и всегда интересовалась погодой. Недавно ты " -"поняла, что погодой можно управлять при помощи волшебства! К сожалению, по " -"мере развития событий ты недолго наслаждалась своими способностями…" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -158694,12 +160353,10 @@ msgstr "Бейcболист" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"До Катаклизма ты был отбивающим в местной бейсбольной команде. Ты сохранил " -"свою экипировку, но как долго продлится твоя подача выживания?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -158710,12 +160367,10 @@ msgstr "Бейcболистка" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "" -"До Катаклизма ты была отбивающей в местной женской бейсбольной команде. Ты " -"сохранила свою экипировку, но как долго продлится твоя подача выживания?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -158800,11 +160455,9 @@ msgstr "Разбуженный" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Тебя разбудил шум посреди ночи. Вооруженный лишь фонариком, ты отправился " -"посмотреть, в чем дело, и теперь ты столкнулся с катаклизмом." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -158815,11 +160468,9 @@ msgstr "Разбуженная" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" -"Тебя разбудил шум посреди ночи. Вооруженная лишь фонариком, ты отправилась " -"посмотреть, в чем дело, и теперь ты столкнулась с катаклизмом." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -158831,12 +160482,9 @@ msgstr "Бионический Велосипедист" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Благодаря тренировкам и бионическим модификациям ради соревнований по " -"велоспорту на Кибер-Олимпиаде ты смог убежать от начала катаклизма. Сможешь " -"ли ты убегать от него вечно?" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -158848,12 +160496,9 @@ msgstr "Бионический Велосипедист" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" -"Благодаря тренировкам и бионическим модификациям ради соревнований по " -"велоспорту на Кибер-Олимпиаде ты смогла убежать от начала катаклизма. " -"Сможешь ли ты убегать от него вечно?" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -158864,12 +160509,10 @@ msgstr "Сварщик" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"До катаклизма ты работал сварщиком в оффшорной компании. Ты возвращался " -"домой, когда наступил конец света. По крайней мере, у тебя есть инструменты." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -158880,12 +160523,10 @@ msgstr "Сварщица" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" -"До катаклизма ты работала сварщицей в оффшорной компании. Ты возвращалась " -"домой, когда наступил конец света. По крайней мере, у тебя есть инструменты." #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -158896,14 +160537,10 @@ msgstr "Первобытный Выживальщик" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Ты знал, что этот день однажды наступит, день, когда всё полетит к чертям. И" -" ты готов к нему не за счёт снаряжения, а благодаря умениям. Все проведённые" -" в лесах дни теперь окупятся сполна. Если уж твои предки сумели выжить без " -"технологий, то ты, чёрт побери, точно сможешь." #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -158914,14 +160551,10 @@ msgstr "Первобытная Выживальщица" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" -"Ты знал, что этот день однажды наступит, день, когда всё полетит к чертям. И" -" ты готов к нему не за счёт снаряжения, а благодаря умениям. Все проведённые" -" в лесах дни теперь окупятся сполна. Если уж твои предки сумели выжить без " -"технологий, то ты, чёрт побери, точно сможешь." #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py @@ -163719,12 +165352,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Когда разразился апокалипсис, вас направили в ближайшее убежище. Здесь вы и " -"жили, никогда его не покидая, чтобы не пострадать во внешнем мире. Припасы " -"на исходе, и в первый раз с момента Катаклизма вам придётся столкнуться с " -"внешним миром." #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -163733,12 +165362,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"Когда разразился апокалипсис, вас направили в ближайшее убежище. Здесь вы и " -"жили, никогда его не покидая, чтобы не пострадать во внешнем мире. Припасы " -"на исходе, и в первый раз с момента Катаклизма вам придётся столкнуться с " -"внешним миром." #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -163804,27 +165429,19 @@ msgstr "Тюрьма" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" -"Когда случился катаклизм, вы находились в тюрьме, будучи преступником или " -"кем-то из работников. Заключённые превратились в безмозглые ходячие ужасы, а" -" охранные боты стреляют на поражение… Возможно, вам стоит поторопиться с " -"вашими планами побега." #. ~ Description for scenario 'Prison' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" -"Когда случился катаклизм, вы находились в тюрьме, будучи преступником или " -"кем-то из работников. Заключённые превратились в безмозглые ходячие ужасы, а" -" охранные боты стреляют на поражение… Возможно, вам стоит поторопиться с " -"вашими планами побега." #. ~ Starting location for scenario 'Prison'. #: lang/json/scenario_from_json.py @@ -163900,9 +165517,9 @@ msgid "" "here before They find you." msgstr "" "Вы попадаете в самое чужеродное место, которое вы когда-либо видели. " -"Горячий влажный воздух и органический структуры заставляют вас чувствовать, " -"что вы оказались в ловушке внутри гигантского существа. Что бы это ни было," -" тебе нужно уйти отсюда, пока они не нашли тебя." +"Горячий влажный воздух и органические стены заставляют вас чувствовать, что " +"вы оказались в ловушке внутри гигантского существа. Что бы это ни было, " +"тебе нужно уйти отсюда, пока они не нашли тебя." #. ~ Description for scenario 'Challenge - Mi-Go Camp' for a female character. #: lang/json/scenario_from_json.py @@ -163914,9 +165531,9 @@ msgid "" "here before They find you." msgstr "" "Вы попадаете в самое чужеродное место, которое вы когда-либо видели. " -"Горячий влажный воздух и органический структуры заставляют вас чувствовать, " -"что вы оказались в ловушке внутри гигантского существа. Что бы это ни было," -" тебе нужно уйти отсюда, пока они не нашли тебя." +"Горячий влажный воздух и органические стены заставляют вас чувствовать, что " +"вы оказались в ловушке внутри гигантского существа. Что бы это ни было, " +"тебе нужно уйти отсюда, пока они не нашли тебя." #. ~ Starting location for scenario 'Challenge - Mi-Go Camp'. #: lang/json/scenario_from_json.py @@ -163941,24 +165558,18 @@ msgstr "Эксперимент" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"С самого рождения вашей единственной целью существования было продвижение " -"генетики, вольно или невольно. После разразившегося Катаклизма вас оставили " -"в лаборатории, и, после бесцельных блужданий, вы оказались в лесу." #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "" -"С самого рождения вашей единственной целью существования было продвижение " -"генетики, вольно или невольно. После разразившегося Катаклизма вас оставили " -"в лаборатории, и, после бесцельных блужданий, вы оказались в лесу." #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -164229,24 +165840,18 @@ msgstr "Потерявшая веру" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" -"Ты долго время проповедовал свою веру, однако последние события значительно " -"её пошатнули. Ты бродил по своему храму и нашёл книги, которые восстановят " -"твою веру или разобьют её насовсем." #. ~ Description for scenario 'Lost Faith' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" -"Ты долго время проповедовала свою веру, однако последние события значительно" -" её пошатнули. Ты бродила по своему храму и нашла книги, которые восстановят" -" твою веру или разобьют её насовсем." #. ~ Starting location for scenario 'Lost Faith'. #: lang/json/scenario_from_json.py @@ -164274,12 +165879,12 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" "Некоторое время вы были учеником волшебника и работали над прототипом " -"устройства, которое, вероятно, можно использовать для побега из Катаклизма. " -"При первом испытании что-то пошло не так, и ваш учитель телепортировался " -"наизнанку. Теперь вы должны сообразить, как спастись самому. По крайней " +"устройства, которое, вероятно, можно использовать для побега из Катаклизма." +" При первом испытании что-то пошло не так, и ваш учитель телепортировался " +"наизнанку. Теперь вы должны сообразить, как спастись самому. По крайней " "мере, он оставил свой блокнот…" #. ~ Description for scenario 'The Wizard's Apprentice' for a female @@ -164291,12 +165896,12 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" -"Некоторое время вы были учеником волшебника и работали над прототипом " -"устройства, которое, вероятно, можно использовать для побега из Катаклизма. " -"При первом испытании что-то пошло не так, и ваш учитель телепортировался " -"наизнанку. Теперь вы должны сообразить, как спастись самому. По крайней " +"Некоторое время вы были ученицей волшебника и работали над прототипом " +"устройства, которое, вероятно, можно использовать для побега из Катаклизма." +" При первом испытании что-то пошло не так, и ваш учитель телепортировался " +"наизнанку. Теперь вы должны сообразить, как спастись самой. По крайней " "мере, он оставил свой блокнот…" #. ~ Starting location for scenario 'The Wizard's Apprentice'. @@ -164322,12 +165927,12 @@ msgstr "Каникулы волшебницы" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" "Вы были учеником волшебника и, находясь в его уединённой башне, долго " -"грезили об отдыхе. Ваше путешествие к самопознанию прервано катаклизмом. " +"грезили об отдыхе. Ваше путешествие к самопознанию прервано Катаклизмом. " "Теперь вы должны выяснить, как выжить самостоятельно." #. ~ Description for scenario 'The Wizard's Vacation' for a female character. @@ -164335,12 +165940,12 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" "Вы были ученицей волшебника и, находясь в его уединённой башне, долго " -"грезили об отдыхе. Ваше путешествие к самопознанию прервано катаклизмом. " +"грезили об отдыхе. Ваше путешествие к самопознанию прервано Катаклизмом. " "Теперь вы должны выяснить, как выжить самостоятельно." #. ~ Starting location for scenario 'The Wizard's Vacation'. @@ -164451,13 +166056,10 @@ msgstr "Испытание: Лагерь смерти" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" -"Вы были одним из многих членов полиции и военных, вызванных, чтобы " -"поддерживать порядок в одном из лагерей МЧС. Всё полетело к чертям… раненый," -" заражённый, окружённый огнём, вы стоите… а они продолжают идти…" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female #. character. @@ -164465,13 +166067,10 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" -"Вы были одной из многих членов полиции и военных, вызванных, чтобы " -"поддерживать порядок в одном из лагерей МЧС. Всё полетело к чертям… раненая," -" заражённая, окружённая огнём, вы стоите… а они продолжают идти…" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. #: lang/json/scenario_from_json.py @@ -165129,9 +166728,7 @@ msgstr "Не каждый может выжить в машине, летяще #: lang/json/snippet_from_json.py msgid "" "Rotten food typically attracts bugs, and bugs got a lot bigger recently…" -msgstr "" -"Сгнившая пища привлекает падальщиков, так что либо заранее уничтожайте " -"сгнившее, либо устраивайте засадную охоту." +msgstr "Сгнившая пища привлекает жуков, а жуки нынче подросли..." #: lang/json/snippet_from_json.py msgid "" @@ -165566,6 +167163,11 @@ msgstr "" "Белки довольно вкусные, но если выстрелить по ним из мощного оружия, то от " "них ничего не останется. Лучше бери пневматику или винтовку калибра .22." +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -165590,10 +167192,30 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." +"impossible unless you have a big tactical advantage." +msgstr "" +"Если увидишь большую толпу зомби, БЕГИ! Бороться с ними бесполезно, если у " +"тебя нет большого тактического преимущества." + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" msgstr "" -"Если увидел большую толпу зомби, то лучше беги! Попытка драться с ними равна" -" самоубийству, если у тебя нет мощного оружия." +"Если увидишь большое скопление зомби, лучше убегай. Бороться с ними — " +"самоубийство!" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "Когда увидишь орду зомби, беги что есть мочи!" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "" +"Если преследует толпа зомби, спускайся в метро и пройди по туннелям пару " +"кварталов, затем возвращайся снова на поверхность." #: lang/json/snippet_from_json.py msgid "" @@ -165634,7 +167256,7 @@ msgid "" "from walls and stuff when they do… the electricity can travel along solid " "surfaces." msgstr "" -"Есть зомби, которые могут стрелять разрядами электричества. Старайтесь " +"Есть зомби, которые могут стрелять разрядами электричества. Старайся " "держаться подальше от стен, потому что по ним могут распространяться " "электрические разряды." @@ -165794,8 +167416,8 @@ msgid "" "Zombies are pretty dumb… heck, most monsters are! If you can get a fire " "going between you and them, they'll just run straight through it." msgstr "" -"Зомби достаточно глупы. Если между вами и ними будет разведён огонь, то они " -"пойдут прямо на него." +"Зомби довольно тупые... блин, да почти все твари тоже! Если разведёшь огонь " +"между ними и собой, они побегут прямо в него." #: lang/json/snippet_from_json.py msgid "" @@ -165860,9 +167482,8 @@ msgid "" "down a zombie brute with one! Of course, if you can find a katana, that " "might be even better…" msgstr "" -"В поисках хорошего холодного оружия не проходите мимо мачете. Мне встречался" -" один парень, который убил им накаченного зомби. Если сможешь найти катану, " -"то это ещё лучше…" +"Если о ножах, то нет ничего лучше мачете. Видел парня, который убил им " +"зомби-амбала! Если найдёшь катану, то это ещё лучше…" #: lang/json/snippet_from_json.py msgid "" @@ -165974,12 +167595,12 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" -"Я видел у пары парней лазерные пистолеты. Идеальное оружие… тихое, точное и " -"смертельное. Но мне такие никогда не попадались, а боеприпасы, наверное, " -"найти ещё сложнее…" +"Я видел пару парней с лазерными пистолетами. Похоже, это идеальное оружие: " +"тихое, точное и смертельное. Но я так и не нашёл его, и держу пари, что " +"боеприпасов не напасёшься..." #: lang/json/snippet_from_json.py msgid "" @@ -166222,6 +167843,12 @@ msgstr "" "Если ты слабый и неуклюжий, забудь про Молотовы и гранаты. Случайно уронишь " "их при броске — и тебе крышка." +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -166284,12 +167911,11 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" -"Тут тебе не кино, заправка не взлетит на воздух от единого выстрела. Однако " -"бензин вытечет и разольётся, что определённо пожароопасно." +"Здесь не так, как в кино. Стрельба по бензоколонке не взорвёт её. Но " +"топливо растечётся повсюду, что определенно пожароопасно." #: lang/json/snippet_from_json.py msgid "" @@ -166307,6 +167933,12 @@ msgstr "" "В следующий раз тащи из бакалеи консервированные продукты, они никогда не " "испортятся!" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -166342,14 +167974,6 @@ msgstr "" "части здания подальше от входа, стены с четырёх сторон, коридор легко " "защищать… Это прекрасно!" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "" -"Если преследует толпа зомби, спускайся в метро и пройди по туннелям пару " -"кварталов, затем возвращайся снова на поверхность." - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -166360,13 +167984,13 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" -"Я мечтал обнести военный бункер, но я в курсе, что хорошая броня и зомби-" -"солдаты — плохое сочетание. Я вздрагиваю от одной мысли, как меня изрешетит " -"турель." +"У меня есть мечта совершить набег на военный бункер, но зомби и броня — " +"страшная смесь. И одна лишь мысль об очереди из турели вызывает у меня " +"дрожь." #: lang/json/snippet_from_json.py msgid "" @@ -166428,32 +168052,45 @@ msgstr "Кто отвёртку в день выпивает, у того цин #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "" "Голоден сильнее обычного? Природные масла могут помочь. Совсем невкусно, но " -"какая разница, если второй вариант — съесть собственную ногу?" +"какая разница, если второй вариант - съесть собственную ногу?" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." msgstr "" -"Местность может изменить ход сражения, убедись, что ты используешь её против" -" врагов, а не наоборот." +"Ландшафт может переломить ход битвы. Всегда используй его против врагов, " +"чтобы они не использовали его против тебя." #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" -"Люди, проходившие мимо шахты, говорили что-то про ужасный запах. Если " -"собираешься туда, подумай прихватить противогаз." #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "Знание — сила. Серьёзно, просто возьми книгу." +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -166538,13 +168175,13 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" -"Начинающим механикам паяльник может стать лучшим другом. Ещё им можно " -"прижечь рану, но подобное лечение убило столько же людей, скольким помогло, " -"так что это крайняя мера." +"Паяльник может стать лучшим другом начинающего механика. Ты также можешь " +"прижечь им рану, но столько же людей погибло, сколько и выжило от такого " +"лечения, так что я думаю, это скорее последнее средство." #: lang/json/snippet_from_json.py msgid "" @@ -166594,7 +168231,7 @@ msgstr "Друг — еще один едок, но для работы четы #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" @@ -166631,6 +168268,12 @@ msgstr "" "Как-то раз видел безумного химика. Он сделал батарейку из картошки... или то" " был лимон?" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -166666,9 +168309,9 @@ msgid "" "stethoscopes. What are they trying to achieve? I use paper money to start " "fires now." msgstr "" -"Я слышал про банду под названием «Доктора». Ну знаешь, грабители банков со " -"стетоскопами. Чего они хотят добиться? Бумажные деньги я сейчас использую " -"вместо растопки." +"Я слышал про банду под названием «Доктора». Ну, грабители банков со " +"стетоскопами. Чего им надо-то? У меня теперь бумажные деньги вместо " +"растопки." #: lang/json/snippet_from_json.py msgid "" @@ -166687,8 +168330,8 @@ msgid "" "Should have put some kevlar on it like those Z9. Oh well…" msgstr "" "Я думал привязать сумку к своей собаке, чтоб она носила мои вещи. Не " -"сработало, потому что у меня была чихуахуа, и её сожрал ротвейлер. Надо было" -" нацепить на неё кевлар, как на тех овчарках. Эх, ладно…" +"сработало, потому что у меня была чихуахуа, и её сожрал гниль-вейлер. Надо " +"было нацепить на неё кевлар, как на тех овчарках. Эх, ладно…" #: lang/json/snippet_from_json.py msgid "" @@ -166781,6 +168424,34 @@ msgstr "" "Нынче всё кругом мутирует. Даже выживальщики. Интересно, пойдут ли мне " "кроличьи ушки? Буду ли я лучше слышать?" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" +"Нынче всё кругом мутирует. Даже выживальщики. Интересно, пойдут ли мне зубы " +"пираньи?" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" +"Нынче всё кругом мутирует. Даже выживальщики. Интересно, пойдут ли мне " +"рога? Конечно, о шляпах не может быть и речи..." + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -166810,6 +168481,15 @@ msgstr "" " — возможно, ты не знаешь, что тебе не хотелось бы их найти, если ты " "улавливаешь мою мысль." +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" +"Слышал о дамочке на роликах и с огнетушителем за спиной. Бегает полуголая и" +" разбивает людоедам морды бейсбольной битой. Разве это не супер?" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -166885,6 +168565,14 @@ msgstr "" "сгодятся даже плюшевый мишка под головой и куча тряпок, чтоб согреться. И " "хорошенько выбери место, даже кресло или скамейка лучше холодной земли." +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" +"Никто не запрещает носить ещё одну пару штанов. Ну, то есть кто-то, наверное" +" и запрещает, но всегда можно на него наплевать!" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -166934,8 +168622,8 @@ msgid "Hey there's some pink tablets, take some!" msgstr "Эй, тут розовые таблеточки, прими пару!" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" -msgstr "Смотри, ЛСД, давай играть в катаклизм: весёлые дни впереди!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" +msgstr "Смотри, ЛСД, давай играть в Катаклизм: весёлые дни впереди!" #: lang/json/snippet_from_json.py msgid "Say yes to LSD, say yes to Fun!" @@ -169802,16 +171490,16 @@ msgstr "" "коктейль в свой реактор." #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." -msgstr "Расскажи, как тебе удалось пережить катаклизм." +msgid "Tell me about how you survived the Cataclysm." +msgstr "Расскажи, как тебе удалось пережить Катаклизм." #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" -msgstr "Как ты выжил в катаклизме?" +msgid "How did you survive the Cataclysm?" +msgstr "Как ты выжил в Катаклизме?" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" -msgstr "Каким для тебя был катаклизм?" +msgid "What was the Cataclysm like for you?" +msgstr "Каким для тебя был Катаклизм?" #: lang/json/snippet_from_json.py msgid "How did you make it through the initial chaos?" @@ -170072,8 +171760,8 @@ msgid "eldritch horror" msgstr "потусторонний кошмар" #: lang/json/snippet_from_json.py -msgid "the cataclysm" -msgstr "катаклизм" +msgid "the Cataclysm" +msgstr "Катаклизм" #: lang/json/snippet_from_json.py msgid "the apocalypse" @@ -170444,7 +172132,7 @@ msgstr "" "Т-ПОДЛОЖКА\n" "\n" "РЕЗЮМЕ:\n" -"Материал, именуемый в дальнейшем т-подложкой, является естественным материалом «основания» фазового пространства. Образцы т-подложки были впервые извлечены во время ПОГРУЖЕНИЯ-25A и, по возвращении, насильственно были испытаны [////////], демонстрируют то, что сейчас известно как «анизотропные» физические свойства. В следующем отчёте более подробно.\n" +"Материал, именуемый в дальнейшем т-подложкой, является естественным материалом «основания» фазового пространства. Образцы т-подложки были впервые извлечены во время ПОГРУЖЕНИЯ-25A и по возвращении [////////] с большой силой, продемонстрировав то, что сейчас известно как «неравноплановые» физические свойства. В следующем отчёте об этом будет указано более подробно.\n" "\n" "Обратитесь к файлу EXO-M-312 для полного отчёта." @@ -170470,6 +172158,332 @@ msgstr "" "\n" "Обратитесь к файлу EXO-M-312 для полного отчёта." +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr " самая большая шлюха в , отвечаю!" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "На стене красивое граффити." + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr " — гетеросексуальный хулиган!" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr " + " + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr " в аду" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "мы все умрём" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "МАМА" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "ОТЪЕБИСЬ" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "Мультяшно нарисованный зомби." + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "Грубое граффити - тэг в окружении черепов." + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" +"У меня с твоей мамашей прочная взаимная любовь, и тебе придется с этим смириться.\n" +"\n" +"Хочешь поговорить об этом? Ты знаешь, где меня найти. Люблю тебя, милашка." + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr " УЁБИЩЕ из-за тебя у меня СПИТ." + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "Я <3 ." + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr " ебал ." + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "Это нарисованный баллончиком рисунок ангела с крыльями из лозы." + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "Мистер — вампир!" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "Они скрывают правду " + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "СЛЕДУЙ ЗА ХИМИОТРАССОЙ" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "Интересный рисунок рулона туалетной бумаги, превращающегося в радугу." + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "Всё, что мы хотим, это сожрать твои мозги" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "не пей воду" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "И они шли по Земле Его, и было ЧИСТИЛИЩЕ, и выжили только достойные" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "Нарисованный зомби с дыркой от пули в черепе." + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "Удивительно художественно нарисованный пенис." + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "Это простой нарисованный баллончиком лес из костей." + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" +"Это нарисованный баллончиком гигантский гриб с поклоняющимися людьми у его " +"основания." + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "мы никогда не сможем вернуться" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "не пакупай мет у " + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr " ты мне торчишь полтос баксов" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "Я тебя убью, " + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "оно в воде" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" +"Нарисованная баллончиком анатомически неправдоподобная женщина почти без " +"одежды." + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "БЛЯДСКОЕ ПРАВИТЕЛЬСТВО ТУПО РАЗБАЗАРИЛО НАЛОГИ" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "Не ешь протеновые батончки" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "МЧС: СОСИ ХУЙ БЛЯ" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" +"Это простой рисунок худой фигуры в спасательном жилете и противогазе. " +"Подпись, написанная внизу, гласит: «Спасибо за снаряжение»." + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "Оставь надежду, всяк сюда входящий." + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "НАМ НИКТО НЕ ПОМОЖЕТ" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "ЗА НАМИ НИКТО НЕ ПРИЕДЕТ" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "НАС БРОСИЛИ" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "Не мертвецы открывать внутри" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "СВЯТИЛИЩЕ" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "всё для косплея у все приходите" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "Остановка Катаклизм" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "Они пришли не для того, чтобы помочь. Они пришли для зачистки" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" +"Это пугающе детальный рисунок огромного умопомрачительного монстра вроде " +"тех, что нападали во время Катаклизма." + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" +"Быстро набросанный маркером завихряющийся портал, из которого тучами валят " +"зомби. Внизу написано: \"Что они наделали?\"" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "покойся с миром, человечество" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "Все умерли Дейв" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "У НАС ТУТ ВСЁ ПУТЁМ А У ТЕБЯ" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" +", не могу больше ждать, я в лагере 36. Встретимся там. Целую, " +"." + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr ", я найду тебя." + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr " здесь и всё ещё жив" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "Б 52" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" +", нет, нет, я сказал, я подожду тебя, но я должен бежать, потом " +"увидимся" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" +"В память:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"Меня не было бы в живых, если бы не вы. Я никогда вас не забуду." + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" +"Это рисунок мультипликационного персонажа, разбивающего труп зомби кувалдой." +" Под ним нацарапана надпись: \"Размажем их\"" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "Они встают. Выстрелы в голову бесполезны." + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "держись подальше от " + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr " пал" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "ТУТ НИКТО НЕ ВЫЖИЛ ИДИ ДАЛЬШЕ" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "смиртельная лавушка" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "никто не придёт" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "ВО ВСЁМ ВИНОВАТО ПРАВИТЕЛЬСТВО" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "ЁБАНЫЙ КИТАЙ" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "ЁБАНЫЕ КОММУНИСТЫ" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "Помни " + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -171054,7 +173068,7 @@ msgstr "современный" #: lang/json/snippet_from_json.py msgid "Christian" -msgstr "Кристиан" +msgstr "христианский " #: lang/json/snippet_from_json.py msgid "Pagan" @@ -171786,7 +173800,7 @@ msgstr "Вас захлёстывает предчувствие неминуе #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "Вы внезапно осознаёте, что Катаклизм случился именно из-за вас." #: lang/json/snippet_from_json.py @@ -174880,7 +176894,7 @@ msgid "" "SchoolClothing Co.\")" msgstr "" "МЕШКИ, МЕШКИ, МЕШКИ! Они очень полезные штуки! Если бы у нас не было МЕШКОВ," -" чем бы мы пользовались… чтобы КЛАСТЬ множество вещей?! (Реклама от «Play " +" чем бы мы пользовались… куда бы СКЛАДЫВАЛИ кучу вещей?! (Реклама от «Play " "SchoolClothing Co.»)" #: lang/json/snippet_from_json.py @@ -176879,10 +178893,10 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" -"«Ах, вижу Спираль в такой Искажённой Форме! Просто манипулировал своим " -"Вихревым движением! Это его Вечная Милость! Его красота Запятнана…»" +"«Ах, вижу Спираль в такой Искажённой Форме! Просто манипулировал своим " +"Вихревым движением! Это его Вечная Милость! Его красота Запятнана…»" #: lang/json/snippet_from_json.py msgid "\"My friend died, but at least I made her into a blob turret.\"" @@ -176900,14 +178914,14 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" -"«День 40. Управление сломано — волшебный реактор машины неумолимо гонит её " -"вперёд. Огромные катки спереди валят лес. Чувак, вот и я.»" +"«День 40. Управление сломано — волшебный реактор машины неумолимо гонит её " +"вперёд. Огромные катки спереди валят лес. Чувак, вот и я.»" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" +msgid "\"my car is a diamond in the rough… literally\"" msgstr "«моя машина — неогранённый алмаз… буквально»" #: lang/json/snippet_from_json.py @@ -176934,11 +178948,11 @@ msgstr "«однажды, я тоже стану частью машины»" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" "«Короч, берёшь старую банку от газировки и пихашь туда чутка динамиту и " -"кусман фугаса… БАХ! Ты куда-то разлетаешься.»" +"кусман фугаса… БАХ! Ты куда-то разлетаешься.»" #: lang/json/speech_from_json.py msgid "\"Hello?\"" @@ -177954,27 +179968,27 @@ msgstr "\"У... Убери свои грязные лапы... Ублюдок… #: lang/json/speech_from_json.py msgid "\"Did-a-chuk?\"" -msgstr "" +msgstr "\"Дид-а-чук?\"" #: lang/json/speech_from_json.py msgid "\"Dad-a-chak?\"" -msgstr "" +msgstr "\"Дад-а-чак?\"" #: lang/json/speech_from_json.py msgid "\"Dad-a-cham?\"" -msgstr "" +msgstr "\"Дад-а-чам?\"" #: lang/json/speech_from_json.py msgid "\"Did-a-chak?\"" -msgstr "" +msgstr "\"Дид-а-чак?\"" #: lang/json/speech_from_json.py msgid "\"Did-a-chum?\"" -msgstr "" +msgstr "\"Дид-а-чам?\"" #: lang/json/speech_from_json.py msgid "\"Dad-a-chuk?\"" -msgstr "" +msgstr "\"Дад-а-чук?\"" #: lang/json/speech_from_json.py msgid "\"What are you doing? No! NO!\"" @@ -178579,6 +180593,38 @@ msgstr "ТЯФ!" msgid "WOOF!" msgstr "АВ-АВ!" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "«Я кричу, но у меня же нет рта!»‮" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "«¿Зачем?»" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "«Подойди поближе, кроха.»" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "\"Я тебя съем! Хотя я всё равно уже не ем.\"" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "\"Сайрус сказал, если я потерплю, он достанет мне новое тело.\"" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "\"Quem é Você?\"" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "\"Eu vou te matar!\"" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "«Я едва сдерживаюсь от убийства, пожалуйста беги!»" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "«Не вынуждай меня заставлять тебя идти по доске»." @@ -178689,17 +180735,18 @@ msgstr "Когда тестирование закончится, по вам б #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" -"Невероятно. Вы, [имя субъекта], прямо-таки гордость [родной город субъекта]!" +"Невероятно. Вы, [имя субъекта], прямо-таки гордость [родной город " +"субъекта]!" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" -"Эта штука, вероятно, контейнер с канализационными отходами. Давай, обмажь " +"Эта штука, вероятно, контейнер с канализационными отходами. Давай, обмажь " "ими всё лицо." #: lang/json/speech_from_json.py @@ -178712,10 +180759,10 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" -"Никто будет вас винить, если вы сдадитесь. На самом деле, уход на данном " +"Никто будет вас винить, если вы сдадитесь. На самом деле, уход на данном " "этапе — совершенно оправданная реакция." #: lang/json/speech_from_json.py @@ -178727,9 +180774,9 @@ msgstr "" "пессимизма." #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" +msgid "Hello again. To reiterate our previous warning: [garbled]" msgstr "" -"И снова здравствуйте. Для повторения предыдущего предупреждения: [искажено]" +"И снова здравствуйте. Для повторения предыдущего предупреждения: [искажено]" #: lang/json/speech_from_json.py msgid "Weeeeeeeeeeeeeeeeeeeeee[bzzt]" @@ -178811,11 +180858,11 @@ msgstr "Кто-то сильно пострадает." #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "" -"Ой ой. Кто-то разрезал торт. Я велела им подождать вас, но они всё равно это" -" сделали." +"Ой, ой. Кто-то разрезал торт. Я велела им подождать вас, но они всё равно " +"это сделали." #: lang/json/speech_from_json.py msgid "This is your fault. It didn't have to be like this." @@ -178848,7 +180895,7 @@ msgstr "Что это было? Вы что-то сказали?" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "" "Я только хотела бы затметить, что вам были предоставлены все возможности для" " успеха." @@ -178907,11 +180954,11 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" -"Я проверила несколько чертежей, и я думаю… Да, точно. Вы определенно идёте " -"не туда." +"Я проверила несколько чертежей, и я думаю... Да, точно. Вы, определенно, " +"идёте не туда." #: lang/json/speech_from_json.py msgid "Are you even listening to me?" @@ -178946,7 +180993,7 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "«То, что у нас есть, — это неспособность общаться.»" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" +msgid "\"E.T. phone home.\"" msgstr "«E.T. звонить домой.»" #: lang/json/speech_from_json.py @@ -179015,8 +181062,8 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "«Дороги? Куда мы идем, нам дороги не нужны.»" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" -msgstr "«Пристегните свои ремни безопасности. Это будет ухабистая ночь.»" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgstr "«Пристегните свои ремни безопасности. Сегодня будет ухабистая ночь.»" #: lang/json/speech_from_json.py msgid "" @@ -179385,8 +181432,8 @@ msgid "\"I'm scared!\"" msgstr "«Мне страшно!»" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" -msgstr "«Что-то не так…»" +msgid "\"Something's wrong…\"" +msgstr "«Что-то не так...»" #: lang/json/speech_from_json.py msgid "\"What are you doing?\"" @@ -179413,16 +181460,16 @@ msgid "\"Excuse me?\"" msgstr "«Извините?»" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" -msgstr "«Я другой…»" +msgid "\"I'm different…\"" +msgstr "«Я другой...»" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" -msgstr "«Спасибо, в любом случае…»" +msgid "\"Thanks anyway…\"" +msgstr "«Спасибо, всё равно...»" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" -msgstr "«Возьми меня с собой…»" +msgid "\"Take me with you…\"" +msgstr "«Возьми меня с собой...»" #: lang/json/speech_from_json.py msgid "\"You have excellent aim!\"" @@ -179501,8 +181548,8 @@ msgid "\"This time is OUR time.\"" msgstr "«На этот раз — это НАШЕ время.»" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" -msgstr "«Со второго раза получится…»" +msgid "\"Second time's a charm…\"" +msgstr "«Со второго раза получится...»" #: lang/json/speech_from_json.py msgid "\"Howdy, stranger!\"" @@ -179573,8 +181620,8 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "«[вздох] Не говори никому об этом.»" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" -msgstr "«Хорошо, я попробовал. Удачи!»" +msgid "\"Well, I tried. Best of luck!\"" +msgstr "«Ну, я пытался. Удачи!»" #: lang/json/speech_from_json.py msgid "\"Hey, safe travels, there.\"" @@ -179869,7 +181916,7 @@ msgid "Cabin" msgstr "Хижина" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "Больница" @@ -180021,7 +182068,7 @@ msgstr "Лагерь МЧС" msgid "Mansion Entrance" msgstr "Вход в поместье" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "Поместье" @@ -180097,19 +182144,19 @@ msgstr "Э… Да, конечно. Думаю, мне пора идти." #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" " taking the bones does the cycle end - their story, their song, their " "strength, become yours to use." msgstr "" -"Когда всё произошло, когда случился Катаклизм, что-то… поменялось. Это видно" -" по всем существам, но главное, видно в костях. Они ломаются, меняются, " -"восстают в бесконечном цикле. Живые мертвецы ходят. Чудища рвут друг друга " -"на куски. Видно резонанс, тихое гудение чистой силы, и цикл можно " -"прекратить, только если забрать кости — их история, их песня, их сила станут" -" твоими." +"Когда всё произошло, когда случился Катаклизм, что-то… поменялось. Это " +"видно по всем существам, но главное, видно в костях. Они ломаются, " +"меняются, восстают в бесконечном цикле. Живые мертвецы ходят. Чудища рвут " +"друг друга на куски. Видно резонанс, тихое гудение чистой силы, и цикл " +"можно прекратить, только если забрать кости — их история, их песня, их сила " +"станут твоими." #: lang/json/talk_topic_from_json.py msgid "So what do you actually do with the bones?" @@ -180224,17 +182271,8 @@ msgid "Yeah, alright." msgstr "Да-да, точно." #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." -msgstr "Если хочешь, у меня есть ещё песня для тебя." - -#: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." -msgstr "Я знаю несколько полезных костей, если хочешь услышать побольше." - -#: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." -msgstr "Тебе ещё предстоит спеть песню, если желаешь." +msgid "There are bones to etch, songs to sing. Wish to join me?" +msgstr "Ещё есть невырезанные кости и неспетые песни. Присоединишься ко мне?" #: lang/json/talk_topic_from_json.py msgid "Do you wish to take on more songs?" @@ -180245,16 +182283,17 @@ msgid "Do you believe you can take on the burden of additional bones?" msgstr "Думаешь, ты сможешь взвалить обузу лишних костей?" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" -msgstr "Ещё есть невырезанные кости и неспетые песни. Присоединишься ко мне?" +msgid "A song may yet be sung by you, should you wish to." +msgstr "Тебе ещё предстоит спеть песню, если желаешь." #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." -msgstr "Послушнику не следует браться за много песен сразу." +msgid "There is an additional song you could take on, if you'd like." +msgstr "Если хочешь, у меня есть ещё песня для тебя." #: lang/json/talk_topic_from_json.py -msgid "That is all for now." -msgstr "Пока что всё." +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." +msgstr "Я знаю несколько полезных костей, если хочешь услышать побольше." #: lang/json/talk_topic_from_json.py msgid "" @@ -180263,6 +182302,14 @@ msgid "" msgstr "" "Пока что песня… Утихла. Возможно, на костях мира будет высечено больше нот." +#: lang/json/talk_topic_from_json.py +msgid "An acolyte should not take on too many songs at once." +msgstr "Послушнику не следует браться за много песен сразу." + +#: lang/json/talk_topic_from_json.py +msgid "That is all for now." +msgstr "Пока что всё." + #: lang/json/talk_topic_from_json.py msgid "I see." msgstr "Понятно." @@ -181071,7 +183118,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "Держать строй: не иди в препятствия рядом со мной." #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -181399,16 +183446,16 @@ msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "" "Ладно, пусть это поможет мне не замёрзнуть при такой погоде. Как дела?" +#: lang/json/talk_topic_from_json.py +msgid "Man it's dark out isn't it? what's up?" +msgstr "Блин, тут же так темно? Что случилось?" + #: lang/json/talk_topic_from_json.py msgid "" "Well, it's the time of day for a quick break surely! How are you holding " "up?" msgstr "Что ж, как раз подходящее время немного отдохнуть! Как у тебя дела?" -#: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" -msgstr "Блин, тут же так темно? Что случилось?" - #: lang/json/talk_topic_from_json.py msgid "Well, I'm feeling pretty sick… are you doing OK though?" msgstr "Ну, мне не совсем хорошо... А у тебя там всё нормально?" @@ -181502,14 +183549,14 @@ msgstr "Ладно, не делай резких движений…" msgid "Keep your distance!" msgstr "Не подходи ближе!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "Это моя территория, ." - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "Это моя территория, ." + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "Успокойся. Я не причиню тебе зла." @@ -181563,29 +183610,29 @@ msgid "I don't care." msgstr "Мне всё равно." #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "У меня есть работа для тебя. Хочешь послушать?" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "У меня есть другая работа для тебя. Хочешь послушать?" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "У меня для тебя есть и другая работа. Хочешь послушать?" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "У меня для тебя есть ещё работа. Хочешь послушать?" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "У меня для тебя есть и другая работа. Хочешь послушать?" +msgid "I have another job for you. Want to hear about it?" +msgstr "У меня есть другая работа для тебя. Хочешь послушать?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "У меня больше нет для тебя работы." +msgid "I just have one job for you. Want to hear about it?" +msgstr "У меня есть работа для тебя. Хочешь послушать?" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "У меня нет работы для тебя." +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "У меня больше нет для тебя работы." + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -181595,6 +183642,10 @@ msgstr "Ну, ладно." msgid "Never mind, I'm not interested." msgstr "Неважно, мне не интересно." +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "Ты сейчас на меня не работаешь." + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "Какое задание?" @@ -181603,10 +183654,6 @@ msgstr "Какое задание?" msgid "What about it?" msgstr "Что насчёт него?" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "Ты сейчас на меня не работаешь." - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "Я это сделаю!" @@ -181823,10 +183870,6 @@ msgstr "Хмм, ладно." msgid "Thanks!" msgstr "Спасибо!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "Смотри на дорогу, бро!" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "У меня есть причины не рассказывать тебе об этом." @@ -181851,6 +183894,10 @@ msgstr "Меня мучает жажда, дай мне чего-нибудь msgid "I must focus on the road!" msgstr "Мне надо смотреть на дорогу!" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "Смотри на дорогу, бро!" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Ну, ладно." @@ -181955,10 +184002,6 @@ msgstr "Нет, мы здесь будем в порядке." msgid "On second thought, never mind." msgstr "Если ещё раз подумать, то неважно." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "Я не могу полноценно обучать тебя, пока ты за рулём!" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "У меня есть причины не учить тебя." @@ -181971,6 +184014,10 @@ msgstr "Дайте мне немного времени, и я вам покаж msgid "I can't train you properly while I'm operating a vehicle!" msgstr "Я не могу тебя учить, когда я за рулём!" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "Я не могу полноценно обучать тебя, пока ты за рулём!" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "Ни единого шанса, я сматываю удочки!" @@ -182723,8 +184770,8 @@ msgid "How are you alive?" msgstr "Как тебе удалось выжить?" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" -msgstr "Кем ты был до катаклизма?" +msgid "What did you do before the Cataclysm?" +msgstr "Кем ты был до Катаклизма?" #: lang/json/talk_topic_from_json.py msgid "" @@ -182969,32 +185016,32 @@ msgid "This is a season spring test response." msgstr "Это тестовый ответ весны." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." -msgstr "Это тестовый ответ 30 дней после катаклизма." +msgid "This is a days since Cataclysm 30 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season summer test response." msgstr "Это тестовый ответ лета." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." -msgstr "Это тестовый ответ 120 дней после катаклизма." +msgid "This is a days since Cataclysm 120 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season autumn test response." msgstr "Это тестовый ответ осени." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." -msgstr "Это тестовый ответ 210 дней после катаклизма." +msgid "This is a days since Cataclysm 210 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season winter test response." msgstr "Это тестовый ответ зимы." #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." -msgstr "Это тестовый ответ 300 дней после катаклизма." +msgid "This is a days since Cataclysm 300 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a is day test response." @@ -183520,12 +185567,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" -"Катаклизм ослабил континуум пространства-времени, я случайно выпал в разрыв " -"в реальности и очутился здесь. Мне нужны твои запасы, чтобы сражаться." +"Катаклизм ослабил континуум пространства-времени, я случайно попал в разрыв " +"в реальности и очутился здесь. Мне нужны твои запасы, чтобы сражаться." #: lang/json/talk_topic_from_json.py msgid "" @@ -183933,8 +185980,8 @@ msgstr "" "и был не на службе, когда началось самое худшее." #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" -msgstr "Что ты делал, когда понял про катаклизм?" +msgid "What did you do when you found out about the Cataclysm?" +msgstr "Что ты делал, когда узнал про Катаклизм?" #: lang/json/talk_topic_from_json.py msgid "" @@ -185599,10 +187646,10 @@ msgstr "Нет, какая-то ерунда." #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" -"Ага, понимаю. Иногда мне кажется, что моя жизнь началась вскоре после " -"катаклизма." +"Ага, понимаю. Иногда мне кажется, что моя жизнь началась вскоре после " +"Катаклизма." #: lang/json/talk_topic_from_json.py msgid "" @@ -187276,8 +189323,8 @@ msgid "What were you saying before that?" msgstr "О чём ты там говорил?" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." -msgstr "Глазам не верю. Пожалуйста, вытащи меня отсюда…" +msgid "I can't believe my eyes. Please get me outta here…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Hey, ." @@ -187317,9 +189364,9 @@ msgstr "Привет, сэр, что вас сюда привело?" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." -msgstr "Я вижу этот значок. Похоже, тебе следует убраться вон с этой земли." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Yeah, I'm a Marshal, what are you going to do about it?" @@ -187351,13 +189398,10 @@ msgstr "Я слышал про Барри, расскажи, кто его сх #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" -"Розовая очень быстрая тварь, куча конечностей, точно не человек. Оно легко " -"нас преследовало, когда мы пытались спастись, ужасающая хрень. Барри упал " -"наземь, и тварь его утащила." #: lang/json/talk_topic_from_json.py msgid "You all just gonna leave him out there to his fate?" @@ -187384,9 +189428,8 @@ msgid "" msgstr "Крис обходит границы нашей земли и обдумывает способы защиты." #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" -"Убирайся с моей фермы, я не буду говорить с чмошником из правительства." #: lang/json/talk_topic_from_json.py msgid "Go on..." @@ -187406,15 +189449,15 @@ msgstr "Привет, как дела?" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." -msgstr "Я вижу твой значок. Прочь с нашей земли, мы тут маршалов не любим." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." -msgstr "Привет, твой отец просил тебя найти. Говорил, ты ищешь своего дядю." +"uncle." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -187428,11 +189471,8 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" -"Ага, они всегда о нас беспокоились, я люблю обхаживать землю и пытаюсь найти" -" что-то новое. Подумываю привести эту хижину в порядок, чтоб была тишь и " -"спокойствие…" #: lang/json/talk_topic_from_json.py msgid "Sounds like you are restless, why not leave?" @@ -187467,11 +189507,8 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" -"В одной долгой вылазке в поисках Барри я что-то видел в поле. Я не " -"подобрался близко, но клянусь, оттуда выходили невероятные твари. Оно типа " -"мерцало, будто было не совсем там. Я немного проследовал за тварями…" #: lang/json/talk_topic_from_json.py msgid "What did you find?" @@ -187480,13 +189517,10 @@ msgstr "Что ты обнаружил?" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" -"Они шли к странной постройке вроде башни, я никогда такого не видел, оно " -"блестело на солнце, будто органическое. Думаю, они держат Барри там, я " -"видел, как они приходили и уходили с другими людьми." #: lang/json/talk_topic_from_json.py msgid "" @@ -187514,8 +189548,8 @@ msgstr "Тебе лучше уйти, пока моя семья тебя не #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." -msgstr "Привет, твой отец просил тебя найти. Говорил, ты ищешь своего дядю." +"Your dad asked me to come find you, said you've been looking for your uncle." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -187571,11 +189605,8 @@ msgstr "" msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" -"На самом деле удача-то и не нужна, если подготовиться и работать сообща. У " -"нас есть потери, мой зять Барри был лучшим охотником, но нынче всё по-" -"другому…" #: lang/json/talk_topic_from_json.py msgid "What happened to Barry?" @@ -187587,11 +189618,9 @@ msgstr "Нынче ферма, должно быть, довольно безо #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "" -"Что ж, приятно познакомиться. Наверно, Джек уже расхвалил мои травяные " -"снадобья, он гордится нашими достижениями." #: lang/json/talk_topic_from_json.py msgid "He did mention you make remedies, are they effective?" @@ -187637,11 +189666,9 @@ msgstr "Мы с Джеком уже 40 лет вместе. Он мой якор #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "" -"Джесси с семьёй живут на лошадиной ферме. У них для тебя наверняка есть " -"работа." #: lang/json/talk_topic_from_json.py msgid "" @@ -187671,6 +189698,12 @@ msgstr "Твоя дочь живёт дальше по дороге?" msgid "Where is your brother's place?" msgstr "Где твой брат?" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "Я вижу этот значок. Похоже, тебе следует убраться вон с этой земли." + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "Милая молочная ферма, должно быть, управляться с нею непросто." @@ -187751,6 +189784,11 @@ msgstr "" "Карлос у себя в мастерской, если не охотится. Он обеспечивает лошадей " "кормом." +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" +"Убирайся с моей фермы, я не буду говорить с чмошником из правительства." + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "Твой сын помогает с молочной фермой?" @@ -188127,18 +190165,18 @@ msgstr "Расскажи про своего отца." #: lang/json/talk_topic_from_json.py msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." +"Sir, I don't know how the hell you got down here but if you have any sense " +"you'll get out while you can." msgstr "" -"Мэм, я не знаю как, чёрт возьми, вы добрались сюда, но если в вас есть хоть " +"Сэр, я не знаю как, чёрт возьми, вы добрались сюда, но если в вас есть хоть " "капля рассудка, уходите отсюда, пока можете." #: lang/json/talk_topic_from_json.py msgid "" -"Sir, I don't know how the hell you got down here but if you have any sense " -"you'll get out while you can." +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." msgstr "" -"Сэр, я не знаю как, чёрт возьми, вы добрались сюда, но если в вас есть хоть " +"Мэм, я не знаю как, чёрт возьми, вы добрались сюда, но если в вас есть хоть " "капля рассудка, уходите отсюда, пока можете." #: lang/json/talk_topic_from_json.py @@ -188622,15 +190660,15 @@ msgstr "Хорошо! Давай идти." msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "Дружище, говорил ли я тебе про картон? Нет ли у тебя его с собой?" +#: lang/json/talk_topic_from_json.py +msgid "We've done it! We've solved the list!" +msgstr "Мы сделали это! Мы закончили список!" + #: lang/json/talk_topic_from_json.py msgid "" "How's things with you? My cardboard collection is getting quite impressive." msgstr "Как продвигаются дела? У меня уже впечатляющее количество картона." -#: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" -msgstr "Мы сделали это! Мы закончили список!" - #: lang/json/talk_topic_from_json.py msgid "About that shopping list of yours…" msgstr "Насчёт твоего списка покупок…" @@ -189586,12 +191624,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" -"Мерзко, правда? Ощущается, как волосня на лобке. Начало расти повсюду вскоре" -" после катаклизма. Без понятия, в чём причина. Я не осуждаю, что все это " -"ненавидят, я и сам ненавижу." +"Мерзко, правда? Ощущается, как волосня на лобке. Начало расти повсюду " +"вскоре после катаклизма. Без понятия, в чём причина. Я не осуждаю, что все" +" это ненавидят, я и сам ненавижу." #: lang/json/talk_topic_from_json.py msgid "" @@ -189663,7 +191701,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" "Ты не в курсе? Губернатор слетел с катушек, как и большинство людей под " @@ -190308,7 +192346,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -190453,6 +192491,14 @@ msgid "" " now. Fought through countless hordes, run ragged, chased at every turn, " "yeah, no thank-you any more of that for me!" msgstr "" +"Ты только на себя посмотри. Беспокоишься о случайных людях, будто пастух! " +"Нет, не обижайся… я в хорошем смысле. Нам нужны люди, беспокоящиеся за " +"других людей. Мир на этом держался и теперь, наверное, будет держаться ещё " +"больше. Я в порядке, дружище, у меня обе ноги и почти нетронутое здоровье. " +"Спина немного побаливает, но если это самое худшее, то грех жаловаться, " +"верно? Похоже, у тебя есть чего рассказать, хотя бы о том, как добрался " +"сюда. Я уже это представляю: пришлось продираться сквозь бесконечные орды, " +"бежать из последних сил, избегать вечных погонь, да уж, мне такого хватит!" #: lang/json/talk_topic_from_json.py msgid "What about you, what's your story?" @@ -190801,6 +192847,9 @@ msgid "" "Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " "up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" +"Потрясно! Мой счастливый день. Дай подумать. Что бы предложить… я могу " +"достать несколько мерчей за, допустим, пять косяков или равноценной хорошей " +"травки." #: lang/json/talk_topic_from_json.py msgid "" @@ -190925,6 +192974,9 @@ msgid "" "\n" "I… I do hope my grandparents are okay though. They were old fashioned, and they made choices I didn't like, but they were family and I still have sweet memories of them from when I was little. I've had to do a lot more thinking about God since , and while I'd never agree with the decisions they made, I understand more why they thought they had to make them. They just wanted the whole family to share their relationship with God, in their messed up way." msgstr "" +"Ты удивишься! Обработка металла долго была частью мусульманских традиций, хотя я ею занимаюсь не поэтому. Я не слишком следую традициям, да и мои родители тоже, но мои дедушка с бабушкой очень старомодные и строгие. Моя сестра заявила, что она лесбиянка, и они превратили её жизнь в ад; мама с папой советовали ей сохранить свой секрет, но сестра думала иначе. Мне всегда нравилась механика и работа руками, так что когда бабушка с дедушкой принялись тиранить моих родителей выдать меня и сестру замуж за достойных мужчин, чтоб мы бросили свою безнравственность, я решила выбрать любимую работу, чтоб как можно сильнее их уязвить. Выбор был верный, не только потому что они пришли в ярость, но и мне ещё нравится сварка. Мне нравится то ощущение, когда стоишь и смотришь на свою работу, осознавая, что взяла куски металла и сделала из них что-то полезное. Я обожаю, когда всё идеально сходится. Умиротворяет.\n" +"\n" +"Я… я всё же надеюсь, что с моими дедушкой и бабушкой всё хорошо. Они старомодные и выбирают то, что мне не по вкусу, но они семья, и у меня остались приятные детские воспоминания. Я намного чаще думаю о Боге с тех пор, как случился , и хотя я никогда не соглашалась с их решениями, я теперь лучше понимаю, почему они так поступали. Они просто хотели, чтобы вся семья разделяла их отношения с Богом в их запутанной манере." #: lang/json/talk_topic_from_json.py msgid "" @@ -190932,6 +192984,9 @@ msgid "" "\n" "Anyway, mine was the second bus to arrive, and they were just getting some triage and processing stuff set up. I was put in charge of helping with the wounded, along with Uyen. Things went a little strange later on… one of the women doing triage and processing had a bit of a hang-up about particular, um, colors of people being allowed into the center. She claimed to have lost our 'papers', along with a lot of other peoples'. Thankfully because we'd helped so many we were able to argue that they couldn't leave us out, but there was no space left downstairs by the time we got that sorted, so here we are." msgstr "" +"Я ехала навестить родителей в Берлингтоне и ждала на автобусной остановке, когда зазвучал сигнал об эвакуации. Я немного не осознавала, насколько масштабными будут бунты. Когда прибыл автобус, его превратили в машину эвакуации и забрали меня. Я… я никогда не была религиозной, ну вот так я родилась, но с тех пор я намного чаще думаю о Боге и как я Ему благодарна за Его помощь. Хотя мне до сих пор трудно, мне легче с осознанием, что Он думает про меня.\n" +"\n" +"Так или иначе, мой автобус прибыл вторым, тут организовали сортировку и регистрацию. Меня и Йен отрядили помогать раненым. Потом начались странности… у одной женщины на регистрации был особый бзик насчёт пропуска, э, некоторых цветов кожи в центр. Она заявила, что потеряла наши «бумаги» вместе с документами некоторых людей. К счастью, поскольку мы многим помогли, мы сумели её убедить впустить нас внутрь, но к тому времени внизу места уже не осталось, так что мы здесь." #: lang/json/talk_topic_from_json.py msgid "" @@ -190989,7 +193044,7 @@ msgstr "Неа, и вообще я уже ухожу." #: lang/json/talk_topic_from_json.py msgid "" "Doing my best to keep going in the face of… everything. Not getting far." -msgstr "" +msgstr "Изо всех сил стараюсь пережить… всё. Получается не очень." #: lang/json/talk_topic_from_json.py msgid "" @@ -191000,6 +193055,11 @@ msgid "" "bus was attacked, destroyed. Nearly everyone died. A few of us made it " "back… not enough." msgstr "" +"До апокалипсиса я работал электриком. Борис — мой шурин, и у нас была " +"приличная бригада. Во время эвакуации мы ушли с нашими… нашими семьями. Мы " +"набились в переполненное убежище, потом в переполненный автобус. Потом… " +"потом всё рухнуло. На автобус напали и уничтожили. Почти все погибли. " +"Немногие сумели выбраться… слишком немногие." #: lang/json/talk_topic_from_json.py msgid "You lost someone…" @@ -191011,6 +193071,9 @@ msgid "" " nephew, Ash, Boris and Stan's son. We got him here, but there wasn't " "anything we could do. Internal injuries." msgstr "" +"Да. Свою жену, Линду… её вышвырнуло из автобуса. Она не выжила. И… и моего " +"племянника, Эша, сына Бориса и Стэна. Мы его сюда принесли, но не смогли " +"помочь. Повреждения внутренних органов." #: lang/json/talk_topic_from_json.py msgid "" @@ -191126,6 +193189,9 @@ msgid "" "I used to be an engineer, though… I'm trying to think of some kind of " "project to get my mind off all this." msgstr "" +"Просто ковыряюсь. Я всё ещё слишком потрясена, чтоб заняться чем-то. Раньше " +"я была инженером... Я пытаюсь придумать, чем бы заняться, чтоб отвлечь " +"мысли." #: lang/json/talk_topic_from_json.py msgid "What's it like living here?" @@ -191143,6 +193209,11 @@ msgid "" "night we can hear the outside, and we all just lie there awake, " "thinking the same things but too scared to talk about it." msgstr "" +"Живётся тут? Точно, я тут теперь живу, наверное. Ну... странно. Мы толпимся " +"в маленьком здании, я не знаю этих людей, но мы ходим в общие душевые и все " +"прошли одно и то же. Не круто. Ночью мы слышим, как снаружи возятся " +", и нам всем не спится, мы думаем об одном и том же, но боимся " +"произносить вслух." #: lang/json/talk_topic_from_json.py msgid "Can you tell me anything about the other refugees here?" @@ -191277,6 +193348,11 @@ msgid "" "We know we've got it pretty good… we're safe, we're alive. It's just, like," " what kind of life are we even living?" msgstr "" +"Есть и хорошее, и плохое. Нас всех достало толпиться здесь месяцами без " +"понятия, будет ли еда или нет. Похоже, нас никогда не впустят в безопасный " +"подвал, и никто из нас нормально не спал с поры, как нас впустили. Понятно, " +"что не всё так плохо... мы в безопасности, мы живы. Просто, ну, какой жизнью" +" мы вообще живём?" #: lang/json/talk_topic_from_json.py msgid "" @@ -191362,6 +193438,14 @@ msgid "" "rumor is that the folks living downstairs have it a lot easier than we do. " "I try not to think too much on that." msgstr "" +"Они тут всем управляют, причём не из-за милосердия. Нам платят за всякую " +"работу, за обслуживание здания и всё такое, и мы меняем деньги на еду. Самая" +" мякотка в спросе и предложении… тут намного больше денег, чем еды. Ноутбук " +"купить легче, чем вяленое мясо, и непохоже, чтоб становилось как-то лучше. " +"Заработка за день тяжёлой работы едва хватает, чтоб набить живот. Хотя не " +"стоит столько ныть. Я не знаю, как устроить всё получше, хотя ходят слухи, " +"что народ внизу живёт куда приятнее, чем мы. Я стараюсь особо об этом не " +"думать." #: lang/json/talk_topic_from_json.py msgid "" @@ -191449,6 +193533,11 @@ msgid "" "stick really close together. I think… I think they also just don't really " "like any of us." msgstr "" +"Сингхи очень стеснительные, похоже, им неловко оттого, что приходится " +"переживать всё это вместе. Они единственная полная семья, что я видела с тех" +" пор, как случился . Им сейчас должно быть очень не по себе; " +"наверно, из-за этого они держатся друг друга. А ещё думаю... думаю, никто из" +" нас им просто не нравится." #: lang/json/talk_topic_from_json.py msgid "" @@ -191461,6 +193550,13 @@ msgid "" "stereotype, I imagine there must be more depth to him, but I haven't seen it" " yet." msgstr "" +"Ванесса... что ж, наверное, она милая. То есть она меня бесит, но нам " +"приходится быть вместе, так что я стараюсь быть помягче. Йен и Ризея спорят," +" кто тут будет главным, но я просто с головой ухожу в сборку чего-нибудь и " +"держусь подальше от этой политики. Толку от неё никакого. Алонсо нормальный," +" он точно положил глаз на меня, а ещё на каждую женщину. Не в моём вкусе, " +"группа слишком маленькая. Джон - ходячий стереотип, полагаю, в его душе что-" +"то есть, но я туда пока не добралась." #: lang/json/talk_topic_from_json.py msgid "" @@ -191473,6 +193569,14 @@ msgid "" "are fine with it, and okay, sure, I guess. John is a walking stereotype, " "but he's a great poker buddy. I admit I kinda like him." msgstr "" +"Ванесса... Я из кожи вон лезу, я правда стараюсь, но мы просто как кошка с " +"собакой. Когда-нибудь одна из нас попытается вышибить другой мозги " +"монтировкой, и слава богу, что я кучу времени возилась с монтировками. Йен и" +" Ризея - прекрасные люди, и мне они правда нравятся, но я не выношу той " +"политической херни, что они творят. Алонсо просто... он... у меня нет " +"цензурных слов, чтоб сказать, кто он такой. Остальных он устраивает, ну что " +"ж, лады, наверное. Джон - ходячий стереотип, но с ним круто играть в покер. " +"Признаю, мне он нравится." #: lang/json/talk_topic_from_json.py msgid "" @@ -191538,6 +193642,9 @@ msgid "" "cattle in a barn… we need pastures to run free, if'n y'get my drift. 'Til " "we got 'em, it's gonna be tense in here." msgstr "" +"Людям не нраица долго сидеть взаперти без голубого неба. Мы тут как скотина " +"в хлеву… нам нужны пастбища, штоб гулять на свободе, если ты п'нимаешь, к " +"чему я. П'ка пастбищ нет, тут буит довольно напряжно." #: lang/json/talk_topic_from_json.py msgid "Hello ma'am. I am Mandeep Singh." @@ -191741,6 +193848,7 @@ msgid "" "The doctor did what she could but after the accident and the stress of the " "attack… No." msgstr "" +"Врач сделала что могла, но после аварии и стресса из-за нападения… Нет." #: lang/json/talk_topic_from_json.py msgid "" @@ -191766,6 +193874,15 @@ msgid "" "seemed like ages, calling it an 'outbreak'. By the time leveller heads " "prevailed, there weren't many people left in there to recover." msgstr "" +"Из автобуса? В конце концов выжили немногие; с нами в автобусе была семья " +"Сингхов. Мы были среди последних, кто прибыл. Они провели нас в комнату " +"регистрации, где они как могли помогали раненым. Врачей не хватало, и один " +"человек умер. Мы все сначала думали, он просто уснул, но нет, он ожил и " +"превратился в зомби, поднялась дикая паника. Стрельба в крохотной набитой " +"комнате, давка… очень нехорошо вышло. Мы были рядом с дверью и сразу успели " +"выскочить, но потом пара психующих людей заперла дверь и оставила там " +"невинных людей, казалось, на целую вечность. Они назвали это «вспышкой». " +"Когда наконец вмешались главные, спасать было уже особо некого." #: lang/json/talk_topic_from_json.py msgid "" @@ -191927,6 +194044,12 @@ msgid "" "forest tourist? I don't know if I'll ever see my own forest again, and the " "thought breaks my heart." msgstr "" +"Мой народ — Гитксан, мы из северо-запада Британской Колумбии с реки Скина. Я" +" сама из Хазелтона. Прекрасное место. Высокие горы, умеренные дождевые леса…" +" Я отчасти пришла туда, потому что мне нравятся влажные прибрежные леса, и " +"мне нравится исследовать их в других странах. По той же причине я была в " +"Корее и Словакии. Наверно, я немного лесная туристка? Не знаю, увижу ли " +"когда-нибудь свой лес, и это разбивает мне сердце." #: lang/json/talk_topic_from_json.py msgid "" @@ -191962,7 +194085,7 @@ msgstr "Не хочешь ли рассказать свою историю?" msgid "" "Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " "Stan." -msgstr "" +msgstr "Привет. Извини, если мы уже виделись, я правда не помню. Я… Я Стэн." #: lang/json/talk_topic_from_json.py msgid "Hm? Oh, hi." @@ -192402,6 +194525,9 @@ msgid "" "and definitely not enough supplies. These are harsh times. We're doing what" " we can for those folks… at least they've got shelter." msgstr "" +"Даже когда мы со всем разобрались, у нас не хватало кроватей на всех, и уж " +"точно не хватало еды. Времена были непростые. Мы делаем что можем для тех " +"ребят… у них хотя бы есть укрытие." #: lang/json/talk_topic_from_json.py msgid "" @@ -192418,6 +194544,10 @@ msgid "" "staging area at first. Things went… wrong. I hear the shopkeeper is " "offering a reward to clear it out, if you're feeling suicidal." msgstr "" +"Что ж, есть подземный этаж, там мест больше нет, так что с ним всё. Ещё есть" +" комната рядом с погрузкой, где мы поначалу распределяли людей. Случилась… " +"неприятность. Я слышал, торговец предлагает награду за зачистку, если тебе " +"хочется помереть." #: lang/json/talk_topic_from_json.py msgid "What went wrong with your staging area?" @@ -192818,14 +194948,14 @@ msgstr "Ведите себя прилично, или вам не поздор msgid "Just on watch, move along." msgstr "Просто стою в дозоре. Проходи мимо." -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "Мадам, вам действительно не стоит тут гулять." - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "Ну что, все прикинул?" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "Мадам, вам действительно не стоит тут гулять." + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "Я слышал, это место было центром для беженцев…" @@ -192890,6 +195020,14 @@ msgid "" "business model. Don't care who your goods come from or how you got them, " "just don't bring trouble." msgstr "" +"Если честно, в начале у нас было шесть автобусов, полных офисных работников " +"и домохозяек… мы сделали что могли, чтоб рассортировать их и в первую " +"очередь взять тех, кто сможет выжить. Звучит жестоко, но вариантов не было. " +"Единственное, чего мы сейчас хотим — запустить достаточно торговли, чтоб " +"выжить… наш адрес есть в компьютере каждого убежища, и люди продолжают " +"приходить, и мы посылаем их прочь, но мы поняли, что можем обменять их " +"находки на наши вещи. Мы планируем построить подобие бизнеса. Нам всё равно," +" откуда ты берёшь свои товары, просто не доставляй проблем." #: lang/json/talk_topic_from_json.py msgid "It's just as bad out there, if not worse." @@ -192903,6 +195041,11 @@ msgid "" "the scavengers out there so ruthless but some of us have had to kill our own" " bloody kids… don't even think about strong arming us." msgstr "" +"Мне жаль, но единственный способ выжить здесь - быстро захлопывать ворота. " +"Охранникам в подвале отдан приказ стрелять на поражение, если кому-то придёт" +" в голову заглянуть на нижние уровни. Я не знаю, почему добытчики здесь " +"такие беспощадные, но некоторым из нас пришлось убить своих собственных, " +"мать твою, детей... Даже не думай о том, что нам не хватает решительности." #: lang/json/talk_topic_from_json.py msgid "" @@ -192930,6 +195073,10 @@ msgid "" "why they've got me up here doing this… and that's all I'm going to say about" " myself. I'm on the clock, after all." msgstr "" +"Ладно, как и многие, я бы предпочёл не копаться в моей прошлой жизни. Все " +"погибли, умерли, воскресли, умерли снова. Впрочем, раньше у меня был " +"магазинчик, поэтому меня сюда посадили заниматься торговлей… вот и всё, что " +"я могу про себя рассказать. Я на работе, в итоге." #: lang/json/talk_topic_from_json.py msgid "" @@ -192980,6 +195127,9 @@ msgid "" "sure whatever toxic waste is still out there is bound to mutate more than " "just his hair." msgstr "" +"Да ни за что! К нам однажды пришёл тут один парень, весь покрытый ебучей " +"шерстью... Вообще это не так уж странно, но я точно знаю, что какая бы " +"токсичная дрянь там ни была, он точно намутировал себе не только волосы." #: lang/json/talk_topic_from_json.py msgid "Fine… *coughupyourscough*" @@ -193030,6 +195180,12 @@ msgid "" "buy, with no intention of it ever being used. From the passing scavengers " "I've heard nothing but prime loot'n spots and rumors of hordes." msgstr "" +"Не могу сказать, что мы много слышали. Похоже, большинство таких убежищ было" +" предназначено для того, чтобы люди чувствовали себя в безопасности... а не " +"для того, чтобы помочь им выжить. Наше радиооборудование - полный хлам, " +"которое кто-то уговорил закупить правительство, без намерения когда-либо " +"использовать его. От проходящих добытчиков я не слышал ничего, кроме " +"информации о местечках с добычей и слухов об ордах." #: lang/json/talk_topic_from_json.py msgid "Hordes?" @@ -193052,6 +195208,11 @@ msgid "" "going around. Until then we're letting them crash here so long as they " "don't mess the place up." msgstr "" +"Это ребята, которые хотели укрыться в нашем убежище, но у нас было слишком " +"много народу и не хватало ни места, ни еды. Многие ушли искать своё " +"собственное пристанище, но эти… эти не стали. Мы пытались найти им " +"безопасный уголок, но нынче проблемы с безопасностью. Пока они сидят " +"тихонько, мы позволяем им там жить." #: lang/json/talk_topic_from_json.py msgid "" @@ -193133,6 +195294,12 @@ msgid "" "sun, fresh air, and hard work… but people are a bit afraid of getting " "attacked by zombie hordes, as you might guess." msgstr "" +"К сожалению, нет. Большая часть тех, кто ушёл, и так застряла наверху, они " +"рисковали куда меньше тех, у кого была безопасная койка внизу. Из подвала " +"вызвалось идти всего несколько человек, и там всё равно было слишком много " +"народу с самого начала. Мы вроде надеялись, что на ранчо отправится побольше" +" людей — ну, к солнышку, свежему воздуху, тяжёлой работе… но как можешь " +"догадаться, людей немного пугает перспектива встречи с ордой зомби." #: lang/json/talk_topic_from_json.py msgid "Citizen..." @@ -193198,6 +195365,9 @@ msgid "" " the days go on. Some survivors too, come in here with… adaptations. Maybe" " they're related." msgstr "" +"Это не классическое нашествие зомби. Похоже, со временем мертвецы становятся" +" сильнее. И некоторые выживальщики тоже приходят с... адаптациями. Возможно," +" это связано." #: lang/json/talk_topic_from_json.py msgid "" @@ -193250,6 +195420,12 @@ msgid "" " those monsters seem to be able to break through a fence or wall constructed" " with the stuff." msgstr "" +"Ну, вообще тут внизу есть парень, у которого есть рабочая пневматическая " +"пушка. Она стреляет металлом как... как пушка, только без грохота. Чертовски" +" выгодная штука. Далее, арматура может пригодиться тем, кто изготавливает " +"самодельное оружие. Ну и напоследок можно упомянуть строительство " +"укреплений. Мало кто из монстров сможет сломать забор или тем более стену, " +"построенные с использованием арматуры." #: lang/json/talk_topic_from_json.py msgid "Well, then…" @@ -193289,10 +195465,15 @@ msgid "" " doesn't want me here when I'm not selling, but… some people get away with " "it." msgstr "" +"Не знаю. В смысле, если сумеешь оказаться полезным. Но сейчас это всё так " +"туманно. Всё зависит от того, кого спрашивать. Торговец, например, точно не " +"хочет меня здесь видеть, когда я не занимаюсь торговлей, но... многих людей " +"это устраивает." #: lang/json/talk_topic_from_json.py msgid "Ssh. Some people in here hate… mutations. This was an accident." msgstr "" +"Шшш. Некоторые люди здесь ненавидят... мутации. Был тут один инцидент." #: lang/json/talk_topic_from_json.py msgid "" @@ -193344,7 +195525,7 @@ msgstr "Эй, кажется вы здесь недавно. Могу я вам #: lang/json/talk_topic_from_json.py msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "" +msgstr "Кажется я учуял свинью. Шучу... Пожалуйста, не арестовывайте меня." #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" @@ -193413,6 +195594,8 @@ msgid "" "Sure, just bagged a fresh batch of meat. You may want to grill it up before" " it gets too, uh… 'tender'." msgstr "" +"Конечно, просто свежая порция мяса. Может ты захочешь его поджарить, пока " +"оно не стало слишком, ммм... \"мягким\"." #: lang/json/talk_topic_from_json.py msgid "" @@ -193520,6 +195703,12 @@ msgid "" "them. Since most survivors here have nothing they want, they are welcomed " "as champions." msgstr "" +"Ну... Я был обычным гражданским, пока меня не мобилизовали, так что скажу " +"прямо. Они сейчас наша лучшая надежда. Они до невозможности растянули свои " +"силы, но делают всё, что нужно для поддержки порядка. Они не особо против " +"мародёров, так как понимают, что почти все уже умерли, но если у тебя есть " +"то, что им нужно... ты им ОТДАШЬ. Поскольку у многих выживших здесь особо " +"ничего нет, их чествуют как героев." #: lang/json/talk_topic_from_json.py msgid "Hmmm…" @@ -193555,6 +195744,11 @@ msgid "" "civilians are offered a cabin on one of the liners to retire to if they " "serve as a federal employee for a few years." msgstr "" +"Я не особо в курсе, как он появился, но вообще это флотилия военных и " +"гражданских кораблей, курсирующих вдоль побережья. У них есть всё — от " +"супертанкеров и авианосцев до рыболовных траулеров… даже несколько кораблей " +"НАТО. Большинство гражданских могут рассчитывать на каюту в одном из " +"лайнеров, если они прослужат пару лет." #: lang/json/talk_topic_from_json.py msgid "" @@ -193617,6 +195811,8 @@ msgid "" "I'm currently waiting for a customer to return… I'll make you a deal though," " 2500 Merch will cover my expenses if I get a small cut of the loot." msgstr "" +"Сейчас я ожидаю возвращения одного заказчика… Вообще-то предлагаю сделку: я " +"к твоим услугам за 2500 мерчей и небольшую долю добычи." #: lang/json/talk_topic_from_json.py msgid "What the heck is a Merch?" @@ -193722,6 +195918,10 @@ msgid "" "interact with the outside world for us, but you know how well it went… " "Shame about what happened, with the evisceration and all..." msgstr "" +"Это было модифицированное шасси Призрака с нашим собственным ИИ. Мы " +"надеялись, он поможет нам взаимодействовать с окружающим миром. Но ты уже в " +"курсе, что получилось… Жалко, что так вышло, со всем этим расчленением и " +"прочим…" #: lang/json/talk_topic_from_json.py msgid "" @@ -193901,7 +196101,7 @@ msgstr "Э? Ничего, мне просто нравится тут отдых #: lang/json/talk_topic_from_json.py msgid "Have you ever noticed how… wait no, never mind." -msgstr "" +msgstr "Ты когда-нибудь замечал, как… стоп, всё, забудь." #: lang/json/talk_topic_from_json.py msgid "" @@ -194012,6 +196212,8 @@ msgid "" "What? I'm a barber… I cut hair. There's demand for cheap cuts and a shave " "out here." msgstr "" +"Что? Я парикмахер... Я стригу волосы. Здесь большая потребность в простых " +"стрижках и бритье." #: lang/json/talk_topic_from_json.py msgid "I can't imagine what I'd need your assistance with." @@ -194167,7 +196369,7 @@ msgstr "Я бы хотел воспользоваться твоими услу #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "" "Меня направили сюда, чтобы помочь в создании фермы. Большинство из нас " @@ -194404,6 +196606,11 @@ msgid "" "can't use helps keep us afloat with the traders. If you wanted to drop off " "a companion or two to assist in one of the runs, I'd appreciate it." msgstr "" +"Я организую походы за добычей, чтобы получить то, что мы сами произвести не " +"можем. Я пытаюсь убедить присоединиться к командам... Это опасная работа, но" +" держит население на плаву. Мы продаём торговцам излишки и поддерживаем " +"отношения. Буду весьма благодарен, если дашь одного-двух человек помочь в " +"походе." #: lang/json/talk_topic_from_json.py msgid "I'll think about it." @@ -194506,6 +196713,10 @@ msgid "" "profession became lumberjack… didn't have any say in it. If I want to eat " "then I'll be cutting wood from now till kingdom come." msgstr "" +"Я — один из мигрантов, меня перенаправили сюда, когда я прибыл в центр " +"беженцев. Они сказали, что я достаточно крепкий, чтобы размахивать топором, " +"так что я стал лесорубом... ничего не поделаешь. Если я захочу поесть, я " +"буду рубить деревья с этого момента и до Второго пришествия." #: lang/json/talk_topic_from_json.py msgid "" @@ -194594,7 +196805,7 @@ msgstr "Я возвращаю порядок на землю." #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -194613,11 +196824,9 @@ msgstr "Думаю, только безумные будут процветат #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" -"Эта еда должна отправиться в наши основные поселения. Но, возможно, мы " -"сможем обменять немного еды на услуги" #: lang/json/talk_topic_from_json.py msgid "I can pay." @@ -194629,11 +196838,9 @@ msgstr "Ну, тогда я ухожу" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" -"Ты должен заработать право торговать с нами. К тому же, мы создали " -"собственную валюту до катаклизма" #: lang/json/talk_topic_from_json.py msgid "It was worth a try." @@ -194656,11 +196863,9 @@ msgstr "Я не хотел вступать к вам, в любом случа #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" -"Здесь? Фрукты и ягоды. Может быть, некоторое сельскохозяйственное " -"оборудование, но тебе нужны крипто-коины" #: lang/json/talk_topic_from_json.py msgid "Ok." @@ -194672,9 +196877,9 @@ msgstr "Что за крипто-коины?" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -194690,13 +196895,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" -"Здесь в ходу крипто-коины. Это была попытка еще до катаклизма " -"абстрагироваться от обычных денег и создать электронные. Потом мы решили, " -"что и дальше будем их использовать. Ты можешь их выменять на что-нибудь." #: lang/json/talk_topic_from_json.py msgid "Heya, scav." @@ -194724,19 +196926,15 @@ msgstr "Нужна помощь в чём-нибудь?" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" -"Нет, нет… Ну, разве немножко. Когда я нашел это место, тут был такой же " -"бардак, как и наверху, было нетрудно навести порядок. Добро пожаловать, ты " -"можешь пока что остановиться в свободной комнате, только не занимай ее " -"одному себе. Ты тут не единственный добытчик." #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "Интересно…" +msgid "Interesting…" +msgstr "Интересно..." #: lang/json/talk_topic_from_json.py msgid "" @@ -194747,8 +196945,8 @@ msgstr "" "своей груде сокровищ. Я более чем хочу поторговать, если у тебя есть деньги." #: lang/json/talk_topic_from_json.py -msgid "I see..." -msgstr "Понятно…" +msgid "I see…" +msgstr "Понятно..." #: lang/json/talk_topic_from_json.py msgid "" @@ -194759,8 +196957,8 @@ msgstr "" " вон там все еще работает, он соединен с банковскими серверами и прочим." #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "Хмм…" +msgid "Hmm…" +msgstr "Гм..." #: lang/json/talk_topic_from_json.py msgid "" @@ -194771,16 +196969,16 @@ msgstr "" "не помешает." #: lang/json/talk_topic_from_json.py -msgid "Alright..." -msgstr "Ладно…" +msgid "Alright…" +msgstr "Хорошо..." #: lang/json/talk_topic_from_json.py msgid "Not at the moment, check back later perhaps." msgstr "Не сейчас, зайди попозже, наверное." #: lang/json/talk_topic_from_json.py -msgid "Sure..." -msgstr "Конечно…" +msgid "Sure…" +msgstr "Конечно..." #: lang/json/talk_topic_from_json.py msgid "Are you part of the rescue team?" @@ -194799,8 +196997,8 @@ msgid "So are you busting us out of here or what?" msgstr "Так вы вытащите нас отсюда или нет?" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." -msgstr "Пока посиди тут, . Я должен убедиться, что берег чист." +msgid "Hold tight, . I've got to clear a path." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Pack your bags, . We're going on a trip." @@ -198697,6 +200895,15 @@ msgstr "закрытые металлические ворота" msgid "A closed metal gate." msgstr "Закрытые металлические ворота." +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "открытые металлические ворота" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "Открытые металлические ворота." + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "деревянная ограда" @@ -200760,14 +202967,23 @@ msgstr "" "вам потребуется оплатить его на ближайшем терминале." #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "бак с бензином" +msgid "fuel tank" +msgstr "топливный бак" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "Бак, полный бензина." +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "пробитый топливный бак" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "Пробитый топливный бак, в котором был бензин." + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "разбитая бензоколонка" @@ -202805,6 +205021,30 @@ msgstr "малая металлическая опора" msgid "A metal support beam." msgstr "Металлическая опорная балка." +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "каменная кладка" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "Прочная сухая каменная стена. Просто камни, наваленные без раствора." + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "полупостроенная каменная кладка" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" +"Крепкая сухая каменная стена половинной высоты. Просто камни, наваленные без" +" раствора. Оставьте, как есть, или хорошенько поработайте, чтобы увеличить в" +" два раза." + #: lang/json/terrain_from_json.py msgid "window" msgstr "окно" @@ -203242,12 +205482,12 @@ msgstr "изгородь из палок" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" -"Дешёвая стена из досок и палок с бревенчатой подпоркой, чтоб всё держалось. " -"Способна поддерживать верхний уровень или крышу. Прочная благодаря грязи и " -"камням. Немного пожароопасна." +"Дешёвая стена из досок и палок с бревенчатой подпоркой, чтоб всё держалось." +" Способна поддерживать верхний уровень или крышу. Прочная благодаря грязи и" +" камням. Немного пожароопасна." #: lang/json/terrain_from_json.py msgid "krick!" @@ -203260,10 +205500,11 @@ msgstr "УСТАРЕВШАЯ гидропонная установка" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" -"Устаревшая гидропонная установка. Разберите и получите запчасти обратно." +"Устаревшая гидропонная установка. Разберите, чтобы получить запчасти " +"обратно." #: lang/json/terrain_from_json.py msgid "burnt tree" @@ -203630,7 +205871,7 @@ msgstr "плетение маны" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "Отсутствует" @@ -204411,7 +206652,7 @@ msgstr "тележка с мороженым" msgid "Luggage Cart" msgstr "багажная тележка" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "тележка для покупок" @@ -207902,11 +210143,11 @@ msgstr "LACP лазерная турель" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" -"Набор непрерывных, взаимосвязанных траков, сделанных из сгустков. Они могут " -"быть установлены вместо колес и обеспечивают хорошее сцепление с землей, а " +"Набор непрерывных, взаимосвязанных траков, сделанных из сгустков. Они могут" +" быть установлены вместо колес и обеспечивают хорошее сцепление с землей, а " "также отлично подходят для езды по бездорожью." #. ~ Description for gel shooter @@ -208703,6 +210944,10 @@ msgstr "витамин С" msgid "Toxins" msgstr "Яды" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "Отвратительная диета" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "Нажмите " @@ -209235,6 +211480,12 @@ msgstr "Невозможно перезарядить %s." msgid "You reload the %s." msgstr "Вы перезарядили %s." +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -210203,6 +212454,10 @@ msgstr "В области этой задачи что-то мешается." msgid "The required items are not available to complete this task." msgstr "Для завершения задачи не хватает требуемых предметов." +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "Здесь слишком темно, чтобы работать." + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -210616,6 +212871,10 @@ msgstr "тип боеприпасов/зарядов" msgid "spoilage" msgstr "испорченность" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -212518,7 +214777,7 @@ msgstr "Очков осталось: %4d" #: src/avatar.cpp msgid "Character Transfer: No changes can be made." -msgstr "" +msgstr "Перенос персонажа: Изменения не могут быть сделаны." #: src/avatar.cpp src/newcharacter.cpp msgid "Freeform" @@ -212719,6 +214978,44 @@ msgstr "Из %s нельзя стрелять в его текущем сост msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr " Невозможно стрелять из %s несовместимыми патронами %s" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "Вы ничего не держите в руках." + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "Вы слишком сыты, чтобы есть листья с %s." + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "Вы съедаете кустарник." + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "Вы слишком сыты, чтобы пастись." + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "Вы едите траву." + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "Эта трава слишком низкая, чтобы пастись на ней." + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "Эта трава мертва и слишком изодрана, чтобы пастись на ней." + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "Эта трава испачкана краской и несъедобна." + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "Вы оставляете пустой предмет (%s)." + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "Вы не можете совершать полноценные броски, находясь в своей раковине." @@ -212756,6 +215053,14 @@ msgstr "Вы сильно сконцентрировались, и ваше те msgid "You can't muster up the effort to throw anything…" msgstr "У вас не хватает сил бросить что-либо…" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "Разрядить вещь" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "У вас нет ничего, что можно было бы разрядить." + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -213670,22 +215975,18 @@ msgstr "Вы приходите в восторг, когда начинаетс #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" -"Вы чувствуете наслаждение, пока вас безболезненно разрезает Автодок. Вы " -"восхищённо рассматриваете скальпели, рассекающие вас на части, но в течение " -"операции на вас внезапно наваливается усталость, и вы отключаетесь." +"Вы чувствуете наслаждение, пока вас безболезненно разрезает Автодок. Вы " +"восхищённо рассматриваете скальпели, рассекающие вас." #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" "Вы лежите очень, очень неподвижно и сосредоточенно разглядываете интересное " -"пятно на потолке, пока автодок выполняет безболезненный разрез. К счастью, " -"вы теряете сознание, когда лезвия достигают поля вашего зрения." +"пятно на потолке, пока Автодок выполняет безболезненный разрез." #: src/bionics.cpp msgid "" @@ -215285,7 +217586,7 @@ msgstr "Все машины в этой зоне помечаются как п #: src/clzones.cpp msgid "Vehicle Patrol Zone" -msgstr "" +msgstr "Транспортная патрульная область" #: src/clzones.cpp msgid "Vehicles with an autopilot will patrol in this zone." @@ -215293,7 +217594,7 @@ msgstr "Транспортные средства с автопилотом бу #: src/clzones.cpp msgid "Basecamp: Storage" -msgstr "" +msgstr "Лагерь: Хранилище" #: src/clzones.cpp msgid "" @@ -216363,8 +218664,8 @@ msgstr "Это выглядит несъедобным в текущем вид msgid "This is full of dirt after being on the ground." msgstr "Тут полно грязи после падения на землю." -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "Вы не можете это делать под водой." @@ -217295,11 +219596,11 @@ msgstr "Экономия времени при серийном изготовл msgid "Dark craftable? %s" msgstr "Изготовление в темноте: %s" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "Легко" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "Сложно" @@ -217800,6 +220101,10 @@ msgstr "Вывести магическую информацию НПС в ко msgid "Test weather" msgstr "Тест погоды" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "Информация…" @@ -218006,7 +220311,7 @@ msgstr "Коллекционер: %d" msgid "Altruism: %d" msgstr "Альтруизм: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "Нужды:" @@ -218705,393 +221010,6 @@ msgstr "Желаемый уровень заклинания (текущий: %d msgid "%s is now level %d!" msgstr "%s теперь на уровне %d!" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "Пожалуйста, подождите, создаётся карта [ 0%% ]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "Караван прибыл! Нажмите пробел…" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "Вам не нужно спать!" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "Вы не можете сохраняться в режиме защиты!" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "Вы не можете оставить %s!" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "Вы смогли продержаться до волны: %d!" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "Пожалуйста, подождите, создаётся карта [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "Пред. опция" - -#: src/defense.cpp -msgid "Next option" -msgstr "След. опция" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "Следующее значение опции" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "Переключить настройки" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "Вы должны выбрать хотя бы одну группу монстров!" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "Спец. Зомби" - -#: src/defense.cpp -msgid "Zombies" -msgstr "Зомби" - -#: src/defense.cpp -msgid "Triffids" -msgstr "Триффиды" - -#: src/defense.cpp -msgid "Robots" -msgstr "Роботы" - -#: src/defense.cpp -msgid "Subspace" -msgstr "Подпространство" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "Есть" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "Наёмники" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "РЕЖИМ ЗАЩИТЫ" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "Нажмите стрелки направления для выбора, Enter — Вкл/Выкл" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "Нажмите S для начала" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "Сценарий:" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "Локация:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "Изначальная Сложность:" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "Сложность первой волны." - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "Сложность волн:" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "Увеличение сложности с каждой волной." - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "Время между волнами:" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "Время между волнами, в минутах." - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "Волн между караванами:" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "Кол-во волн между караванами." - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "Стартовый капитал:" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "Количество денег у игрока в начале игры." - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "Награда за 1-ую волну:" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "Деньги за уничтожение первой волны." - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "Прирост награды:" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "Увеличение награды с каждой волной." - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "Выбор противников:" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "Пользовательский" - -#: src/defense.cpp -msgid "Medium" -msgstr "Средне" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "Зомби по имени Шон" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "Рассвет мертвецов" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "Атака пауков" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "День триффидов" - -#: src/defense.cpp -msgid "Skynet" -msgstr "Скайнет" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "Зов Ктулху" - -#: src/defense.cpp -msgid "A custom game." -msgstr "Своя игра." - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "Лёгкие монстры и куча денег." - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "Монстры посложнее. Вам надо есть." - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "Все монстры. Надо есть и пить." - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "Защитите бар от классических зомби. Легко и весело." - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "Классические зомби. Медленные и более реалистичные." - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "Динамичная и весёлая драка с пауками!" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "Защитите своё поместье от триффидов." - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "Роботы восстали против людей!" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "Сражайтесь с легионом жутких страшилищ." - -#: src/defense.cpp -msgid "Public Works" -msgstr "Общественные работы" - -#: src/defense.cpp -msgid "Megastore" -msgstr "Супермаркет" - -#: src/defense.cpp -msgid "Bar" -msgstr "Бар" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "Один вход и много комнат. Немного медикаментов." - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "Легко укрепляемое здание. Много полезных предметов." - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "Большое здание с разными припасами." - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "Небольшое здание с большим количеством алкоголя." - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "Большой дом с множеством комнат." - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" -"КАРАВАН:\n" -"Выбор категории товаров — кнопки вверх/вниз.\n" -"Переключение между выбором категорий и предметов — кнопка %s.\n" -"Выбор предмета — кнопки вверх/вниз. Купить больше/меньше — кнопки влево/вправо.\n" -"Купить всё выбранное — %s. Не покупать ничего — %s." - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "Что, правда, ничего не купите?" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "Недостаточно денег!" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "Купить %d предмет, оставшись с %s?" -msgstr[1] "Купить %d предмета, оставшись с %s?" -msgstr[2] "Купить %d предметов, оставшись с %s?" -msgstr[3] "Купить %d предмет, оставшись с %s?" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "Вы выкладываете несколько предметов." - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "Оружие ближнего боя" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "Оружие дальнего боя" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "Амуниция" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "Материалы для сборки и строительства" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "Еда и медикаменты" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "Одежда и броня" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "Инструменты, ловушки и гранаты" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "? — меню помощи." - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "Ваши деньги: %s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "Добро пожаловать на волну %d!" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "Волна %d: " - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "Нашествие %s!" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "Атака %s!" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "%s Атакуют!" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "%s из Ада!" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "Берегитесь! %s!" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "День %s!" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "Месть %s!" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "Восстание %s!" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -219684,53 +221602,53 @@ msgstr "Эта травка была просто улёт." #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "Сила +%d; " +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "Сила %d; " +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "Ловкость +%d; " +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "Ловкость %d; " +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "Восприятие +%d; " +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "Восприятие %d; " +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "Интеллект +%d; " +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "Интеллект %d; " +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "Скорость +%d; " +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "Скорость %d; " +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -220732,8 +222650,11 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." -msgstr "У %s не получилось начать строительство лагеря %s." +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." +msgstr "" +"У %s не получилось начать строительство лагеря %s. Возможно, мешает " +"транспортное средство." #: src/faction_camp.cpp msgid "There is no faction camp here to recover!" @@ -221295,6 +223216,19 @@ msgid "" "Total faction food stock: %d kcal\n" "or %d day's rations" msgstr "" +"Примечание:\n" +"Распределить еду среди всех ваших компаньонов и заполнить кладовые. Положите распределяемую еду в зону еды. Требуется зона еды и зона хранения предметов, иначе вам придётся создать их с помощью менеджера зон.\n" +" Эффекты:\n" +"> Увеличивает ваши запасы еды, которые в свою очередь, используются для оплаты труда рабочим.\n" +" \n" +"Должна иметь удовольствие >= -6\n" +"Скоропортящаяся еда считается со штрафом в зависимости от улучшений лагеря и скорости гниения:\n" +"> Гнилое: 0%%\n" +"> Сгниёт через < 2 дня: 60%%\n" +"> Сгниёт через < 5 дней: 80%%\n" +" \n" +"Запас продуктов питания: %d ккал\n" +" или %d дневных рационов." #: src/faction_camp.cpp msgid "Distribute Food" @@ -221597,8 +223531,10 @@ msgstr "реагирует на экстренный отзыв…" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." -msgstr "У %sне получилось улучшить %s." +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." +msgstr "" +"У %sне получилось улучшить %s. Возможно, мешает транспортное средство." #: src/faction_camp.cpp msgid "returns from upgrading the camp having earned a bit of experience…" @@ -221818,8 +223754,11 @@ msgstr "Выберите расширение:" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" -msgstr "У %s не получилось построить расширение %s" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." +msgstr "" +"У %s не получилось построить расширение %s. Возможно, мешает транспортное " +"средство." #: src/faction_camp.cpp msgid "returns from surveying for the expansion." @@ -222110,6 +224049,26 @@ msgstr "Куски %s валялись по всей округе." msgid "(You wonder if your companions are fit to work on their own…)" msgstr "(Интересно, ваши компаньоны вообще способны за себя постоять?..)" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr " в %s" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "покрыт %s" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr " на %s" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr " под %s" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -222947,7 +224906,8 @@ msgstr "Без дополнительного топлива будет горе msgid "Without extra fuel it will burn for between %s to %s." msgstr "Без дополнительного топлива будет гореть от %s до %s." -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "Во время езды верхом этого делать нельзя." @@ -223466,40 +225426,6 @@ msgstr "" msgid "%s helps with this task…" msgstr "%s помогает в этом…" -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "Вы слишком сыты, чтобы есть листья с %s." - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "Вы съедаете кустарник." - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "Вы слишком сыты, чтобы пастись." - -#: src/game.cpp -msgid "You eat the grass." -msgstr "Вы едите траву." - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "Эта трава слишком низкая, чтобы пастись на ней." - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "Эта трава мертва и слишком изодрана, чтобы пастись на ней." - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "Эта трава испачкана краской и несъедобна." - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "Вы оставляете пустой предмет (%s)." - #: src/game.cpp msgid "Change side for item" msgstr "Изменить сторону для предмета" @@ -223529,6 +225455,11 @@ msgstr "%s уже полон!" msgid "You can't reload a %s!" msgstr "Вы не можете перезарядить %s!" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "Вы изо всех сил пытаетесь перезарядить заклинивший %s." + #: src/game.cpp msgid "Reload item" msgstr "Перезарядить предмет" @@ -223537,18 +225468,6 @@ msgstr "Перезарядить предмет" msgid "You have nothing to reload." msgstr "У вас нет ничего, что можно было бы перезарядить." -#: src/game.cpp -msgid "Unload item" -msgstr "Разрядить вещь" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "У вас нет ничего, что можно было бы разрядить." - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "Вы ничего не держите в руках." - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -223635,6 +225554,13 @@ msgstr "Не удаётся найти схваченный объект." msgid "You cannot board a vehicle whilst riding." msgstr "Вы не можете зайти в транспорт верхом." +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "%1$s выгладит опасно. Если всё равно хотите туда попасть, бегите." + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "Нельзя заходить на препятствия во время езды верхом." @@ -224329,11 +226255,6 @@ msgstr "" msgid "Your inventory is empty." msgstr "Ваш инвентарь пуст." -#: src/game_inventory.cpp -#, c-format -msgid "You don't have a %s." -msgstr "У вас нет %s." - #: src/game_inventory.cpp msgid "ENCUMBRANCE" msgstr "СКОВАННОСТЬ" @@ -224472,8 +226393,8 @@ msgid "CBM" msgstr "КБМ" #: src/game_inventory.cpp -msgid "ENERGY" -msgstr "ЭНЕРГИЯ" +msgid "ENERGY (kJ)" +msgstr "ЭНЕРГИЯ (кДж)" #: src/game_inventory.cpp msgid "Can't drink spilt liquids" @@ -224700,13 +226621,13 @@ msgstr "Убрать вещь в кобуру" #: src/game_inventory.cpp #, c-format -msgid "Choose a weapon to put into your %s" -msgstr "Выберите оружие для помещения в %s" +msgid "Choose an item to put into your %s" +msgstr "Выберите предмет для помещения в %s" #: src/game_inventory.cpp #, c-format -msgid "You have no weapons you could put into your %s." -msgstr "У вас нет оружия, которое вы могли бы убрать в %s." +msgid "You have no items you could put into your %s." +msgstr "У вас нет предметов, которые вы могли бы убрать в %s." #: src/game_inventory.cpp src/iuse.cpp msgid "Cut up what?" @@ -224952,6 +226873,409 @@ msgstr "Обучение" msgid "Defense" msgstr "Выживание" +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [ 0%% ]" +msgstr "Пожалуйста, подождите, создаётся карта [ 0%% ]" + +#: src/gamemode_defense.cpp +msgid "A caravan approaches! Press spacebar…" +msgstr "Караван прибыл! Нажмите пробел…" + +#: src/gamemode_defense.cpp +msgid "You don't need to sleep!" +msgstr "Вам не нужно спать!" + +#: src/gamemode_defense.cpp +msgid "You cannot save in defense mode!" +msgstr "Вы не можете сохраняться в режиме защиты!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You cannot leave the %s behind!" +msgstr "Вы не можете оставить %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "You managed to survive through wave %d!" +msgstr "Вы смогли продержаться до волны: %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Please wait as the map generates [%2d%%]" +msgstr "Пожалуйста, подождите, создаётся карта [%2d%%]" + +#: src/gamemode_defense.cpp +msgid "Previous option" +msgstr "Пред. опция" + +#: src/gamemode_defense.cpp +msgid "Next option" +msgstr "След. опция" + +#: src/gamemode_defense.cpp +msgid "Cycle option value" +msgstr "Следующее значение опции" + +#: src/gamemode_defense.cpp +msgid "Toggle option" +msgstr "Переключить настройки" + +#: src/gamemode_defense.cpp +msgid "You must choose at least one monster group!" +msgstr "Вы должны выбрать хотя бы одну группу монстров!" + +#: src/gamemode_defense.cpp +msgid "Special Zombies" +msgstr "Спец. Зомби" + +#: src/gamemode_defense.cpp +msgid "Zombies" +msgstr "Зомби" + +#: src/gamemode_defense.cpp +msgid "Triffids" +msgstr "Триффиды" + +#: src/gamemode_defense.cpp +msgid "Robots" +msgstr "Роботы" + +#: src/gamemode_defense.cpp +msgid "Subspace" +msgstr "Подпространство" + +#: src/gamemode_defense.cpp src/handle_action.cpp +msgid "Food" +msgstr "Есть" + +#: src/gamemode_defense.cpp +msgid "Mercenaries" +msgstr "Наёмники" + +#: src/gamemode_defense.cpp +msgid "Allow save" +msgstr "" + +#: src/gamemode_defense.cpp +msgid "DEFENSE MODE" +msgstr "РЕЖИМ ЗАЩИТЫ" + +#: src/gamemode_defense.cpp +msgid "Press direction keys to cycle, ENTER to toggle, S to start" +msgstr "" +"Нажмите стрелки направления для выбора, Enter - Вкл/Выкл, S для начала" + +#: src/gamemode_defense.cpp +msgid "Scenario:" +msgstr "Сценарий:" + +#: src/gamemode_defense.cpp src/panels.cpp +msgid "Location:" +msgstr "Локация:" + +#: src/gamemode_defense.cpp +msgid "Initial Difficulty:" +msgstr "Изначальная Сложность:" + +#: src/gamemode_defense.cpp +msgid "The difficulty of the first wave." +msgstr "Сложность первой волны." + +#: src/gamemode_defense.cpp +msgid "Wave Difficulty:" +msgstr "Сложность волн:" + +#: src/gamemode_defense.cpp +msgid "The increase of difficulty with each wave." +msgstr "Увеличение сложности с каждой волной." + +#: src/gamemode_defense.cpp +msgid "Time b/w Waves:" +msgstr "Время между волнами:" + +#: src/gamemode_defense.cpp +msgid "The time, in minutes, between waves." +msgstr "Время между волнами, в минутах." + +#: src/gamemode_defense.cpp +msgid "Waves b/w Caravans:" +msgstr "Волн между караванами:" + +#: src/gamemode_defense.cpp +msgid "The number of waves in between caravans." +msgstr "Кол-во волн между караванами." + +#: src/gamemode_defense.cpp +msgid "Initial Cash:" +msgstr "Стартовый капитал:" + +#: src/gamemode_defense.cpp +msgid "The amount of money the player starts with." +msgstr "Количество денег у игрока в начале игры." + +#: src/gamemode_defense.cpp +msgid "Cash for 1st Wave:" +msgstr "Награда за 1-ую волну:" + +#: src/gamemode_defense.cpp +msgid "The cash awarded for the first wave." +msgstr "Деньги за уничтожение первой волны." + +#: src/gamemode_defense.cpp +msgid "Cash Increase:" +msgstr "Прирост награды:" + +#: src/gamemode_defense.cpp +msgid "The increase in the award each wave." +msgstr "Увеличение награды с каждой волной." + +#: src/gamemode_defense.cpp +msgid "Enemy Selection:" +msgstr "Выбор противников:" + +#: src/gamemode_defense.cpp src/iuse_software_minesweeper.cpp +msgid "Custom" +msgstr "Пользовательский" + +#: src/gamemode_defense.cpp +msgid "Medium" +msgstr "Средне" + +#: src/gamemode_defense.cpp +msgid "Shaun of the Dead" +msgstr "Зомби по имени Шон" + +#: src/gamemode_defense.cpp +msgid "Dawn of the Dead" +msgstr "Рассвет мертвецов" + +#: src/gamemode_defense.cpp +msgid "Eight-Legged Freaks" +msgstr "Атака пауков" + +#: src/gamemode_defense.cpp +msgid "Day of the Triffids" +msgstr "День триффидов" + +#: src/gamemode_defense.cpp +msgid "Skynet" +msgstr "Скайнет" + +#: src/gamemode_defense.cpp +msgid "The Call of Cthulhu" +msgstr "Зов Ктулху" + +#: src/gamemode_defense.cpp +msgid "A custom game." +msgstr "Своя игра." + +#: src/gamemode_defense.cpp +msgid "Easy monsters and lots of money." +msgstr "Лёгкие монстры и куча денег." + +#: src/gamemode_defense.cpp +msgid "Harder monsters. You have to eat." +msgstr "Монстры посложнее. Вам надо есть." + +#: src/gamemode_defense.cpp +msgid "All monsters. You have to eat and drink." +msgstr "Все монстры. Надо есть и пить." + +#: src/gamemode_defense.cpp +msgid "Defend a bar against classic zombies. Easy and fun." +msgstr "Защитите бар от классических зомби. Легко и весело." + +#: src/gamemode_defense.cpp +msgid "Classic zombies. Slower and more realistic." +msgstr "Классические зомби. Медленные и более реалистичные." + +#: src/gamemode_defense.cpp +msgid "Fast-paced spider-fighting fun!" +msgstr "Динамичная и весёлая драка с пауками!" + +#: src/gamemode_defense.cpp +msgid "Defend your mansion against the triffids." +msgstr "Защитите своё поместье от триффидов." + +#: src/gamemode_defense.cpp +msgid "The robots have decided that humans are the enemy!" +msgstr "Роботы восстали против людей!" + +#: src/gamemode_defense.cpp +msgid "Ward off legions of eldritch horrors." +msgstr "Сражайтесь с легионом жутких страшилищ." + +#: src/gamemode_defense.cpp +msgid "Public Works" +msgstr "Общественные работы" + +#: src/gamemode_defense.cpp +msgid "Megastore" +msgstr "Супермаркет" + +#: src/gamemode_defense.cpp +msgid "Bar" +msgstr "Бар" + +#: src/gamemode_defense.cpp +msgid "One entrance and many rooms. Some medical supplies." +msgstr "Один вход и много комнат. Немного медикаментов." + +#: src/gamemode_defense.cpp +msgid "Easily fortifiable building. Lots of useful tools." +msgstr "Легко укрепляемое здание. Много полезных предметов." + +#: src/gamemode_defense.cpp +msgid "A large building with various supplies." +msgstr "Большое здание с разными припасами." + +#: src/gamemode_defense.cpp +msgid "A small building with plenty of alcohol." +msgstr "Небольшое здание с большим количеством алкоголя." + +#: src/gamemode_defense.cpp +msgid "A large house with many rooms." +msgstr "Большой дом с множеством комнат." + +#: src/gamemode_defense.cpp +#, c-format +msgid "" +"CARAVAN:\n" +"Start by selecting a category using your favorite up/down keys.\n" +"Switch between category selection and item selecting by pressing %s.\n" +"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" +"Press %s to buy everything in your cart, %s to buy nothing." +msgstr "" +"КАРАВАН:\n" +"Выбор категории товаров — кнопки вверх/вниз.\n" +"Переключение между выбором категорий и предметов — кнопка %s.\n" +"Выбор предмета — кнопки вверх/вниз. Купить больше/меньше — кнопки влево/вправо.\n" +"Купить всё выбранное — %s. Не покупать ничего — %s." + +#: src/gamemode_defense.cpp +msgid "Really buy nothing?" +msgstr "Что, правда, ничего не купите?" + +#: src/gamemode_defense.cpp +msgid "You can't afford those items!" +msgstr "Недостаточно денег!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Buy %d item, leaving you with %s?" +msgid_plural "Buy %d items, leaving you with %s?" +msgstr[0] "Купить %d предмет, оставшись с %s?" +msgstr[1] "Купить %d предмета, оставшись с %s?" +msgstr[2] "Купить %d предметов, оставшись с %s?" +msgstr[3] "Купить %d предмет, оставшись с %s?" + +#: src/gamemode_defense.cpp +msgid "You drop some items." +msgstr "Вы выкладываете несколько предметов." + +#: src/gamemode_defense.cpp +msgid "Melee Weapons" +msgstr "Оружие ближнего боя" + +#: src/gamemode_defense.cpp +msgid "Ranged Weapons" +msgstr "Оружие дальнего боя" + +#: src/gamemode_defense.cpp +msgid "Ammuniton" +msgstr "Амуниция" + +#: src/gamemode_defense.cpp +msgid "Crafting & Construction Components" +msgstr "Материалы для сборки и строительства" + +#: src/gamemode_defense.cpp +msgid "Food & Drugs" +msgstr "Еда и медикаменты" + +#: src/gamemode_defense.cpp +msgid "Clothing & Armor" +msgstr "Одежда и броня" + +#: src/gamemode_defense.cpp +msgid "Tools, Traps & Grenades" +msgstr "Инструменты, ловушки и гранаты" + +#: src/gamemode_defense.cpp +msgid "Press ? for help." +msgstr "? — меню помощи." + +#: src/gamemode_defense.cpp +#, c-format +msgid "Your Cash: %s" +msgstr "Ваши деньги: %s" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Welcome to Wave %d!" +msgstr "Добро пожаловать на волну %d!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Wave %d: " +msgstr "Волна %d: " + +#: src/gamemode_defense.cpp +#, c-format +msgid "Invasion of the %s!" +msgstr "Нашествие %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Attack of the %s!" +msgstr "Атака %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s Attack!" +msgstr "%s Атакуют!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "%s from Hell!" +msgstr "%s из Ада!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Beware! %s!" +msgstr "Берегитесь! %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "The Day of the %s!" +msgstr "День %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Revenge of the %s!" +msgstr "Месть %s!" + +#: src/gamemode_defense.cpp +#, c-format +msgid "Rise of the %s!" +msgstr "Восстание %s!" + +#. ~ default name for the tutorial +#: src/gamemode_tutorial.cpp +msgid "John Smith" +msgstr "Джон Смит" + +#: src/gamemode_tutorial.cpp +msgid "" +"You're saving a tutorial - the tutorial world lacks certain features of " +"normal worlds. Weird things might happen when you load this save. You have" +" been warned." +msgstr "" +"Вы сохранились при прохождении обучения — в мире обучения отсутствуют " +"некоторые особенности нормальных миров. Странные вещи могут случиться, если " +"вы загрузите это сохранение. Вас предупредили." + #: src/gates.cpp msgid "There's some buffoon in the way!" msgstr "На дороге стоит какой-то шут!" @@ -225303,6 +227627,10 @@ msgstr "" msgid "You may want to deactivate these before you sleep." msgstr "Возможно, вы захотите отключить это перед тем, как лечь спать." +#: src/handle_action.cpp +msgid " (DEAF!)" +msgstr " (ГЛУХОЙ!)" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -227404,11 +229732,11 @@ msgstr "Автодок Mk. XI. Статус: В работе. Пожалуйст #: src/iexamine.cpp msgid "Choose Compact Bionic Module to install." -msgstr "Выберите Компактный Бионический Модуль для установки." +msgstr "Выбрать Компактный Бионический Модуль для установки." #: src/iexamine.cpp msgid "Choose installed bionic to uninstall." -msgstr "Выберите установленную бионику для удаления." +msgstr "Выбрать установленную бионику для удаления." #: src/iexamine.cpp msgid "ERROR NO SPACE AVAILABLE. Operation impossible. Exiting." @@ -227473,11 +229801,11 @@ msgstr "" #: src/iexamine.cpp msgid "Choose Compact Bionic Module to install" -msgstr "Выберите Компактный Бионический Модуль для установки." +msgstr "Выбрать Компактный Бионический Модуль для установки." #: src/iexamine.cpp msgid "Choose installed bionic to uninstall" -msgstr "Выберите установленную бионику для удаления." +msgstr "Выбрать установленную бионику для удаления." #: src/iexamine.cpp msgid "Splint broken limbs" @@ -230463,7 +232791,7 @@ msgstr "Ваш %1$s не может хранить больше %2$s." msgid "That %s doesn't have room to expand." msgstr "%s не имеет места для расширения." -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%2$s x %1$d" @@ -230546,96 +232874,6 @@ msgstr "Ваш %s заржавел из-за гари чёрного порох msgid "Your %s disappears!" msgstr "Ваш %s исчезает!" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "освежёванный труп %s" -msgstr[1] "освежёванных трупа %s" -msgstr[2] "освежёванных трупов %s" -msgstr[3] "освежёванные трупы %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "освежёванная туша %s" -msgstr[1] "освежёванных туши %s" -msgstr[2] "освежёванных туш %s" -msgstr[3] "освежёванные туши %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "туша %s" -msgstr[1] "туши %s" -msgstr[2] "туш %s" -msgstr[3] "туша %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "четвертованная туша %s" -msgstr[1] "четвертованные туши %s" -msgstr[2] "четвертованных туш %s" -msgstr[3] "четвертованная туша %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "%s труп" -msgstr[1] "%s трупа" -msgstr[2] "%s трупов" -msgstr[3] "%s труп" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "освежёванный %s труп %s" -msgstr[1] "освежёванных %s трупа %s" -msgstr[2] "освежёванных %s трупов %s" -msgstr[3] "освежёванные %s трупы %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "освежёванная %s туша %s" -msgstr[1] "освежёванных %s туши %s" -msgstr[2] "освежёванных %s туш %s" -msgstr[3] "освежёванные %s туши %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "%s туша %s" -msgstr[1] "%s туши %s" -msgstr[2] "%s туш %s" -msgstr[3] "%s туша %s" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%s труп %s" -msgstr[1] "%s трупа %s" -msgstr[2] "%s трупов %s" -msgstr[3] "%s труп %s" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -230655,6 +232893,21 @@ msgstr[1] "%s крови" msgstr[2] "%s крови" msgstr[3] "%s кровь" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "%1$s %2$s" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "%1$s %2$s, %3$s" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "У вас нет этого предмета, чтобы выполнить действие." @@ -230877,8 +233130,8 @@ msgid "" "You start scarfing down the delicious cake. It tastes a little funny " "though…" msgstr "" -"Вы начали с жадностью поедать великолепное пирожное. На вкус оно, правда, " -"немного смешное…" +"Вы с жадностью уминаете великолепное пирожное. На вкус оно, правда, немного " +"смешное…" #: src/iuse.cpp msgid "You snort a bump of coke." @@ -231281,7 +233534,7 @@ msgstr "Здесь некого кормить." msgid "Modify what?" msgstr "Что модифицировать?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "У вас нет этого предмета!" @@ -232349,6 +234602,10 @@ msgstr "Сапёр" msgid "Lights on!" msgstr "Lights on!" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -232777,10 +235034,6 @@ msgstr "Вы слышите «%s»" msgid "You need a mechanics skill of 2 to use this repair kit." msgstr "Для использования этого ремкомплекта нужен уровень 2 навыка механики." -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "Выберите огнестрельное оружие для ремонта" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "Это не огнестрельное оружие!" @@ -232833,23 +235086,6 @@ msgstr "У вас нет подходящих инструментов." msgid "You cancel unloading the tool." msgstr "Вы прекращаете разряжать инструмент." -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "Недостаточно света для ремонта!" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "Вам нужен навык производства 1 уровня для использования ремкомплекта." - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "Выберите предмет для ремонта" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "Вы укрепили ваш %s." - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "Клац! Клац!" @@ -233103,31 +235339,6 @@ msgstr "Сработала защита файлов, и данные стёрл msgid " on " msgstr " на " -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "покрыт %s" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr " на %s" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr " под %s" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr " под светом %s" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr " в %s" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -233977,6 +236188,14 @@ msgstr "" "Ваши попытки почти сломали мультиварку! К счастью, она все ещё работает, но " "лучше прекратить это." +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "Выберите УБП:" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "У вас нет УБП." + #: src/iuse.cpp msgid "Using cable:" msgstr "Использование кабеля:" @@ -234005,14 +236224,6 @@ msgstr "Вы присоединяете кабель к системе заря msgid "You attach the cable to the solar pack." msgstr "Вы присоединяете кабель к рюкзаку с солнечными панелями." -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "Выберите УБП:" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "У вас нет УБП." - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "Вы подключаете кабель к УБП." @@ -236071,7 +238282,7 @@ msgstr "Это обычный бюст Бетховена… Но почему #: src/iuse_software_kitten.cpp msgid "It's TV's lovable wisecracking Crow! \"Bite me!\", he says." -msgstr "Это — обожаемый острящий Crow на ТВ! «Укусите меня!», — говорит он." +msgstr "Это любимый мудрый Ворон с телевидения! «Укуси меня!», — говорит он." #: src/iuse_software_kitten.cpp msgid "" @@ -236158,7 +238369,7 @@ msgstr "Это римшот. Ба-да-бууум!" #: src/iuse_software_kitten.cpp msgid "" "It's creepy and it's kooky, mysterious and spooky. It's also somewhat ooky." -msgstr "Это страшно и это чудно, таинственно и жутко. А также немного ОКай." +msgstr "Это страшно и это чудно, таинственно и жутко. А также немного утка." #: src/iuse_software_kitten.cpp msgid "This is an anagram." @@ -236185,7 +238396,8 @@ msgid "" "\"There is no kitten!\" cackles the old crone. You are shocked by her " "blasphemy." msgstr "" -"«Здесь нет котёнка!» — кряхтит старая карга. Вы шокированы её богохульством." +"«Нет никакого котёнка!» — кряхтит старая карга. Вы шокированы её " +"богохульством." #: src/iuse_software_kitten.cpp msgid "This is a Lagrange point. Don't come too close now." @@ -236236,7 +238448,7 @@ msgstr "Моток промышленного медного провода." #: src/iuse_software_kitten.cpp msgid "Oh boy! Grub! Er, grubs." -msgstr "Ох парень! Копай! Рр, рой." +msgstr "Ничего себе! Груша! Эээ, боксёрская." #: src/iuse_software_kitten.cpp msgid "A puddle of mud, where the mudskippers play." @@ -236296,7 +238508,7 @@ msgstr "Неустойчиво качающаяся стопка семидюй #: src/iuse_software_kitten.cpp msgid "It's nothing but a corrupted floppy. Coaster anyone?" -msgstr "Ничего кроме повреждённой дискеты. Кому-нибудь нужна подставка?" +msgstr "Ничего, кроме повреждённой дискеты. Кому-нибудь нужна подставка?" #: src/iuse_software_kitten.cpp msgid "A section of glowing phosphor cells sings a song of radiation to you." @@ -236580,12 +238792,9 @@ msgid "Congratulations, you won!" msgstr "Поздравляем, вы выиграли!" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "Макс:" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "Мин:" +#, c-format +msgid "Min: %d Max: %d" +msgstr "" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -237447,6 +239656,43 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "Сразу в игру!" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" +"Позволяет полностью настроить пул очков, сценарий, профессию персонажа, " +"характеристики, черты, навыки и другие параметры." + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "Выбрать персонажа по созданному шаблону." + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" +"Создаёт случайного персонажа, но позволяет предварительно посмотреть его " +"сгенерированные характеристики, сценарий и, при необходимости, изменить как " +"самого персонажа, так и сценарий." + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" +"Игра начинается сразу со случайным персонажем, чертами, профессией, навыками" +" и другими параметрами. Вы начинаете со сценария Эвакуированный." + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" +"Игра начинается сразу со случайным сценарием и персонажем, характеристиками," +" чертами, профессией, навыками и другими параметрами." + #: src/main_menu.cpp msgid "No templates found!" msgstr "Шаблоны не найдены!" @@ -237674,6 +239920,14 @@ msgstr "Что-то вылезло из %s!" msgid "DANGER! MINEFIELD!" msgstr "ОПАСНОСТЬ! МИННОЕ ПОЛЕ!" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "Результат 32400 выборов:" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -237806,20 +240060,9 @@ msgid "You're violently teleported!" msgstr "Вас резко телепортировало!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "Пчела жалит вас!" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "Пчела жалит вас несколько раз подряд!" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "Пчела жалит вас множество раз!" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "Пчела жалит вас по всему телу!" +#, c-format +msgid "The bees sting you in %s!" +msgstr "Пчёлы жалят вас в %s!" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -237985,6 +240228,19 @@ msgstr[1] "Навыка" msgstr[2] "Навыков" msgstr[3] "Навыки" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "Требования: " @@ -243005,6 +245261,11 @@ msgstr "Покрывающая %s кислота обжигает вашу ко msgid "Acid sprays out of %s as it is hit!" msgstr "Брызги кислоты разлетаются по округе при попадании по существу (%s)!" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" +"Обнаружены выстрелы невидимого противника, включен режим ответного огня." + #: src/monexamine.cpp msgid "zombie slave" msgstr "зомби-раб" @@ -243052,11 +245313,11 @@ msgstr "Поиграть с %s" #: src/monexamine.cpp msgid "Untie" -msgstr "Развязать" +msgstr "Отвязать" #: src/monexamine.cpp msgid "Tie" -msgstr "Связать" +msgstr "Привязать" #: src/monexamine.cpp #, c-format @@ -245347,7 +247608,7 @@ msgstr "" #: src/npc.cpp msgid "Hunting and fishing - Currently only fishing is enabled" -msgstr "" +msgstr "Охота и рыбалка — В настоящее время включена только рыбалка" #: src/npc.cpp msgid "Gathering edibles - Currently only a placeholder" @@ -246017,8 +248278,9 @@ msgid "I have news." msgstr "У меня есть новости." #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "Да, давай продолжим тренировку " +#, c-format +msgid "Yes, let's resume training %s" +msgstr "Да, давай продолжим тренировку %s" #: src/npctalk.cpp #, c-format @@ -246742,6 +249004,17 @@ msgstr "" "Когда отключено, заставляет игрока ронять новые предметы, если превышен " "лимит веса." +#: src/options.cpp +msgid "Dangerous running" +msgstr "Опасный бег" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" +"Если включен, позволяет игроку забегать в опасные тайлы без предупреждения." + #: src/options.cpp msgid "Safe mode" msgstr "Безопасный режим" @@ -249156,11 +251429,11 @@ msgstr "Искать:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" "Несколько значений разделяйте запятыми, для исключения ставьте в начале минус.\n" -"Текущий радиус поиска %d. Его можно изменить в настройках." +"Текущий радиус поиска %d. Его можно изменить в настройках." #: src/overmap_ui.cpp msgid "No results found." @@ -249598,6 +251871,10 @@ msgstr "Усталость:" msgid "Heat :" msgstr "Тепло :" +#: src/panels.cpp +msgid "Deaf!" +msgstr "Глухота!" + #: src/panels.cpp msgid "Underground" msgstr "Под землёй" @@ -249656,10 +251933,6 @@ msgstr "Луна :" msgid "Lighting:" msgstr "Освещение: " -#: src/panels.cpp -msgid "Deaf!" -msgstr "Глухота!" - #: src/panels.cpp msgid "Weapon :" msgstr "Оружие:" @@ -250696,6 +252969,11 @@ msgstr "Исправить какой дефект?" msgid "Turns into: %s\n" msgstr "Превращается в: %s\n" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -251169,93 +253447,74 @@ msgstr "СКОРОСТЬ" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "Плавание стоит %+d очко движения. " -msgstr[1] "Плавание стоит %+d очка движения. " -msgstr[2] "Плавание стоит %+d очков движения. " -msgstr[3] "Плавание стоит %+d очко движения. " +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "Бег стоит %+d очко движения. " -msgstr[1] "Бег стоит %+d очка движения. " -msgstr[2] "Бег стоит %+d очков движения. " -msgstr[3] "Бег стоит %+d очко движения. " +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "Перезарядка стоит %+d очко движения. " -msgstr[1] "Перезарядка стоит %+d очка движения. " -msgstr[2] "Перезарядка стоит %+d очков движения. " -msgstr[3] "Перезарядка стоит %+d очко движения. " +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "Атаки ближнего боя и метания стоят %+d очко движения. " -msgstr[1] "Атаки ближнего боя и метания стоят %+d очка движения. " -msgstr[2] "Атаки ближнего боя и метания стоят %+d очков движения. " -msgstr[3] "Атаки ближнего боя и метания стоят %+d очко движения. " +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "Навык уклонения %+.1f. " +msgid "Dodge skill: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "Шансы на попадание в ближнем бою %+d%%; " +msgid "Melee attack rolls: %+d%%\n" +msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." +"Head encumbrance has no effect; it simply limits how much you" +" can put on." msgstr "" -"Сковывание головы не имеет эффекта; оно лишь ограничивает количество надетых" -" на неё вещей." #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"Восприятие %+d при поиске ловушек или стрельбе из дальнобойного оружия;\n" -"Рассеяние %+d при метании предметов." #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "Покрытие рта затруднит процесс дыхания и его восстановления." +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." msgstr "" -"Скованность рук влияет на расход выносливости в ближнем бою и на точность " -"попадания дальнобойным оружием." #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "Снижает скорость, с которой вы можете обращаться с предметами\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "Ловкость %+.1f при метании предметов;\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "Снижает скорость прицеливания на %.1f." +msgid "Reduced gun aim speed: %.1f" +msgstr "" #: src/player_display.cpp msgid "" @@ -251355,11 +253614,9 @@ msgstr "Вес:" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "" -"Ваш вес в целом показывает, сколько жира запасено в вашем теле и сколько вы " -"можете прожить без еды. Избыток или недостаток веса вредны для здоровья." #: src/player_display.cpp #, c-format @@ -251572,18 +253829,18 @@ msgstr " стошнило тысячами живых спор!" #: src/player_hardcoded_effects.cpp msgid "The flesh on your broken arms bulges. Fungus stalks burst through!" -msgstr "Плоть на ваших сломанных руках вздута. Из неё прорастают грибы!" +msgstr "Плоть на ваших сломанных руках вздувается. Из неё прорастают грибы!" #: src/player_hardcoded_effects.cpp msgid "'s broken arms bulge. Fungus stalks burst out of the bulges!" -msgstr "Сломанные руки вздуты. Из них прорастают грибы!" +msgstr "Сломанные руки вздуваются. Из них прорастают грибы!" #: src/player_hardcoded_effects.cpp msgid "" "The flesh on your broken and unbroken arms bulge. Fungus stalks burst " "through!" msgstr "" -"Плоть на вашей сломанной и не сломанной руке вздута. Из них прорастают " +"Плоть на вашей сломанной и несломанной руке вздувается. Наружу прорастают " "грибы!" #: src/player_hardcoded_effects.cpp @@ -252122,6 +254379,16 @@ msgstr "Ваше оружие (%s) дало осечку, издав лишь т msgid "'s %s misfires with a muffled click!" msgstr "Оружие %s () даёт осечку, издав лишь тихий щелчок!" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -252162,6 +254429,16 @@ msgstr "Прикреплённая модификация (%s) поврежда msgid "'s %s is damaged by their shot!" msgstr "Прикреплённая модификация (%s) повреждается из-за выстрела!" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "%s издаёт невыносимый пилящий звук!" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "%s у издаёт невыносимый пилящий звук!" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -252361,6 +254638,10 @@ msgstr "Точное прицеливание" msgid "[%c] to take precise aim and fire." msgstr "[%c] Точно прицелиться и выстрелить." +#: src/ranged.cpp +msgid "turrets" +msgstr "турель" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -252822,8 +255103,8 @@ msgstr "Слышно %s!" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." -msgstr "Со своего места вы слышите %1$s." +msgid "From your position you hear %1$s" +msgstr "Вы слышите %1$s" #: src/sounds.cpp #, c-format @@ -253655,7 +255936,7 @@ msgstr "Электрические разряды вылетают из пола #: src/trapfunc.cpp #, c-format msgid "Electrical beams emit from the floor and slice the %s!" -msgstr "Электрические разряды вылетают из пола и вонзаются в %s!" +msgstr "Электрические лучи вылетают из пола и рассекают %s!" #: src/trapfunc.cpp msgid " falls in a pit!" @@ -253741,7 +256022,7 @@ msgstr "Ваш %s обжигается о лаву!" #: src/trapfunc.cpp msgid "You fail to attach it…" -msgstr "Вам не удалось прикрепить это…" +msgstr "Вам не удалось это прикрепить…" #: src/trapfunc.cpp msgid "There's nowhere to pull yourself to, and you sink!" @@ -253948,21 +256229,6 @@ msgstr[1] "%s указывает в вашу сторону издаёт %d ра msgstr[2] "%s издаёт %d раздражающих писков." msgstr[3] "%s издаёт %d раздражающих писков." -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "Джон Смит" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "" -"Вы сохранились при прохождении обучения — в мире обучения отсутствуют " -"некоторые особенности нормальных миров. Странные вещи могут случиться, если " -"вы загрузите это сохранение. Вас предупредили." - #: src/veh_interact.cpp msgid "Select part" msgstr "Выбрать деталь" @@ -256303,6 +258569,10 @@ msgstr "солнечно" msgid "Cloudy" msgstr "пасмурно" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "Легкая морось" + #: src/weather_data.cpp msgid "Drizzle" msgstr "морось" diff --git a/lang/po/zh_CN.po b/lang/po/zh_CN.po index f01574b048737..44f7a3c891968 100644 --- a/lang/po/zh_CN.po +++ b/lang/po/zh_CN.po @@ -1,10 +1,10 @@ # Translators: # ImmortalSTAR , 2018 +# dikai li , 2018 # Jin Zhang <610037437@qq.com>, 2018 # 晨光 马 <448367875@qq.com>, 2018 # Vimsucks Ho , 2018 # cellxiecao , 2018 -# dikai li , 2018 # 1 23 , 2018 # 4c6e1d75b9f86fe32f55f91342c2d6a6, 2018 # 高 励贤 <475964436@qq.com>, 2018 @@ -25,11 +25,9 @@ # 张义钊 , 2019 # Heaper327 , 2019 # LXY 233 , 2019 -# 曾泰瑋 , 2019 # Roy Y , 2019 # Muye Ma , 2019 # Mizu Izumi, 2019 -# fei li , 2019 # Silencess Shakespeare , 2019 # Jerry Shell , 2019 # D Laboratory , 2019 @@ -37,25 +35,28 @@ # JeffChen , 2019 # Aloxaf , 2019 # ehnuhc , 2019 +# Amans Tofu , 2019 # zao lv , 2019 # 何方神圣 何 <1366003560@qq.com>, 2019 -# Jianxiang Wang , 2019 # Mein Führer <851000914@qq.com>, 2019 # 鑫 江 <779384468@qq.com>, 2019 # Middo <18119928570@163.com>, 2019 -# startobira , 2019 -# Amans Tofu , 2019 # Brett Dong , 2019 # 万 和 <380014507@qq.com>, 2019 +# startobira , 2019 +# fei li , 2019 +# Jianxiang Wang , 2019 # cainiao , 2019 +# Sakuya , 2019 +# 曾泰瑋 , 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" -"Last-Translator: cainiao , 2019\n" +"Last-Translator: 曾泰瑋 , 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1574,7 +1575,7 @@ msgstr "洗涤剂" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." +msgid "A popular pre-Cataclysm washing powder." msgstr "一种在大灾变前流行的用于清洗肮脏物品的粉末。" #: lang/json/AMMO_from_json.py @@ -1854,6 +1855,16 @@ msgstr[0] "灯油" msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "一份轻型无烟灯油，在油灯中使用。" +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "机油" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "一款供汽车引擎使用的机油。" + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -2000,6 +2011,61 @@ msgid "" "administered manually." msgstr "一整套用于手术麻醉的工具箱，内含装有各种强力催眠剂、止痛剂及兴奋剂的瓶子。该工具箱设计主要用于专业医疗设备使用，暂时无法直接使用。" +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "40mm 照明弹" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "一颗 40mm 照明榴弹。它会明亮地燃烧大约一分钟，并同时会在它的飞行轨迹上留下一道烟雾的痕迹。" + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "40x46mm 榴弹" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "一颗 40mm 闪光榴弹。它能在引爆后产生强光和巨响，对附近的所有目标产生致盲、失聪的效果。" + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "40mm 燃烧弹" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "" +"一个装载小型凝固汽油弹的40mm口径榴弹，爆炸时能产生高温火焰，内装有由汽油和其他化学品制成的胶状物，爆炸时向四周溅射，发出一千摄氏度左右的高温，并能粘在其他物体上长时间燃烧。" + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40mm 烟雾弹" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "设计用来提供烟幕掩护的40mm口径榴弹。" + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "40mm 独头榴弹" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "一颗 40mm 独头榴弹，里面装着一颗巨大的弹头。我想跟你的肩膀说再见吧。" + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "10mm Auto 被甲弹" @@ -2800,126 +2866,133 @@ msgid ".40 S&W JHP, reloaded" msgstr ".40 S&W 空尖弹（复装）" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40mm 榴弹" +msgid "40x46mm grenade" +msgstr "40x46mm 榴弹" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "40mm 沙包弹" +msgid "40x46mm M1006" +msgstr "40x46mm M1006 榴弹" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." -msgstr "一颗 40mm 口径的非致命沙包榴弹，可给予目标强烈的冲击，使其极度疼痛并失能。请注意，该弹药仍有一定的杀伤效果。" +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." +msgstr "一款低初速低杀伤的40x46mm榴弹，弹头内装着泡沫和塑料弹丸，目的是使得受攻击目标疼痛并迷失方向。但仍可能造成伤害并导致死亡。" #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40mm 震荡弹" +msgid "40x46mm M433" +msgstr "40x46mm M433 榴弹" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "一颗40mm口径榴弹，配有震荡爆炸弹头。" +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "一款低初速的40x46mm HEDP 高爆两用榴弹。它能够穿透2英寸厚的钢板和，而击中目标时产生的大量破片也使它能作为反步兵弹药使用。" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "40mm 照明弹" +msgid "40x46mm M576" +msgstr "40x46mm M576 榴弹" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." -msgstr "一颗 40mm 照明榴弹。它会明亮地燃烧大约一分钟，并同时会在它的飞行轨迹上留下一道烟雾的痕迹。" +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." +msgstr "一款低初速的40x46mm猎鹿榴弹，设计供丛林和室内近距离作战使用。" #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "40mm 闪光弹" +msgid "40x46mm M651" +msgstr "40x46mm M651 榴弹" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." -msgstr "一颗 40mm 闪光榴弹。它能在引爆后产生强光和巨响，对附近的所有目标产生致盲、失聪的效果。" +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" +msgstr "一款低初速的40x46mm催泪瓦斯榴弹。在防暴行动及将敌方步兵驱离防御阵地时十分有效。" #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "40mm 镖形弹" +msgid "40x46mm buckshot" +msgstr "40x46mm 猎鹿弹" -#. ~ Description for 40mm flechette +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." -msgstr "一颗 40mm 口径的榴弹，装有大量能穿甲的飞镖型弹丸。" +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." +msgstr "一款自制的40x46mm猎鹿榴弹，弹道特性接近于 M576 榴弹。" #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40mm 破片榴弹" +msgid "40x46mm slug" +msgstr "40x46mm 独头弹" -#. ~ Description for 40mm frag +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." -msgstr "一颗 40mm 破片榴弹，有个小型高爆弹头，能产生大量伤害很高的碎片。" +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." +msgstr "一款自制的40x46mm独头榴弹，弹道特性接近于大号的独头霰弹。" #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "40mm 燃烧弹" +msgid "40x46mm flechette" +msgstr "40x46mm 镖形弹" -#. ~ Description for 40mm incendiary +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." -msgstr "" -"一个装载小型凝固汽油弹的40mm口径榴弹，爆炸时能产生高温火焰，内装有由汽油和其他化学品制成的胶状物，爆炸时向四周溅射，发出一千摄氏度左右的高温，并能粘在其他物体上长时间燃烧。" +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "一款自制的40x46mm镖形榴弹，弹头内装入了70根钢镖。" +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "40x53mm 榴弹" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M1001" +msgstr "40x53mm M1001 榴弹" + +#. ~ Description for 40x53mm M1001 #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "40mm 猎鹿霰弹" +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "一款40x53mm镖形榴弹，弹头内装着17格令重的飞镖。" -#. ~ Description for 40mm buckshot +#: lang/json/AMMO_from_json.py +msgid "40x53mm M430A1" +msgstr "40x53mm M430A1 榴弹" + +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." -msgstr "一颗 40mm 口径的榴弹，内部装有威力强大的猎鹿霰弹弹丸，可作为备用的大号霰弹枪，也可用于强行破除路障等障碍物。" +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "一款高初速的40x53mm HEDP 高爆两用榴弹。它能够穿透3英寸厚的钢板和，而击中目标时产生的大量破片也使它能作为反步兵弹药使用。" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40mm 烟雾弹" +msgid "40x53mm buckshot" +msgstr "40x53mm 猎鹿弹" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "设计用来提供烟幕掩护的40mm口径榴弹。" +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "一款自制的40x53mm猎鹿榴弹，弹道特性接近于 M576 榴弹。" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "40mm 催泪瓦斯弹" +msgid "40x53mm slug" +msgstr "40x53mm 独头弹" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." -msgstr "一颗 40mm 催泪瓦斯榴弹。它爆炸后会散发的气雾能使目标暂时丧失战斗力。" +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." +msgstr "一款自制的40x53mm独头榴弹，弹道特性接近于大号的独头霰弹。" #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "40mm 独头榴弹" +msgid "40x53mm flechette" +msgstr "40x53mm 镖形弹" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." -msgstr "一颗 40mm 独头榴弹，里面装着一颗巨大的弹头。我想跟你的肩膀说再见吧。" +msgid "An improvised 40x53mm flechette load containing 100 steel darts." +msgstr "一款自制的40x53mm镖形榴弹，弹头内装入了100根钢镖。" #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -4630,7 +4703,7 @@ msgstr[0] "银块" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." msgstr "" "一种较软的具有明显光泽的金属，你可以用它制造一些东西，或有其它用途。\n" @@ -5147,13 +5220,6 @@ msgstr "" msgid "plutonium cell" msgstr "核能钚电池" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "一些自由流动的电能，可以为电池补充电量，但无法取出。" - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5219,9 +5285,10 @@ msgstr "脉冲弹" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." -msgstr "合金子弹头组成的脉冲弹药，拥有强大冲击力。不要胡乱发射，小心伤及无辜。" +msgstr "" +"螺旋形的弹匣内装满了合金空尖弹，采用分隔式底火发射，虽然它不是目前杀伤力最大的武器，但是你在发射它时不必担心流弹会对环境造成不良影响，而且威力还够用。" #: lang/json/AMMO_from_json.py msgid "6.54x42mm 9N8" @@ -5674,18 +5741,6 @@ msgid "" "Hefty round projectiles cast from lead, useful as ammunition for slings." msgstr "扎实的铅弹丸，很适合当抛石索的弹药。" -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "骨制弩矢" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "一支由骨头削尖制得的弩矢。重量较轻，命中率和伤害也不差。射击后有很高概率可以保持完好。" - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -6136,7 +6191,7 @@ msgstr[0] "变形怪培养物" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." +"blob needs to be healthy. You think…" msgstr "" "包含了各种有机材料的混合物，提供变形怪健康成长所需要的所有营养。\n" "\"可爱变形怪专用热销饲料。\"" @@ -6485,7 +6540,7 @@ msgstr[0] "游牧装" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." msgstr "一套由大灾变前的衣物制作的自制服装，有大量的储存空间，专为长途旅行设计。" @@ -6497,7 +6552,7 @@ msgstr[0] "轻型游牧装" #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." msgstr "一套由大灾变前的衣物制作的轻便自制服装，有大量的储存空间，专为夏季长途旅行设计。相较于普通游牧装，储存空间和护甲较低。" @@ -6557,10 +6612,10 @@ msgstr[0] "拾荒者套装" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." msgstr "" -"一套由大灾变前的衣物制成、拥有大量储存空间的耐用临时服装。\n" +"一套由大灾变前的衣物制成、拥有大量储存空间的耐用自制服装。\n" "\"穿上它开开心心的捡破烂。\"" #: lang/json/ARMOR_from_json.py @@ -10439,7 +10494,7 @@ msgstr "一条有着厚实毛皮内衬、相当保暖的裤子。" #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" +msgid_plural "faux fur pants" msgstr[0] "人造毛皮长裤" #. ~ Description for faux fur pants @@ -12008,7 +12063,7 @@ msgstr "一件白色的日式短裤，一般为习武者穿戴。" #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" +msgid_plural "violin cases" msgstr[0] "小提琴盒" #. ~ Description for violin case @@ -12622,9 +12677,9 @@ msgstr[0] "巨大新奇背包" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." -msgstr "一个体积巨大的纤维背包，在大灾变前看上去很可笑。现在，虽然看着还是很蠢，但是能储存许多物品。" +msgstr "一个体积巨大的纤维织物背包，在大灾变前看上去很可笑。现在，虽然看着还是很蠢，但是能储存许多物品。" #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -13775,6 +13830,131 @@ msgstr "" "一颗镶有钻石的假牙，套在牙齿上。带上很不舒服，但是异常的闪亮耀眼。穿上后很有高级帮派说唱歌手的风格。\n" "\"嘻哈音乐在本世纪三十年代已经被灭绝。\"" +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "石榴石假牙" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "一颗石榴石假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "紫水晶假牙" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "一颗紫水晶假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "海蓝宝石假牙" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "一颗海蓝宝石假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "祖母绿假牙" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "一颗祖母绿假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "紫翠玉假牙" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "一颗紫翠玉假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "红宝石假牙" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "一颗红宝石假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "橄榄石假牙" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "一颗橄榄石假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "蓝宝石假牙" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "一颗蓝宝石假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "电气石假牙" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "一颗电气石假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "黄水晶假牙" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "一颗黄水晶假牙，套在牙齿上。看上去异常的闪亮耀眼。" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "蓝黄玉假牙" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "一颗蓝黄玉假牙，套在牙齿上。看上去异常的闪亮耀眼。" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -13852,7 +14032,7 @@ msgstr "一只铜制的发夹。可以戴在头上，但是没有什么防护效 #: lang/json/ARMOR_from_json.py msgid "copper locket" msgid_plural "copper lockets" -msgstr[0] "铜吊坠盒" +msgstr[0] "铜质盒式吊坠" #. ~ Description for copper locket #: lang/json/ARMOR_from_json.py @@ -13860,7 +14040,7 @@ msgid "" "A circular, copper locket. It's been tarnished with use, and has gained " "some dull green spots. You can wear it if you like, but it won't provide " "any effects." -msgstr "一只圆形铜吊坠盒。长期的使用已让它失去光泽，上面出现了许多暗绿的锈点。你可以把它戴在脖子上，但是不会有什么防护效果。" +msgstr "一条圆形铜质的盒式小吊坠。长期的使用已让它失去光泽，上面出现了许多暗绿的锈点。你可以把它戴在脖子上，但是不会有什么防护效果。" #: lang/json/ARMOR_from_json.py msgid "copper necklace" @@ -13978,7 +14158,7 @@ msgstr "一个金质的发簪，是专为富人设计的奢侈品。你想戴的 #: lang/json/ARMOR_from_json.py msgid "gold locket" msgid_plural "gold lockets" -msgstr[0] "金质吊坠盒" +msgstr[0] "金质盒式吊坠" #. ~ Description for gold locket #: lang/json/ARMOR_from_json.py @@ -13986,7 +14166,7 @@ msgid "" "A heart-shaped, gold locket with a frame inside to store photographs or " "small objects. You can wear it if you like, but it won't provide any " "effects." -msgstr "一个心形的金质吊坠盒，有一个可以存放照片或其他小物件的夹层。你想戴的话可以把它戴上，但它并不会给你带来任何特殊效果。" +msgstr "一条心形的金质盒式小吊坠，有一个可以存放照片或其他小物件的夹层。你想戴的话可以把它戴上，但它并不会给你带来任何特殊效果。" #: lang/json/ARMOR_from_json.py msgid "gold medal" @@ -14211,14 +14391,14 @@ msgstr "这只发夹由铂金制成，是金属发夹逼格的极致。你可以 #: lang/json/ARMOR_from_json.py msgid "platinum locket" msgid_plural "platinum lockets" -msgstr[0] "铂金吊坠盒" +msgstr[0] "铂金质盒式吊坠" #. ~ Description for platinum locket #: lang/json/ARMOR_from_json.py msgid "" "A small, platinum locket for storing photographs or other small objects. " "You can wear it if you like, but it won't provide any effects." -msgstr "一只小小的铂金吊坠盒，用于存放照片或其它小东西。你可以戴上它，但是不会有什么防护效果。" +msgstr "一条铂金的盒式小吊坠，用于存放照片或其它小东西。你可以戴上它，但是不会有什么防护效果。" #: lang/json/ARMOR_from_json.py msgid "platinum necklace" @@ -14323,14 +14503,14 @@ msgstr "一只闪耀的银发夹，上面刻着一只小蜜蜂。你可以戴上 #: lang/json/ARMOR_from_json.py msgid "silver locket" msgid_plural "silver lockets" -msgstr[0] "银质吊坠盒" +msgstr[0] "银质盒式吊坠" #. ~ Description for silver locket #: lang/json/ARMOR_from_json.py msgid "" "A small, silver locket with a frame inside to store photographs or small " "objects. You can wear it if you like, but it won't provide any effects." -msgstr "一个银质小吊坠盒，有一个可以存放照片或其他小物件的夹层。你想戴的话可以把它戴上，但它并不会给你带来任何特殊效果。" +msgstr "一条银质的盒式小吊坠，有一个可以存放照片或其他小物件的夹层。你想戴的话可以把它戴上，但它并不会给你带来任何特殊效果。" #: lang/json/ARMOR_from_json.py msgid "silver medal" @@ -14583,6 +14763,510 @@ msgid "" " behind you when you walk." msgstr "一个小珠子吊着一条漆黑光滑的皮制尾巴，当你走路时会随之摆动，非常可爱，引\"人\"注目。" +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "钻石金耳环" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "一对闪亮的钻石金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "石榴石金耳环" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "一对闪亮的石榴石金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "紫水晶金耳环" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的紫水晶金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "海蓝宝石金耳环" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的海蓝宝石金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "祖母绿金耳环" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "一对闪亮的祖母绿金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "紫翠玉金耳环" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "一对闪亮的紫翠玉金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "红宝石金耳环" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "一对闪亮的红宝石金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "橄榄石金耳环" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "一对闪亮的橄榄石金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "蓝宝石金耳环" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的蓝宝石金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "电气石金耳环" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的电气石金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "黄水晶金耳环" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "一对闪亮的黄水晶金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "蓝黄玉金耳环" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的蓝黄玉金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "猫眼石金耳环" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "一对闪亮的猫眼石金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "珍珠金耳环" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "一对闪亮的珍珠金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "钻石银耳环" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的钻石银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "石榴石银耳环" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮石榴石银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "紫水晶银耳环" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的紫水晶银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "海蓝宝石银耳环" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的海蓝宝石银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "祖母绿银耳环" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的祖母绿银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "紫翠玉银耳环" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的紫翠玉银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "红宝石银耳环" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "一对闪亮的红宝石银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "橄榄石银耳环" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的橄榄石银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "蓝宝石银耳环" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的蓝宝石银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "电气石银耳环" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的电气石银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "黄水晶银耳环" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的黄水晶银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "蓝黄玉银耳环" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的蓝黄玉银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "珍珠银耳环" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "一对闪亮的珍珠银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "猫眼石银耳环" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "一对闪亮的猫眼石银耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "钻石铂金耳环" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "一对闪亮的钻石铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "石榴石铂金耳环" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的石榴石铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "紫水晶铂金耳环" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的紫水晶铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "海蓝宝石铂金耳环" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的海蓝宝石铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "祖母绿铂金耳环" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "一对闪亮的祖母绿铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "紫翠玉铂金耳环" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的紫翠玉铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "红宝石铂金耳环" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的红宝石铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "橄榄石铂金耳环" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "一对闪亮的橄榄石铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "蓝宝石铂金耳环" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的蓝宝石铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "电气石铂金耳环" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的电气石铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "黄水晶铂金耳环" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "一对闪亮的黄水晶铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "蓝黄玉铂金耳环" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "一对闪亮的蓝黄玉铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "猫眼石铂金耳环" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的猫眼石铂金耳环。你可以戴着它，但是不会有特殊效果。" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "珍珠铂金耳环" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "一对闪亮的珍珠铂金耳环。你可以戴着它，但是不会有特殊效果。" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -15064,10 +15748,10 @@ msgstr[0] "C.R.I.T 战术面罩" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" -"C.R.I.T标配的面具，内衬凯夫拉纤维以提供额外保护。少量的过滤装置提供了不错的环境保护力，但是并不能永久性使用。有一个基础屏显示其状态。" +"C.R.I.T标配的面具，内衬了凯夫拉纤维以提供额外保护。只需要消耗少量滤芯就能提供不错的环境保护，但是无法永久使用。它内置了一台简单的平视显示器显示其工作状态。" #: lang/json/ARMOR_from_json.py msgid "pair of CRIT boots" @@ -15077,12 +15761,12 @@ msgstr[0] "C.R.I.T 重型战靴" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" -"C.R.I.T标配靴。次时代凝胶不仅能确保执行长期任务时脚也舒适与健康，还能吸收外部冲击和热量。高温合金网和橡胶也提供了相当足的化学保护力。不过就是有点重。" +"C.R.I.T标配的战斗靴。次时代凝胶不仅能在长期执行任务时确保脚部舒适健康，还能吸收外部冲击和热量。超合金材质的网状纤维和橡胶也提供了相当不错的化学防护能力。不过就是有点重。" #: lang/json/ARMOR_from_json.py msgid "pair of CRIT LA boots" @@ -15092,11 +15776,12 @@ msgstr[0] "C.R.I.T 轻型战靴" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." -msgstr "C.R.I.T轻型战靴，基于C.R.I.T靴的更轻型版本，以适应更为温暖的气候，LA靴保持了标准靴的基本特性，只是牺牲部分保护换取行动力。" +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." +msgstr "" +"C.R.I.T轻型战斗靴，基于C.R.I.T标配战斗靴的更轻型版本，能够适应更温暖的气候，轻型战斗靴保留了标配战斗靴的大部分特性，不过牺牲了部分保护以换取行动时的便利。" #: lang/json/ARMOR_from_json.py msgid "pair of CRIT fingertip-less gloves" @@ -15106,10 +15791,11 @@ msgstr[0] "C.R.I.T 露指手套" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." -msgstr "C.R.I.T标配手套。用高温合金网制成，适用于基因改造或突变的生物，能够做出更大的操作的同时提供保护。" +msgstr "" +"C.R.I.T标配的手套。外部采用超合金网状纤维制成，能够完全贴合基因改造过或突变之后的生物体表面，在保证操作物品能力的同时提供了不错的防护。" #: lang/json/ARMOR_from_json.py msgid "pair of CRIT fingertip-less liners" @@ -15119,10 +15805,10 @@ msgstr[0] "C.R.I.T 手套内衬" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." -msgstr "C.R.I.T露指手套内衬，配合露指手套使用，用高温合金网制成，适用于基因改造或突变的生物，能够做出更大的操作的同时提供保护。" +msgstr "C.R.I.T标配的手套内衬。采用橡胶保温材料制成，露指设计能适用于基因改造过或突变之后的生物，在保证操作物品能力的同时提供了不错的防护。" #: lang/json/ARMOR_from_json.py msgid "CRIT backpack" @@ -15132,12 +15818,12 @@ msgstr[0] "C.R.I.T 战术背包" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." msgstr "" -"C.R.I.T标准包。基于MOLLE背包的设计，这个小一些的包在储存空间和累赘感之间取得了极佳的平衡，可以收纳一把大型武器。然而就算是有磁力弹夹，拔枪和收枪还是很不舒服，只有多多练习才行。" +"C.R.I.T标配的背包。基于MOLLE战术背包设计，这个体积较小的背包在储存空间和累赘感之间取得了极佳的平衡，可以收纳一把大型武器。然而就算是有磁力弹夹，拔枪和收枪还是很不舒服，只有多多练习才行。" #: lang/json/ARMOR_from_json.py msgid "CRIT chestrig" @@ -15159,10 +15845,10 @@ msgstr[0] "C.R.I.T 战术护腿" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." -msgstr "C.R.I.T标准版护腿。简单的设计和耐用的材料使得奔跑时更加轻松与安全，保温材料让你更加适应寒冷的环境。" +msgstr "C.R.I.T标配的护腿。简单的设计和耐用的材料使得奔跑时更加轻松与安全，保温材料让你更加适应寒冷的环境。" #: lang/json/ARMOR_from_json.py msgid "pair of CRIT arm guards" @@ -15173,9 +15859,9 @@ msgstr[0] "C.R.I.T 战术护臂" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." -msgstr "用氯丁橡胶模压与合金材料制成的绝缘护臂。非常坚固，可以很好的阻挡攻击。当然，也重的出奇。" +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." +msgstr "用氯丁橡胶模压与超合金材料制成的绝缘护臂。非常坚固，可以很好防护所受到的攻击。当然，也重的出奇。" #: lang/json/ARMOR_from_json.py msgid "CRIT web belt" @@ -15185,9 +15871,9 @@ msgstr[0] "C.R.I.T 战术腰带" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." -msgstr "C.R.I.T标准版腰带，坚固耐用并且集成了一个小型刀鞘。" +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." +msgstr "C.R.I.T标配的腰带。坚固耐用并且集成了一个小型刀鞘。" #: lang/json/ARMOR_from_json.py msgid "CRIT infantry duster" @@ -15197,10 +15883,10 @@ msgstr[0] "C.R.I.T 防尘风衣" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." -msgstr "带有橡胶绝缘层的防尘风衣。虽然有点重，但是可以有效的防护电击。它有许多口袋，可以提供额外的存储空间。" +"discharges from the robots. Has several pockets for storage." +msgstr "带有橡胶绝缘层的防尘风衣。虽然有点累赘，但是可以有效的防护电击。它有许多口袋，可以提供额外的存储空间。" #: lang/json/ARMOR_from_json.py msgid "CRIT Engineering Suit" @@ -15211,10 +15897,11 @@ msgstr[0] "C.R.I.T 工程装甲" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." -msgstr "一套由复合纤维材料制成的柔韧套装，配备有防护装甲板。内部安装了复杂的物品数字化存储设备，同时内置的扭转棘轮可以为系统运行提供足够的电量。" +msgstr "" +"一套由复合纤维材料制成的柔韧套装，配备有防护装甲板。内部安装了复杂的物品数字化存储设备，同时内置的动力齿轮供能系统可以为交互界面提供足够的电量。" #: lang/json/ARMOR_from_json.py msgid "CRIT Armored Anomaly Suit" @@ -15224,10 +15911,10 @@ msgstr[0] "C.R.I.T 装甲防护服" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" "一套轻便的防护盔甲，由复合纤维编制而成。内部巧妙的放置了凯夫拉材料，使得在拥有不错防护能力的同时保持重量轻便。同时能很好的防护辐射和其他环境危险。" @@ -15252,14 +15939,14 @@ msgstr[0] "C.R.I.T 执法者装甲战衣" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" -"由一套合金护甲、防护装置及卡扣组成的防弹衣，通常覆盖在外层衣物之上。通过特殊的设计，使得正面的凯夫拉装甲向外凸出从而可以转移攻击。这件防弹衣牺牲了舒适性的基础上大大加强了防护性，因此也会变得相当累赘和难以穿戴。" +"一套由各式合金护甲、防护装置及卡扣组成的全身防弹衣，通常穿在其他衣物之上。相互交叠的钢甲和凯夫拉板覆盖了大部分身体，同时在某些部位向外凸出从而能转移攻击。这件防弹衣通过牺牲舒适性来加强防护性，因此也会变得相当累赘和难以穿戴。整套装甲外布满了各式各样带子和夹子将其连接在一起。" #: lang/json/ARMOR_from_json.py msgid "pair of CRIT Enforcer docks" @@ -15269,9 +15956,9 @@ msgstr[0] "C.R.I.T 执法者装甲战靴" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -15286,10 +15973,10 @@ msgstr[0] "C.R.I.T 士兵装甲" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" "一套现代化凯夫拉材质的士兵套装，内置的合金板可以在防护的同时减轻重量。内衬软氯丁橡胶使得穿戴起来非常舒适，最重要的是，它可以很轻松的穿戴在其他盔甲内部。" @@ -15302,9 +15989,9 @@ msgstr[0] "C.R.I.T 孤狼战甲" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "一套哑光的黑色战甲，在笨重的板甲基础上添加了柔软的凯夫拉纤维。这款重型装甲可以保护你免受绝大多数伤害，当然前提是你能够穿着它走路。" #: lang/json/ARMOR_from_json.py @@ -15315,30 +16002,30 @@ msgstr[0] "C.R.I.T 衬衫" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" -"C.R.I.T标准版衬衫。轻便、耐用，有足够大的存储空间。内衬弹性氯丁橡胶能让人在中等偏冷的天气里保持温暖，流线型的设计使得衣物非常贴身。拉链设计让穿戴起来更加快速。" +"C.R.I.T标配的衬衫。轻便、耐用，有足够大的存储空间。内衬弹性氯丁橡胶能让人在中等偏冷的天气里保持温暖，流线型的设计使得衣物非常贴身。拉链设计让穿戴起来更加快速。" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" +msgid_plural "C.R.I.T trousers" msgstr[0] "C.R.I.T 长裤" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." -msgstr "C.R.I.T标准版长裤。轻便、耐用，有足够大的存储空间。内衬弹性氯丁橡胶能让人在中等偏冷的天气里保持温暖。" +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." +msgstr "C.R.I.T标配的长裤。轻便、耐用，有足够大的存储空间。内衬弹性氯丁橡胶能让人在中等偏冷的天气里保持温暖。" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "C.R.I.T长裤，极简的的时尚设计使得裤子非常的轻便。内衬超级弹性氯丁橡胶在中等偏冷的天气里也能保暖。" @@ -15349,8 +16036,8 @@ msgstr[0] "C.R.I.T 头盔内衬" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." -msgstr "C.R.I.T标准版头盔内衬，可以让人保持温暖。" +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgstr "C.R.I.T标配的头盔内衬，可以让人保持温暖。" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T shoes" @@ -15359,20 +16046,20 @@ msgstr[0] "C.R.I.T 正装皮鞋" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "一双时髦的礼服鞋。很花哨，很好看。" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" +msgid_plural "pairs of C.R.I.T rec gloves" msgstr[0] "C.R.I.T 防水手套" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " -msgstr "C.R.I.T标准版防水手套。这款手套既贴身又光滑，由棉制成，内衬氯丁橡胶既能保暖又能防滑。" +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " +msgstr "C.R.I.T标配的防水手套。这款手套既贴身又光滑，由棉制成，内衬氯丁橡胶既能保暖又能防滑。" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T web belt" @@ -15382,9 +16069,9 @@ msgstr[0] "C.R.I.T 战术腰带" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." -msgstr "C.R.I.T标准版腰带，坚固耐用并且集成了一个小型刀鞘。" +msgstr "C.R.I.T标配的腰带，坚固耐用并且集成了一个小型工具挂带。" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T rec duster" @@ -15394,7 +16081,7 @@ msgstr[0] "C.R.I.T 防水外套" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "防水长大衣。由氯丁橡胶制成，设计的相当时尚，完美的结合了舒适性与功能性，衣服上有几个袋子可以稍微增加存储空间。" @@ -15408,8 +16095,8 @@ msgstr[0] "C.R.I.T 防水兜帽" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "设计上非常时尚的C.R.I.T标准版防水兜帽，这顶帽子非常的光滑合身，厚度也让你在寒冷的天气里能保持温暖。" #: lang/json/ARMOR_from_json.py @@ -15498,10 +16185,11 @@ msgid_plural "copper infusion bracelets" msgstr[0] "符文铜手镯" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." msgstr "这个手镯上刻着符文。当你看着它的时候，你会感觉到一种神秘的微弱气息。它将有助于将法力吸收到物质中。" #: lang/json/ARMOR_from_json.py @@ -15509,13 +16197,6 @@ msgid "silver infusion bracelet" msgid_plural "silver infusion bracelets" msgstr[0] "符文银手镯" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "这个手镯上刻着符文。当你看着它的时候，你会感觉到一种神秘的微弱气息。它将有助于将法力吸收到物质中。" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -15798,7 +16479,7 @@ msgstr "你的脚上有一层魔法形成的光滑冰层。虽然在平坦的地 #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" +msgid_plural "flesh pouches" msgstr[0] "肉身成袋" #. ~ Description for flesh pouch @@ -15809,6 +16490,18 @@ msgid "" "minimize encumbrance." msgstr "你的背上长出了一个坚硬的肉袋子，里面有细小的触手，可以抓住你放在里面的任何东西。它们不断改变和调整自己，以减少累赘。" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "朦胧光环" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "一个覆盖全身、看不见的魔法光环扭曲了你身体周围的光。让你在一个回合中获得两次额外闪避攻击的能力。" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -17572,10 +18265,10 @@ msgstr[0] "离子过载发生器CBM" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" -"一套强大的离子能量发生器被植入你的胸腔之中。能够发射出一道威力巨大的，不断扩散并能穿透多个目标的高能冲击波。所产生的冲击波会点燃氧气，使其经过的地方产生火焰，并在最终撞击目标时爆炸。近距离使用它是非常不明智的选择。" +"一套强大的离子能量发生器被植入你的胸腔之中。能够发射出一个道威力巨大的，不断扩散并能穿透多个目标的高能冲击波。所产生的冲击波会点燃氧气，使的其经过的地方产生火焰，并在最终撞击目标时爆炸。近距离使用它是非常不明智的选择。" #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py msgid "Blood Power Generator CBM" @@ -19243,6 +19936,138 @@ msgid "" "goblins, and trolls." msgstr "一本有趣的民间传说故事集，里面有着常见的精灵、地精、巨魔等。" +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "这个童话故事讲的是一只狼吃了太多咸肉，最终被困在屠夫的地窖里。" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "在这个传统童话故事中，一只狡猾的狐狸说服一只年长的狮子杀死一只恶毒的狼。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "这是一本有插图的童话书，讲述的是老鼠和猫之间的对话。" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "一本有趣的童话故事集，封面上写着《金姑娘和三只小熊》。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "这是一个有着不错插图的童话故事书，讲述了鸟类和野兽之间的战争，描述了蝙蝠在战争之中的行为和最终命运。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "这本书名为《响尾蛇的复仇》，是切诺基族神话和传说的故事集。标题页上用铅笔手写了\"285D\"。" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "这本童话书中讲述了一个《杰克和豌豆》故事的本地变体。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "这本童话书的标题是《小红帽》。它描述了一个穿红斗篷的小女孩与一只会说话的大灰狼的各种遭遇。" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "一本关于鬼怪的童话故事集，警告读者从死者身上偷东西的危险。" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "一本被翻译成英文的意大利童话书。封面上画着一只橙色的仙子正在用一个柠檬、一个酸橙和一个橘子玩杂耍。" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "一本关于变成鸟的人的童话书。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "一本关于魔鬼的有趣的民间故事集录，标题为《地狱的水壶：魔鬼的传说》。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "一本迷人的瑞典童话书，标题为《玻璃山和公主》。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "一本童话故事集，警告了读者过度贪婪的下场。" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "一本标题为《偷东西的罐子：阿拉伯世界的民间故事》的故事书。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "这是一本民间传说故事集，由旅行家约翰尼·卡西迪在20世纪60年代收集并出版。" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "一本格林兄弟的童话书，书名为《夏娃的孩子们》。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "这本童话书基于艾弗所之七圣童的传说改编扩写而成。" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "在这个童话故事中，一个强壮的小裁缝把石头里的水挤出来吓唬巨人。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "这本乡村民间故事书的标题为《如何大叫来吓跑魔鬼》。" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "这本书的标题是《锡兰的乡村民间故事》。它里面包括了一个关于一名来自斯里兰卡卡达姆巴瓦的男人的逻辑错误和愚蠢误判的童话故事。" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "这本民间故事书的标题是《一个有丑陋名字的女孩，和其他故事》。" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "标题为《逃走的松饼》的民间童话故事集，适合讲给小孩子听。" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -19644,7 +20469,7 @@ msgstr[0] "色情小说" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." +msgid "A hackneyed fictional narrative concealing low-grade literary smut." msgstr "这是一本陈词滥调，文字低劣的书，有着流水账一般的文笔，充满了大量下流的情色描写。" #: lang/json/BOOK_from_json.py @@ -20418,7 +21243,7 @@ msgstr "彼得·阿列克谢耶维奇·克鲁泡特金亲王所著的《夺取 #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "萧沆所著的《诞生之不便》。这本书应该是大灾变前几十年出版的，封面已经饱经风雨。" @@ -21850,9 +22675,9 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" "一张介绍某种糖果的传单。上面画着一个用光滑的糖果做成的闪闪发光的人，正害怕地看着你。\"糖人，世上首个真人大小的糖果！你真是个怪物吗？你能把它吞下吗？\"\n" "在传单的背面，你可以看到一些草草书写的笔记：\n" @@ -21884,7 +22709,7 @@ msgstr[0] "入侵无人机手册简单学" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." msgstr "一本关于非法入侵、重新编程和改装机器人的书。它有很多有用的步骤指南和示例蓝图。" @@ -22086,6 +22911,16 @@ msgstr[0] "盐水" msgid "Water with salt added. Not good for drinking." msgstr "一些加了盐的水，很咸，一般用于制造物品或有其它用途。" +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "肥皂水" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "一些加了肥皂的水，最好别喝。" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -22628,7 +23463,7 @@ msgstr[0] "私酿威士忌" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." msgstr "一种经过蒸馏的使用玉米和糖酿成的高度酒，最强、最纯、最好的老式烈酒！保证让你忘掉这一切关于灾难的事情，或给你些梦一般的幻象。" @@ -22745,6 +23580,69 @@ msgstr "" "一些由大麦等谷物酿制，在橡木桶中陈酿多年后，调配成43度左右的烈性蒸馏酒，英国人称之为\"生命之水\"。\n" "\"只有刚从酒瓶直接倒出来的威士忌才是最好的。\"" +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "爱尔兰单壶式蒸馏威士忌" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "一种由含麦芽和不含麦芽的大麦混合酿成的威士忌。" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "廉价威士忌" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "一种廉价的混合威士忌。" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "加拿大威士忌" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "一种由玉米和黑麦混合酿成的杂粮威士忌酒。" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "雪利酒" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "一瓶源自东印度的索莱拉陈酿。英国绅士的真正佳酿。\"来杯雪莉吗，奈尔斯？\"（注：《欢乐一家亲（1993）》）" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "夏微雪利酒" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "一种高端雪利酒，使用美国橡木桶酿造并熟成，在英国布里斯托尔罐装出品。" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "马德拉酒" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "一瓶加入了烈酒强化的马德拉葡萄酒。皇家海军的真正佳酿。" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "浪子鸡尾酒" @@ -23427,6 +24325,18 @@ msgid "meat jerky" msgid_plural "meat jerky" msgstr[0] "肉干" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "人肉干" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "怪兽肉干" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -23447,20 +24357,26 @@ msgstr "" "\"好吃好吃喵！\"" #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "人肉干" +msgid "smoked meat" +msgstr "熏肉" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "一块可以长期保存的咸人肉干，会使人越吃越渴。" +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "熏人肉" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "熏肉" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "%s（变异肉）" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -23481,17 +24397,6 @@ msgid "" "could be further smoked to dehydrate it completely." msgstr "一份经过烟熏处理以长期保存的美味熏鱼。可进一步烟熏，使其完全脱水。" -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "熏人肉" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "一份经过烟熏处理以长期保存的烟熏人肉，味道不错，如果你喜欢吃的话。可进一步烟熏，使其完全脱水。" - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -24828,7 +25733,7 @@ msgstr "利爪怪卵" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." msgstr "" "一团利爪怪的卵，大灾变时代的美味。\n" "\"末世小神厨系列。\"" @@ -25997,11 +26902,11 @@ msgid "" msgstr "墨西哥式调味玉米片。再来点奶酪，或者是加点牛肉就更棒了。" #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" +msgid "cheese nachos" +msgid_plural "cheese nachos" msgstr[0] "奶酪辣味玉米片" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -26009,47 +26914,49 @@ msgid "" msgstr "墨西哥式调味玉米片。这份已经加了奶酪。再来点肉就更棒了。" #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" +msgid "meat nachos" +msgid_plural "meat nachos" msgstr[0] "加肉辣味玉米片" -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "墨西哥式调味玉米片。这份已经加了肉。再来点奶酪就更棒了。" - +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "niño辣味玉米片" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "加肉辣味玉米片（变异肉）" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." -msgstr "墨西哥式调味玉米片。这份已经加了人肉。再来点奶酪就更棒了。（注：原文niño在西班牙语中是孩子的意思）" +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." +msgstr "墨西哥式调味玉米片。这份已经加了肉。再来点奶酪就更棒了。" +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "加肉奶酪辣味玉米片" + +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "niño奶酪辣味玉米片" -#. ~ Description for niño nachos with cheese +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "墨西哥式调味玉米片，加了人肉，又盖上一层奶酪，美味！（注：原文niño在西班牙语中是孩子的意思）" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "加肉奶酪辣味玉米片（变异肉）" -#: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "奶酪加肉辣味玉米片" - -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -26117,18 +27024,6 @@ msgstr[0] "辣椒热狗" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "一个浇头是辣椒肉酱的热狗，香辣可口。" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "性感热狗" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "" -"一个涂上了\"墨西哥辣人酱\"的热狗，香辣可口。\n" -"\"真是对上我的胃口的好邻居！\"" - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -26212,8 +27107,8 @@ msgstr[0] "生热狗" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." -msgstr "一个高度加工的香肠，常见于各个快餐行业之中或者棒球赛的看台上。加工后口感更佳。" +"Cataclysm. It would taste much better prepared." +msgstr "一根经过大量加工的香肠，大灾变之前棒球比赛看台上的常客。加工后口感更佳。" #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -26254,6 +27149,22 @@ msgstr "一份表面被巧克力包裹的松脆糖果。其中所含的麦芽给 msgid "raw sausage" msgstr "生香肠" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "生人肉香肠" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -26263,6 +27174,12 @@ msgstr "一条很大的生香肠，可以用来熏制或烹饪。" msgid "sausage" msgstr "香肠" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "人肉香肠" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -26272,24 +27189,17 @@ msgstr "一条很大的美味腊肠，已经经过处理熏制，可以长期存 msgid "cooked sausage" msgstr "熟香肠" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "熟人肉香肠" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "一条很大的熟香肠，可以食用了。" -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "人肉香肠" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "" -"一根巨大的人肉香肠，被特别加工以便于长期储存，十分美味。\n" -"\"有些人和笨猪一样，下场也一样。\"" - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -26305,6 +27215,19 @@ msgid "bratwurst" msgid_plural "bratwursts" msgstr[0] "德式香肠" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "德式人肉肠" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26374,6 +27297,13 @@ msgstr "" msgid "glazed tenderloins" msgstr "蜜汁里脊" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26386,6 +27316,20 @@ msgstr "一小块用糖裹起来的里脊肉，伴有蔬菜，营养丰富且十 msgid "currywurst" msgstr "咖喱香肠" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "%s（人肉）" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26397,6 +27341,20 @@ msgstr "一份覆盖有辣味咖喱番茄酱的香肠，香辣四溢。" msgid "aspic" msgstr "肉冻" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "%s（变异肉）" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "%s（人肉）" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26465,6 +27423,13 @@ msgstr "一份金黄色的酥脆炸鱼，油香中富有鱼肉的鲜美，非常 msgid "lunch meat" msgstr "午餐肉" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26476,6 +27441,20 @@ msgstr "将煮熟的肉腌制之后，切成薄片，便于夹在三明治中。 msgid "bologna" msgstr "博洛尼亚红肠" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "%s（人肉）" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26534,6 +27513,19 @@ msgid "sausage gravy" msgid_plural "sausage gravies" msgstr[0] "香肠肉汁" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "人肉香肠浓情汤" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26545,6 +27537,20 @@ msgstr "一份饼干、肉块和美味的蘑菇汤搅在一起的油腻肉汁， msgid "pemmican" msgstr "干肉饼" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "%s（人肉）" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26557,6 +27563,19 @@ msgstr "一份集中混合了脂肪和蛋白质的高营养高能量食物。由 msgid "hamburger helper" msgstr "汉堡助手" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "汉堡\"助手\"" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26578,6 +27597,18 @@ msgid "chili con carne" msgid_plural "chilis con carne" msgstr[0] "墨西哥辣肉酱" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "墨西哥辣人酱" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "墨西哥辣肉酱（变异肉）" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -26644,20 +27675,38 @@ msgstr "切碎的圆蛤浸泡在水里，就这样塞入了罐中。" #: lang/json/COMESTIBLE_from_json.py msgid "clam chowder" -msgstr "蛤蜊杂脍" +msgstr "蛤蜊浓汤" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "肉碎浓汤" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "肉碎浓汤（变异肉）" #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." -msgstr "像湖泊一样起伏的白色蛤蜊汤混杂着马铃薯。新英格兰美食的最后余晖。" +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." +msgstr "一款美味羹汤，通常用蛤蜊炖煮而成，像湖泊一样起伏的白色肉汤之中混杂着马铃薯。新英格兰美食的最后余晖。" #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" msgid_plural "baked beans" msgstr[0] "烘豆" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "黄豆炖肉（变异肉）" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -26668,6 +27717,12 @@ msgid "meat fried rice" msgid_plural "meat fried rice" msgstr[0] "肉块炒饭" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "肉块炒饭（变异肉）" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -26678,6 +27733,13 @@ msgid "deluxe beans and rice" msgid_plural "deluxe beans and rice" msgstr[0] "美味豆拌饭" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "美味豆拌饭（变异肉）" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26689,6 +27751,19 @@ msgstr "将慢火烹制的豆子与米饭一起烹调，配上肉块和调料。 msgid "meat pie" msgstr "肉派" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "肉派（人肉）" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -26698,6 +27773,19 @@ msgstr "一个美味的、满是肉的馅饼，香气四溢。" msgid "meat pizza" msgstr "肉香披萨" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "肉香披萨（人肉）" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26705,11 +27793,27 @@ msgid "" "and heavily seasoned." msgstr "一份加肉披萨，肉食者们的最爱，加入了大量切碎的肉并配以浓郁的酱料。" +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "至尊披萨" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "一款加入了所有配料的至尊披萨。" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" msgstr[0] "美味炒蛋" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "美味炒蛋（变异肉）" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26721,6 +27825,12 @@ msgstr "一块蓬松美味的摊蛋，再加上一些配料，好吃！" msgid "canned meat" msgstr "罐装肉" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "罐装人肉" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26732,6 +27842,12 @@ msgstr "罐装的低盐熟肉，有着全方位的营养补充，尝起来却没 msgid "salted meat slice" msgstr "腌肉片" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "腌肉片（人肉）" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -26742,6 +27858,19 @@ msgid "spaghetti bolognese" msgid_plural "spaghetti bolognese" msgstr[0] "意式番茄牛肉面" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "恶棍意面" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -26751,6 +27880,20 @@ msgstr "软糯的口感，美味的肉汁，让你欲罢不能。" msgid "lasagne" msgstr "千层面" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "%s（人肉）" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26771,17 +27914,44 @@ msgstr "被油炸过，这实际上是非常美味的。" msgid "cheeseburger" msgstr "奶酪汉堡包" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "%s（人肉）" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." +"Cataclysm culinary achievement." msgstr "这个三明治里塞满了美味的碎肉、奶酪和调料。灾前烹饪工艺的巅峰之作。" #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "汉堡包" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "\"汉\"堡包" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -26791,6 +27961,19 @@ msgstr "一个填充肉饼并洒满调料的美味汉堡，食用方便、风味 msgid "sloppy joe" msgstr "碎肉汉堡" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "仨明治" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26802,6 +27985,20 @@ msgstr "一个馅料由肉糜和番茄酱组成的汉堡包。" msgid "taco" msgstr "墨西哥卷饼" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "%s（人肉）" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26815,6 +28012,12 @@ msgstr "" msgid "pickled meat" msgstr "腌肉" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "腌人肉" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26825,6 +28028,14 @@ msgstr "一份爽口罐装腌肉，美味而且营养丰富。" msgid "dehydrated meat" msgstr "脱水肉块" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "%s（人肉）" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26848,6 +28059,14 @@ msgid "haggis" msgid_plural "haggii" msgstr[0] "苏格兰羊杂" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "%s（人肉）" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26875,6 +28094,13 @@ msgid "meat temaki" msgid_plural "meat temaki" msgstr[0] "肉手卷" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26907,6 +28133,13 @@ msgstr "脱水保存以避免烂个精光的受感染的肉，依旧有毒，不 msgid "pelmeni" msgstr "俄式饺子" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26918,6 +28151,12 @@ msgstr "面团里裹了肉的饺子，煮了之后真好吃。" msgid "homemade burrito" msgstr "自制玉米卷饼" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "自制玉米卷饼（变异肉）" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26926,331 +28165,6 @@ msgid "" "but homemade and delicious!" msgstr "墨西哥传统食物，将肉和蔬菜馅料，放在玉米饼上，卷成管状，就像你在加油站找到的那些一样，但自制的更加美味可口！" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "脱水人肉" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "" -"一些片装的脱水人肉，如果储存妥善，这种干燥的食物可以保存非常长的时间。\n" -"\"该受害者死于严重脱水。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "水发人肉" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "" -"一些由脱水后再水发的碎人做的人肉片，泡水后口味更佳了。\n" -"\"处理的非常好，保证不会发生巨人观。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "苏格兰杂碎" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"苏格兰传统风味布丁，将那个杂碎的杂碎加上燕麦片混合后放入那个杂碎的胃里缝好、煮熟。如果你喜欢吃人，你会发现这玩意充实而美好，与他的一生形成鲜明对比。正宗吃法还要搭配煮根菜，再来点高度威士忌。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "博洛尼亚人肠" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "经过切碎腌制的细人肉末，被灌进肠衣后切成圆形薄片。他也许曾经叫奥斯卡，能当作冷盘吃，就像现在的冷血食人的你。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "咖喱人肉香肠" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "" -"一份泡在辣味咖喱酱里的人肉香肠，香辣四溢。\n" -"\"肉中散发着咖喱的香味，肉源可能是印度品种。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "人肉香肠浓情汤" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "一份将饼干，人肉和美味的蘑菇汤搅在一起的油腻肉汁，香喷喷的，非常好吃。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "肉冻小人" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "" -"一份加工过的人肉冻，富含人骨胶原蛋白。\n" -"\"真是个好吃的小滑头。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "\"生存者\"干肉饼" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "一份集中混合了脂肪和蛋白质的高营养高能量食物。由牛油、可食用植物和一名不幸的\"生存者\"制成，营养丰富，便于携带。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "懒人三明治" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "" -"一份面包中间夹着人肉的三明治。\n" -"\"生前夹在家庭与工作之中，如今夹在面包片之中。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "特级仨明治" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "这个三明治里塞满了美味的人肉、蔬菜、奶酪和调料。灾前烹饪工艺的巅峰之作。尽情品尝你敌人的灵魂和美味菜园的绿色蔬菜吧。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "汉堡\"助手\"" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "芝士通心粉加碎肉。这肉……好像是助手做的。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "墨西哥辣人酱" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "" -"利用人肉、辣椒、番茄和豆子熬制而成。\n" -"\"墨西哥毒品战争的始作俑者。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "人肉乐天派" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "" -"一份添加了人肉制成的烤派，香气四溢。\n" -"\"添加了些士兵、科学家、瘾君子、运动员或者刚刚弄死的家伙的肉，美味。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "人肉披萨" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "" -"一份全肉披萨，专为食人族制定，非常美味。\n" -"\"精选新鲜人类碎肉、加上三倍香料，现已加入豪华午餐。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "罐装人肉" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "" -"罐装的低盐人肉，有着全方位的营养补充，尝起来却没有熟肉的味道。\n" -"\"缸中脑，罐中肉。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "腌人肉片" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "" -"用盐腌制并真空包装的人肉片。很咸，但是作为一道应急配菜仍然非常美味。\n" -"\"生前会口渴，死后会可口。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "恶棍意面" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "" -"厚厚的人肉酱汁盖着的意大利面，如果你喜欢这东西的话会感到很美味。 \n" -"\"意大利传统美食。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "千人千面" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "非常古老的面食，由数层面饼与奶酪、人肉馅、酱汁烹制而成。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "人酪汉堡包" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "一份塞满了碎人肉和奶酪、经过适当调味的三明治，后大灾变时代人肉美食的巅峰之作。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "人肉汉堡包" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "" -"一个填充人肉并洒满调料的美味汉堡，食用方便、风味可口、营养全面，含有过量人肉成分，超过了美国食品和药物管理局规定的4%限量。\n" -"\"一位德国汉堡市的良好市民。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "仨明治" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "" -"一个填充了人肉成分的三明治。\n" -"\"著名的明治维新三杰，简称三明治。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "墨西哥卷人饼" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "" -"一份墨西哥传统料理，把人肉馅夹在或卷在用玉米面或小麦面烙成的薄饼里制成。\n" -"\"毒品战争的受害者都变成了这份传统料理。\"" - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "生人肉香肠" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "一条很大的生\"两脚羊\"香肠，可以用来熏制或烹饪。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "熟人肉香肠" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "一条很大的生香肠，可以食用了。真是一道\"人气美食\"啊。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "德式人肉肠" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "一种德式香肠，由被切细的碎人肉制成，需要使用平底锅煎或烤制后食用。最好是趁热吃新鲜的。顺便说一句，任何人都行，不一定必须用德国人。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "腌人肉" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "" -"一份爽口的罐装腌人肉。\n" -"\"该受害者被活活咸死。\"" - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -28020,7 +28934,7 @@ msgstr "风味骨粉片" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." +" as palatable as the pre-Cataclysm tablets." msgstr "一份用骨粉制成的自制钙补充剂。由于添加了甜味剂来抵消原本粉状质地和骨灰味道，它现在几乎和大灾变前的药片一样可口。" #: lang/json/COMESTIBLE_from_json.py @@ -28591,7 +29505,7 @@ msgstr "鸟类诱变血清" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "超浓缩的诱变剂，那种蓝色让你想起了大灾变之前的天空。你需要一个针管来注射……如果你真的想用的话。" @@ -29462,7 +30376,7 @@ msgstr[0] "马洛斯明胶" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." msgstr "这看起来就像凝固住的柠檬色液体，活像末日前的果冻。香气浓郁，芬芳扑鼻，但显然经过了变异，或许是外星产物也说不准。" @@ -29727,13 +30641,13 @@ msgstr[0] "狗粮" msgid "This is food for dogs. It smells strange, but dogs seem to love it." msgstr "狗粮，闻起来很奇怪，但是狗狗喜欢。" -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "猫食" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "猫粮，闻起来很奇怪，但是猫猫喜欢。" @@ -29770,58 +30684,27 @@ msgstr[0] "花蜜" msgid "Some nectar. Seeing this item is a bug." msgstr "一些花蜜。该物品不应该出现在正常游戏中。" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "蛋白饮料" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "Soylent Green人造蛋白饮料" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "精制人体蛋白质粉与水的混合稀浆，虽然很有营养，但味道并不怎么样。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" -msgstr[0] "Soylent Green人造蛋白粉" - -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "" -"精制蛋白质原粉，精选人体制成！虽然很有营养，但是这种纯净形态让你难以下咽，冲泡后食用。（注：原文Soylent " -"Green为1973年一部科幻反乌托邦电影，Soylent Green是电影中的一种\"人造\"食物）" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "Soylent Green混合蛋白饮料" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "由人体蛋白粉和水果混合而成的营养丰富的美味饮料，口感醇厚。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "Soylent Green增强型营养饮料" - -#. ~ Description for fortified soylent green shake +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "由人体蛋白粉和水果混合而成的营养丰富的美味饮料，口感醇厚。特别添加人体所需的维生素和矿物质，均衡膳食营养。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "蛋白饮料" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" +msgstr[0] "%s（变异肉）" #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py @@ -29835,6 +30718,13 @@ msgid "protein powder" msgid_plural "protein powder" msgstr[0] "蛋白粉" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "Soylent Green人造蛋白粉" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29843,12 +30733,10 @@ msgid "" msgstr "精制蛋白质原粉。虽然很有营养，但是这种纯净形态让你难以下咽，冲泡后食用。" #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "应急蛋白口粮" +msgid "protein ration" +msgstr "蛋白口粮" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -29865,6 +30753,12 @@ msgstr "" msgid "protein shake" msgstr "蛋白混合饮料" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "人肉蛋白饮料" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29876,6 +30770,13 @@ msgstr "由蛋白质粉和水果混合而成的营养丰富的美味饮料，口 msgid "fortified protein shake" msgstr "增强型蛋白混合饮料" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "增强型人肉蛋白饮料" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30650,6 +31551,12 @@ msgid "deluxe sandwich" msgid_plural "deluxe sandwiches" msgstr[0] "特级三明治" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "特级三明治（变异肉）" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30736,6 +31643,20 @@ msgid "meat sandwich" msgid_plural "meat sandwiches" msgstr[0] "火腿三明治" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "懒人三明治" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "%s（变异肉）" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -31623,15 +32544,6 @@ msgstr "炖骨汤" msgid "A tasty and nutritious broth made from bones." msgstr "一份营养丰富且美味的骨头汤。" -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "人骨汤" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "一份用人骨慢火熬成的富含营养的骨头汤，富含骨胶原等营养物质。" - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "蔬菜浓汤" @@ -31645,6 +32557,12 @@ msgstr "一份营养丰富且美味的蔬菜汤。" msgid "meat soup" msgstr "肉汤" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "浓情人肉汤" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -31674,6 +32592,12 @@ msgid "curry with meat" msgid_plural "curries with meat" msgstr[0] "咖喱炖肉" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "咖喱（变异肉）" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -31683,22 +32607,17 @@ msgstr "一份加满了辣椒丁和肉丁的香辣酱的咖喱炖肉，鲜香可 msgid "woods soup" msgstr "森林杂烩汤" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "森林杂烩汤（变异肉）" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "一份用大自然的馈赠做成的美味的汤，极富营养价值。" -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "浓情人肉汤" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "" -"一份用人肉蒸煮而成的汤。\n" -"\"有些人作汤比做汤更合适。\"" - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "鸡汤面" @@ -32728,17 +33647,6 @@ msgid "" " resembles spoiled milk." msgstr "为了稀释营养素片的味道，将其溶于水后的产物。就像变质的牛奶一样令人恶心。" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "面团" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "与水混合的面粉，被揉成黏糊糊的一团。这种面团相比于面粉，更适合用来烤面包。" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "阳光水" @@ -32787,6 +33695,17 @@ msgid "" "installation of bionics." msgstr "混合了多种毒品的阳光凝胶，但却没有任何副作用。其止痛效果并未变化，但原有的强效兴奋作用已被逆转，可用于安装生化插件时的麻醉。" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "面团" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "与水混合的面粉，被揉成黏糊糊的一团。这种面团相比于面粉，更适合用来烤面包。" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "吸血鬼诱变剂" @@ -32805,9 +33724,9 @@ msgstr "吸血鬼诱变血清" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" -msgstr "一种超浓缩、黑沥青状、带着让你联想起灿烂星空的银色斑点的物质。你需要一个针管来注射它……如果你真的想用的话。" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" +msgstr "一种超浓缩、黑色沥青状物质，带有让你联想起灿烂星空的闪闪发光的银色斑点。你需要一个针管来注射它……如果你真的想用的话。" #: lang/json/COMESTIBLE_from_json.py msgid "wendigo mutagen" @@ -32821,9 +33740,9 @@ msgstr "雪怪诱变血清" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" -msgstr "一种超浓缩的泥炭棕色物质，带有闪闪发光的绿色斑点，让人想起一棵树。你需要一个针管来注射它……如果你真的想用的话。" +msgstr "一种超浓缩、棕色泥炭状物质，带有让你联想起树木的闪闪发光的绿色斑点。你需要一个针管来注射它……如果你真的想用的话。" #: lang/json/COMESTIBLE_from_json.py msgid "SpOreos" @@ -33069,17 +33988,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "从尖叫蘑菇怪身上获得的蘑菇。可以用来炼制药剂。" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "树脂线" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "原始粘合材料，由线团和自然粘合剂混合制成。用于修复木、纸、骨、几丁质制品。" - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "糖猫尸体" @@ -33087,8 +33995,8 @@ msgstr "糖猫尸体" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "一具糖猫的尸体，现在看起来真像一块巨大的彩虹糖。咬一口肯定没关系的，对吧？" #: lang/json/COMESTIBLE_from_json.py @@ -33111,7 +34019,7 @@ msgstr[0] "卵状畸形体" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" +"uncontested and partake of the Fruit. We can't have that, can we?" msgstr "如果吾等将其留在此处，就会有人大摇大摆地走进花丛享用果实。吾等不可让此事发生，是不是？" #: lang/json/COMESTIBLE_from_json.py @@ -33123,7 +34031,7 @@ msgstr[0] "种子状畸形体" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" +"uncontested and partake of the Seed. We can't have that, can we?" msgstr "如果吾等将其留在此处，就会有人大摇大摆地走进花园享用种子。吾等不可让此事发生，是不是？" #: lang/json/COMESTIBLE_from_json.py @@ -33135,7 +34043,7 @@ msgstr[0] "马洛斯明胶" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" msgstr "如果吾等将其留在此处，就会有人大摇大摆的走进尖塔享用汁液。嘿，等等，你怎么弄到这个东西的？" #: lang/json/COMESTIBLE_from_json.py @@ -33146,9 +34054,9 @@ msgstr[0] "果实状畸变体" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." -msgstr "吾等不应存在在这一时空，聪明的小小人类哟，汝是用了调试模式吗，在完成设定之前，吾等是不能允许汝加入的。" +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." +msgstr "吾等不应存在在这一时空，聪明的小小人类哟，汝是用了调试模式吗，在当前模组加载设置下，吾等是不能允许汝加入的。" #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -33261,7 +34169,7 @@ msgstr[0] "无麸质花生酱蜂蜜三明治" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" +"right mind- oh wait this is pretty good. Gluten free too!" msgstr "" "一份将蜂蜜涂抹在两片无麸质面包片的花生酱三明治，简单的加工却让本身单调的花生酱变得美味起来。\n" "\"哪个傻瓜把蜂蜜抹在花生酱三明治上面……等等，真香。\"" @@ -33285,15 +34193,15 @@ msgstr "无乳糖山胡桃酿" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." msgstr "一份用代乳制作的美味山核桃酿，神的饮品。" #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." msgstr "看上去像一份玉米粉……或者大米粉……或者其他什么粉。但它肯定不是小麦粉！它可以被用来烘培成各类食物。" #: lang/json/COMESTIBLE_from_json.py @@ -33303,8 +34211,8 @@ msgstr "无麸质玉米烤饼" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " msgstr "我们会时常想吃点烤面饼。玉米面粉或许无法代替小麦粉，但它确是一种兼具味道与营养的无麩质油炸面食。" #: lang/json/COMESTIBLE_from_json.py @@ -33340,7 +34248,7 @@ msgstr[0] "无麸质无乳糖水果馅饼" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." msgstr "用你仅能吃的东西做成的馅饼，至少它加了真正的枫糖，混合水果之后更加香甜与健康。" @@ -33376,8 +34284,8 @@ msgstr[0] "无麸质无乳糖法式烤面包" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." msgstr "切片的无麸质面包浸过代乳和蛋的混合物之后炸成。你从没想过这玩意真能做出来，不过现在你感觉自己就像一名真正的00后了。" #: lang/json/COMESTIBLE_from_json.py @@ -33466,7 +34374,7 @@ msgstr "无麸质奶酪汉堡包" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." +"of pre-Cataclysm culinary achievement." msgstr "这个无麸质三明治里塞满了美味的碎肉、奶酪和调料。这是大灾变前烹饪工艺的巅峰之作。" #: lang/json/COMESTIBLE_from_json.py @@ -33586,7 +34494,7 @@ msgstr[0] "无麸质单调三明治" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" +" the bread… especially if it is the wrong type of bread!" msgstr "单一调味酱的无麸质三明治。比起面包夹面包好得多。特别是当那些面包还有麸质的时候……" #: lang/json/COMESTIBLE_from_json.py @@ -33595,7 +34503,7 @@ msgstr "无麸质华夫饼" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgid "Gluten free waffle. It's basically a pancake in hashtag form." msgstr "无麸质华夫饼。它基本上是一个夹心烤饼干。" #: lang/json/COMESTIBLE_from_json.py @@ -33604,13 +34512,13 @@ msgstr "无乳糖华夫饼" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgid "Lactose free waffle. It's basically a pancake in hashtag form." msgstr "无乳糖华夫饼。它基本上是一个夹心烤饼干。" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." msgstr "无麸质无乳糖华夫饼。它基本上是一个夹心烤饼干。" @@ -33655,7 +34563,7 @@ msgstr[0] "米浆" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." msgstr "比真正的牛奶要甜，尝起来很像香草味雪糕，很快就会变质。" @@ -33667,7 +34575,7 @@ msgstr[0] "椰子水" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." msgstr "椰奶冲了水让它变得更清淡些，但尝起来还行，很快就会变质。" @@ -34441,6 +35349,16 @@ msgid "" "it's anyone's guess what it's for." msgstr "绅士的气球，一次性生命预防器，乳胶无指手套。可用来装液体，但是别人会怀疑里面装着体液。" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "气球" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "一个儿童气球。可以作为简易的水容器使用。" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -35157,6 +36075,26 @@ msgid "corpse" msgid_plural "corpses" msgstr[0] "尸体" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "胴体" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "%s（已剥皮）" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "四分体" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -35174,12 +36112,7 @@ msgid "" " so with a gigantic claw." msgstr "一具严重受损并脱水的尸体，看起来是被某种东西用巨大的爪子杀掉的。" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "人类尸体" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "一具人类的尸体。" @@ -35269,6 +36202,32 @@ msgid "" "wound." msgstr "一具头没了一半的尸体。造成这种损伤的原因不得而知。" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "磁控管" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "一个能够产生微波的电子元件，主要用于微波炉中。" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "爆磁压缩发生器" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "一个大型爆炸装置，其中主要部分是一根内部装满高能炸药且外部缠满电线的大型铜管。当正确引爆时，爆炸装置能在极短的时间内产生巨大的电磁脉冲。" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -36922,6 +37881,136 @@ msgstr[0] "钻石" msgid "A sparkling diamond." msgstr "一颗闪闪发光的钻石。" +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "石榴石" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "一颗闪闪发光的石榴石。" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "紫水晶" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "一颗闪闪发光的紫水晶。" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "海蓝宝石" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "一颗闪闪发光的海蓝宝石。" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "祖母绿" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "一颗闪闪发光的祖母绿。" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "紫翠玉" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "一颗闪闪发光的紫翠玉。" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "珍珠" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "一颗光滑圆润的珍珠。" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "红宝石" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "一颗闪闪发光的红宝石。" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "橄榄石" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "一颗闪闪发光的橄榄石。" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "蓝宝石" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "一颗闪闪发光的蓝宝石。" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "猫眼石" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "一颗光滑圆润的猫眼石。" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "电气石" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "一颗闪闪发光的电气石。" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "黄水晶" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "一颗闪闪发光的黄水晶。" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "蓝黄玉" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "一颗闪闪发光的蓝黄玉。" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -37884,9 +38973,9 @@ msgstr[0] "铁拳套" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." -msgstr "一只沉重的金属护手，套在拳头上可以增加打击力度，下方增加了结实的衬垫保护穿戴者的手不受伤害。" +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." +msgstr "一个皮革缠绕而成的护手和护臂，在指关节上嵌入了金属板，以提高拳击威力和防护。" #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -38578,17 +39667,17 @@ msgstr[0] "小型坦克履带组" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "一组小型坦克履带，就像“\"猎兔犬\"型无人坦克用的那种。" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "炮塔底盘" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "炮塔支架" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." -msgstr "移除所有可动部件和电子设备时剩下的，是炮塔的骨架和装甲。" +"skeleton of a turret." +msgstr "移除所有可动部件和电子设备后剩下的构成炮塔的骨架。" #: lang/json/GENERIC_from_json.py msgid "tripod chassis" @@ -40422,6 +41511,274 @@ msgid ".50 ammo belt linkage" msgid_plural ".50 ammo belt linkages" msgstr[0] ".50 子弹带链节" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "虚拟毛刷" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "一般物品模板" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "肥皂盒" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "用来盛肥皂的浅盒子，内部有帮助排水的凸出的脊。这并不是什么能让你兴高采烈的战利品。" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "剃须刀" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "一把剃须刀，刀片安装在一个舒适的手柄上。用剃须刀刮胡子比起直接用剃须刀片来要容易得多。" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "牙刷" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "一根顶部有软毛的用来清洁你的牙齿的塑料牙刷。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "一根顶部有软毛的用来清洁你的牙齿的塑料牙刷。它有着廉价的长条形手柄，很可能是一次性的。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "一根带有牙龈按摩器的复合型牙刷。它有一个符合人体工程学的硅橡胶握把。真是豪华！" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "一根顶部有软毛的用来清洁你的牙齿的塑料牙刷。手柄上的蓝色和白色图案暗示着干净清洁。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "一根专为儿童设计的短牙刷。手柄上有一只大眼睛的卡通小马。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "一根专为儿童设计的短牙刷。手柄上有一辆笑逐颜开的红色赛车。" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "发梳" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "一个用来折磨头发的工具。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "一个用来折磨头发的工具。刚毛尖端有许多圆形的安全帽。" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "一根带有人造木柄的老式直排头发梳理工具。" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "一根柔软的带有软垫的发梳。闪亮的镀铬设计看起来很现代。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "一把十分俗气的儿童发梳。手柄上的卡通鲸鱼似乎很友好。" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "卷发器" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "一个柔软的塑料圆柱体，可以用它把你的头发卷曲起来。" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "牙线" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "一根长25码的细蜡线缠绕在一个塑料容器上。最适合用来取出塞在牙齿上的熏肉。拆解它可获得细线。" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "梳子" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "一个带有许多梳齿的梳妆工具，能用来理顺你的头发。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "不知怎么回事，这把看上去全新的梳子上已经有几个梳齿折断了。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "一个带有许多梳齿的梳妆工具，能用来理顺你的头发。这把又窄又黑又朴实。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "用软塑料制成的梳子。上面的龟甲式图案使它显得古色古香。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "一把带有折叠铰链的梳子，想当油头滑面的时髦少年就带上它吧。" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "马桶塞" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "一根用来通管道的带有橡胶头的工具，也是一根新手幸存者所使用的棍子。" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "专业马桶塞" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "一根内部中空的塑料马桶塞，顶部能像手风琴一样压缩。它用来通马桶当然十分有效，但作为武器使用时完全就是垃圾。" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "厕纸" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "一卷人类文明最后的奢华遗物。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "用尽你的想象力想象一下最薄、最一次性的厕纸。然后再想象一下比这更薄的东西。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "这卷厕纸采用双层纸张，中间还加了衬垫，用来破坏房屋比以往任何时候都更舒适。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "这个牌子的厕纸号称完全溶于水！" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "你最讨厌的政客的照片被印在每一张厕纸上。" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "一卷人类文明最后的奢华遗物。不过，其中可见的未经加工的木屑使它看起来不那么奢华了。" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "吹风机" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "一个通过加热线圈及推动空气使你的头发变干的电动工具。在没有能运作的电网之后，这不过是一个机械化的镇纸。" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] " 卷发钳" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "一根采用耐热陶瓷制成的短棒。当插入插座后，它能够加热到使你的头发卷曲的温度。可惜停电了。" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "马桶刷" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "丧尸没法被恐吓或羞辱，所以这把坚硬的刷子只适合用来刷马桶。" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -40548,15 +41905,39 @@ msgid "An empty casing from a 10mm Auto round." msgstr "10mm Auto弹的空弹壳。" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "40mm 榴弹壳" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "40x46mm M212 榴弹弹壳" -#. ~ Description for 40mm canister +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." +msgid "A large canister from a spent 40mm cartridge." msgstr "40mm 榴弹发射后留下的大号弹壳。" +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "40x46mm M118 榴弹弹壳" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "40x46mm M199 榴弹弹壳" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "40x46mm M195 榴弹弹壳" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "40x53mm M169 榴弹弹壳" + #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" msgid_plural ".44 Magnum casings" @@ -40888,16 +42269,6 @@ msgid "generic silverware" msgid_plural "generic silverwares" msgstr[0] "一般银器" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "一般物品模板" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -43457,6 +44828,26 @@ msgid "" msgstr "" "这是一个小盒子，里面有各种各样的夹具，可以安装在铁架台上。所有夹具的螺栓都至少缺少了一个用于拧紧的蝶形螺母。似乎有人明智地使用了纽带、管道胶带和其他材料来代替。" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "订书机" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "一种将纸张固定在一起的订书机。" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "圆珠笔" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "一根塑料圆珠笔。" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -44970,8 +46361,8 @@ msgstr[0] "加密币" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" "PrepNet一直在大量使用无法追踪的互联网数字货币来避税。如果该运动持续下去的话，它很可能会大大削弱美国税基，但大灾变先其一步到来了。这些实体硬币上面印有随机数序列表明其对应的数字货币。" @@ -45095,12 +46486,80 @@ msgstr[0] "原子黄油搅拌机（折叠）" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." msgstr "" "Rivtech搅拌终结者4000型，世上唯一一种被13种不同宗教教派禁用的搅拌机。支架已经被折叠起来便于携带。不同于普通搅拌器需要事先将奶油从生奶中分离，这台搅拌机只需要你手头有生牛奶，食用盐以及对闪闪发光的辐射机器的适当尊重。" +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "缸中之脑" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "这个罐子里装着一个人类的大脑，并由米·戈科技维持生存。它外部有许多金属的脉状卷须，似乎可以让它连接到各种设备。" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "蜂鸣之心" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" +"这个类似心脏的器官上有多个瓣膜，当它被正确地从生物武器的尸体上移除之后，所有阀门都会自动封闭起来。它在你的手中轻声地嗡嗡作响，仿佛在等待一个合适的容器。" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "感官集簇" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" +"这个肉块上有各种突出的叶片，每隔一段时间就会发出不同音调的声音。也许它可以通过回声定位。就像其他的米·戈生物身体部件一样，这块躯体的开口在它被从尸体上切除后就关闭了，它似乎进入了一种冬眠的形式，为了保存能量，脉动的速度越来越慢。" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "生物武器底盘" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" +"这个看上去像海葵和你所想象的巨龙龙嘴杂交而成的怪物是某种生物武器的核心部件。你无法想象你还能把它用来做什么，但也许在某个地方有某个人能够将它派上用场。" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "米·戈炮塔（损坏）" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." +msgstr "一个损坏的米·戈炮塔。它正在泄漏出你无法辨认的气味和液体。可以拆解得到部件。" + #: lang/json/GENERIC_from_json.py msgid "hydraulic gauntlet" msgid_plural "hydraulic gauntlets" @@ -47048,9 +48507,22 @@ msgstr[0] "隐身卷轴" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" +"The light can not interact with you unless you want it to. Become " +"invisible!" msgstr "没有你的允许，光将不会与你发生作用。隐身！" +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "朦胧术卷轴" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." +msgstr "一个魔法光环扭曲了你身体周围的光线，使你更容易闪避敌人的攻击。" + #: lang/json/GENERIC_from_json.py msgid "Scroll of Smite" msgid_plural "Scroll of Smites" @@ -48158,6 +49630,16 @@ msgstr[0] "普通的魔法书" msgid "A small book, containing spells created by a novice magician." msgstr "一本小型书籍，内部包含了由一名新人魔法师创造的几个法术。" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "光影和幻象" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "一本白色小册子，它淡淡地增强了四周的光。" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -48318,6 +49800,45 @@ msgid "" "hopes to discover a more permanent solution." msgstr "人类是寻求自我提升的生物。这本著作详细研究了许多可以暂时增强人类身体极限的法术，希望能从中寻找到一个更持久的解决方案。" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "巨木棒" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "一根顶端有个十分粗壮疙瘩的坚固木棍。虽然它很重，但在力量强大的人手中，它是非常有效的武器。" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "木制三叉戟" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" +"这根木制近战武器的顶端安装了一个手工锻造的三叉钢叉。它可以用来近距离穿刺敌人，也可以作为投掷武器使用，在知道如何正确使用的人手中可以很容易地解除对手的武装。" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "带刺标枪" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "这根大约有3英尺长的标枪上像箭一样安装了尾翼，提高了命中率。它的尖端有个看上去很邪恶的倒钩，能够导致大量出血。" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -48635,7 +50156,7 @@ msgstr[0] "掠行机器人（无武装）" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." msgstr "一个损坏的掠行机器人。内置武器已经被拆卸掉。可以拆解得到部件或者改装再利用。" @@ -48660,7 +50181,7 @@ msgstr[0] "防御机器人（无武装）" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "一个损坏的防御机器人。内置武器已经被拆卸掉。可以拆解得到部件或者改装再利用。" @@ -48692,7 +50213,7 @@ msgstr[0] "双足机器人（无武装）" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "一个损坏的双足机器人。内置武器已经被拆卸掉。可以拆解得到部件或者改装再利用。" @@ -49185,7 +50706,7 @@ msgstr[0] "机器废料牛仔（损坏）" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." msgstr "一个损坏的改装机器人。可以拆解得到部件或者改装再利用。" #: lang/json/GENERIC_from_json.py @@ -49211,8 +50732,8 @@ msgstr[0] "军训机器人（损坏）" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." msgstr "一个损坏的军训机器人，内置了一把彩弹枪。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #: lang/json/GENERIC_from_json.py @@ -49223,43 +50744,43 @@ msgstr[0] "军用机器人（损坏）" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." msgstr "一个损坏的军用机器人，内置了一把5.56mm口径枪械。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." msgstr "一个损坏的军用机器人，内置了一把7.62mm口径枪械。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." msgstr "一个损坏的军用机器人，内置了一把 .50 口径枪械。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." msgstr "一个损坏的军用机器人，内置了一把8x40mm无壳弹枪械。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." msgstr "一个损坏的军用机器人，内置了一把镖形弹枪械。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." msgstr "一个损坏的军用机器人，内置了一把40mm榴弹发射器。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #: lang/json/GENERIC_from_json.py @@ -49270,8 +50791,8 @@ msgstr[0] "军用喷火机器人（损坏）" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." msgstr "一个损坏的军用机器人，内置了一把火焰喷射器。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #: lang/json/GENERIC_from_json.py @@ -49284,8 +50805,10 @@ msgstr[0] "守护者机器人（损坏）" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "一个损坏的改装机器人。可以拆解得到部件或者改装再利用。" #: lang/json/GENERIC_from_json.py @@ -49295,7 +50818,7 @@ msgstr[0] "豪华机器人（损坏）" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." +msgid "A broken deluxe robot. Could be stripped or recrafted." msgstr "一个损坏的豪华机器人。可以拆解得到部件或者改装再利用。" #: lang/json/GENERIC_from_json.py @@ -49316,7 +50839,7 @@ msgstr[0] "高级机器人（无武装）" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." msgstr "一个损坏的高级机器人。内置武器已经被拆卸掉。可以拆解得到部件或者改装再利用。" @@ -49328,29 +50851,29 @@ msgstr[0] "高级机器人（损坏）" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." msgstr "一个损坏的高级机器人，内置了一把激光武器。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." msgstr "一个损坏的高级机器人，内置了一把等离子发射器。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." msgstr "一个损坏的高级机器人，内置了一个放电装置。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." msgstr "一个损坏的高级机器人，内置了一把EMP发射器。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #: lang/json/GENERIC_from_json.py @@ -49373,8 +50896,8 @@ msgstr[0] "机器电锯狂人（损坏）" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." msgstr "一个损坏的改装机器人，谢天谢地它可算是歇了。可以拆解得到部件或者改装再利用。" #: lang/json/GENERIC_from_json.py @@ -49392,12 +50915,6 @@ msgid "broken fist king" msgid_plural "broken fist kings" msgstr[0] "机器铁拳国王（损坏）" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "一个损坏的改装机器人。可以拆解得到部件或者改装再利用。" - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -49513,7 +51030,7 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." +"you…" msgstr "" "这滩无定形物质似乎已经成长完成；其先进的内部结构就能够证明。它能够通过调整体内液压进行移动，同时能够承担大量负载，并且显示出惊人的智力，能够通过伸长的伪足操纵连接着的任何东西，无论是变形怪部件还是其他载具部件。你认为你可能能够控制它，并通过它，控制所有连接的载具部件。然而这需要你和它亲密接触一番；让人更加不安的是，它看起来十分愿意容纳你……" @@ -49562,6 +51079,11 @@ msgid "" msgstr "" "一打强化高能太阳能电池板被安装在几米高的底盘上。使脆弱的太阳能板安全地远离任何潜在威胁，并能跟踪太阳以提高发电效率。代价是整套系统变得非常沉重而且无法通行。" +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "炮塔底盘" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -49607,10 +51129,10 @@ msgstr[0] "稳定传送门" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" msgstr "" -"可以在现实中移动的深渊洞口，内部空间仿佛无穷无尽，当你凝视它时，脑海中回响着来自永恒的声音：\"真正无穷无尽的事物有两种：宇宙，和人类的盗窃癖。\"" +"当你看从这一在现实中可延展的洞口中看进去里面这样无限深的空洞时，一句远古的话语在你的脑中回想：它的意思是：\"只有两种东西是无边际的：宇宙和人类的盗窃癖。\"" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -50845,6 +52367,17 @@ msgid "" " reload a compatible revolver." msgstr "这个快速装弹器可以装载 5 发 .357 马格南弹或 .38 特装弹，为兼容左轮手枪快速装弹。" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "6发快速装弹器 （.38/.357）" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "这个快速装弹器可以装载 6 发 .357 马格南弹或 .38 特装弹，为兼容左轮手枪快速装弹。" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "Kel-Tec P3AT 手枪弹匣" @@ -50910,6 +52443,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "一个紧凑的钢制盒式弹匣，可用于陶鲁斯\"光谱\"手枪。" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "AF2011A1弹匣" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "两个 .38 超级弹8发盒式弹匣被连接在同一个基座上，总共可容纳16发子弹，AF2011A1 双管手枪专用。" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "M1911 .38超级弹匣" @@ -51218,9 +52762,9 @@ msgstr "5发快速装弹器（.454口径）" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." -msgstr "这种快速装弹器能装载5发.454或.45口径子弹，为兼容的左轮手枪快速装弹。" +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." +msgstr "这种快速装弹器能装载5发.454或.45口径子弹及.410口径霰弹，为兼容的左轮手枪快速装弹。" #: lang/json/MAGAZINE_from_json.py msgid "H&K 4.6mm extended magazine" @@ -51973,7 +53517,7 @@ msgid "" "A plastic tube with a sliding handle that can be used to quickly load 6 " "rounds into a shotgun's tube in a much shorter period of time than by hand." " It needs to interface with a chute to be used with any speed." -msgstr "一根带滑动手柄的塑料管，能够比手工装填更快地将 6 发霰弹装入霰弹枪中。它需要与枪上的滑槽接口对接才能使用。" +msgstr "一根带滑动手柄的塑料管，能够比手工装填更快地将 6 发霰弹装入霰弹枪中。它需要与枪上的滑槽接口对接，才能快速使用。" #: lang/json/MAGAZINE_from_json.py msgid "shotgun 8-round speedloader" @@ -52419,9 +53963,9 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"一件生物学之谜，这只变形怪已经进化出了通过未知途径缓慢产生电力的能力。它在这样做时会发出亮度很低的磷光。它也能够存储从其他来源的电力，但这样做使它不工作。看起来柔韧得似乎可以被直接拉开…" +"一件生物学之谜，这只变形怪已经进化出了通过未知途径缓慢产生电力的能力。它在这样做时会发出亮度很低的磷光。它也能够存储从其他来源的电力，但这样做使它不工作。看起来柔韧得似乎可以被直接拉开……" #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -52470,24 +54014,6 @@ msgstr "" msgid "pebble hopper" msgstr "小石子漏匣" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "AF2011A1弹匣" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "装到同一个位置上的两个并排弹匣。AF2011A1手枪专用。" - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "M1991A1 .38超级弹匣" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "一个用于M1991A1 .38超级手枪的9发弹匣。" - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "默认" @@ -52707,9 +54233,9 @@ msgstr "Fuji的更多建筑包" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" -msgstr "增加了更多新建筑和已有建筑的新建筑形式。（需要开启更多建筑）" +msgstr "增加了更多新建筑和已有建筑的新建筑形式。（需要启用更多的地点）" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -52730,7 +54256,7 @@ msgstr "图形版大地图" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "重新制作大地图显示模式。查看Readme了解安装方法。" @@ -52762,7 +54288,7 @@ msgstr "水培种植" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." msgstr "添加水培单元，一种可以提高种植在其中的作物产量的新家具。偶尔会在实验室或地下室生成，也可以自己建造。" @@ -52856,8 +54382,8 @@ msgstr "变异NPC" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" -msgstr "有些在废土世界游荡的NPC们会带有变异---你的敌人也会如此。当心点！" +"included. Beware!" +msgstr "有些在废土世界游荡的NPC们会带有变异——你的敌人也会如此。当心点！" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -52866,10 +54392,9 @@ msgstr "甜蜜大灾变" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" -msgstr "大灾变是好事，但如果你能让它变甜一点呢？不如变成一个糖人在这个灾变后的世界中和你的宠物糖果猫一起四处游荡？" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" +msgstr "不如变成一个糖人和你的宠物糖果猫一起畅游大灾变？" #: lang/json/MOD_INFO_from_json.py msgid "NPC traits" @@ -53173,7 +54698,7 @@ msgstr "Ben的定制菜单" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." msgstr "添加了一些简单的无麸质和无乳糖的替代食物的制作配方。尚不完整。" @@ -53211,9 +54736,9 @@ msgstr "替换小地图图标" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." -msgstr "将小图标替换为更容易阅读的图标。原本采用不同色彩分别的建筑物使用建筑名称的首字母，而非\"^v<>\"符号。" +msgstr "将地图建筑物图标替换为更容易阅读的图标。使用不同色彩区分的建筑名称首字母而不是\"^v<>\"符号。" #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -53354,9 +54879,9 @@ msgstr "发现玩家图标，HitButton_iso版" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." -msgstr "如果一个生物看到了一个玩家，添加一个黄色的！图标。专为HitButton isometric贴图包设计。" +msgstr "如果某个生物看到了你，会显示一个！图标。专为 HitButton isometric 贴图包设计。" #: lang/json/MOD_INFO_from_json.py msgid "sees-player icon, +attitude" @@ -53366,8 +54891,8 @@ msgstr "发现玩家+态度图标，Live/Dead people版" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." -msgstr "如果一个生物看到了一个玩家，添加一个黄色的！图标，气泡颜色表示对玩家的态度，红色-敌对。专为Live/Dead people贴图包设计。" +"bubble otherwise. Designed for Live/Dead people tileset." +msgstr "如果某个生物看到了你，会显示一个！图标，同时用不同颜色表示对你的不同态度。专为 Live/Dead people 贴图包设计。" #: lang/json/MOD_INFO_from_json.py msgid "sees-player icon, -attitude" @@ -53377,8 +54902,8 @@ msgstr "发现玩家图标，Live/Dead people版" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." -msgstr "如果一个生物看到了一个玩家，添加一个黄色的！图标。专为Live/Dead people贴图包设计。" +"is unseen. Designed for Live/Dead people tileset." +msgstr "如果某个生物看到了你，会显示一个！图标。专为 Live/Dead people 贴图包设计。" #: lang/json/MOD_INFO_from_json.py msgid "sees-player icon, retrodays" @@ -53387,9 +54912,9 @@ msgstr "发现玩家图标，retrodays版" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." -msgstr "如果一个生物看到了一个玩家，添加一个黄色的！图标。专为retrodays贴图包设计。" +msgstr "如果某个生物看到了你，会显示一个！图标。专为 retrodays 贴图包设计。" #: lang/json/MOD_INFO_from_json.py msgid "SpeedyDex" @@ -53455,8 +54980,8 @@ msgstr[0] "鸭" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." -msgstr "一只野鸭，常见于河流或其他水体附近，主要以昆虫、种子、植物根为食。" +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." +msgstr "一只野鸭，常见于河流或其他水体附近，主要以昆虫、种子、植物根为食。当然，在大灾变之前，还有面包屑。" #: lang/json/MONSTER_from_json.py msgid "goose" @@ -54165,7 +55690,7 @@ msgstr[0] "鲤鱼" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "一条金黄色的普通鲤鱼。有人觉得它们不好吃，但是你在大灾变的时候实在没有太多选择。" #: lang/json/MONSTER_from_json.py @@ -54302,7 +55827,7 @@ msgid "skittering plague" msgid_plural "skittering plagues" msgstr[0] "疫变飞掠者" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "一只体型巨大的被感染的蟑螂，它以丧尸尸体为食。" @@ -54312,7 +55837,7 @@ msgid "plague nymph" msgid_plural "plague nymphs" msgstr[0] "疫变飞掠幼体" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "一只体型约有老鼠大小的被感染的蟑螂幼体。" @@ -54322,7 +55847,7 @@ msgid "plague vector" msgid_plural "plague vectors" msgstr[0] "瘟疫传染者" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -54344,7 +55869,7 @@ msgid "giant cockroach nymph" msgid_plural "giant cockroach nymphs" msgstr[0] "巨型蟑螂幼虫" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "一只体积约有老鼠一样大的变异蟑螂的幼虫。" @@ -54366,7 +55891,7 @@ msgid "giant bee" msgid_plural "giant bees" msgstr[0] "巨型蜜蜂" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -54378,7 +55903,7 @@ msgid "giant centipede" msgid_plural "giant centipedes" msgstr[0] "巨型蜈蚣" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -54414,7 +55939,7 @@ msgid "giant mosquito" msgid_plural "giant mosquitos" msgstr[0] "巨型蚊怪" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -54426,7 +55951,7 @@ msgid "giant cellar spider" msgid_plural "giant cellar spiders" msgstr[0] "巨型地窖蛛" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -54439,7 +55964,7 @@ msgid "immature giant cellar spider" msgid_plural "immature giant cellar spiders" msgstr[0] "巨型地窖蛛幼体" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -54451,7 +55976,7 @@ msgid "giant jumping spider" msgid_plural "giant jumping spiders" msgstr[0] "巨型跳蛛" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -54463,7 +55988,7 @@ msgid "giant trapdoor spider" msgid_plural "giant trapdoor spiders" msgstr[0] "巨型螲蟷蛛" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -54475,7 +56000,7 @@ msgid "giant web spider" msgid_plural "giant web spiders" msgstr[0] "巨型网蛛" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -54487,7 +56012,7 @@ msgid "fungal spider" msgid_plural "fungal spiders" msgstr[0] "真菌蜘蛛" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -54500,7 +56025,7 @@ msgid "immature giant web spider" msgid_plural "immature giant web spiders" msgstr[0] "巨型网蛛幼体" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -54512,7 +56037,7 @@ msgid "giant black widow" msgid_plural "giant black widows" msgstr[0] "巨型黑寡妇蜘蛛" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -54524,7 +56049,7 @@ msgid "giant black widow spiderling" msgid_plural "giant black widow spiderlings" msgstr[0] "巨型黑寡妇蜘蛛幼体" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -54536,7 +56061,7 @@ msgid "giant wolf spider" msgid_plural "giant wolf spiders" msgstr[0] "巨型狼蛛" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -54548,7 +56073,7 @@ msgid "giant wasp" msgid_plural "giant wasps" msgstr[0] "巨型黄蜂" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -54560,7 +56085,7 @@ msgid "dermatik" msgid_plural "dermatiks" msgstr[0] "寄生蜂" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -54584,7 +56109,7 @@ msgid "giant ant" msgid_plural "giant ants" msgstr[0] "巨型蚂蚁" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -54596,7 +56121,7 @@ msgid "giant acidic ant" msgid_plural "giant acidic ants" msgstr[0] "巨型酸蚁" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -54621,7 +56146,7 @@ msgid "acidic queen ant" msgid_plural "acidic queen ants" msgstr[0] "酸蚁蚁后" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -54634,7 +56159,7 @@ msgid "acidic soldier ant" msgid_plural "acidic soldier ants" msgstr[0] "酸蚁士兵" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -54647,7 +56172,7 @@ msgid "fungal ant" msgid_plural "fungal ants" msgstr[0] "真菌蚁" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -54671,7 +56196,7 @@ msgid "queen ant" msgid_plural "queen ants" msgstr[0] "蚁后" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -54683,7 +56208,7 @@ msgid "soldier ant" msgid_plural "soldier ants" msgstr[0] "兵蚁" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -54695,7 +56220,7 @@ msgid "giant locust" msgid_plural "giant locusts" msgstr[0] "巨型蝗虫" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -54707,7 +56232,7 @@ msgid "locust nymph" msgid_plural "locust nymphs" msgstr[0] "巨型蝗虫幼体" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -55485,14 +57010,14 @@ msgid "marloss zealot" msgid_plural "marloss zealots" msgstr[0] "马洛斯狂信徒" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "当她狂喜地背诵赞美诗时，她的眼睛空空如也，口吐白沫。" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -55504,7 +57029,7 @@ msgid "X-03: 'Spectre' Recon Mech" msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "X-03：\"幽灵\"型侦察机甲" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -55523,7 +57048,7 @@ msgid "X-02: 'Grunt' Combat Mech" msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "X-02：\"大兵\"型战斗机甲" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -55541,7 +57066,7 @@ msgid "X-01: 'Jack' Lifting Mech" msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "X-01：\"千斤顶\"型起重机甲" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -55559,7 +57084,7 @@ msgid "mi-go" msgid_plural "mi-gos" msgstr[0] "米·戈" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -55575,7 +57100,7 @@ msgid "mi-go slaver" msgid_plural "mi-go slavers" msgstr[0] "米·戈奴役者" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -55592,7 +57117,7 @@ msgid "mi-go surgeon" msgid_plural "mi-go surgeons" msgstr[0] "米·戈外科医生" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -55605,7 +57130,7 @@ msgid "mi-go guard" msgid_plural "mi-go guards" msgstr[0] "米·戈守卫" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -55622,7 +57147,7 @@ msgid "mi-go myrmidon" msgid_plural "mi-go myrmidons" msgstr[0] "米·戈战士" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -55639,7 +57164,7 @@ msgid "mi-go scout" msgid_plural "mi-go scouts" msgstr[0] "米·戈侦察兵" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -57105,6 +58630,18 @@ msgid "" msgstr "" "这只丧尸的头很明显曾经被摧毁过，它脸上的裂口充满了一种特殊的灰色粘液。人类的耳朵从侧面垂下，巨大而令人恶心。眼睛前的狭缝表明它还可能还保留着一定的视力。" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "静电丧尸" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "一具非常苍白的尸体，长着你所见过的最糟糕的带电头发。偶尔你可以看到它四周的电火花。" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -57704,7 +59241,7 @@ msgid "experimental mutant" msgid_plural "experimental mutants" msgstr[0] "实验变种人" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -57719,7 +59256,7 @@ msgid "evolved mutant" msgid_plural "evolved mutants" msgstr[0] "进化变种人" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -58120,7 +59657,7 @@ msgstr[0] "M2HB CROWS II 炮塔" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" @@ -58138,7 +59675,7 @@ msgstr[0] "M249 CROWS II 炮塔" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" "这是一台M153 CROWS II " @@ -58155,7 +59692,7 @@ msgstr[0] "M240 CROWS II 炮塔" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" "这是一台M153 CROWS II " @@ -58502,7 +60039,7 @@ msgstr[0] "赛博獒犬" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "一条大白熊犬和高加索犬的混血犬，体内安装了许多生化插件。这些犬只保护生化先驱者们的领地不受外来者、丧尸和其他生物的打扰。" @@ -58516,9 +60053,22 @@ msgstr[0] "赛博獒犬幼犬" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." msgstr "一只可爱而无助的幼年赛博獒犬。驯服起来比一只成年狗要安全得多。体内已经被植入了生化插件，但幼犬一样发育未全。" +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "脑熔炮塔" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." +msgstr "米·戈已经在这里设置了一些防御系统。这个由机械和生物融合的怪胎看上去似乎是由缸中之脑控制的。从好的一方面想，它可以被爆头。" + #: lang/json/MONSTER_from_json.py msgid "headless zombie" msgid_plural "headless zombies" @@ -58859,9 +60409,9 @@ msgstr[0] "砍杀者尸变体" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." msgstr "一个扭曲得可怕的人类尸体。两片巨大的刀锋从它的两肩中迸发出来，它们在它的头顶上保持着平衡，它带着可怕的目的在四处游荡。" #: lang/json/MONSTER_from_json.py @@ -58872,10 +60422,10 @@ msgstr[0] "虚弱的砍杀者尸变体" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." msgstr "" "一具残缺不全的人体。两片脆弱的刀锋刚从它的手上刺出来用以对付猎物，缺失了下巴的脸庞的可以直接看见喉咙。额头上的一个裂开的伤口让你的脊椎感到一阵寒意。他笨拙的步伐严重的降低了它的移动速度。" @@ -58888,7 +60438,7 @@ msgstr[0] "挥霍者尸变体" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" "身穿重型突击装备的它，从凹陷的眼窝和张开的嘴巴以及头盔下闪烁出一道诡异的淡绿色光芒。奇怪的刀尖从它的手臂中迸发出来，使它拥有非常强大的杀伤力。" @@ -58902,8 +60452,8 @@ msgstr[0] "跳跃者尸变体" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" "这个曾经是人类的肉体现在几乎认不出来了，它的腹部扭动着，以巨大的手臂力量向前跳跃。这张怪异的脸不停地咆哮，长长的尖牙很容易咬伤你的肌肉。它的下半身融合在一起，形成了一条巨大的尾巴，尾巴上长着尖锐的倒刺。" @@ -58917,7 +60467,7 @@ msgstr[0] "抽搐者尸变体" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -58932,10 +60482,10 @@ msgstr[0] "群居者尸变体" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" "一个尖叫的变异儿童丧尸。整个皮肤泛白，眼睛肿得合不上，张大的嘴巴被撕开，皮肤垂在一边。一对看似无用的附肢从它的肩膀上长出来，最后伸进它的手臂。它的小手末端有锋利的爪子。" @@ -58947,9 +60497,9 @@ msgstr[0] "呕吐者尸变体" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -58963,8 +60513,8 @@ msgstr[0] "躁动之手" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "一只被卸下的手臂，正缓缓向前爬动。偶尔有触须从断处钻出来，胡乱抽打。" #: lang/json/MONSTER_from_json.py @@ -58975,9 +60525,9 @@ msgstr[0] "无头骑士" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" "缓慢摆动的无头骑士。华丽而实用的盔甲装饰着这具可怕的尸体，它以一种绝对可怕的坚定姿态出现。偶尔会有条长长的触须从它的右臂中伸出，胡乱地四处拍打。" @@ -58985,7 +60535,7 @@ msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "一具身体呈现淡蓝色的丧尸，由于生化插件的异常放电，其周围不断有噼啪的电流环绕。看起来似乎急于告诉你点东西。" @@ -58998,8 +60548,8 @@ msgstr[0] "骷髅先生" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "这具血肉内脏尽失的行走骨架，令人颤栗入骨。在它骨感的手上，抓着一支崭新的小号，即便是世界终结也毫发无伤。" #: lang/json/MONSTER_from_json.py @@ -59022,7 +60572,7 @@ msgstr[0] "冒烟的熊" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." +"gaze at you with malice… and hunger." msgstr "曾经是头熊，现在仅存一具冒着烟的躯壳。它那深邃的眼睛盯着你，满怀怨恨和饥渴。" #: lang/json/MONSTER_from_json.py @@ -59309,6 +60859,85 @@ msgid "" "like jaws." msgstr "一只布满黑色鳞片的怪物，有着深沉的眼窝，内部闪烁着邪恶的绿光。它的脸和头骨看起来像是骷髅一样，酸液从匕首状的下颚上滴落下来。" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "蜥蜴人战士" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" +"一种高大而强壮的人形爬行动物，它的尾巴肌肉发达，皮肤表面覆盖着深灰绿色的鳞片。它们是部落群居的生物，通常活动在洞穴和其附近的水域中，特别是在有龙族和古龙居住的地区。它们通常不会有敌意，虽然它们不关心外人，但是一旦被激怒了也会非常危险。虽然它们通常喜欢用巨木棒战斗，但当它们使用锋利的牙齿和爪子时也同样凶猛。" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "蜥蜴人猎手" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "蜥蜴人猎手的体型比普通战士要小，但依靠轻巧的身材和精确的标枪投掷，它们依然同样致命。" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "蜥蜴人猎手向你掷出一根带刺标枪！" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "蜥蜴人萨满" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" +"蜥蜴人非常地聪明和狡猾，但使用魔法的能力却相当罕见。蜥蜴人萨满在幼年时期就从部落中挑选出来，那时它们所展现出的魔法能力就已经标志了年轻部落战士的命运。外界对于它们所必须经历的启蒙仪式知之甚少，但很少有人能在其中幸存下来。蜥蜴人萨满是德鲁伊魔法师，可以使用大自然的力量与敌人战斗，并在需要时召唤援军。" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "蜥蜴人酋长" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" +"在蜥蜴人之中，野心是一种罕见特性。蜥蜴人酋长通过表现出异乎寻常的强大野心赢得了自己的地位，而外界往往将其误认为是过度残酷的暴力行为。这位蜥蜴人酋长是部落中最大、最强壮的一员，它所携带的造型凶猛的三叉戟是作为对它的锋利牙齿和爪子的赞美。" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "鳄鱼" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "作为一名曾经和未来的蜥蜴人萨满，这只大鳄鱼不再有任何人形特征，而且看起来非常非常危险。" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -59804,7 +61433,7 @@ msgstr[0] "防御机器人" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "一台使用内置电源并依旧活跃的自动防御机器人。这个机器人装备有一把电击枪和一把内置9mm口径枪械。" @@ -59816,7 +61445,7 @@ msgstr[0] "安防机器人" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "一台使用内置电源并依旧活跃的自动防御机器人。这个机器人装备有一把内置9mm口径枪械。" @@ -59828,7 +61457,7 @@ msgstr[0] "防暴机器人" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "一台使用内置电源并依旧活跃的自动防御机器人。这个机器人装备有一把电击枪，一把催泪瓦斯喷射器和一把内置40mm沙包榴弹发射器。" @@ -60147,8 +61776,8 @@ msgstr[0] "消化机器人" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" "一台改装的通用机器人，用来当作一台全自动真空吸尘器。它会把地上四散的物品吸入，然后用内部储存的酸液溶解它们。一个让你的草坪保持清洁免受垃圾……或尸体影响的好帮手。" @@ -60200,8 +61829,8 @@ msgstr[0] "灵药机器人" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" "* 这台机器人目前无法正常工作，不要建造。\n" "一台改装的医疗机器人，内部制药器经过重新编程能够产生诱变剂。" @@ -61632,6 +63261,17 @@ msgstr "致盲闪光" msgid "Ethereal Grasp" msgstr "幽影攫抓" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "朦胧术" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "一个魔法光环扭曲了你身体周围的光线，增加了你在一个回合中所能闪避攻击的次数。" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "保护光环" @@ -62055,6 +63695,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "这仪式会创造出一块与炽霜法师共鸣的小石块。你可以将符文作为催化剂用于制造其它物品。" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "召唤鳄鱼" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "召唤1只永久的鳄鱼。" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "蜥蜴人萨满召唤出一只鳄鱼！" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "古老的蜥蜴人法术" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "让一名蜥蜴人萨满施放法术。" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "魔法飞弹" @@ -63803,6 +65466,18 @@ msgid "" "This is a medical listening tool. Use it to listen to things. Closely." msgstr "一个医用听诊工具。只能用来听身边的东西。靠近物体并使用。" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "简易听诊器" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "一个相对笨重的自制儿童听诊玩具 。只能用来听身边的东西。靠近物体并使用。" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -64075,9 +65750,9 @@ msgstr[0] "C.R.I.T 标准 G.E.A.R" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "C.R.I.T 标准生物工程辅助平台（G.E.A.R），通过线缆链接你的骨髓，可以改善你的整体体质，并提供你周围环境的基本信息。" #: lang/json/TOOL_ARMOR_from_json.py @@ -64087,8 +65762,8 @@ msgstr[0] "C.R.I.T 特战面具（关）" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." -msgstr "C.R.I.T HUD 已启动。" +msgid "C.R.T HUD booting up…" +msgstr "C.R.I.T HUD 启动……" #. ~ Use action need_charges_msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py @@ -64100,9 +65775,9 @@ msgstr "电量低，无法安全启动。" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" "C.R.I.T改进型特种部队防毒面具，配备各种顶级电子设备，内衬凯夫拉材料以提供额外的头部保护。各种过滤器和其他高科技的设备，即使在轰炸下也能提高氧气的摄入量和安全性。它有一个集成的HUD，可以选择打开它以获得更多功能。" @@ -64119,7 +65794,7 @@ msgstr "C.R.I.T HUD 已关闭。" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "C.R.I.T改进型特战防毒面具，它目前已经开启了抬头显示器（HUD）、低水平夜视仪和其他保护元件，电量在持续消耗中。" @@ -64131,22 +65806,22 @@ msgstr[0] "C.R.I.T 强化背心（关）" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." -msgstr "C.R.I.T 强化背心已启动。" +msgid "C.R.I.T EM booting up…" +msgstr "C.R.I.T 强化背心启动……" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." -msgstr "电量低，无法安全启动。" +msgid "Power levels too low for safe bootup…" +msgstr "电量低，无法安全启动……" #. ~ Description for CRIT EM vest (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" "C.R.I.T " "特战部队增强型运动背心，采用高科技纤维制成，内置无功伺服系统，可以保护穿戴者并消耗能量协助运动。C.R.I.T常规操作人员通常会穿着它，以方便使用和操作。开启它至服装模式以获得额外的保护和移动。" @@ -64163,8 +65838,8 @@ msgstr "关闭护甲" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." -msgstr "C.R.I.T 强化背心已关闭。" +msgid "C.R.I.T E.M powering off…" +msgstr "C.R.I.T 强化背心关闭……" #. ~ Description for CRIT EM vest (on) #: lang/json/TOOL_ARMOR_from_json.py @@ -64172,8 +65847,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" "C.R.I.T " "特战部队增强型运动背心，采用高科技纤维制成，内置无功伺服系统，可以保护穿戴者并消耗能量协助运动。C.R.I.T常规操作人员通常会穿着它，以方便使用和操作。这件背心目前是开启状态，正超高功率消耗电量。" @@ -64192,7 +65867,7 @@ msgstr "你打开了%s。" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "C.R.I.T标准版头盔。保护头部，有一段绝缘钢网，用于颈部的保暖和防护。" @@ -64210,10 +65885,10 @@ msgstr "你关掉了%s。" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "C.R.I.T标准版头盔。保护头部，有一段绝缘钢网，用于颈部的保暖和防护。战术手电筒已经开启，正在消耗着电量并散发出昏暗的光芒。" #: lang/json/TOOL_ARMOR_from_json.py @@ -64450,6 +66125,30 @@ msgid "" "throwing knife into your hand on activation." msgstr "一枚华丽的银制戒指，上面刻着匕首。它被激活时能够在你手中召唤出一把近乎完美的飞刀。" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "鳗鱼戒指" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "一个轻薄的银戒指，上面画着一条鳗鱼。让你每回合额外闪避一次攻击。" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "双头鳗鱼戒指" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "一个轻薄的金戒指，上面画着一条盘绕在自己身上的双头鳗鱼。让你每回合额外闪避两次攻击。" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -64965,12 +66664,13 @@ msgstr "你拉下了%s的保险插销，赶紧扔出去。" #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "滴答。" @@ -65043,13 +66743,12 @@ msgstr "你拉开了扰频手雷的保险销。" #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" -"这是一个高度修改的EMP手雷，用来获取机器人芯片的控制权，从而让它们站在你这边。可惜，效果只能维持一会，然后就会被机器人的备用系统取代。使用它将拔出保险插销。" +"这是一个特制的EMP手雷，用来获取机器人芯片的控制权，从而让它们站在你这边。可惜，效果只能维持一会，然后就会被机器人的备用系统取代。使用它将拔出保险插销。" #: lang/json/TOOL_from_json.py msgid "active scrambler grenade" @@ -65063,6 +66762,49 @@ msgid "" "control wave that temporarily converts robots to your side." msgstr "一个拔了插销的扰频手雷，马上就会爆炸并发出一道控制波束，使机器人暂时与你为伍。" +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "EMP手雷" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "你拉开了EMP手雷的保险销。" + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" +"一个使用低电感电容连接单环天线放电来产生电磁脉冲的EMP手雷。使用该物品将会拔下保险销并点燃引信。你有三回合时间来扔掉它。它会产生一道EMP脉冲，破坏机器人并损耗生化能量。" + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "EMP手雷（无保险）" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "你拉下了%s的拉环，赶紧丢出去。" + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "" +"很好，这个EMP手雷已经被激活了，很快就会引爆并产生电磁脉冲，这会破坏附近的机器人并损耗生化能量。你需要做的就是把它用力丢出去，然后就等着瞧吧。" + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -65446,25 +67188,30 @@ msgid "" msgstr "使用了航空材料的折叠毯，打开后可以覆盖你身上的重要部位。使用它以打开。" #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "EMP手雷" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "EMP炸弹" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "你拉开了EMP手雷的保险销。" +msgid "Activate bomb" +msgstr "激活炸弹" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "你激活了EMP炸弹。" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" -"一个使用低电感电容连接单环天线放电来产生电磁脉冲的EMP手雷。使用该物品将会拔下保险销并点燃引信。你有三回合时间来扔掉它。它会产生一道EMP脉冲，破坏机器人并损耗生化能量。" +"这个体型巨大的爆炸装置是一个能产生电磁脉冲的炸弹。当激活时，内部钚燃料电池将磁通压缩发生器充能，之后爆炸将产生强磁场。当磁场被导入发射天线之中后，会产生一个很强的电磁脉冲。" #: lang/json/TOOL_from_json.py msgid "riding saddle" @@ -65479,26 +67226,24 @@ msgid "" msgstr "把鞍座装在已驯服的动物上就可骑乘。" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "EMP手雷（无保险）" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "EMP炸弹（激活）" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "你拉下了%s的拉环，赶紧丢出去。" +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "你已经激活了%s，赶紧丢出去。" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." msgstr "" -"很好，这个EMP手雷已经被激活了，很快就会引爆并产生电磁脉冲，这会破坏附近的机器人并损耗生化能量。你需要做的就是把它用力丢出去，然后就等着瞧吧。" +"很好，这个EMP炸弹已经被激活了，很快就会引爆并产生电磁脉冲和巨大爆炸，这会破坏附近的机器人并损耗生化能量。你需要做的就是把它用力丢出去，然后就等着瞧吧。" #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -65920,7 +67665,7 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" "35mm的数码单反（单镜头反光）相机使用普通电池，带光学/数字取景器，具有自动对焦和变焦镜头和闪光灯的防抖功能。你可以使用它查看已拍摄的照片，或者将照片存储至SD存储卡上；它使用传统的普通电池供电。在大灾变之前，专业级照片都是使用它拍摄出来的。" @@ -66583,6 +68328,7 @@ msgid_plural "pseudo butter churns" msgstr[0] "虚拟黄油搅拌机" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "这是一个虚拟物品，正常不应该出现在你的游戏里。" @@ -66595,7 +68341,7 @@ msgstr[0] "电纸书" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." msgstr "一台拥有高清彩色电子墨水屏的平板电脑。大灾变前的俏玩意，现如今的无价宝。它需要电池进行供电。" @@ -67636,7 +69382,7 @@ msgstr[0] "简易锤子" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." msgstr "粗糙的锤子，用一块金属固定在棍子上制成。虽然当锤子是勉强凑合了，但跟正规的还是没得比。" @@ -68569,18 +70315,6 @@ msgstr "" "一把小型的，非常锋利的刀具，被广泛应用于各项外科手术中。如果你很擅长近战武器的话，它也会是一件大杀器。\n" "\"在寂静岭医院工作的护士们用此解剖过无数活人。\"" -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "剪刀" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "一个长的工艺剪刀，用以将衣物等棉制品剪割成布条，或有其它用途。" - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -70735,6 +72469,17 @@ msgid "" msgstr "" "一个未激活的诺斯罗普派遣者，军用型号。它通过装配和部署飞锯无人机进行攻击。激活它以将其放置在地上；但是，由于在未激活期间触发了单向开关，它将不具有攻击性，并且只能起到分散敌人注意力的作用。" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "衣架" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "一个带金属钩的塑料衣架，能在挂衣杆上挂衣服。" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -72660,6 +74405,18 @@ msgid "" "toy!" msgstr "这是一个较小版本的，台式的大型家具大小的离心机。别被它的便携式天平欺骗了，它仍然是一个非常强大的设备，可以快速旋转东西。这不是玩具！" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "剪刀" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "一个长的工艺剪刀，用以将衣物等棉制品剪割成布条，或有其它用途。" + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -72806,6 +74563,27 @@ msgid "precision solderers" msgid_plural "precision soldererss" msgstr[0] "精密焊接" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "虚拟原子黄油搅拌机" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "脑熔炮塔（关）" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" +"一座未激活的脑熔炮塔。使用它以将它开启并放在地面上。此炮塔保证在用它那威力无比的转轮激光炮扫射丧尸时不会误伤自己。电子学和计算机学等级决定了你将其重新编程的成功几率。" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -72995,12 +74773,12 @@ msgstr[0] "C.R.I.T 野外餐具" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" "C.R.I.T标准版野外餐具，非常方便携带。外形参考普通军用版野外餐具制成，但是材料上使用了不锈钢及高温陶瓷合金。美中不足的是为了保证便携性，牺牲了电池容量，但是额外安装了一个相当小（无用）的太阳能电池板。还配备了一个小得荒谬的集成叉勺和刀铲套装！" @@ -73012,10 +74790,11 @@ msgstr[0] "C.R.I.T 军用匕首" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" "C.R.I.T标准版军用匕首，拥有一个钢制护手保护手指关节。底部配有小型撬棍可以帮助你撬开简单的物品。哑光的黑色涂层可以避免反光引起敌人的发现。匕首采用高强度合金锻造而成，可以很轻松的穿透轻型装甲。" @@ -73027,7 +74806,7 @@ msgstr[0] "C.R.I.T 格斗指虎" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "C.R.I.T近战用格斗指虎，除了重量外，和平常的指虎没什么不同。但是更加坚固耐用。" @@ -73039,7 +74818,7 @@ msgstr[0] "C.R.I.T 共振刀锋" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "C.R.I.T近战武器。陌生的符文装饰着巨大的碳素钢刀刃。奇怪的是，刀片毫不锋利，但在近距离观察时，能听见从内部发出能量振动的嗡嗡作响。" @@ -73052,10 +74831,10 @@ msgstr[0] "屠龙刀" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" "C.R.I.T研发的杰出武器。陌生的符文装饰着巨大的碳素钢刀刃，内部的能量振动的嗡嗡作响。仅仅是用手指轻拂武器就能带来一种不可战胜的感觉。它看起来更像一堆生铁，而不是一把剑。问题是……你能手持挥舞它吗?" @@ -73068,7 +74847,7 @@ msgstr[0] "C.R.I.T 工兵铲" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "C.R.I.T标准型可折叠铲子。内置的振动系统由使用者的移动提供动力，使得较小的铲子可以像较大的铲子一样清理土壤。" @@ -73081,7 +74860,7 @@ msgstr[0] "C.R.I.T 警棍" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "C.R.I.T标准版警棍，比起普通警棍，更长更粗，使得威力也更加大。" @@ -73546,7 +75325,7 @@ msgstr[0] "生化术士符文" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." msgstr "这块注魔的小石块上面有一个像撕裂骨肉的符号，对于将魔力导入制品的生化术士来说必不可少。" @@ -73558,7 +75337,7 @@ msgstr[0] "科技法师符文" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." msgstr "这块注魔的小石块上面有一个像齿轮和发条装置的符号，对于将魔力导入制品的科技法师来说必不可少。" @@ -73570,7 +75349,7 @@ msgstr[0] "魔术师符文" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." msgstr "这块注魔的小石块上面有一个像水晶与魔力球的符号，对于将魔力导入制品的魔术师来说必不可少。" @@ -73582,7 +75361,7 @@ msgstr[0] "塑地者符文" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." msgstr "这块注魔的小石块上面有一个像钢铁与岩石的符号，对于将魔力导入制品的塑地者来说必不可少。" @@ -73594,8 +75373,8 @@ msgstr[0] "炽霜法师符文" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." msgstr "这块注魔的小石块上面有一个像寒冰与烈火的符号，对于将魔力导入制品的炽霜法师来说必不可少。" #: lang/json/TOOL_from_json.py @@ -73606,8 +75385,8 @@ msgstr[0] "风暴塑造者符文" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." msgstr "这块注魔的小石块上面有一个像闪电与雷雨云的符号，对于将魔力导入制品的风暴塑造者来说必不可少。" #: lang/json/TOOL_from_json.py @@ -73618,7 +75397,7 @@ msgstr[0] "德鲁伊符文" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." msgstr "这块注魔的小石块上面有一个像自然与绿树的符号，对于将魔力导入制品的德鲁伊来说必不可少。" @@ -73630,8 +75409,8 @@ msgstr[0] "泛灵师符文" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." msgstr "这块注魔的小石块上面有一个像召唤师的符号，对于将魔力导入制品的泛灵师来说必不可少。" #: lang/json/TOOL_from_json.py @@ -73642,7 +75421,7 @@ msgstr[0] "炼金术士符文" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." msgstr "这块注魔的小石块上面有一个像炼金术和魔药的符号。虽然它在制造中的用处十分广泛，但是因为缺少与任何魔法流派的共鸣，它无法用于制造高级的物品。" @@ -73725,7 +75504,7 @@ msgstr[0] "暗暮之剑" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." @@ -73736,7 +75515,7 @@ msgstr "" #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." +msgid "Error. No weapon systems found." msgstr "出错！未找到武器系统。" #. ~ Description for disarmed defense turret @@ -73904,7 +75683,7 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" "一座未激活的军用榴弹炮塔。激活时，最多50发标准40mm破片榴弹会被自动装填至该炮塔中。放置该炮塔后，它的先进敌我识别软件会将你识别为友军。如果发生故障，请查阅安全手册。" @@ -73960,8 +75739,8 @@ msgstr[0] "先进轨道炮炮塔（关）" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" "一座未激活的先进轨道炮炮塔。激活时，最多50发标准轨道弹会被自动装填至该炮塔中。放置该炮塔后，它的先进敌我识别软件会将你识别为友军。如果发生故障，请查阅安全手册。" @@ -73975,7 +75754,7 @@ msgstr[0] "先进喷酸炮塔（关）" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "一座未激活的先进喷酸炮塔。放置该炮塔后，它的先进敌我识别软件会将你识别为友军。如果发生故障，请查阅安全手册。" @@ -73988,7 +75767,7 @@ msgstr[0] "先进EMP炮塔（关）" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "一座未激活的先进EMP炮塔。放置该炮塔后，它的先进敌我识别软件会将你识别为友军。如果发生故障，请查阅安全手册。" @@ -74286,7 +76065,7 @@ msgstr[0] "浮空加热器（关）" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "一台改装的眼球无人机，被用作悬浮的加热器。这台机器人用一束持续的暖流对封闭空间进行加热。它没有武器，也不会攻击敌人。激活以部署该机器人。" @@ -74299,7 +76078,7 @@ msgstr[0] "悬浮炉（关）" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." @@ -74361,10 +76140,10 @@ msgstr[0] "消化机器人（关）" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" "一台改装的通用机器人，用来当作一台全自动真空吸尘器。它会把地上四散的物品吸入，然后用内部储存的酸液溶解它们。它没有武器，也不会攻击敌人。激活它来部署机器人。" @@ -74397,7 +76176,7 @@ msgstr[0] "刺客机器人（关）" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "一台改装的医疗机器人，现在成了一台杀人机器。它使用一组刀片和一根毒针攻击敌对目标。激活以部署该机器人。" @@ -74437,8 +76216,8 @@ msgstr[0] "捕鼠机器人（关）" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "一台改装的掠行机器人，用来捕猎小型猎物。它使用一对螯和一把内置的电击枪来攻击目标。激活以部署该机器人。" @@ -74480,7 +76259,7 @@ msgstr[0] "死灵改造人（关）" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "一台改装的报废改造人，头部被替换成了死灵法尸的头颅。死而复生的头部保留了一些复活丧尸的能力。激活以部署该改造人。" @@ -74524,7 +76303,7 @@ msgstr[0] "机器瞎搭圣骑（关）" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" "一台改装的防御机器人，装上了自制的火焰喷射器和两把烧红的刀刃。当你的物品栏中有汽油时，你可以激活以装填并部署该机器人……但是最好离可燃物远一点。" @@ -74835,9 +76614,9 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" -"一件生物学之谜，这只变形怪的内部结构存在着一滩低密度流体，尽管已经处在过冷状态但仍然保留液体形态；但仍然保持着其之前所具有的柔韧性。冰霜形成的碎片不断从它身上剥落。看起来柔韧得似乎可以被直接拉开…" +"一件生物学之谜，这只变形怪的内部结构存在着一滩低密度流体，尽管已经处在过冷状态但仍然保留液体形态；但仍然保持着其之前所具有的柔韧性。冰霜形成的碎片不断从它身上剥落。看起来柔韧得似乎可以被直接拉开……" #: lang/json/TOOL_from_json.py msgid "growing cold mass" @@ -75024,9 +76803,9 @@ msgstr "晶簇在你手中分裂了。" #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "从钻石晶阵上破碎下来的一簇人工晶体。虽然通常这些物质从催化剂中分离出来时会降解，但是这些碎片不知道因为何种机制可以保持稳定。" #: lang/json/TOOL_from_json.py @@ -75037,8 +76816,8 @@ msgstr[0] "钻石晶阵" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." -msgstr "当你深深凝视着宝石的中心时，你的感官都有点迟钝了…" +"Your senses dull as you gaze into the depths of this gemstone's center…" +msgstr "当你深深凝视着宝石的中心时，你的感官都有点迟钝了……" #. ~ Description for diamond matrix #: lang/json/TOOL_from_json.py @@ -75055,10 +76834,10 @@ msgstr[0] "涡旋引擎" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" "一个可以被称作是\"盒子里的龙卷风\"的载具部件。在这一看似无害的容器里面，承载着清洁能源的人类智慧结晶，抑或是能将人类文明（或者说残存部分）从地面上抹除的大规模杀伤性武器。容器上有个外接装置，使其可作为引擎使用。" @@ -75071,10 +76850,10 @@ msgstr[0] "涡旋发电机" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" "一个可以被称作是\"盒子里的龙卷风\"的载具部件。在这一看似无害的容器里面，承载着清洁能源的人类智慧结晶，抑或是能将人类文明（或者说残存部分）从地面上抹除的大规模杀伤性武器。容器上有个外接装置，使其可作为发电机使用。" @@ -78246,6 +80025,10 @@ msgstr "建造篱笆墙" msgid "Build Stone Wall" msgstr "建造石墙" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "建造干砌石墙" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "建造矮墙" @@ -81833,6 +83616,35 @@ msgid "" "from the inside." msgstr "你的神经系统失灵了，就像从内部被撕裂了一样。" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "恶心食物" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "你吃的食物令人恶心。" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "沮丧食物" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "除了恶心的口粮什么都没有，这开始让你感到失望。" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "抑郁食物" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "是的，你活了下来，但这样活着还有什么意义，日复一日地吃着这些恶心的口粮？" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "被照亮" @@ -82496,7 +84308,7 @@ msgstr "睡眠不足" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." msgstr "你这一阵子一直缺乏足够的睡眠。你该歇会了。" @@ -82638,7 +84450,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -82653,7 +84465,7 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" "在你死后找到了生命的新意义。虽然他从没有告诉过你，但是他在已经失去的旧世界中所犯下的罪行将使得他永远无法在社会上拥有真正的地位。随着所有犯罪记录被破坏，他站出来承担起社会责任，向他的同伴们证明了自身的价值。大灾变之后的许多年后，他在一次独自旅行时死于心脏病发作。" @@ -82672,7 +84484,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " @@ -82705,7 +84517,7 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" @@ -83079,7 +84891,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -83113,7 +84925,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " @@ -83397,7 +85209,7 @@ msgstr "HUB 01" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "HUB 01，一个大灾变前的研究实验室里幸存的职工人员。他们很少离开实验室（如果会的话），并依靠机器人和先进的技术来生存。" @@ -83560,7 +85372,7 @@ msgstr "难民" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." @@ -83636,6 +85448,20 @@ msgstr "清理黑火药污垢" msgid "You clean your %s." msgstr "你清理了 %s。" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "清理污垢并润滑" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "你清理并润滑了 %s。" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "弹壳卡膛" @@ -83659,6 +85485,29 @@ msgstr "退出弹壳" msgid "You eject the spent casing from the %s." msgstr "你从 %s 中退出空弹壳。" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "未润滑" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "这把枪要么是全新没有润滑，要么是最近用溶剂清洗过后没有润滑。无论怎样，它都没有润滑，也无法正常上膛循环，甚至可能被损坏。" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "润滑" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "你润滑了 %s。" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "枪膛残渣" @@ -83680,6 +85529,11 @@ msgstr "" msgid "Clean gun" msgstr "清理枪械" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "清理枪械并润滑" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "磨损的传动皮带" @@ -84402,11 +86256,13 @@ msgstr "冷却装置" msgid "A big, blocky metal device for refrigerating large areas." msgstr "一种用于大面积制冷的大块金属装置。" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "一声尖锐的金属断裂的声音！" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "哐啷！" @@ -86244,6 +88100,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "固定在木柱顶部的金属盒子。邮件投递已经有一段时间没来了。看上去也不会再有新邮件来了。" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "挂衣杆" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "一个用来挂衣服的栏杆。" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "展架" @@ -87152,8 +89017,8 @@ msgstr "原子黄油搅拌机（架起）" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" "这台由Rivtech公司生产的原子黄油搅拌机已经架起，正不断高声轰鸣。已经能够朝其中添加生奶和食盐，并用其超强的动力把它们和这世上其他的一切东西一起搅成黄油！" @@ -87187,7 +89052,7 @@ msgstr "水培单元（种子）" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "这是一个独立的水培单元，用于在室内种植蔬菜。已有种子" @@ -87198,7 +89063,7 @@ msgstr "水培单元（幼苗）" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "这是一个独立的水培单元，用于在室内种植蔬菜。已有幼苗" @@ -87209,7 +89074,7 @@ msgstr "水培单元（成熟）" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "这是一个独立的水培单元，用于在室内种植蔬菜。已成熟" @@ -87220,7 +89085,7 @@ msgstr "水培单元（可收割）" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "这是一个独立的水培单元，用于在室内种植蔬菜。可收割" @@ -88946,9 +90811,9 @@ msgstr "" "M60是一款通用机枪，他被开发以取代.30口径的M1918和M1919型号机枪。它很沉重，很难拿着它来抵肩站立射击，你如果没有《第一滴血》系列里的兰博的体格的话，还是架起两脚架趴着玩吧。" #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" -msgstr[0] "自制钢管步枪（.308口径）" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" +msgstr[0] "自制重型卡宾枪" #: lang/json/gun_from_json.py msgid "" @@ -89156,6 +91021,18 @@ msgstr "" "COP " ".357德林加手枪是一把小型的肥嘟嘟的德林加手枪，外观有着莫斯伯格\"布朗尼\"德林加手枪的痕迹。它使用一根旋转的发火针来触发排列成方形阵列的四根枪管内的独立击锤。" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "S&W Model 10 左轮手枪" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "一把六发左轮手枪，最早于1899年生产，被誉为20世纪最流行的手枪。弹仓能够侧向旋出，便于重新装填。" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -89196,8 +91073,8 @@ msgid "" "declared 'fit only for combat in a phone booth' due to its low weight and " "absurd fire rate ranging from 1200 to 1400 rounds per minute." msgstr "" -"这款冲锋枪是Mac-10的一个鲜为人知的变种，发射0.380 " -"ACP弹药，整体尺寸较小，子弹初速可达到亚音速。这种廉价的自动武器几乎所有尺寸都较小，由于其重量轻，射速高达每分钟1200到1400发，因此被称为\"仅适用于电话亭中的战斗\"。" +"Mac-10 冲锋枪的一个鲜为人知的衍生型号，发射0.380 " +"ACP弹药，虽然整体尺寸较小，子弹初速仍可达到亚音速。这款廉价的自动武器和其他冲锋枪相比在任何方面上都要更小，由于其重量轻，而且射速高达每分钟1200到1400发，因此被称为\"仅适用于电话亭中的战斗\"。" #: lang/json/gun_from_json.py msgid "Kel-Tec P3AT" @@ -89269,6 +91146,17 @@ msgid "" "quality, durable materials." msgstr "一把体积紧凑的 .38 口径手枪，在设计时极力强调隐蔽携带性能，在制造时更是选用了高质量、有保障的新型材料。" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "AF2011A1 .38 超级手枪" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "一把源自意大利的双管半自动手枪，每次发射两发子弹，是 M1911 手枪的衍生型号。" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -89426,18 +91314,6 @@ msgid "" " sees use with many units worldwide." msgstr "这是一种广泛运用的榴弹发射器，最早由美国在越南战争中使用。虽然它几乎已经被更现代的发射器所取代，但M79型仍然在世界上许多部队中使用。" -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "Mark 19 榴弹发射器" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "这种重型三脚架式榴弹发射器被美国军方使用自冷战后一直使用到灾难的开始，如果你能找到一些40mm榴弹，你绝对可以继续用下去。" - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -89479,6 +91355,19 @@ msgstr "一台自制的三管40mm榴弹发射器。能够同时发射三颗榴 msgid "multi" msgstr "多发" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "Mark 19 榴弹发射器" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"一台重型三脚架式采用弹带供弹的40mm榴弹发射器，美国军方自冷战开始就一直使用这种型号，一直用到大灾变之前，如果你能找来一些40mm榴弹的话，也许还能继续用下去。" + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -89491,6 +91380,18 @@ msgid "" "shell at a time like most shotguns." msgstr "Saiga-410是一把半自动霰弹枪，采用了与AK47相同的卡拉什尼科夫布局。与其他霰弹枪不同，它用弹匣供弹。" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "温彻斯特 M37 .410 霰弹枪" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "一把单发开膛式霰弹枪，采用.410口径。设计得比12口径霰弹枪有更低的后坐力，它很轻便而且制造起来很简单。" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -89757,6 +91658,17 @@ msgid "" "has impressive stopping power." msgstr "陶鲁斯\"愤怒公牛\"左轮手枪发射.454 卡苏尔弹，弹容量5发，这种子弹的停止作用很优异。" +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "陶鲁斯\"暴怒裁决\"左轮手枪" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "陶鲁斯\"暴怒裁决\"左轮手枪发射 .454 卡苏尔弹，弹容量5发。该型号同时也能够发射 .410 口径霰弹或 .45 柯尔特弹。" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -89799,6 +91711,35 @@ msgstr "" "一把19世纪单发步枪的仿制品，采用 .45-70 " "口径，曾在19世纪末用于狩猎野牛和其他大型猎物。在当时高度精确和威力强大，这款型号已被改造为使用现代无烟火药。" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "邦德军械厂德林加手枪" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "邦德军械厂德林加手枪是该系列的多管轻便型手枪型号。常见型号采用 .45 柯尔特口径，但枪室也足够长，可以发射 .410 口径霰弹。" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "柯尔特\"闪电\" .45 卡宾枪" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" +"柯尔特泵动式步枪的现代重制版本。原本采用 .44-40 口径，现代重制品常常采用 .45 柯尔特口径，在牛仔射击运动中可作为单动式手枪的替代品。" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "咔嚓。" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -89921,10 +91862,9 @@ msgstr[0] "M2HB 勃朗宁重机枪" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." -msgstr "" -"美帝军队在大灾变之初大量使用的重型机枪，在幸存者之中也有少量保有。其巨大的体积和罕见的弹药口径使它几乎无法由单兵使用，当然部署在车上是个好主意！" +msgstr "美帝军队在大灾变之初大量使用的重型机枪，在幸存者之中也有少量保有。其巨大的体积和独特结构使它几乎无法使用，除非被安装在载具上。" #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -90665,7 +92605,7 @@ msgid "" "Austria's EKO Cobra unit. It has compensator cuts along its barrel to make " "recoil more manageable." msgstr "" -"格洛克 17 手枪的可选射击模式的变种型号，最初是为奥地利的EKO眼镜蛇部队设计的。它有一个沿着枪管走向的枪口补偿器，使其后坐力能在掌控范围内。" +"格洛克 17 手枪可选射击模式的衍生型号，最初设计供奥地利的 EKO 眼镜蛇部队使用。它有一个沿着枪管走向的枪口补偿器，使其后坐力能在掌控范围内。" #: lang/json/gun_from_json.py msgid "Kel-Tec PF-9" @@ -91283,7 +93223,7 @@ msgstr[0] "科布雷\"清道夫\"霰弹枪" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -91442,7 +93382,7 @@ msgstr[0] "A7 激光步枪" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" "最先进的激光步枪，由研究机构\"Aerial " @@ -91506,6 +93446,17 @@ msgid "" "ammunition." msgstr "一个木制吹箭筒，容易使用并且有比较高的准确度。使用飞镖作为弹药。" +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "生化热熔炮" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "这玩意是你从一台米·戈怪物上撕下来了的。你根本不知道它是怎么装填弹药的，甚至不知道它是否需要装填弹药。" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -91552,7 +93503,7 @@ msgstr[0] "C.R.I.T .5 激光手枪" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -91565,7 +93516,7 @@ msgstr[0] "C.R.I.T 链式激光枪" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -91578,7 +93529,7 @@ msgstr[0] "C.R.I.T 激光卡宾枪" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "C.R.I.T研发的一种短管轻型激光枪。研制这种武器是为了试验激光武器的新突破。" @@ -91589,8 +93540,8 @@ msgstr[0] "C.R.I.T. 能量步枪" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "C.R.I.T研发的一种重型能量枪。研制这种武器是为了试验混合武器的新突破。" #: lang/json/gun_from_json.py @@ -91600,12 +93551,12 @@ msgstr[0] "C.R.I.T 格斗制式枪械" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" "一把简单的组合枪支。这只军用级的半自动卡宾枪结合了9mm子弹在中距离的多功能性和12口径霰弹的强大威能。为了在未来与更好的与格斗术相结合，把手部分经过特殊设计可以更好的发挥使用者的力量，而握把T型拐状的坚固结构可以更好地击打敌人的头部。集成的弹夹使它更难装载，不过也阻止了其意外的弹出。" @@ -91629,13 +93580,13 @@ msgstr[0] "弹丸枪" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" -"令人惊讶的强大气枪，可以可靠地狩猎。小的铅或合金球团可被装入枪膛内，使它在每次射击中都能散射出大量的弹丸。虽然每次装弹都非常缓慢，但是精准度相当可靠。" +"令人惊讶的强大气枪，可以可靠地狩猎小型猎物。各类小型铅弹或合金弹丸都可被装入枪膛内，每次射击的威力也不低。其命中率和威力甚至可以与.22口径弹药相媲美，但其折管式装弹机构需要一些力量才能玩的转。" #: lang/json/gun_from_json.py msgid "Plasma Cutter" @@ -91644,7 +93595,7 @@ msgstr[0] "等离子切割机" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "C.R.I.T试验型武器，可以发射一束温度很高的等离子波。瞬间摧毁融化目标。" @@ -91655,8 +93606,8 @@ msgstr[0] "铆钉激发器" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "C.R.I.T 研发的实验性两用工具，它可以将普通钉子在几分之一秒内快速拉长后射出，到达目标后，脆弱的金属钉会当场破碎。" @@ -91668,7 +93619,7 @@ msgstr[0] "线性等离子炮" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "C.R.I.T研发的试验型武器，可以发射一束非常宽的线性等离子光束，击中后可以切割摧毁目标。" @@ -91679,8 +93630,8 @@ msgstr[0] "脉冲步枪" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "C.R.I.T研发的试验型三管亚音速步枪，非常适合在封闭空间内消灭大量敌人。发射合金弹丸，弹丸在撞击后立即爆炸。" @@ -91691,7 +93642,7 @@ msgstr[0] "开膛手" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "C.R.I.T研发的实验性电磁场锯，非常适合远距离切割材料。" @@ -91715,8 +93666,8 @@ msgstr[0] "Biubiu炮" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "万弹齐发！Biubiubiu！什么丧尸，浩克，蜘蛛，还有狗比鼹鼠，全部去死！" @@ -91824,8 +93775,9 @@ msgstr[0] "JHEC M128 自动左轮" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" "约翰逊重型武器公司研发的M128自动左轮手枪；其他同类产品都无法和它媲美。约翰逊重型武器公司是D&B Minneapolis公司旗下的子公司。" @@ -91909,8 +93861,8 @@ msgstr "" "1776冲锋枪：来自自由国度的兵工厂！" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" msgstr[0] "L.T. 防暴卡宾枪" #: lang/json/gun_from_json.py @@ -92244,7 +94196,7 @@ msgstr "设计优良的使用通用轻型步枪弹药的手工制作卡宾枪。 #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." msgstr "一把威力强大的电子激光枪，由大灾变发生不久前的准军事组织研究机构\"Aerial Labs\"制造。对电子目标特别有效。它由UPS供能。" @@ -92267,8 +94219,8 @@ msgstr[0] "激光步枪" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" @@ -92410,6 +94362,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "一把具有神奇魔法的华丽反曲弓。由结实而有弹性的木料制成，拉开弓弦就会自动生成一只箭。" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "射出带刺标枪的假枪。" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -92434,7 +94390,7 @@ msgstr[0] "基础机器枪" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "该物品用于实现怪物攻击，如果你看到这个说明游戏出Bug了。" #: lang/json/gun_from_json.py @@ -92605,9 +94561,9 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" -"一只活的变形怪变成的自主武器；设计作为一种覆盖整块车架的防御屏障。它进化出不断产生钙化突刺的能力，然后被弯曲的弹性肌肉纤维所控制。这些\"牙齿\"，可以用来咬住并伤害任何在其附近的倒霉家伙。变形怪的外膜也明显变厚，以支持其更剧烈的运动；然而看起来柔韧得似乎可以被直接拉开…" +"一只活的变形怪变成的自主武器；设计作为一种覆盖整块车架的防御屏障。它进化出不断产生钙化突刺的能力，然后被弯曲的弹性肌肉纤维所控制。这些\"牙齿\"，可以用来咬住并伤害任何在其附近的倒霉家伙。变形怪的外膜也明显变厚，以支持其更剧烈的运动；然而看起来柔韧得似乎可以被直接拉开……" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "gel shooter" @@ -92620,9 +94576,9 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" -"一只活的变形怪变成的自主武器。会从地面吸取材料，吸收养分。剩余的残渣朝着附近的威胁被高速发射出去。变形怪无定形的形体可以在你手中被重塑和连接，但武器本身由于没有控制而呈现惰性。看起来柔韧得似乎可以被直接拉开…" +"一只活的变形怪变成的自主武器。会从地面吸取材料，吸收养分。剩余的残渣朝着附近的威胁被高速发射出去。变形怪无定形的形体可以在你手中被重塑和连接，但武器本身由于没有控制而呈现惰性。看起来柔韧得似乎可以被直接拉开……" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py msgid "frost lancer" @@ -93137,16 +95093,6 @@ msgid "" msgstr "" "这把气动突击步枪已经经过各种非法强化改装，使其能够更快速地连发和提供更高的发射初速。它装载在炮塔上，如果提供一些额外的输入的话，它就能够自动瞄准目标。但是，这把武器十分难于携带，所以需要安装到炮塔底盘上使用。" -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "军警十型左轮手枪" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "一把六发左轮手枪。弹仓能够侧向旋出，便于重新装填。" - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -93161,42 +95107,6 @@ msgid "" msgstr "" "一把轻便的组合两用步枪，将.22凸缘弹枪管和.410口径霰弹枪枪管结合，设计可折叠以便于存储。起初为空难后受困的军用飞机成员制造，之后由多家公司生产并进入民用市场。" -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "柯尔特\"闪电\".45步枪" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" -"柯尔特泵动式步枪的现代重制品。原本采用 .44-40 口径，现代重制品常常采用 .45 长柯尔特口径，在牛仔射击运动中可作为单动式手枪的替代品。" - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "邦德军械厂德林加手枪" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "邦德军械厂德林加手枪是该系列的双管轻便型手枪型号。最常见的型号采用.45长柯尔特口径，但枪室也足够长，可以使用.410口径霰弹。" - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] ".410 青少年用霰弹枪" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "一把老旧的开膛式霰弹枪，采用.410口径。设计得比12口径霰弹枪有更低的后坐力，它很轻便而且制造起来很简单。" - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -93208,40 +95118,6 @@ msgid "" " with a hammer to strike the single round it holds." msgstr "一把自制的霰弹枪，采用.410口径。简单地把一根钢管安装在木把上，还有一个只能单次击发的击锤。" -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "AF2011A1 .38超级手枪" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "一个双枪管的半自动手枪，看起来是两个M1911粘起来的。" - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38超级手枪" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "一把现代化的M1911，其枪膛发射.38超级弹药。有着非常不错的命中率。" - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "陶鲁斯\"暴怒裁决\"左轮手枪" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "陶鲁斯\"暴怒裁决\"左轮手枪发射.454 卡苏尔弹，弹容量5发。该型号同时也能够发射.410口径霰弹或.45长柯尔特弹。" - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -94367,7 +96243,7 @@ msgstr[0] "望远镜式瞄准镜" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "一个简单的自制望远镜式瞄准镜，由单筒望远镜加上准星而成。它没有大灾变前生产的瞄准镜好用。增加枪械重量，但同时会提升命中率。" @@ -94710,6 +96586,17 @@ msgid "" msgstr "" "M320榴弹发射器模组采用非常小的封装就达到了大体积发射器才能实现的功能，但是射击精度相比有所下降。它可以被安装在多种步枪的枪管下，也可以安个枪托独立使用。这个榴弹发射器经过了改装，可以装在除了手枪和泵动式枪械之外的几乎任何武器上。" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "M6 生存步枪霰弹枪" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "M6 生存步枪集成的12号口径霰弹枪。无法拆除。" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -94931,7 +96818,7 @@ msgstr[0] "下挂式信号弹发射器" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "一个下挂式信号弹发射器。由于它所处的尴尬位置，相比普通信号枪的命中率也会更差一些。" @@ -94953,9 +96840,9 @@ msgstr[0] "折叠式带钩枪托" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "一个军用级的枪托，能够折叠起来减少枪械体积。它的重量以及一个能固定在手臂上的旋转挂钩使你的手臂持枪更加稳定。" #: lang/json/gunmod_from_json.py @@ -94966,7 +96853,7 @@ msgstr[0] "衍射透镜" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "一套安装在激光武器上的光学装置，它将激光束衍射成几个低功率光束。这稍微增加了近距离的伤害，但减少了射程。" @@ -95131,17 +97018,6 @@ msgid "" "attacks when attached to long arm or crossbow." msgstr "简单地用即一片回收来的大刀片和一些线绑成的自制宽刺刀。它可以装在某些长兵器或者一把十字弓上，然后就能把其作为一把趁手的近战武器使用了。" -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "M6 ASW 霰弹枪" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "M6 ASW 空勤生存武器集成的.410口径霰弹枪。无法拆除。" - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "你把鱼掏除内脏并切成片" @@ -96462,7 +98338,7 @@ msgid "" "Ammunition is worthless without a gun to load it into. Generally, there are several variants for any particular caliber. Ammunition has damage, dispersion, and range ratings, and an armor-piercing quality." msgstr "" "= 弹药\n" -"如果没有枪来装载的话，弹药就什么都不是。一般来说，每一种口径的弹药都有几种变种。弹药有伤害、散布、射程、穿甲等级。" +"如果没有可用来装载的枪械，弹药几乎毫无用武之地。一般来说，每种口径的弹药都有几个不同弹种。不同的弹药伤害值、散布、射程和穿甲能力都不同。" #: lang/json/help_from_json.py msgid "" @@ -96881,10 +98757,6 @@ msgstr "切断螺丝或者铁丝" msgid "Heat up food (with it)" msgstr "加热食物（工具用）" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "修理木/纸/骨/甲壳制品" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "添加为工具模组" @@ -97706,6 +99578,11 @@ msgid "" " This can feel good." msgstr "这件装备在湿透时依旧性能良好，不受心情值惩罚。" +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "这件装备可与动力装甲同时穿戴。" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -98825,7 +100702,8 @@ msgstr "建设地形" msgid "Disassemble items" msgstr "拆解物品" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "睡觉" @@ -99635,9 +101513,10 @@ msgstr "黄蜂巢" msgid "Wasp nest is here." msgstr "这里有个黄蜂巢。" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" -msgstr "蜘蛛网" +msgstr "蜘蛛" #. ~ Description for Spiders #: lang/json/map_extra_from_json.py @@ -99694,6 +101573,33 @@ msgstr "池塘" msgid "Small pond is here." msgstr "这里有个小池塘。" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "杂树林" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "这里零星地长着几棵树。" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "茂密草丛" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "这里长着一片茂密草丛。" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "废弃棚屋" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "这里有间废弃棚屋。" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "黏土矿床" @@ -99764,7 +101670,7 @@ msgstr "尸体" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "这里有些在大灾变中不幸丧生的人的尸体。" #. ~ Computer name @@ -100537,6 +102443,16 @@ msgstr "禁止追逐打闹！" msgid "NO Diving!" msgstr "禁止跳水！" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "军械库入口" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "打开军械库" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -100671,8 +102587,7 @@ msgid "Emergency Message" msgstr "紧急告知" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "停用备用能源" @@ -101377,7 +103292,7 @@ msgstr "不动如山" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -102574,7 +104489,7 @@ msgstr "C.R.I.T之强度" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "每层增加伤害和穿透。可叠加 5 次" #: lang/json/martial_art_from_json.py @@ -102597,7 +104512,7 @@ msgstr "C.R.I.T 镇压术" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "以击昏、击退、击倒敌人为核心的防御性战技，每次攻击命中增加0.125的护甲，并根据属性值提供其他加成。" @@ -102608,7 +104523,7 @@ msgstr "C.R.I.T之积聚" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "每层+0.05护甲，并获得其他微弱加成。可叠加 10 次" #: lang/json/martial_art_from_json.py @@ -102617,7 +104532,7 @@ msgstr "C.R.I.T之守护" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "+1护甲。力量提供命中和少量钝击伤害，以及护甲穿透。" #: lang/json/martial_art_from_json.py @@ -102628,7 +104543,7 @@ msgstr "C.R.I.T 格斗术" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "一种以快速打击和刺穿为中心的战斗风格。每次攻击命中都会增加额外的连击奖励。25% 钝击伤害。" #: lang/json/martial_art_from_json.py @@ -102638,7 +104553,7 @@ msgstr "C.R.I.T之坚韧" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "基于敏捷，每层增加攻击速度和其他微弱加成。可叠加 5 次" #: lang/json/martial_art_from_json.py @@ -102649,7 +104564,7 @@ msgstr "C.R.I.T之主动" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "敏捷提供闪避、命中和少量砍/刺伤害及护甲穿透。50% 钝击伤害。" #: lang/json/martial_art_from_json.py @@ -102831,6 +104746,10 @@ msgstr "破烂" msgid "Diamond" msgstr "钻石" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "宝石" + #: lang/json/material_from_json.py msgid "Egg" msgstr "蛋" @@ -103048,8 +104967,8 @@ msgid "Mushroom" msgstr "蘑菇" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "水" @@ -104365,7 +106284,7 @@ msgstr "生存者证明" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "通过生存 10 天来证明自己的生存能力，并向给予你任务的人报到。" @@ -104515,11 +106434,11 @@ msgid "" msgstr "谢谢，我永远也没办法报答你的恩情。这是我的一份心意，这些是我为我家人做的西装，我在做的时候总是会多做几套备用。" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "我不觉得自己得救了……" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "告诉我的家人我爱他们……" #: lang/json/mission_def_from_json.py @@ -104560,6 +106479,10 @@ msgstr "谢谢，这对我们很有用。作为谢礼给你一个我之前做的 msgid "What good does this do me?" msgstr "这对我有什么好处？" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "反正是注定要失败的……" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "找到克里斯·伊舍伍德" @@ -104600,7 +106523,7 @@ msgid "" msgstr "谢谢，我刚刚还准备自己去找找看呢。现在我终于有了铁砧了，可以继续做我的新马铠了，给你这个——我新做的马铠原型，拿去试试吧。" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "我希望他没有像巴里一样出事……" #: lang/json/mission_def_from_json.py @@ -104638,13 +106561,13 @@ msgstr "你准备好了？" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" "这里比我记忆中还要高，我们应该抓紧去找被关起来的人。我走之前给我家里留了个便条。如果我们活下来了，那间小屋应该也修好了。如果你想住下的话随时欢迎。" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "好吧，之前它还在这……" #: lang/json/mission_def_from_json.py @@ -104713,7 +106636,7 @@ msgid "" msgstr "哦哦，太好了。这是些我自己做的草药。如果它不起效的话，可以试试别的。" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "我还是去找一个更了解森林的人吧……" #: lang/json/mission_def_from_json.py @@ -104731,7 +106654,7 @@ msgstr "我看到旧屋外有一些野猫。你能帮我抓一只吗？" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "谢谢你！请快点回来！拿着这个笼子吧，那样你就有机会抓住一只了。" @@ -104752,7 +106675,7 @@ msgstr "你找到一只猫了吗？" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "太谢谢你了，拿上这本自然疗法日志的副本吧。我把这本帅气的著作叫做约书亚。" #: lang/json/mission_def_from_json.py @@ -104760,8 +106683,8 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "什么？！你在撒谎，我看出来了！你到底把我的笼子带回来没有？" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." -msgstr "哦，不！我想它们对你来说太快了…" +msgid "Oh no! I guess they are too nimble for you…" +msgstr "哦，不！我想它们对你来说太快了……" #: lang/json/mission_def_from_json.py msgid "Gather 120 Stones" @@ -105460,7 +107383,7 @@ msgstr "这可不管用。" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "如果没有那罐特别的面团，我想我是挺不过这场大灾变的。" @@ -105868,7 +107791,7 @@ msgstr "清理难民中心被封锁的内部区域并使尸变的自由商会前 msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -106166,7 +108089,7 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" @@ -107575,7 +109498,7 @@ msgstr "我需要50片毛皮。" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "我白天得照看果园，但晚上我还得缝制冬衣。你能帮我找些毛皮来吗……差不多50片就够了。" #: lang/json/mission_def_from_json.py @@ -107601,10 +109524,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "我真是太谢谢你了。别担心，你不会空手回去的。" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "感谢你的努力……我想是吧。" - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "别担心，这事其实也没那么重要。" @@ -107629,7 +109548,7 @@ msgstr "面粉能够让我打破这里日复一日水果和肉类的单调饮食 #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "谢谢你接受这个任务。否则我会为了一片三明治杀死一个陌生人。开玩笑的。" #: lang/json/mission_def_from_json.py @@ -107669,8 +109588,8 @@ msgstr "当水果收成时，我需要用来储存各种液体农产品的容器 #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "每个季节我们都会产出大量水果。有些会被制成果汁，有些会被酿成酒。我需要些能轻松把它们装上商队带走的容器。" #: lang/json/mission_def_from_json.py @@ -107691,7 +109610,7 @@ msgid "Do you have those jugs now?" msgstr "弄到加仑壶了吗？" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "我很感谢你的帮助。我还有一件事要请你帮忙。" #: lang/json/mission_def_from_json.py @@ -107718,7 +109637,7 @@ msgstr "谢谢你接受这个任务。你真对生化先驱者有大用。" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "这些材料往往都在危险地区。我理解你的选择。" #: lang/json/mission_def_from_json.py @@ -107733,7 +109652,7 @@ msgstr "找到那些故障的生化插件了吗？" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "我很感谢你的帮助。我想我们很快就能把你介绍给其他人了。" @@ -107802,6 +109721,54 @@ msgstr "%1$s 试图猛击你，但被绊倒了。" msgid "The %1$s tries to slam into , but fails to." msgstr "%1$s 试图猛击 ，但失败了。" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "%1$s 用三叉戟刺穿了你的 %2$s！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "%1$s 用三叉戟刺穿了 的 %2$s！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "%1$s 试图用三叉戟刺穿你的 %2$s，但是没能穿透护甲！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "%1$s 试图用三叉戟刺穿 的 %2$s，但是没能穿透护甲！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "%1$s 用巨木棒砸碎了你的 %2$s！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "%1$s 用巨木棒砸碎了 的 %2$s！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "%1$s 试图用巨木棒砸碎你的 %2$s，但是砸空并摔倒了！" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "%1$s 试图用巨木棒砸碎 的 %2$s，但是砸空并摔倒了！" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -115123,7 +117090,7 @@ msgstr "幸存者故事" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" +msgid "This NPC could tell you about how they survived the Cataclysm" msgstr "这名NPC可以告诉你他们是如何在大灾变中幸存下来的。" #: lang/json/mutation_from_json.py @@ -115591,7 +117558,7 @@ msgstr "C.R.I.T近战训练" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "你接受过防身训练，你每次命中敌人都可以获得些许战斗增益，取决于你的各种属性。" @@ -115655,18 +117622,10 @@ msgstr "自然恩赐" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "你的存在被大自然掩盖了，你很难被察觉。" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "你能让动物平静下来，他们会以与生俱来的信任对待你。此特性只对野生动物起效。" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "锋行者" @@ -116303,7 +118262,7 @@ msgid "Gardener" msgstr "园丁" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "当末日来临时，我们已经准备好了。现在我为我的生化先驱者族人们种植食物。" #: lang/json/npc_class_from_json.py @@ -116336,7 +118295,7 @@ msgid "I'm just trying to stay alive." msgstr "我只是在试着活下去。" #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." msgstr "我只是在试着活下去……但是这并不像看上去的那么容易。" #: lang/json/npc_class_from_json.py @@ -116345,9 +118304,9 @@ msgstr "蜥蜴变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "嘶嘶——我在找蜥蜴诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "嘶嘶——我在找蜥蜴诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Medical Mutant" @@ -116355,9 +118314,9 @@ msgstr "医学变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." -msgstr "我在找医用诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "我在找医用诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Bird Mutant" @@ -116365,9 +118324,9 @@ msgstr "鸟类变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." -msgstr "我在找鸟类诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." +msgstr "我在找鸟类诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Fish Mutant" @@ -116375,9 +118334,9 @@ msgstr "鱼类变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." -msgstr "我在找鱼类诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." +msgstr "我在找鱼类诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Beast Mutant" @@ -116385,9 +118344,9 @@ msgstr "野兽变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "嗷嗷——我在找野兽诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +msgstr "嗷嗷——我在找野兽诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Ursine Mutant" @@ -116395,9 +118354,9 @@ msgstr "熊科变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "呼呼——我在找熊科诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "呼呼——我在找熊科诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Feline Mutant" @@ -116405,9 +118364,9 @@ msgstr "猫科变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我在找猫类诱变剂喵…这个世界已经不适合人类了喵，因此我也不打算做人了喵。" +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "我在找猫类诱变剂喵……这个世界已经不适合人类了喵，因此我也不打算做人了喵。" #: lang/json/npc_class_from_json.py msgid "Lupine Mutant" @@ -116415,9 +118374,9 @@ msgstr "狼类变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "嗷——我在找狼类诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "嗷——我在找狼类诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Cattle Mutant" @@ -116425,9 +118384,9 @@ msgstr "家畜变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "哼哧——我在找家畜诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "哼哧——我在找家畜诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Insect Mutant" @@ -116435,9 +118394,9 @@ msgstr "昆虫变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "喀喀喀——我在找昆虫诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "喀喀喀——我在找昆虫诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Plant Mutant" @@ -116445,9 +118404,9 @@ msgstr "植物变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "我在找植物诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +msgstr "我在找植物诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Slime Mutant" @@ -116455,9 +118414,9 @@ msgstr "变形怪变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "我在找变形怪诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +msgstr "我在找变形怪诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Troglobite Mutant" @@ -116465,9 +118424,9 @@ msgstr "穴居变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." -msgstr "我在找穴居动物诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +msgstr "我在找穴居动物诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Cephalopod Mutant" @@ -116475,9 +118434,9 @@ msgstr "章鱼变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." -msgstr "我在找章鱼诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +msgstr "我在找章鱼诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Spider Mutant" @@ -116485,9 +118444,9 @@ msgstr "蜘蛛变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我在找蜘蛛诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "我在找蜘蛛诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Rat Mutant" @@ -116495,9 +118454,9 @@ msgstr "大鼠变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." -msgstr "吱——我在找大鼠诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." +msgstr "吱——我在找大鼠诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Mouse Mutant" @@ -116505,9 +118464,9 @@ msgstr "小鼠变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "吱吱——我在找小鼠诱变剂…这个世界已经不适合人类了，我不做人了！" +msgstr "吱吱——我在找小鼠诱变剂……这个世界已经不适合人类了，我不做人了！" #: lang/json/npc_class_from_json.py msgid "Alpha Mutant" @@ -116515,9 +118474,9 @@ msgstr "新人类变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "我在找新人类诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +msgstr "我在找新人类诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Elfa Mutant" @@ -116525,9 +118484,9 @@ msgstr "精灵变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." -msgstr "诺多！我在找精灵诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." +msgstr "我在找精灵诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Chimera Mutant" @@ -116535,9 +118494,9 @@ msgstr "奇美拉变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." -msgstr "呃啊——我在找奇美拉诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "我在找奇美拉诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_class_from_json.py msgid "Raptor Mutant" @@ -116545,9 +118504,9 @@ msgstr "迅猛龙变种人" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我在找迅猛龙诱变剂…这个世界已经不适合人类了，因此我也不打算做人了。" +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "我在找迅猛龙诱变剂……这个世界已经不适合人类了，因此我也不打算做人了。" #: lang/json/npc_from_json.py msgid "Brigitte LaCroix" @@ -118615,7 +120574,7 @@ msgstr "导弹发射井" #: lang/json/overmap_terrain_from_json.py msgid "fire lookout tower" -msgstr "火警了望塔" +msgstr "火警瞭望塔" #: lang/json/overmap_terrain_from_json.py msgid "survivor's bunker" @@ -119794,7 +121753,7 @@ msgstr "避难所幸存者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "在大灾变开始的时候，你幸运的找到一个防空洞躲了起来。现在，冬天来临了，你希望之前从书上学到的那些乱七八糟的技能可以帮助你继续活下去。" @@ -119808,7 +121767,7 @@ msgstr "避难所幸存者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." msgstr "在大灾变开始的时候，你幸运的找到一个防空洞躲了起来。现在，冬天来临了，你希望之前从书上学到的那些乱七八糟的技能可以帮助你继续活下去。" @@ -119822,7 +121781,7 @@ msgstr "避难所民兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "在大灾变开始的时候，你幸运的找到一个防空洞躲了起来。现在，冬天来临了，你希望之前学到的那些乱七八糟的技能和你手中的枪可以帮助你继续活下去。" @@ -119836,7 +121795,7 @@ msgstr "避难所女民兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." msgstr "在大灾变开始的时候，你幸运的找到一个防空洞躲了起来。现在，冬天来临了，你希望之前学到的那些乱七八糟的技能和你手中的枪可以帮助你继续活下去。" @@ -119908,7 +121867,7 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" "我的天！你对这个陌生的地方还有带你来到这的法术一无所知！这种情况下你只能破罐破摔采取新的生活方式才能抗过那场诺亚乘坐方舟躲过的大洪水以来人类最大的灾难。" @@ -119924,7 +121883,7 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." msgstr "" "我的天！你对这个陌生的地方还有带你来到这的法术一无所知！这种情况下你只能破罐破摔采取新的生活方式才能抗过那场诺亚乘坐方舟躲过的大洪水以来人类最大的灾难。" @@ -120023,7 +121982,7 @@ msgstr "养蜂人" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "你曾经是一名养蜂人。大灾变来袭，你不得不抛下你珍贵的蜜蜂，不过好歹你记得拿上一些工具和蜂蜜。" @@ -120037,7 +121996,7 @@ msgstr "养蜂人" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." msgstr "你曾经是一名养蜂人。大灾变来袭，你不得不抛下你珍贵的蜜蜂，不过好歹你记得拿上一些工具和蜂蜜。" @@ -120050,7 +122009,7 @@ msgstr "男篮运动员" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "这本来是你第一次参加真正的大型联赛，但大灾变来袭。多亏了你的飞毛腿，你成为幸运的少数几个生存下来并逃过那些怪物的人。" @@ -120064,7 +122023,7 @@ msgstr "女篮运动员" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." msgstr "这本来是你第一次参加真正的大型联赛，但大灾变来袭。多亏了你的飞毛腿，你成为幸运的少数几个生存下来并逃过那些怪物的人。" @@ -120200,7 +122159,7 @@ msgstr "男仆" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "你在一户富裕人家中供职。大灾变爆发时，他们乘着私人飞机去了一个你不知道的地方，而你被留下来照顾自己。" @@ -120213,7 +122172,7 @@ msgstr "女仆" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." msgstr "你在一户富裕人家中供职。大灾变爆发时，他们乘着私人飞机去了一个你不知道的地方，而你被留下来照顾自己。" @@ -121118,7 +123077,7 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "你曾经为一些小企业做些基础电气工程工作。而当大灾变爆发时你正好在一间避难所里进行工作，不幸的是，除了电脑的维修外，你没有完成其他的工作。" @@ -121133,7 +123092,7 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." msgstr "你曾经为一些小企业做些基础电气工程工作。而当大灾变爆发时你正好在一间避难所里进行工作，不幸的是，除了电脑的维修外，你没有完成其他的工作。" @@ -121204,7 +123163,7 @@ msgstr "淋浴受害男" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "当大灾变发生时，你正在舒舒服服地洗着热水澡。你勉强逃出生天，但是身上仅带着几块肥皂，和有史以来最最有用的玩意儿……一条毛巾。" @@ -121218,7 +123177,7 @@ msgstr "淋浴受害女" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "当大灾变发生时，你正在舒舒服服地洗着热水澡。你勉强逃出生天，但是身上仅带着几块肥皂，和有史以来最最有用的玩意儿……一条毛巾。" @@ -121258,7 +123217,7 @@ msgstr "舞厅男伴舞" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "大灾变之前，你曾是个舞厅的伴舞人员。你不会拒绝用你的闪避技能同丧尸跳一曲华尔兹，不是吗？" @@ -121271,7 +123230,7 @@ msgstr "舞厅女伴舞" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." msgstr "大灾变之前，你曾是个舞厅的伴舞人员。你不会拒绝用你的闪避技能同丧尸跳一曲华尔兹，不是吗？" @@ -122040,7 +123999,7 @@ msgstr "新郎" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "这原本是你一生中最重要的日子，但大灾变来了。你穿着盛装从婚礼现场逃了出来。双脚冰凉吗？但是好歹你的脚还和身子连在一起。" @@ -122053,7 +124012,7 @@ msgstr "新娘" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" msgstr "这原本是你一生中最重要的日子，但大灾变来了。你穿着盛装从婚礼现场逃了出来。双脚冰凉吗？但是好歹你的脚还和身子连在一起。" @@ -122123,7 +124082,7 @@ msgstr "乐队主唱" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "你的天团在鼓手把贝斯手吃掉之后就永远解散了。现在你独自一人面对末日，身上只剩下一包烟，MP3里一首你们乐队的曲子都没有。" #: lang/json/professions_from_json.py @@ -122136,7 +124095,7 @@ msgstr "乐队女主唱" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." +"in the Cataclysm with some cigarettes and your mp3 player." msgstr "你的天团在鼓手把贝斯手吃掉之后就永远解散了。现在你独自一人面对末日，身上只剩下一包烟，MP3里一首你们乐队的曲子都没有。" #: lang/json/professions_from_json.py @@ -122174,7 +124133,7 @@ msgstr "死囚" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "大灾变给了你逃跑的机会，但是自由的代价似乎有点偏高。" @@ -122187,7 +124146,7 @@ msgstr "女囚" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." msgstr "大灾变给了你逃跑的机会，但是自由的代价似乎有点偏高。" @@ -122574,7 +124533,7 @@ msgstr "拉比" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "当灾变袭来时，你正在庙里和你的信徒们举行者宗教典礼。现在，你相信，救世主弥赛亚只能是你自己！" @@ -122587,7 +124546,7 @@ msgstr "女拉比" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" msgstr "当灾变袭来时，你正在庙里和你的信徒们举行者宗教典礼。现在，你相信，救世主弥赛亚只能是你自己！" @@ -122767,7 +124726,7 @@ msgstr "披萨外送小子" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" @@ -122783,7 +124742,7 @@ msgstr "披萨外送妹子" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" @@ -122886,7 +124845,7 @@ msgstr "农夫" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "灾难来临之时，你靠着种庄稼来养活自己。现在，手握着可靠的锄头和一些种子，是时候重建地球了，一棵棵的种过去。" @@ -122900,7 +124859,7 @@ msgstr "农妇" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "灾难来临之时，你靠着种庄稼来养活自己。现在，手握着可靠的锄头和一些种子，是时候重建地球了，一棵棵的种过去。" @@ -122944,7 +124903,7 @@ msgstr "资深拾荒者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "作为逃离大灾变的幸运儿之一，你开始在废墟捡破烂。甭管是坑蒙拐骗还是哭爹喊娘，你终于成为了捡破烂中的精英。" @@ -122958,7 +124917,7 @@ msgstr "资深拾荒女" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." msgstr "作为逃离大灾变的幸运儿之一，你开始在废墟捡破烂。甭管是坑蒙拐骗还是哭爹喊娘，你终于成为了捡破烂中的精英。" @@ -123234,7 +125193,7 @@ msgstr "生存狂子弟" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." @@ -123250,7 +125209,7 @@ msgstr "生存狂子妹" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." @@ -124145,7 +126104,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" "在你工作的塔顶上，你可以很好地欣赏世界末日；一条条光带从天空落下，绽放成蘑菇云，在地平线边上一闪而过，让你的防眩光补偿器自动切换了模式。你迅速冲到安全的地方，否则冲击波会把你从你刚刚休息的地方炸飞。你合同中所包含生化插件现在可算是派上用场了……" @@ -124163,7 +126122,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" "在你工作的塔顶上，你可以很好地欣赏世界末日；一条条光带从天空落下，绽放成蘑菇云，在地平线边上一闪而过，让你的防眩光补偿器自动切换了模式。你迅速冲到安全的地方，否则冲击波会把你从你刚刚休息的地方炸飞。你合同中所包含生化插件现在可算是派上用场了……" @@ -124423,10 +126382,10 @@ msgstr "C.R.I.T 预备役军官" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" "你是一名C.R.I.T预备役军官，你正在为即将到来的战争做着训练。当你到达征召令现场时发现现场一片混乱，你的战友们倒在了血泊之中。在一片恐慌中，你拼命逃了出来免得让你落得和你的朋友一个下场。现在你要靠你的智慧和多年的训练才能让你在这场灾难中存活下来。" @@ -124440,10 +126399,10 @@ msgstr "C.R.I.T 预备役军官" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" "你是一名C.R.I.T预备役军官，你正在为即将到来的战争做着训练。当你到达征召令现场时发现现场一片混乱，你的战友们倒在了血泊之中。在一片恐慌中，你拼命逃了出来免得让你落得和你的朋友一个下场。现在你要靠你的智慧和多年的训练才能让你在这场灾难中存活下来。" @@ -124456,9 +126415,9 @@ msgstr "C.R.I.T 清洁工" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -124473,9 +126432,9 @@ msgstr "C.R.I.T 清洁工" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -124490,7 +126449,7 @@ msgstr "C.R.I.T 士官" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "你是一名高级士官，日常负责将上级指令向你的小队队员们传达。当灾难发生时，你的专业知识让你一次又一次拯救了大伙，直到最终支撑不住全部垮塌。" @@ -124504,7 +126463,7 @@ msgstr "C.R.I.T 士官" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "你是一名高级士官，日常负责将上级指令向你的小队队员们传达。当灾难发生时，你的专业知识让你一次又一次拯救了大伙，直到最终支撑不住全部垮塌。" @@ -124519,9 +126478,9 @@ msgstr "C.R.I.T 步兵" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -124537,9 +126496,9 @@ msgstr "C.R.I.T 步兵" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -124554,13 +126513,13 @@ msgstr "C.R.I.T 战地医生" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" "你是团队里的那个书呆子，一名接受了如何对付各类异界怪物训练的战地医生，但你的主要任务还是让你的战友们安然无恙。几个星期以来，你出生入死尽量保证每个人能活下去。然而，当陷入潮水一般的丧尸群和明显已经失控的政府机器人包围之中时，你被用来分散丧尸的注意力，不得不就此逃走。你是否能够找到生存的方法，或者最终成为尸潮的一员，化作你队友的梦魇？" @@ -124573,13 +126532,13 @@ msgstr "C.R.I.T 战地医生" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" "你是团队里的那个书呆子，一名接受了如何对付各类异界怪物训练的战地医生，但你的主要任务还是让你的战友们安然无恙。几个星期以来，你出生入死尽量保证每个人能活下去。然而，当陷入潮水一般的丧尸群和明显已经失控的政府机器人包围之中时，你被用来分散丧尸的注意力，不得不就此逃走。你是否能够找到生存的方法，或者最终成为尸潮的一员，化作你队友的梦魇？" @@ -124593,8 +126552,8 @@ msgstr "C.R.I.T 机枪兵" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -124610,8 +126569,8 @@ msgstr "C.R.I.T 机枪兵" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -124627,9 +126586,9 @@ msgstr "C.R.I.T 指挥官" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" "作为一名顶级的指挥官，你不到万不得已时不会直接加入战斗。你的个人魅力和敏锐才智帮助你不断晋升，并为你的盟友提供帮助。现在一切都被冲进下水道了，这还会对你有帮助吗？" @@ -124643,9 +126602,9 @@ msgstr "C.R.I.T 指挥官" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" "作为一名顶级的指挥官，你不到万不得已时不会直接加入战斗。你的个人魅力和敏锐才智帮助你不断晋升，并为你的盟友提供帮助。现在一切都被冲进下水道了，这还会对你有帮助吗？" @@ -124658,13 +126617,13 @@ msgstr "C.R.I.T 执法者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" "建议 10 " "力量。你被赋予了联邦执法官所拥有的所有特权。作为一名警卫，大伙时常开玩笑说你不过是一个戴着花哨徽章的商场保安。你心照不宣地一笑了之，穿上装备然后投入部署。虽然你大部分时间都在基地里消磨时光，你磨练了自己的技能，并植入了特殊的生化插件，让你能更加轻松的完成一名\"保安\"的工作。现在是时候上岗了，尽管任务范围看起来已经扩展了很多。" @@ -124678,13 +126637,13 @@ msgstr "C.R.I.T 执法者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" "建议 10 " "力量。你被赋予了联邦执法官所拥有的所有特权。作为一名警卫，大伙时常开玩笑说你不过是一个戴着花哨徽章的商场保安。你心照不宣地一笑了之，穿上装备然后投入部署。虽然你大部分时间都在基地里消磨时光，你磨练了自己的技能，并植入了特殊的生化插件，让你能更加轻松的完成一名\"保安\"的工作。现在是时候上岗了，尽管任务范围看起来已经扩展了很多。" @@ -124698,10 +126657,10 @@ msgstr "C.R.I.T 孤狼" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" "建议 10 " "力量。你是一个全副武装的恶棍，并且拥有联邦执法官的所有特权。作为一支能够处理任何事情的单兵部队，你被投放至战区，单枪匹马干翻对面方整个营。现在是时候把它们全都吊死了。" @@ -124715,10 +126674,10 @@ msgstr "C.R.I.T 孤狼" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" "建议 10 " "力量。你是一个全副武装的恶棍，并且拥有联邦执法官的所有特权。作为一支能够处理任何事情的单兵部队，你被投放至战区，单枪匹马干翻对面方整个营。现在是时候把它们全都吊死了。" @@ -124732,12 +126691,12 @@ msgstr "C.R.I.T 特种部队" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" "建议 10 " "力量。你是灾难应对及研究调查小组（C.R.I.T）的精英成员，作为在应对世界各种威胁时背后若隐若现的幽灵部队，你的团队领先其他世界强国数十年。你的小队是第一批被部署到新英格兰地区的小队，直达中心，遏制即将爆发的疫情，收集信息并反馈给总部。祝你好运，士兵。" @@ -124751,12 +126710,12 @@ msgstr "C.R.I.T 特种部队" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" "建议 10 " "力量。你是灾难应对及研究调查小组（C.R.I.T）的精英成员，作为在应对世界各种威胁时背后若隐若现的幽灵部队，你的团队领先其他世界强国数十年。你的小队是第一批被部署到新英格兰地区的小队，直达中心，遏制即将爆发的疫情，收集信息并反馈给总部。祝你好运，士兵。" @@ -124770,17 +126729,17 @@ msgstr "C.R.I.T 生存专家" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" "你是一名C.R.I.T的精英侦察员，你被誉为顶级生存专家，能在被困敌后数周时仅凭一些石头、树枝和植物生存下去。然而，在当地的酒吧喝了几（20）杯酒后，在酒馆斗殴时和你的一个指挥官打了一架（你一拳击晕了他），你被剥夺了军衔，带着你所有装备被丢进森林里接受生存试炼。你花费了一个小时在树林里找到一个不错的庇护所，突然无线电响了，有人告诉你，世界要毁灭了。显然，没人有时间去接你，欢呼干杯吧。下次记得少喝几杯；至少这次手头还有些真正的工具！" @@ -124793,17 +126752,17 @@ msgstr "C.R.I.T 生存专家" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" "你是一名C.R.I.T的精英侦察员，你被誉为顶级生存专家，能在被困敌后数周时仅凭一些石头、树枝和植物生存下去。然而，在当地的酒吧喝了几（20）杯酒后，在酒馆斗殴时和你的一个指挥官打了一架（你一拳击晕了他），你被剥夺了军衔，带着你所有装备被丢进森林里接受生存试炼。你花费了一个小时在树林里找到一个不错的庇护所，突然无线电响了，有人告诉你，世界要毁灭了。显然，没人有时间去接你，欢呼干杯吧。下次记得少喝几杯；至少这次手头还有些真正的工具！" @@ -124818,9 +126777,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" "你在新英格兰接受生存训练，但是大灾变发生了，教练再没能给你上下一堂课。所以现在你带着标配训练套装被困在隔离区，你真希望自己能有一把更好的枪。看起来这次是真的生存训练了！" @@ -124835,9 +126794,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" "你在新英格兰接受生存训练，但是大灾变发生了，教练再没能给你上下一堂课。所以现在你带着标配训练套装被困在隔离区，你真希望自己能有一把更好的枪。看起来这次是真的生存训练了！" @@ -124852,10 +126811,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -124872,10 +126831,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -124891,9 +126850,9 @@ msgstr "C.R.I.T 工程师" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" "你被派去修复新英格兰的几个实验室设施，并向其他研究人员展示你们正在研制的新武器。然后大灾变就爆发了，这让你的测试变得更容易了，但似乎没有什么意义了。是时候离开了！" @@ -124907,9 +126866,9 @@ msgstr "C.R.I.T 工程师" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" "你被派去修复新英格兰的几个实验室设施，并向其他研究人员展示你们正在研制的新武器。然后大灾变就爆发了，这让你的测试变得更容易了，但似乎没有什么意义了。是时候离开了！" @@ -124922,11 +126881,12 @@ msgstr "C.R.I.T 夜行者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" "你在新英格兰的基地已经在大灾变时的极端猛攻中沦陷。然而，作为研发部门的一名顶级研究员，你选择了逐渐将自己变异成超越人体的新生物。调配出的药虽然还不完善，但它让你年老体弱的身体充满了力量。用你现在所拥有的新肉体，用你的獠牙，战斗到天明。" @@ -124939,11 +126899,12 @@ msgstr "C.R.I.T 夜行者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" "你在新英格兰的基地已经在大灾变时的极端猛攻中沦陷。然而，作为研发部门的一名顶级研究员，你选择了逐渐将自己变异成超越人体的新生物。调配出的药虽然还不完善，但它让你年老体弱的身体充满了力量。用你现在所拥有的新肉体，用你的獠牙，战斗到天明。" @@ -125096,7 +127057,7 @@ msgstr "特种狙击手" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "你花了好几天和一个敌对狙击手斗智斗勇，而他却突然……死了。然后他又\"活\"了。" @@ -125109,7 +127070,7 @@ msgstr "特种狙击手" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." msgstr "你花了好几天和一个敌对狙击手斗智斗勇，而他却突然……死了。然后他又\"活\"了。" @@ -125146,7 +127107,7 @@ msgstr "特种兵卧底" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "你已经监视你的目标数月，而他现在却变成了丧尸。真是有用的线索。" @@ -125159,7 +127120,7 @@ msgstr "特种兵卧底" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "你已经监视你的目标数月，而他现在却变成了丧尸。真是有用的线索。" @@ -125172,7 +127133,7 @@ msgstr "核生化特种兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "化学武器？打勾。生化疫情？打勾。核战争？打勾。看来你找对工作了！" @@ -125185,7 +127146,7 @@ msgstr "核生化特种兵" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "化学武器？打勾。生化疫情？打勾。核战争？打勾。看来你找对工作了！" @@ -125245,7 +127206,7 @@ msgstr "战斗天使" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "一台战备状态的改造人，从一个不起眼的垃圾场里被抢救出来……" #: lang/json/professions_from_json.py @@ -125256,7 +127217,7 @@ msgstr "战斗天使" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "一台战备状态的改造人，从一个不起眼的垃圾场里被抢救出来……" #: lang/json/professions_from_json.py @@ -125320,7 +127281,7 @@ msgstr "德鲁伊" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "古老的德鲁伊祭坛在大灾变中随风而逝了。但自然终将繁盛。" @@ -125333,7 +127294,7 @@ msgstr "德鲁伊" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." msgstr "古老的德鲁伊祭坛在大灾变中随风而逝了。但自然终将繁盛。" @@ -125431,7 +127392,7 @@ msgstr "死灵法师学徒" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "你以前总是不得不隐藏自己的魔法，因为它在魔法师世界中不被大多数人所接受，但现在面对大灾变时，你需要使出浑身解数利用好每一个法术。" @@ -125445,7 +127406,7 @@ msgstr "死灵法师学徒" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." msgstr "你以前总是不得不隐藏自己的魔法，因为它在魔法师世界中不被大多数人所接受，但现在面对大灾变时，你需要使出浑身解数利用好每一个法术。" @@ -125461,7 +127422,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "你爸以前是个气象员，所以你也对气象学很感兴趣。最近你发现你居然可以用神秘的方法操作天气！可惜你没来得及发挥你的力量，大灾变就到来了……" #: lang/json/professions_from_json.py @@ -125476,7 +127437,7 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." +"power, as events unfolded…" msgstr "你爸以前是个气象员，所以你也对气象学很感兴趣。最近你发现你居然可以用神秘的方法操作天气！可惜你没来得及发挥你的力量，大灾变就到来了……" #: lang/json/professions_from_json.py @@ -126398,7 +128359,7 @@ msgstr "棒球运动员" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "灾难发生前你是本地小联盟的一个击球手。你穿着你的装备逃了出来，但在你的局开始前你能活多久？" @@ -126412,7 +128373,7 @@ msgstr "棒球女运动员" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" msgstr "灾难发生前你是本地小联盟的一个击球手。你穿着你的装备逃了出来，但在你的局开始前你能活多久？" @@ -126486,8 +128447,8 @@ msgstr "惊醒者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "你在半夜被一阵噪声惊醒了。你带着手头仅有的手电筒去调查一下，却发现自己现在面临着大灾变的挑战。" #: lang/json/professions_from_json.py @@ -126499,8 +128460,8 @@ msgstr "女惊醒者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "你在半夜被一阵噪声惊醒了。你带着手头仅有的手电筒去调查一下，却发现自己现在面临着大灾变的挑战。" #: lang/json/professions_from_json.py @@ -126513,7 +128474,7 @@ msgstr "生化自行车手" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "你为生化奥运会自行车比赛所准备的各种训练和强化插件为你提供了在大灾变开始时逃出生天的优势。但你能永远逃得掉吗？" @@ -126527,7 +128488,7 @@ msgstr "生化自行车手" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "你为生化奥运会自行车比赛所准备的各种训练和强化插件为你提供了在大灾变开始时逃出生天的优势。但你能永远逃得掉吗？" @@ -126540,8 +128501,8 @@ msgstr "焊工" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "在大灾变之前你是一家近海采油公司的焊工。在你正准备回家休假的路上，大灾变来了。至少你手头上还有你用来吃饭的家伙。" @@ -126554,8 +128515,8 @@ msgstr "电焊工" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "在大灾变之前你是一家近海采油公司的焊工。在你正准备回家休假的路上，大灾变来了。至少你手头上还有你用来吃饭的家伙。" @@ -126568,9 +128529,9 @@ msgstr "复古生存狂" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" "你知道这一天终将来临，一切都会变得无法收拾。你早就为此准备就绪，不靠装备，而是纯靠技巧；在树林中待过的那些日子都给了你回报。你的祖先在没有各种高科技的情况下都能生存下去，如果你还不行的话那可真该死。" @@ -126583,9 +128544,9 @@ msgstr "复古生存狂" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" "你知道这一天终将来临，一切都会变得无法收拾。你早就为此准备就绪，不靠装备，而是纯靠技巧；在树林中待过的那些日子都给了你回报。你的祖先在没有各种高科技的情况下都能生存下去，如果你还不行的话那可真该死。" @@ -131026,7 +132987,7 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" "当世界末日来临的时候，你果断跑到了附近的紧急避难所里。在这里，你成功活了下来，并且从不离开避难所以免外面的\"东西\"伤害到你，但是救援从未到来。终于，你赖以维生的物资将要耗竭，你被迫走出避难所大门，第一次面对灾后的世界。" @@ -131037,7 +132998,7 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" "当世界末日来临的时候，你果断跑到了附近的紧急避难所里。在这里，你成功活了下来，并且从不离开避难所以免外面的\"东西\"伤害到你，但是救援从未到来。终于，你赖以维生的物资将要耗竭，你被迫走出避难所大门，第一次面对灾后的世界。" @@ -131101,7 +133062,7 @@ msgstr "监狱" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "当大灾变发生时，你正在监狱服刑劳改。现在所有的囚犯都变成了没头没脑的怪物，安防机器人见人就射……你或许要考虑一次越狱行动了。" @@ -131110,7 +133071,7 @@ msgstr "当大灾变发生时，你正在监狱服刑劳改。现在所有的囚 #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "当大灾变发生时，你正在监狱服刑劳改。现在所有的囚犯都变成了没头没脑的怪物，安防机器人见人就射……你或许要考虑一次越狱行动了。" @@ -131218,7 +133179,7 @@ msgstr "实验体" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "那夜凌晨，你坐上了旺角开往大埔的红van。你以为你可以掌握自己的未来和命运，但实际上你只是一枚被抹去了过去的棋子。" @@ -131227,7 +133188,7 @@ msgstr "那夜凌晨，你坐上了旺角开往大埔的红van。你以为你可 msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." msgstr "那夜凌晨，你坐上了旺角开往大埔的红van。你以为你可以掌握自己的未来和命运，但实际上你只是一枚被抹去了过去的棋子。" @@ -131466,8 +133427,8 @@ msgstr "信仰动摇" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" "你已经宣扬你的信仰很长一段时间了，但最近的事件让产生了动摇。你在神殿里游荡，发现了一些书籍。也许它能够恢复你的信仰。但也说不定会完全摧毁它。" @@ -131476,8 +133437,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." msgstr "" "你已经宣扬你的信仰很长一段时间了，但最近的事件让产生了动摇。你在神殿里游荡，发现了一些书籍。也许它能够恢复你的信仰。但也说不定会完全摧毁它。" @@ -131507,7 +133468,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" "自从你成为一名魔法师的学徒已经有一段时间了，正在研制一种可以用来逃离大灾变的原型设备。不过，处女航出了点问题，你的老师把他的内脏传送到了体外。现在你要想办法靠自己生存。至少他忘了把笔记本带上……" @@ -131520,7 +133481,7 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" "自从你成为一名魔法师的学徒已经有一段时间了，正在研制一种可以用来逃离大灾变的原型设备。不过，处女航出了点问题，你的老师把他的内脏传送到了体外。现在你要想办法靠自己生存。至少他忘了把笔记本带上……" @@ -131547,8 +133508,8 @@ msgstr "魔法假期" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" "自从你成为一名魔法师的学徒已经有一段时间了，你已经储蓄多年，梦想能在一座僻静的法师塔里中度假。你的自我发现之旅被突如其来的大灾变打断了。现在你得自己想办法活下去。" @@ -131558,8 +133519,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" "自从你成为一名魔法师的学徒已经有一段时间了，你已经储蓄多年，梦想能在一座僻静的法师塔里中度假。你的自我发现之旅被突如其来的大灾变打断了。现在你得自己想办法活下去。" @@ -131660,9 +133621,9 @@ msgstr "挑战-FEMA死亡营地" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" "你是在被派遣到FEMA（联邦应急管理局）营地的众多像是保安或者军人的维持营地治安的一员。你亲身感受到这个营地情况迅速的恶化：受伤，伤口感染，被火包围的你还躺在地上……而\"他们\"正在涌来……" @@ -131672,9 +133633,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" "你是在被派遣到FEMA（联邦应急管理局）营地的众多像是保安或者军人的维持营地治安的一员。你亲身感受到这个营地情况迅速的恶化：受伤，伤口感染，被火包围的你还躺在地上……而\"他们\"正在涌来……" @@ -132583,6 +134544,11 @@ msgid "" "you'll probably be left with no meat! Use a BB gun or maybe a .22 rifle." msgstr "松鼠相当的美味，但是如果你用伤害过高的枪械射击它们的话，它们会渣都不剩！用BB枪或者.22 口径步枪比较好。" +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "如果你不把松鼠都炸成碎肉的话，它们还真不算是糟糕的零食。" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -132603,9 +134569,25 @@ msgstr "杀死巨型蠕虫之后也千万别松懈。它们分裂后的躯体依 #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." +"impossible unless you have a big tactical advantage." msgstr "如果你看到一大群丧尸向你袭来，赶紧跑！试图与它们搏斗就是自杀的行为，除非你有巨大的战术优势。" +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "如果你看到一大群丧尸向你袭来，赶紧跑！试图与它们搏斗就是自杀的行为。" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "如果你看到一大群丧尸向你袭来，赶紧跑！" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "当你被众多的丧尸追得屁滚尿流的时候，可以试着躲到下水道，过了一两个街区，就又是一条好汉。" + #: lang/json/snippet_from_json.py msgid "" "Watch out for those zombies that shriek; they'll let other zombies know " @@ -132888,9 +134870,9 @@ msgstr "你知道吗，拿着突击步枪不一定要一直用全自动模式。 #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" -msgstr "我见过威力恐怖的激光武器，那几乎是完美的武器……安静，准确，致命。但是我从来就没找到过那玩意，我敢打赌那种枪子弹一定很稀少……" +msgstr "我见过威力恐怖的激光武器，那几乎是完美的武器：安静，准确，致命。但是我从来就没找到过那玩意，我敢打赌那种枪子弹一定很稀少……" #: lang/json/snippet_from_json.py msgid "" @@ -133074,6 +135056,12 @@ msgid "" "be deadly." msgstr "你感到虚弱或手脚笨拙时，最好不去扔莫洛托夫燃烧瓶和手榴弹。万一没扔出去，掉在地上，你就死定了。" +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "如果你不是特别敏捷的话，最好不要乱扔莫洛托夫燃烧瓶或手榴弹。涉及这类物品的事故往往很严重。" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -133120,10 +135108,9 @@ msgstr "虽然加油站里搜刮不到什么，但在这里能获得大量汽油 #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." -msgstr "和电影里不同——射击汽油泵并不会让它爆炸，只会让汽油流满地面，一有火星就会燃烧起来。" +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." +msgstr "和电影里不同，射击汽油泵并不会让它爆炸，只会让汽油流满地面，一有火星就会燃烧起来。" #: lang/json/snippet_from_json.py msgid "" @@ -133137,6 +135124,12 @@ msgid "" " bad!" msgstr "下次你搜刮杂货店时，记得多拿些罐装食物吧，它们是不会腐坏的！" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "如果你找到一家杂货店，记得多带些罐头食品走。罐头食品永远不会坏！" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -133162,12 +135155,6 @@ msgid "" "defense… it's perfect!" msgstr "我曾经藏身在服装店后面的更衣室里，安全地度过了许多个夜晚。四面都有墙，而且远离商店入口，便于防御的狭窄走廊……我要给它一百分！" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "当你被众多的丧尸追得屁滚尿流的时候，可以试着躲到下水道，过了一两个街区，就又是一条好汉。" - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -133176,10 +135163,10 @@ msgstr "你有看见过那些出现在荒郊野地的科学实验室吗？依我 #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." -msgstr "我一直梦想着能洗劫一次军事掩体，但我很清楚，丧尸士兵加良好的掩护是最坏的组合。一想到炮塔向我喷射子弹，我就不寒而栗。" +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." +msgstr "我一直梦想着能洗劫一次军事掩体，但丧尸和护甲是个可怕的组合。而且一想到会有炮塔向我喷射子弹，我就不寒而栗。" #: lang/json/snippet_from_json.py msgid "" @@ -133226,26 +135213,41 @@ msgstr "螺丝刀鸡尾酒在手，预防坏血病我有！" #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "比平时更饿？纯天然的油会帮你度过难关。虽然味道很糟糕，但在吃你自己的腿是第二选择时，谁还在乎呢？" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." -msgstr "地形可以扭转战局，确保你用它来对付敌人，以免它被敌人用来对付你。" +msgstr "地形可以扭转战局。记得用它来对付敌人，而别被敌人用它来对付你。" #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "从矿井旁边经过的人提到了些难闻的味道。如果你计划去那里的话，可以考虑带上防毒面具。" #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "知识就是力量。我说的是真的，拿起一本书就知道了。" +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "知识就是力量。而书籍是可以阅读的力量。" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "知识就是力量。但并不是每本书都包含真正的知识。" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "你会有些很难过的日子。但如果手头有本好书的话，读一读会帮你渡过难关。" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -133310,7 +135312,7 @@ msgstr "当你知道有多少物品能够被拆成零件时，你会惊讶的。 #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" @@ -133353,7 +135355,7 @@ msgstr "多一个同伴就多一张吃饭的嘴，但当有活要干时，四只 #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "我一直反对使用毒品，直到有次我被尸潮追杀时，差点被一只丧尸杀死，除了从那个丧尸尸身上得到的一些白色粉末之外，我什么也没有。它救了我一命。" @@ -133380,6 +135382,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "我曾经见过一位疯狂的化学家。她制造电池只用了土豆……也许是柠檬？" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "我曾经见过一位疯狂的化学家。她用土豆做了一个电池，然后没人愿意吃那个土豆。" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -133490,6 +135498,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "如今一切似乎都在变异，即使是幸存者。我想知道如果我长兔子耳朵会不会好看？能增强我的听力吗？" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "如今一切似乎都在变异，即使是幸存者。我想知道如果我长着水虎鱼的牙齿会不会好看？" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "如今一切似乎都在变异，即使是幸存者。我想知道如果我脸上长刺的话会不会好看？" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "如今一切似乎都在变异，即使是幸存者。我想知道如果我的眼睛能射出激光时视力是否还正常？" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "如今一切似乎都在变异，即使是幸存者。我想知道如果我长着鹿角会不会好看？帽子该怎么戴呢……" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -133512,6 +135544,13 @@ msgid "" msgstr "" "听说有很少一部分城市居民被疏散到了一处地图上没标注的地方。现在很难找到他们，也许是他们不想被人找到。或者更糟——也许你不知道自己并不想找到他们，如果你明白我的意思的话。" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "听说有一位女士背上绑着灭火器，脚上穿着溜冰鞋。四处滑行，几乎不穿衣服，用棒球棒砸碎食人族的脸。难道这还不够棒吗？" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -133567,6 +135606,12 @@ msgid "" msgstr "" "我知道现在不该说这个，但你要努力睡好觉。如果你睡眠不足，你就不是你自己。找个枕头和毯子。如果你做不到，即使用泰迪熊做枕头，盖上一堆衣服保暖也行。选一个好地方，即使是睡在椅子或长椅上也比睡地板好。" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "没有任何规则禁止你穿多条裤子。嗯，我想，也许还是有的，但没有什么能阻止你打破它！" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -133612,7 +135657,7 @@ msgid "Hey there's some pink tablets, take some!" msgstr "嘿，有一些粉红药片，快吃点！" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" msgstr "看，一些迷幻药，让我们玩大灾变：有趣的时代来临！" #: lang/json/snippet_from_json.py @@ -136441,15 +138486,15 @@ msgid "" msgstr "我现在需要一些高放射性的钚浆来给我补充生化能量。" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." +msgid "Tell me about how you survived the Cataclysm." msgstr "和我说说你是怎么在大灾变中幸存下来的。" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" +msgid "How did you survive the Cataclysm?" msgstr "你是如何在大灾变中幸存下来的？" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" +msgid "What was the Cataclysm like for you?" msgstr "对你来说大灾变是什么样的？" #: lang/json/snippet_from_json.py @@ -136711,7 +138756,7 @@ msgid "eldritch horror" msgstr "可怕的怪物" #: lang/json/snippet_from_json.py -msgid "the cataclysm" +msgid "the Cataclysm" msgstr "大灾变" #: lang/json/snippet_from_json.py @@ -137106,6 +139151,316 @@ msgstr "" "\n" "参见 EXO-M-312 号文件获取完整报告。" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr " 是 最大的妓女，而我为此感到骄傲！（注：恶搞川皇发言）" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "这面墙上有一个被很漂亮地画出来的涂鸦标记。（注：恶搞川皇发言）" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr " 是一个异性恋霸权恶棍！（注：恶搞川皇发言）" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "♥" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr " 是地狱" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "我们都得死" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "妈妈" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "操你妈" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "这上面画着一只动画形象的丧尸。" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "这上面有个粗糙喷绘而成的用头骨装饰的涂鸦标记。" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" +"我和你妈妈有一段稳固而又充满爱意的感情，你需要尽快接受这一点。\n" +"\n" +"你想谈谈吗？你知道去哪找我。爱你亲爱的。" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr " 你个该死的家伙传得我艾滋，你个贱货。" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "我是<3 。" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "操了。" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "这上面喷绘着一个长着荆棘双翼的天使的涂鸦标记。" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "先生是个吸血鬼！" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "他们隐瞒了事实" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "跟 着 化 学 凝 结 尾" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "这上面画着一卷厕纸溶解成彩虹的奇怪图案。" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "我们只想吃你的脑子" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "别喝水" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "它们行走在祂的世上，而后是审判日，只有有价值的人才能幸存" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "这上面画着一只脑袋上有个弹孔的丧尸。" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "这上面画着一个令人惊叹的十分有艺术气息的屌。" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "这上面喷绘着一片由骨头构成的森林。" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "这上面喷绘着一幅底部有许多小人朝拜的巨大蘑菇的壁画。" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "我们再也回不去了" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "别买的冰" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "你欠我五十块钱" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "我会杀了你的" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "它在水里" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "这上面喷绘着一个完全不符合人体解剖学的穿得很少的女人。" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "浪费纳税人的钱该死的政府" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "别吃那口粮" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "FEMA: FUCKIN EAT MY ASSHOLE" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "这上面画着一个穿着急救夹克戴着防毒面具的瘦骨嶙峋的人的简笔画。下面草草地写着：\"谢谢这套行头。\"" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "所有进入这里的人，放弃你的希望。" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "没 人 会 来 救 我 们 的" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "没 有 救 援 巴 士" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "他 们 让 我 们 失 望" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "不要死在里面" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "收容所" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "的COS装扮全都接受" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "大灾变公交车站" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "他们不是来救援的，他们是来清理的" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "这上面画着一幅过于详细的巨作，描绘了一只巨大得让人精神扭曲的怪物，在大灾变时攻击此处的场景。" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "这上面用记号笔画着一个不断旋转的传送门的草图，丧尸源源不断从中涌出。下面写着：\"他们都干了些什么？\"" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "安息吧人类" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "所有人都死了，戴夫（注：《红矮星号（1988）》）" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "我们这一切都好，你呢（注：《星球大战4（1977）》）" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "，我等不及了，去36号营地。我在那了。爱你的。" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "，我还在四处找你。" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "到过这里而且还活着" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "蓝色 52" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "，我说过我会等你但我得逃走了，来找我" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" +"为纪念：\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"如果不是你们我没法活下来。我永远不会忘记的。" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "这上面画着一个卡通人物用大锤砸碎丧尸尸体的图案。下方潦草地写着：\"把它们全砸碎\"" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "它们又复活了。爆头没有用。" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "远离" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "已经陷落" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "这 里 没 人 了 继 续 往 前" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "死亡陷阱" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "没人来救" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "这一切都是政府干的" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "操他妈的中国" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "操他妈的共产主义者" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "纪念" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -138378,8 +140733,8 @@ msgstr "你感到越来越强烈的厄运来临的感觉。" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." -msgstr "你突然意识到自己必须对这场灾难负责。" +"Cataclysm." +msgstr "你突然意识到自己才应该对大灾变负责。" #: lang/json/snippet_from_json.py msgid "You get the odd feeling that your thoughts are not your own." @@ -142402,8 +144757,8 @@ msgstr "“找到了曾经的装甲排。大部分坦克出入口都在上面， #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" -msgstr "“啊，看看漩涡石这如此扭曲的螺线！操控它那螺旋运动的方式！永远不停歇的优雅运动！它的美丽被玷污了……”" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" +msgstr "\"啊，看看漩涡石这如此扭曲的螺线！操控它那螺旋运动的方式！永远不停歇的优雅运动！它的美丽被玷污了……\"" #: lang/json/snippet_from_json.py msgid "\"My friend died, but at least I made her into a blob turret.\"" @@ -142418,13 +144773,13 @@ msgstr "“我的购物车上装了一门激光炮炮塔。我推着它到处跑 #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" -msgstr "“第40日。控制器坏了——但车里神奇的反应堆让其不为所动依旧一直前行。正前方巨大的压路机正摧毁着森林。缅因州，我来了。”" +msgstr "\"第40日。控制器坏了——但车里神奇的反应堆让其不为所动依旧一直前行。正前方巨大的压路机正摧毁着森林。缅因州，我来了。\"" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" -msgstr "“我的车是未经琢磨的钻石……就是字面上的意思”" +msgid "\"my car is a diamond in the rough… literally\"" +msgstr "\"我的车是未经琢磨的钻石……就是字面上的意思\"" #: lang/json/snippet_from_json.py msgid "\"M249 TURRET NODDED. IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" @@ -142446,7 +144801,7 @@ msgstr "“总有一天，我要也会变成车的一部分”" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "\"把一点炸药和一半地雷放进一个旧汽水罐里……砰！你就会飞到不知道什么地方了。\"" @@ -144061,6 +146416,38 @@ msgstr "狂吠！" msgid "WOOF!" msgstr "低吠！" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "\"我没有嘴但我必须尖叫！\"" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "\"¿Por qué?（西班牙语：为什么？）\"" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "\"靠近点小家伙。\"" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "\"是为了一口把你吃掉呀！可是我想我没法吃东西了。\"" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "\"居鲁士说如果我足够耐心（是病人的话），他能帮我找来一副新躯体。\"" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "\"Quem é Você?（葡萄牙语：你是谁？）\"" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "\"Eu vou te matar!（葡萄牙语：我他妈的要杀了你！）\"" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "\"我控制不住自己要杀你，请快逃！\"" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "\"别逼我请你吃板刀面。\"" @@ -144169,13 +146556,13 @@ msgstr "当测试结束时，你将会被错过。" #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "不可思议呀！[subject name here]，[subject hometown here]必将以您为傲！" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "这可能是某种未经处理的污水容器。快去好好洗把脸吧。" @@ -144187,7 +146574,7 @@ msgstr "为了您和他人的安全，请不要触碰 [滋滋滋——]" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "你即便放弃也没人会因此责备你的，事实上，离职恰好是一个非常合理的反应。" @@ -144198,8 +146585,8 @@ msgid "" msgstr "太棒了!在如此悲哀的气氛中，你仍然有着果敢与机智。" #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" -msgstr "再次向您致敬。并重申我们之前的警告： [难以理解的乱码]" +msgid "Hello again. To reiterate our previous warning: [garbled]" +msgstr "再次向您致敬。并重申我们之前的警告：[garbled]" #: lang/json/speech_from_json.py msgid "Weeeeeeeeeeeeeeeeeeeeee[bzzt]" @@ -144274,8 +146661,8 @@ msgstr "有人正受到严重伤害。" #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "啊哦。有人分了杯羹，我让他们等等你，但是他们还是那样做了。" #: lang/json/speech_from_json.py @@ -144307,7 +146694,7 @@ msgstr "那是什么？你刚刚说话了吗？" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "我只想指出，所有通向成功的机会已经给你了。" #: lang/json/speech_from_json.py @@ -144355,7 +146742,7 @@ msgstr "我知道你不会相信的，但目前为止发生的一切事情都是 #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "我在检视一些蓝图，我想……嗯，是的，在这，你肯定走错路了。" @@ -144392,7 +146779,7 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "\"我们这儿看到的就是沟通失败的结果。\" （注：《铁窗喋血（1967）》）" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" +msgid "\"E.T. phone home.\"" msgstr "\"E.T.打电话回家。\"（注：《E.T. 外星人（1982）》）" #: lang/json/speech_from_json.py @@ -144456,7 +146843,7 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "\"路？我们要去的地方，不需要路。\"（注：《回到未来（1985）》）" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" msgstr "\"系好你的安全带。这将是一个颠簸的夜晚。\"（注：《彗星美人（1950）》）" #: lang/json/speech_from_json.py @@ -144823,7 +147210,7 @@ msgid "\"I'm scared!\"" msgstr "\"我好害怕！\"" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" +msgid "\"Something's wrong…\"" msgstr "\"有点不对劲……\"" #: lang/json/speech_from_json.py @@ -144851,15 +147238,15 @@ msgid "\"Excuse me?\"" msgstr "\"劳驾。\"" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" +msgid "\"I'm different…\"" msgstr "\"我和它们不一样……\"" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" +msgid "\"Thanks anyway…\"" msgstr "\"不管怎样，谢谢了……\"" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" +msgid "\"Take me with you…\"" msgstr "\"带我走吧……\"" #: lang/json/speech_from_json.py @@ -144939,7 +147326,7 @@ msgid "\"This time is OUR time.\"" msgstr "\"现在是我们的时代了。\"" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" +msgid "\"Second time's a charm…\"" msgstr "\"第二回该走运了点了吧……\"" #: lang/json/speech_from_json.py @@ -145011,7 +147398,7 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "\"叹气，千万别告诉别人。\"" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" +msgid "\"Well, I tried. Best of luck!\"" msgstr "\"嗨，至少我试过。祝你好运！\"" #: lang/json/speech_from_json.py @@ -145305,7 +147692,7 @@ msgid "Cabin" msgstr "小屋" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "医院" @@ -145457,7 +147844,7 @@ msgstr "联邦应急管理局营地" msgid "Mansion Entrance" msgstr "别墅入口" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "别墅" @@ -145531,7 +147918,7 @@ msgstr "嗯……好吧，是吧。我想我该走了。" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -145634,17 +148021,8 @@ msgid "Yeah, alright." msgstr "是的，好吧。" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." -msgstr "你尚可再唱一首歌，如果你想的话。" - -#: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." -msgstr "我知道有一些有用的骨头，如果你想知道更多的话。" - -#: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." -msgstr "尚有歌未被你所唱，如果你想的话。" +msgid "There are bones to etch, songs to sing. Wish to join me?" +msgstr "有骨头要刻，有歌曲要唱。想加入吾等吗？" #: lang/json/talk_topic_from_json.py msgid "Do you wish to take on more songs?" @@ -145655,16 +148033,17 @@ msgid "Do you believe you can take on the burden of additional bones?" msgstr "你相信自己能承担额外骨骼带来的重担吗？" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" -msgstr "有骨头要刻，有歌曲要唱。想加入吾等吗？" +msgid "A song may yet be sung by you, should you wish to." +msgstr "尚有歌未被你所唱，如果你想的话。" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." -msgstr "一名助手一次不应该唱太多的歌。" +msgid "There is an additional song you could take on, if you'd like." +msgstr "你尚可再唱一首歌，如果你想的话。" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." -msgstr "到此为止。" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." +msgstr "我知道有一些有用的骨头，如果你想知道更多的话。" #: lang/json/talk_topic_from_json.py msgid "" @@ -145672,6 +148051,14 @@ msgid "" "the bones of this world." msgstr "现在歌……很安静。也许随着时间的推移，更多的音符会刻在这个世界的骨头上。" +#: lang/json/talk_topic_from_json.py +msgid "An acolyte should not take on too many songs at once." +msgstr "一名助手一次不应该唱太多的歌。" + +#: lang/json/talk_topic_from_json.py +msgid "That is all for now." +msgstr "到此为止。" + #: lang/json/talk_topic_from_json.py msgid "I see." msgstr "我懂了。" @@ -146448,7 +148835,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "坚守阵地：不要移动到我旁边的障碍物上。" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -146761,16 +149148,16 @@ msgstr "是的，炎炎夏日让我很难受，让我们休息一下，你最近 msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "好吧，也许这能让我不再这鬼天气里冻僵了，怎么了？" +#: lang/json/talk_topic_from_json.py +msgid "Man it's dark out isn't it? what's up?" +msgstr "天太黑了不是吗？怎么了？" + #: lang/json/talk_topic_from_json.py msgid "" "Well, it's the time of day for a quick break surely! How are you holding " "up?" msgstr "对啊，是时候休息一下了！你感觉怎么样？" -#: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" -msgstr "天太黑了不是吗？怎么了？" - #: lang/json/talk_topic_from_json.py msgid "Well, I'm feeling pretty sick… are you doing OK though?" msgstr "我感觉很难受……你还好吗？" @@ -146858,14 +149245,14 @@ msgstr "好吧，别乱动……" msgid "Keep your distance!" msgstr "离我远点！" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "这是我的地盘，。" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "这是我的地盘，。" + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "冷静点，我不会伤害你。" @@ -146919,29 +149306,29 @@ msgid "I don't care." msgstr "我不在乎。" #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "我这正好有份你能做的事，想听听吗？" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "我还有件事要拜托你，要听听看吗？" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "我还有些其它的工作想交给你，要听听看吗？" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "我还有更多的工作想交给你，要听听看吗？" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "我还有些其它的工作想交给你，要听听看吗？" +msgid "I have another job for you. Want to hear about it?" +msgstr "我还有件事要拜托你，要听听看吗？" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "我没有更多的工作可以给你了。" +msgid "I just have one job for you. Want to hear about it?" +msgstr "我这正好有份你能做的事，想听听吗？" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "我没有工作可以给你。" +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "我没有更多的工作可以给你了。" + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -146951,6 +149338,10 @@ msgstr "哦，好的。" msgid "Never mind, I'm not interested." msgstr "[拒绝]算了，我没兴趣。" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "你现在没有为我做任何事情。" + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "哪个工作？" @@ -146959,10 +149350,6 @@ msgstr "哪个工作？" msgid "What about it?" msgstr "怎么样了？" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "你现在没有为我做任何事情。" - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "[确认]我去做吧！" @@ -147171,10 +149558,6 @@ msgstr "嗯嗯，好吧。" msgid "Thanks!" msgstr "谢谢啦！" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "专心开车，兄弟！" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "我不方便对你说。" @@ -147199,6 +149582,10 @@ msgstr "我渴了，给我来点喝的吧。" msgid "I must focus on the road!" msgstr "我在开车呢！" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "专心开车，兄弟！" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "啊，好吧。" @@ -147303,10 +149690,6 @@ msgstr "不要，在这挺好的。" msgid "On second thought, never mind." msgstr "[取消]回头想一想，算了吧。" -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "你开车的时候，我没法好好儿训练你！" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "我不教你是有原因的。" @@ -147319,6 +149702,10 @@ msgstr "给我点时间，我会给你看点新玩意……" msgid "I can't train you properly while I'm operating a vehicle!" msgstr "我开车的时候没法训练你！" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "你开车的时候，我没法好好儿训练你！" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "一点可能也没有。我要留下来！" @@ -148042,7 +150429,7 @@ msgid "How are you alive?" msgstr "你是怎么活下来的？" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" +msgid "What did you do before the Cataclysm?" msgstr "你在大灾难之前是做什么的？" #: lang/json/talk_topic_from_json.py @@ -148269,7 +150656,7 @@ msgid "This is a season spring test response." msgstr "春季测试回应。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." +msgid "This is a days since Cataclysm 30 test response." msgstr "大灾变后30天测试回应。" #: lang/json/talk_topic_from_json.py @@ -148277,7 +150664,7 @@ msgid "This is a season summer test response." msgstr "夏季测试回应。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." +msgid "This is a days since Cataclysm 120 test response." msgstr "大灾变后120天测试回应。" #: lang/json/talk_topic_from_json.py @@ -148285,7 +150672,7 @@ msgid "This is a season autumn test response." msgstr "秋季测试回应。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." +msgid "This is a days since Cataclysm 210 test response." msgstr "大灾变后210天测试回应。" #: lang/json/talk_topic_from_json.py @@ -148293,7 +150680,7 @@ msgid "This is a season winter test response." msgstr "冬季测试回应。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." +msgid "This is a days since Cataclysm 300 test response." msgstr "大灾变后300天测试回应。" #: lang/json/talk_topic_from_json.py @@ -148810,7 +151197,7 @@ msgstr "没时间解释了，世界末日到了，我们必须联合起来拯救 #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "大灾变削弱了时空连续性，我不小心掉进了时空裂痕之中，然后就来到了这里。我需要你提供给我一些资源，我才能继续战斗。" @@ -149148,7 +151535,7 @@ msgstr "" "之前，我是个警察。就在一切变得不可收拾的几天前我刚好挂彩了……我在一次缉毒行动中被错认了，一个混蛋开枪打中了我的肚子，差点就没能被防弹背心挡住。我受了很重的内伤。我从未想过这一枪会救我一命，但当最糟糕的时刻来临时，我正好休班在家休养。" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" +msgid "What did you do when you found out about the Cataclysm?" msgstr "当你发现大灾变发生后，你做了些什么？" #: lang/json/talk_topic_from_json.py @@ -150442,7 +152829,7 @@ msgstr "不，那太糟了。" #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "是的，我明白。有时我觉得我是在大灾变后不久才真正开始存在的。" #: lang/json/talk_topic_from_json.py @@ -151765,7 +154152,7 @@ msgid "What were you saying before that?" msgstr "你刚刚还说了什么？" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "我不敢相信我看到的一切。请把我从这里弄出去……" #: lang/json/talk_topic_from_json.py @@ -151804,7 +154191,7 @@ msgstr "你好先生，你来这有什么事吗？" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "我看见那个徽章了，你最好马上离开这个地方。" @@ -151836,8 +154223,8 @@ msgstr "我听说巴里的事了，你能告诉我是什么抓走了他吗？" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "它是粉色的，速度很快，有很多附肢，肯定不是人类。当我们逃跑时，它能够轻易跟上，太恐怖了。巴里最终不慎摔倒在地，而那个东西随即掳走了他。" @@ -151864,7 +154251,7 @@ msgid "" msgstr "克里斯正在我们地盘的边界巡逻，制定些防御方案。" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "马上滚出我的农场，我不跟政府的走狗说话。" #: lang/json/talk_topic_from_json.py @@ -151885,14 +154272,14 @@ msgstr "你好？" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "我看到那个徽章了，你最好马上离开我们的地盘，我家里对执法官没什么好感。" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "你好，你爸让我来找你，他说你在找你的叔叔。" #: lang/json/talk_topic_from_json.py @@ -151905,7 +154292,7 @@ msgstr "我之前和卢克说过话，他说你对世界末日有些有趣的见 msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "对啊，他们总是担心我们。我更喜欢侦察地形并记录变化。我正准备修好这个小屋，这样我可以静静……" #: lang/json/talk_topic_from_json.py @@ -151935,7 +154322,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" "在一次寻找巴里的远途侦察时，我在野外看见了某种东西。我没有靠近，但是我发誓我看到了不可思议的怪物从里面出现。那只怪物隐约在闪光，就像它并不在那一样。我跟踪了那些怪物一会……" @@ -151946,7 +154333,7 @@ msgstr "然后怎么样了？" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -151973,7 +154360,7 @@ msgstr "你最好在我家里人看见之前离开。" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "你爸让我来找你，他说你在找你的叔叔。" #: lang/json/talk_topic_from_json.py @@ -152026,7 +154413,7 @@ msgstr "能够在这片疯狂的灾难中有这样一片宁静之地一定很舒 msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "如果你准备充分并同心协力，也不需要太多的运气。我们也有失去的亲人，我老公的兄弟巴里，本来是我们最优秀的猎手。但是现在不一样了……" #: lang/json/talk_topic_from_json.py @@ -152039,7 +154426,7 @@ msgstr "如今的农场应该会是个非常安全的地方。" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." msgstr "啊，你好。杰克是不是和你吹过我的草药了？他对我们在这里的成果挺自豪的。" @@ -152081,8 +154468,8 @@ msgstr "我和杰克在一起40年了。他在这场混乱中一直是我的依 #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." msgstr "杰西他们家住在那边的牧马场，他们可能有活想让你干。" #: lang/json/talk_topic_from_json.py @@ -152111,6 +154498,12 @@ msgstr "你女儿住在路那边吗？" msgid "Where is your brother's place?" msgstr "你的兄弟住在哪？" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "我看见那个徽章了，你最好马上离开这个地方。" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "这奶场不错，让它保持运作很辛苦吧？" @@ -152176,6 +154569,10 @@ msgid "" " a forage set up." msgstr "卡洛斯没有打猎的时候都在他的工作间里面。他正在搞一个锻造台。" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "马上滚出我的农场，我不跟政府的走狗说话。" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "你的儿子在帮你干奶场的活吗？" @@ -152501,18 +154898,18 @@ msgstr "这儿没人会帮你。" msgid "Tell me about your dad." msgstr "和我说说你爸吧。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." -msgstr "女士，我不知道你怎么到这里来的。只要稍微有点理智，趁着你还能离开，赶紧走吧。" - #: lang/json/talk_topic_from_json.py msgid "" "Sir, I don't know how the hell you got down here but if you have any sense " "you'll get out while you can." msgstr "先生，我不知道你是怎么到这里来的。如果你还有点理智的话，趁现在你还能离开，赶紧走吧。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." +msgstr "女士，我不知道你怎么到这里来的。只要稍微有点理智，趁着你还能离开，赶紧走吧。" + #: lang/json/talk_topic_from_json.py msgid "Marshal, I hope you're here to assist us." msgstr "执法官，我希望你是来帮忙的。" @@ -152928,15 +155325,15 @@ msgstr "好的！那我们走吧。" msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "我跟你说过硬纸板的事吗，朋友？你有吗？" +#: lang/json/talk_topic_from_json.py +msgid "We've done it! We've solved the list!" +msgstr "成功了！购物清单完成了！" + #: lang/json/talk_topic_from_json.py msgid "" "How's things with you? My cardboard collection is getting quite impressive." msgstr "近况如何？我收集的纸箱越来越多了！" -#: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" -msgstr "成功了！购物清单完成了！" - #: lang/json/talk_topic_from_json.py msgid "About that shopping list of yours…" msgstr "关于你的购物清单……" @@ -153729,7 +156126,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "真恶心，不是吗？像个野人一样。大灾难过后不久，我身上就开始到处长毛。不知道是什么引起的。我不怪他们讨厌这玩意，我也讨厌。" @@ -153790,7 +156187,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" "你不知道？州长疯了，就像很多人在最后做的那样，不过他权力更大些。有一天，他和一群暴徒效忠者一起出现，发动了一场政变，完全占领了政府，杀死了所有反对者，然后把尽可能多的人转移到了岛上。我听到的传言是，他们中的大多数人在大灾变后幸存了下来，现在仍在那里，但我觉得这不太可能。" @@ -154343,7 +156740,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -156547,14 +158944,14 @@ msgstr "文明点，否则我对你不客气。" msgid "Just on watch, move along." msgstr "我就是个站岗的。走开。" -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "女士，你真的不该到处乱跑。" - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "外面很难活下去，不是吗？" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "女士，你真的不该到处乱跑。" + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "我听说这是一个难民中心……" @@ -157777,7 +160174,7 @@ msgstr "我想雇你。" #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." msgstr "我是被派过来帮忙建设农场的。我们大多数人在大灾变来临之前都没学过相关的知识，所以我们现在是在尝试和错误中努力前行。" @@ -158147,7 +160544,7 @@ msgstr "我要把秩序带回这片土地。" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -158167,7 +160564,7 @@ msgstr "我想，也许只有疯子才能活下去吧。 " #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "这些食物必须送回到我们的中心社区去。但也许我们可以用食物来换取一些服务。" @@ -158181,8 +160578,8 @@ msgstr "好吧，我该走了。" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "你先得努力赢得与我们贸易的权利。此外，我们在大灾变之前创造了我们自己使用的货币。" #: lang/json/talk_topic_from_json.py @@ -158205,8 +160602,8 @@ msgstr "反正我也不想加入你们那个俱乐部。" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "这里？水果和浆果。也许偶尔是农场设备，但你需要加密币。" #: lang/json/talk_topic_from_json.py @@ -158219,9 +160616,9 @@ msgstr "什么是加密币？" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" "我是通过互助协会被介绍进这场运动里的。从那时起，我一生中剩下的时间全花在这上面了，为了末日后的世界做准备。这似乎让我们相较其他人而言更成功地活了下来。" @@ -158239,9 +160636,9 @@ msgstr "能一直忙也是福报。" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" "我们这里用加密币当钱用。这原本是一次大灾变前的尝试，目的是进一步抽象化货币，创造电子化的现金。我们想我们会坚持下去的。物物交换还是有局限的。" @@ -158271,15 +160668,15 @@ msgstr "能帮你什么忙吗？" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" "没有，没有……好吧，也许有一点。当我发现它的时候，它就和地面部分一样被毁坏了，但修复起来并不难。欢迎你待在这里的空房间里，只是别独占了。你并不是这里唯一的拾荒者。" #: lang/json/talk_topic_from_json.py -msgid "Interesting..." +msgid "Interesting…" msgstr "有意思……" #: lang/json/talk_topic_from_json.py @@ -158289,7 +160686,7 @@ msgid "" msgstr "只不过是个幸运的家伙罢了。现在我心满意足地坐在我这堆宝物上。如果你有现金，我很乐意和你做笔交易。" #: lang/json/talk_topic_from_json.py -msgid "I see..." +msgid "I see…" msgstr "我明白了……" #: lang/json/talk_topic_from_json.py @@ -158299,8 +160696,8 @@ msgid "" msgstr "为什么不行呢？其他人都这样，所以我想这就足够了。我那边的自动取款机还能用，连接到银行服务器和其他什么的。" #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "恩……" +msgid "Hmm…" +msgstr "嗯……" #: lang/json/talk_topic_from_json.py msgid "" @@ -158309,7 +160706,7 @@ msgid "" msgstr "我想我有。像你一样的拾荒者都需要补给，对吧？而我总是需要更多的钱。" #: lang/json/talk_topic_from_json.py -msgid "Alright..." +msgid "Alright…" msgstr "好吧……" #: lang/json/talk_topic_from_json.py @@ -158317,7 +160714,7 @@ msgid "Not at the moment, check back later perhaps." msgstr "现在没有，也许以后再来看看吧。" #: lang/json/talk_topic_from_json.py -msgid "Sure..." +msgid "Sure…" msgstr "当然……" #: lang/json/talk_topic_from_json.py @@ -158337,7 +160734,7 @@ msgid "So are you busting us out of here or what?" msgstr "那你是要把我们从这里弄出去还是什么？" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." +msgid "Hold tight, . I've got to clear a path." msgstr "跟紧了，。我得先扫清一条路出来。" #: lang/json/talk_topic_from_json.py @@ -160341,17 +162738,17 @@ msgstr "轻松地将%s缴械" #: lang/json/technique_from_json.py msgid "Palm Strike" -msgstr "金刚掌" +msgstr "拗步掌" #: lang/json/technique_from_json.py #, python-format msgid "You palm strike %s" -msgstr "你给了%s一记金刚掌" +msgstr "你给了%s一记拗步掌" #: lang/json/technique_from_json.py #, python-format msgid " palm strikes %s" -msgstr "给了%s一记金刚掌" +msgstr "给了%s一记拗步掌" #: lang/json/technique_from_json.py msgid "Grasp the Sparrow's Tail" @@ -160369,17 +162766,17 @@ msgstr "使出揽雀尾，躲开了%s的攻击，并把它摔倒在地" #: lang/json/technique_from_json.py msgid "Double Palm Strike" -msgstr "大力金刚掌" +msgstr "双按掌" #: lang/json/technique_from_json.py #, python-format msgid "You double-handed palm strike %s" -msgstr "你给了%s一记大力金刚掌" +msgstr "你给了%s一记双按掌" #: lang/json/technique_from_json.py #, python-format msgid " double-handed palm strikes %s" -msgstr "给了%s一记大力金刚掌" +msgstr "给了%s一记双按掌" #: lang/json/technique_from_json.py msgid "Tiger Palm" @@ -162035,6 +164432,15 @@ msgstr "金属门（关）" msgid "A closed metal gate." msgstr "一扇关闭的金属门。" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "金属门（开）" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "一扇开启的金属门。" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "木制隐私围栏" @@ -163784,14 +166190,23 @@ msgstr "" "宝贵的汽油。曾经文明世界向他们的石油之神顶礼膜拜，而石油之神却把他们引向毁灭。但它还剩有足够的燃料来给你的车辆加油。如果这个加油泵不免费提供汽油的话，你可能要到附近的支付终端付款。" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "汽油储罐" +msgid "fuel tank" +msgstr "油罐" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "一个装满汽油的油箱。" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "油罐（损坏）" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "一个曾经装满汽油的坏油箱。" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "汽油泵（损坏）" @@ -165569,6 +167984,27 @@ msgstr "小型金属支架" msgid "A metal support beam." msgstr "金属支撑梁。" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "干砌石墙" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "一面坚固而干燥的石墙。没有砂浆，只有堆在一起的岩石。" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "干砌石墙（半成品）" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "一面坚固而干燥的半高石墙。没有砂浆，只有堆在一起的岩石。你可以就建成这样或再努把力把它再建高一些。" + #: lang/json/terrain_from_json.py msgid "window" msgstr "窗户" @@ -165943,8 +168379,8 @@ msgstr "简易墙" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "一堵用原木柱支撑起来的木板木棍混合墙，相当简陋。它能支撑上层楼或屋顶。泥土和石头使得它比较牢固。有些易燃。" #: lang/json/terrain_from_json.py @@ -165958,7 +168394,7 @@ msgstr "水培单元（废弃）" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "这是一个废弃的水培单元。你可以拆解它来收回材料。" @@ -166311,7 +168747,7 @@ msgstr "法力编织" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "无" @@ -166965,7 +169401,7 @@ msgstr "冰激凌车" msgid "Luggage Cart" msgstr "行李推车" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "购物车" @@ -170095,8 +172531,8 @@ msgstr "LACP 激光手枪炮塔" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "一条由变形怪环环相扣而成的履带。它可以替代轮胎，提供了更好抓地和越野性能。" #. ~ Description for gel shooter @@ -170821,6 +173257,10 @@ msgstr "维生素C" msgid "Toxins" msgstr "毒素" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "恶心的饮食" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "按 " @@ -171295,6 +173735,12 @@ msgstr "无法重新装填%s。" msgid "You reload the %s." msgstr "你重新装填了%s。" +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "你设法清理了 %s 的残渣，让它勉强能用。" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -172181,6 +174627,10 @@ msgstr "完成任务所需位置被挡住了。" msgid "The required items are not available to complete this task." msgstr "完成任务所需物品当前不可用。" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "光线不足，你无法工作！" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -172587,6 +175037,10 @@ msgstr "弹药/装药类型" msgid "spoilage" msgstr "腐败度" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "交换价值" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -174615,6 +177069,44 @@ msgstr "%s无法在当前状态下开火。" msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "%s使用了不兼容的弹药%s，不能开火。" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "你没有手持任何东西。" + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "你已经吃得很饱了，没法吃光%s的叶子。" + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "你吃下了 灌木丛。" + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "你已经吃得很饱了，没法咀嚼植物。" + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "你吃下了 草丛。" + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "这草太短，你吃不了。" + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "这草已枯萎或破碎，你吃不了。" + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "这草被油漆污染，你吃不了。" + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "你丢下空%s。" + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "你缩在龟壳里无法有效投掷物品。" @@ -174652,6 +177144,14 @@ msgstr "你聚精会神，你的身体开始服从大脑了！" msgid "You can't muster up the effort to throw anything…" msgstr "你无法提起力气投掷任何东西……" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "清空物品" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "你没有可以清空的物品。" + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -175529,16 +178029,14 @@ msgstr "手术开始时，你感到一阵兴奋。" #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." -msgstr "当全自动医疗仪毫无痛苦地割开你的身体时，你感到一阵兴奋。你欣喜地看着手术刀将你切开，但随着手术进行，你突然感到一阵疲惫，最后失去了意识。" +"sight of scalpels slicing you apart." +msgstr "当全自动医疗仪毫无痛苦地割开你的身体时，你感到一阵兴奋。你欣喜地看着手术刀将你切开。" #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." -msgstr "你静静地待着，专心注视着天花板上有趣的岩石纹路。全自动医疗仪正把你切开，但你毫无痛觉。幸运的是，你在看到刀片时就昏睡过去了。" +"ceiling, as the Autodoc slices painlessly into you." +msgstr "你静静等待着，凝视着天花板上一块有趣的污渍。全自动医疗仪正把你切开，但你毫无痛感。" #: src/bionics.cpp msgid "" @@ -178107,8 +180605,8 @@ msgstr "这看起来目前还不能吃。" msgid "This is full of dirt after being on the ground." msgstr "它太脏了，沾满了泥土，不能食用。" -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "你在水下时无法这样做。" @@ -178981,11 +181479,11 @@ msgstr "批量耗时减少：%s" msgid "Dark craftable? %s" msgstr "暗处制造：%s" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "简单" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "困难" @@ -179480,6 +181978,10 @@ msgstr "输出 NPC 魔法信息至控制台" msgid "Test weather" msgstr "测试天气" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "测试地图事件列表" + #: src/debug_menu.cpp msgid "Info…" msgstr "信息…" @@ -179686,7 +182188,7 @@ msgstr "收集：%d" msgid "Altruism: %d" msgstr "良心：%d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "人物需求：" @@ -180375,390 +182877,6 @@ msgstr "设置法术等级：（当前%d）" msgid "%s is now level %d!" msgstr "%s 已设为 %d 级！" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "请等待，地图生成中……[ 0%%]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "来了一个商队！按空格键继续……" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "你现在不需要睡觉！" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "防御模式下无法保存游戏！" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "你不能丢下%s！" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "恭喜你撑过了第 %d 波！" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "请等待。地图正在生成中 [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "上一选项" - -#: src/defense.cpp -msgid "Next option" -msgstr "下一选项" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "切换选项" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "开关选项" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "你需要至少选择一类怪物。" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "特殊丧尸" - -#: src/defense.cpp -msgid "Zombies" -msgstr "经典丧尸" - -#: src/defense.cpp -msgid "Triffids" -msgstr "三尖树" - -#: src/defense.cpp -msgid "Robots" -msgstr "机器人" - -#: src/defense.cpp -msgid "Subspace" -msgstr "异界" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "食物" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "雇佣兵" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "防御模式" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "按方向键切换选项，按回车键开关选项" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "按 S 开始" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "起始场景：" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "位置：" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "起始难度：" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "首波怪物的难度。" - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "每波难度：" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "每波难度提升幅度。" - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "每波间隔：" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "每波怪物的刷新间隔时间（分钟）。" - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "商队间隔：" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "每波商队的刷新间隔时间（怪物波次）。" - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "起始现金：" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "玩家的起始资金。" - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "首波奖金：" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "杀死首波怪物的奖金。" - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "奖金增幅：" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "每波怪物的奖金增幅。" - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "敌人种类：" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "自定义" - -#: src/defense.cpp -msgid "Medium" -msgstr "中等" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "僵尸肖恩" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "活死人黎明" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "八脚怪" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "三尖树之日" - -#: src/defense.cpp -msgid "Skynet" -msgstr "天网" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "克鲁苏的呼唤" - -#: src/defense.cpp -msgid "A custom game." -msgstr "自定义游戏。" - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "怪物菜，奖励多。" - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "怪物较强，你需要食物。" - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "怪物包含所有种类，你需要进食和饮水。" - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "在酒吧中防御经典丧尸。简单又有趣。" - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "经典丧尸。移动更慢更真实。" - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "爽快而有趣的蜘蛛战！" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "在你的别墅中抵抗三尖树的进攻。" - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "机器人已经研究决定了，人类都是敌人！" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "抵挡来自远古传说怪兽的入侵。" - -#: src/defense.cpp -msgid "Public Works" -msgstr "市政工程部" - -#: src/defense.cpp -msgid "Megastore" -msgstr "购物广场" - -#: src/defense.cpp -msgid "Bar" -msgstr "酒吧" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "一个入口和许多房间。一些医疗用品。" - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "一座容易建造防御工事的建筑，其中有许多实用工具。" - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "一栋巨大的建筑，里面有各种各样的物资。" - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "一间小屋子，以及各式酒精饮料。" - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "一座大房子，有许多房间。" - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" -"商队：\n" -"按上下键来选择菜单。\n" -"按 %s 键在主菜单和次级菜单之间切换。\n" -"选中物品后按左右键来增减购买数量。\n" -"按 %s 键购买购物车中物品。按 %s 键什么都不买。" - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "真的不买点什么吗？" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "小子，你买不起这些东西！" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "购买 %d 件物品，剩余资金： %s ，确定吗？" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "你丢下一些物品。" - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "近战武器" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "远程武器" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "弹药" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "制造/建筑材料" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "食物/药品" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "衣着/装备" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "工具/陷阱/手雷" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "按\"?\"键查看帮助。" - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "持有资金：%s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "欢迎来到第 %d 波！" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "第 %d 波：" - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "%s入侵！" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "%s来袭！" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "%s攻击！" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "来自地狱的%s！" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "小心！%s！" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "%s之日！" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "%s的复仇！" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "%s崛起！" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -181330,53 +183448,53 @@ msgstr "这大麻完全就是……扎西德勒巴扎嗨，你阿姐來亚克西 #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "力量 +%d; " +msgid "Strength +%d; " +msgstr "力量 +%d；" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "力量 %d; " +msgid "Strength %d; " +msgstr "力量 %d；" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "敏捷 +%d; " +msgid "Dexterity +%d; " +msgstr "敏捷 +%d；" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "敏捷 %d; " +msgid "Dexterity %d; " +msgstr "敏捷 %d；" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "感知 +%d; " +msgid "Perception +%d; " +msgstr "感知 +%d；" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "感知 %d; " +msgid "Perception %d; " +msgstr "感知 %d；" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "智力 +%d; " +msgid "Intelligence +%d; " +msgstr "智力 +%d；" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "智力 %d; " +msgid "Intelligence %d; " +msgstr "智力 %d；" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "速度 +%d; " +msgid "Speed +%d; " +msgstr "速度 +%d；" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "速度 %d; " +msgid "Speed %d; " +msgstr "速度 %d；" #: src/effect.cpp msgid "pain" @@ -182368,8 +184486,9 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." -msgstr "%s没能成功开始建设%s营地。" +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." +msgstr "%s没能成功建立%s营地，可能目标区域被载具挡住了。" #: src/faction_camp.cpp msgid "There is no faction camp here to recover!" @@ -183245,8 +185364,9 @@ msgstr "紧急召唤归来……" #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." -msgstr "%s没能成功升级%s。" +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." +msgstr "%s没能成功建造升级项目%s，可能目标区域被载具挡住了。" #: src/faction_camp.cpp msgid "returns from upgrading the camp having earned a bit of experience…" @@ -183462,8 +185582,9 @@ msgstr "选择扩展区：" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" -msgstr "%s没能成功扩展%s。" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." +msgstr "%s没能成功建造%s扩展区，可能目标区域被载具挡住了。" #: src/faction_camp.cpp msgid "returns from surveying for the expansion." @@ -183745,6 +185866,26 @@ msgstr "%s的残肢被发现散落在周围的灌木丛上。" msgid "(You wonder if your companions are fit to work on their own…)" msgstr "（你深刻地反省你的同伴是否胜任独自一人在野外工作……）" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "和%s" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "和%s" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "和%s" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "和%s" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -184531,7 +186672,8 @@ msgstr "如不添加燃料，将会持续燃烧约%s。" msgid "Without extra fuel it will burn for between %s to %s." msgstr "如不添加燃料，将会持续燃烧%s至%s。" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "不能在骑乘时这样做。" @@ -185022,40 +187164,6 @@ msgstr "你的心情不好，而且一想到手要沾上内脏和鲜血，你决 msgid "%s helps with this task…" msgstr "%s 协助你完成这项任务……" -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "你已经吃得很饱了，没法吃光%s的叶子。" - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "你吃下了 灌木丛。" - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "你已经吃得很饱了，没法咀嚼植物。" - -#: src/game.cpp -msgid "You eat the grass." -msgstr "你吃下了 草丛。" - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "这草太短，你吃不了。" - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "这草已枯萎或破碎，你吃不了。" - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "这草被油漆污染，你吃不了。" - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "你丢下空%s。" - #: src/game.cpp msgid "Change side for item" msgstr "物品换侧" @@ -185084,6 +187192,11 @@ msgstr "%s已经满了！" msgid "You can't reload a %s!" msgstr "你不能重新装填%s！" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "你艰难地装填了被残渣堵塞的%s。" + #: src/game.cpp msgid "Reload item" msgstr "装填物品" @@ -185092,18 +187205,6 @@ msgstr "装填物品" msgid "You have nothing to reload." msgstr "你没有可以装填的物品。" -#: src/game.cpp -msgid "Unload item" -msgstr "清空物品" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "你没有可以清空的物品。" - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "你没有手持任何东西。" - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -185188,6 +187289,13 @@ msgstr "找不到抓着的东西。" msgid "You cannot board a vehicle whilst riding." msgstr "不能在驾驶时登上载具。" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "直接走进 %1$s 很危险。如果你想走进去的话，切换至奔跑。" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "不能在骑乘时通过障碍物。" @@ -185844,11 +187952,6 @@ msgstr "已分配的物品快捷键： %d/ (DEAF!)" +msgstr "（失聪！）" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -191716,7 +194219,7 @@ msgstr "你的 %1$s 不能装下更多的 %2$s。" msgid "That %s doesn't have room to expand." msgstr "%s 没有可扩展的空间。" -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%d x %s" @@ -191799,69 +194302,6 @@ msgstr "%s 因被黑火药污染而生锈。" msgid "Your %s disappears!" msgstr "你的 %s 消失了！" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "%s 的尸体（已剥皮）" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "%s 的胴体（已剥皮）" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "%s 的胴体" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "%s 的四分体" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "%s 的尸体" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "%s 的尸体（已剥皮）（%s）" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "%s 的胴体（已剥皮）（%s）" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "%s 的 %s 胴体" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%s 的尸体（%s）" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -191875,6 +194315,21 @@ msgid "%s blood" msgid_plural "%s blood" msgstr[0] "%s 血液" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "%2$s的%1$s" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "%2$s（%3$s）的%1$s" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "你没有进行这个行动所需要的工具。" @@ -192451,7 +194906,7 @@ msgstr "这里没有可以喂食的对象。" msgid "Modify what?" msgstr "改造什么？" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "你没有这个东西！" @@ -193502,6 +195957,10 @@ msgstr "扫雷" msgid "Lights on!" msgstr "灯全都亮了！" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "随便玩一会" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -193924,10 +196383,6 @@ msgstr "你听见 \"%s\"" msgid "You need a mechanics skill of 2 to use this repair kit." msgstr "你需要2级机械技能才能使用这个修理包。" -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "选择需要修理的枪械。" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "那货不是枪械！" @@ -193978,23 +196433,6 @@ msgstr "你没有兼容该模组的工具。" msgid "You cancel unloading the tool." msgstr "你取消了卸载工具。" -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "太暗了，你无法修理！" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "你需要1级制造技能才能使用这个修理包。" - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "选择要修理的物品" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "你强化了 %s。" - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "咔啷！咔啷！" @@ -194242,31 +196680,6 @@ msgstr "你触发了固件的保护程序，卡上的内容被自动清除了。 msgid " on " msgstr "和" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "和%s" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "和%s" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "和%s" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "和%s的亮光" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "和%s" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -195075,6 +197488,14 @@ msgid "" " but best to stop messing with it." msgstr "你的捣鼓要把多功能厨师机弄坏了！幸运的是，它还能用。你最好少乱动它了。" +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "选择UPS：" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "你没有任何UPS。" + #: src/iuse.cpp msgid "Using cable:" msgstr "使用电缆：" @@ -195103,14 +197524,6 @@ msgstr "你将电缆一端连接至你的电缆充电器CBM上。" msgid "You attach the cable to the solar pack." msgstr "你将电缆一端连接至太阳能背包。" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "选择UPS：" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "你没有任何UPS。" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "你将电缆一端连接至UPS。" @@ -197598,12 +200011,9 @@ msgid "Congratulations, you won!" msgstr "恭喜你，你赢了！" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "最大：" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "最小：" +#, c-format +msgid "Min: %d Max: %d" +msgstr "最小：%d，最大：%d" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -198459,6 +200869,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "直接游戏！" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "可以完全设置起始点数，起始场景，角色职业、属性、特性、技能和其他参数。" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "从之前保存的角色模板中选择角色游玩。" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "创建随机角色，但可以预览生成的角色和起始场景，并在需要时更改角色及起始场景。" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "直接开始游戏，随机选择角色职业、属性、特性、技能和其他参数。起始场景固定为被疏散者。" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "直接开始游戏，随机选择起始场景，角色职业、属性、特性、技能和其他参数。" + #: src/main_menu.cpp msgid "No templates found!" msgstr "预设角色不存在！" @@ -198686,6 +201124,14 @@ msgstr "从 %s 里爬出了一些东西！" msgid "DANGER! MINEFIELD!" msgstr "危险！雷区！" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "选择要测试的地图事件列表" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "32400次选择的结果：" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -198818,20 +201264,9 @@ msgid "You're violently teleported!" msgstr "你猛地被传送走了！" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "蜜蜂刺了你一下！" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "蜜蜂刺了你几下！" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "蜜蜂刺了你无数下！" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "蜜蜂把你刺得体无完肤！" +#, c-format +msgid "The bees sting you in %s!" +msgstr "%s 中的蜜蜂刺了你一下！" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -198994,6 +201429,16 @@ msgid "Skill" msgid_plural "Skills" msgstr[0] "技能" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "所需伤害类型：" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "%s：%d" + #: src/martialarts.cpp msgid "Requires: " msgstr "要求：" @@ -203881,6 +206326,10 @@ msgstr "%s 身上的强酸灼烧着你的手！" msgid "Acid sprays out of %s as it is hit!" msgstr "从 %s 被击中的伤口中喷出了酸液！" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "侦测到来自未知攻击者的射击，回击模式已启动。" + #: src/monexamine.cpp msgid "zombie slave" msgstr "丧尸奴仆" @@ -206803,8 +209252,9 @@ msgid "I have news." msgstr "我有个消息。" #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "是的，让我们接着训练 。" +#, c-format +msgid "Yes, let's resume training %s" +msgstr "是的，让我们继续%s的训练" #: src/npctalk.cpp #, c-format @@ -207500,6 +209950,16 @@ msgid "" "weight limit." msgstr "开启时，超重物品将保留在物品栏中不被自动丢下。关闭时，新拾取的超重物品将会被自动丢下。" +#: src/options.cpp +msgid "Dangerous running" +msgstr "强制奔跑" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "开启后，玩家在奔跑时可以走进已知的危险地块中。" + #: src/options.cpp msgid "Safe mode" msgstr "安全模式" @@ -209658,7 +212118,7 @@ msgstr "搜索词：" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" "使用\",\"以分隔各项，使用\"-\"以排除该项\n" @@ -209686,11 +212146,11 @@ msgstr "方向：" #: src/overmap_ui.cpp msgid "'<-' '->' Cycle targets." -msgstr "按‘<-’‘->’切换目标。" +msgstr "按\"左/右方向\"键切换目标。" #: src/overmap_ui.cpp msgid "Enter/Spacebar to select." -msgstr "回车/空格 来选择。" +msgstr "按\"回车\"或\"空格\"键选择。" #: src/overmap_ui.cpp msgid "q or ESC to return." @@ -210100,6 +212560,10 @@ msgstr "休息：" msgid "Heat :" msgstr "保暖：" +#: src/panels.cpp +msgid "Deaf!" +msgstr "失聪！" + #: src/panels.cpp msgid "Underground" msgstr "地下" @@ -210158,10 +212622,6 @@ msgstr "月相： " msgid "Lighting:" msgstr "光照：" -#: src/panels.cpp -msgid "Deaf!" -msgstr "失聪！" - #: src/panels.cpp msgid "Weapon :" msgstr "武器：" @@ -211182,6 +213642,11 @@ msgstr "修复什么故障？" msgid "Turns into: %s\n" msgstr "修复后变为：%s\n" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "同时修复：%s\n" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -211635,77 +214100,78 @@ msgstr "速度" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "游泳消耗 %+d 点行动点。" +msgid "Swimming movement point cost: %+d\n" +msgstr "游泳行动点消耗：%+d\n" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "奔跑消耗 %+d 点行动点。" +msgid "Running movement point cost: %+d\n" +msgstr "奔跑行动点消耗：%+d\n" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "重新装填消耗 %+d 点行动点。" +msgid "Reloading movement point cost: %+d\n" +msgstr "装填行动点消耗：%+d\n" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "近战和投掷消耗 %+d 点行动点。" +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "近战和投掷行动点消耗：%+d\n" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "闪避技能 %+.1f。" +msgid "Dodge skill: %+.1f\n" +msgstr "闪避技能：%+.1f\n" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "近战攻击掷骰 %+d%%；" +msgid "Melee attack rolls: %+d%%\n" +msgstr "近战攻击掷骰：%+d%%\n" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." -msgstr "头部累赘没有任何影响，它仅用于限制你能穿多少装备。" +"Head encumbrance has no effect; it simply limits how much you" +" can put on." +msgstr "头部累赘没有任何影响，它仅用于限制你能穿多少装备。" #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"探测陷阱或使用远程武器时 洞察%+d；\n" -"投掷物品时散布 %+d。" +"探测陷阱或使用远程武器时感知值：%+d\n" +"投掷物品时散布值：%+d" #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "嘴部累赘会让你呼吸和喘气变得更加困难，降低体力恢复速度。" +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "嘴部累赘会让你呼吸和喘气变得更加困难，降低体力恢复速度。" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." -msgstr "手臂累赘度影响近战攻击时的耐力消耗和远程武器命中。" +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." +msgstr "手臂累赘度影响近战攻击时的耐力消耗和远程武器命中率。" #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "降低你控制和操作物品的速度\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" +"降低你控制和操作物品的速度。\n" +"\n" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "投掷物品时，敏捷 %+.1f。\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "投掷物品时敏捷值：%+.1f\n" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "枪械瞄准速度降低 %.1f。" +msgid "Reduced gun aim speed: %.1f" +msgstr "瞄准速度减少：%.1f" #: src/player_display.cpp msgid "" @@ -211795,8 +214261,8 @@ msgstr "体重：" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." msgstr "体重是衡量你体内脂肪量的一个通用指标，换句话说它可以用于衡量你在没有食物时能够活多久。体重过重或过轻都是不健康的。" #: src/player_display.cpp @@ -212541,6 +215007,16 @@ msgstr "你的 %s 发出一声沉重的响声，哑火了！" msgid "'s %s misfires with a muffled click!" msgstr " 的 %s 发出一声沉重的响声，哑火了！" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "也许清空 %s 并重新装填能起效。" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "也许清空 的 %s 并重新装填能起效。" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -212581,6 +215057,16 @@ msgstr "你的 %s 因射击而受损了！" msgid "'s %s is damaged by their shot!" msgstr " 的 %s 因射击受损了！" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "%s 发出让人痛苦万分的刺耳声！" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr " 的 %s 发出让人痛苦万分的刺耳声！" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -212779,6 +215265,10 @@ msgstr "精准瞄准" msgid "[%c] to take precise aim and fire." msgstr "[%c] 精确瞄准并开火。" +#: src/ranged.cpp +msgid "turrets" +msgstr "炮塔" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -213211,8 +215701,8 @@ msgstr "听到了 %s！" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." -msgstr "你听见自己这发出 %1$s。" +msgid "From your position you hear %1$s" +msgstr "你听见自己这发出 %1$s" #: src/sounds.cpp #, c-format @@ -214305,18 +216795,6 @@ msgid "%s emits an IFF warning beep." msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "%s 发出了 %d 声烦人的警报声。" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "John Smith" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "你在教学虚拟世界中存档了！- 教学世界不是真实世界，缺少许多关键特性。读取这个存档会发生不可测的问题。该怎么做你明白了吗？" - #: src/veh_interact.cpp msgid "Select part" msgstr "选择部件" @@ -216604,6 +219082,10 @@ msgstr "晴" msgid "Cloudy" msgstr "多云" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "毛毛雨" + #: src/weather_data.cpp msgid "Drizzle" msgstr "细雨" diff --git a/lang/po/zh_TW.po b/lang/po/zh_TW.po index 76fe1a23009b8..2999641783827 100644 --- a/lang/po/zh_TW.po +++ b/lang/po/zh_TW.po @@ -10,28 +10,28 @@ # John Doe , 2019 # 黃某人, 2019 # vivi00791 , 2019 -# KTISME , 2019 # Maynard , 2019 # 菲伊斯 , 2019 # 林楷翌 , 2019 -# Brett Dong , 2019 # Jeremy Wu , 2019 # kiddragon Chung , 2019 # Julian Lau , 2019 # HOXV , 2019 -# xap, 2019 -# Laughing Man, 2019 # Hao JK , 2019 # Hsinyu Chan, 2019 # 鋼龍 , 2019 +# 類凱宇 , 2019 +# Brett Dong , 2019 +# xap, 2019 +# Laughing Man, 2019 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-06 15:57+0800\n" +"POT-Creation-Date: 2019-12-20 11:54+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" -"Last-Translator: 鋼龍 , 2019\n" +"Last-Translator: Laughing Man, 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1488,8 +1488,8 @@ msgstr "洗衣粉" #. ~ Description for detergent #: lang/json/AMMO_from_json.py -msgid "A popular pre-cataclysm washing powder." -msgstr "一款於災變前隨處可見的洗衣粉。" +msgid "A popular pre-Cataclysm washing powder." +msgstr "" #: lang/json/AMMO_from_json.py msgid "soap flakes" @@ -1764,6 +1764,16 @@ msgstr[0] "燈油" msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "一份無煙輕油, 適用於油燈。" +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "motor oil" +msgid_plural "motor oil" +msgstr[0] "" + +#. ~ Description for motor oil +#: lang/json/AMMO_from_json.py +msgid "An oil made for use in car engines." +msgstr "" + #: lang/json/AMMO_from_json.py msgid "napalm" msgid_plural "napalm" @@ -1906,6 +1916,60 @@ msgid "" "administered manually." msgstr "一組用來導引手術麻醉的工具包, 包含各種強效催眠藥、止痛藥和興奮藥的專用藥罐。它只能用於專業的醫療設備中, 不能手動使用。" +#: lang/json/AMMO_from_json.py +msgid "40mm flare" +msgstr "40mm 信號彈" + +#. ~ Description for 40mm flare +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm signal flare. It will burn brightly for up to a minute, and will " +"also leave a streak of smoke cover in its wake." +msgstr "一個 40mm 口徑的信號彈, 能夠暫時照亮四周一陣子, 但是發射時會留下煙霧的軌跡。" + +#: lang/json/AMMO_from_json.py +msgid "40x46mm " +msgstr "" + +#. ~ Description for 40x46mm +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a flashbang load. It will detonate with a blast of " +"light and sound, designed to blind, deafen, and disorient anyone nearby." +msgstr "搭載閃光彈的 40mm 榴彈。爆炸時會發出強光和巨響, 能夠讓附近的人失明失聰。" + +#: lang/json/AMMO_from_json.py +msgid "40mm incendiary" +msgid_plural "40mm incendiaries" +msgstr[0] "40mm 燃燒榴彈" + +#. ~ Description for 40mm incendiary +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm grenade with a small napalm load, designed to create a burst of " +"flame." +msgstr "內含固態汽油, 能夠產生燃燒效果的 40mm 榴彈。" + +#: lang/json/AMMO_from_json.py +msgid "40mm smoke cover" +msgstr "40mm 煙霧榴彈" + +#. ~ Description for 40mm smoke cover +#: lang/json/AMMO_from_json.py +msgid "A 40mm grenade designed to provide smoke cover." +msgstr "40mm 的煙霧榴彈, 用來提供煙霧掩護。" + +#: lang/json/AMMO_from_json.py +msgid "40mm slug" +msgstr "40mm 獨頭彈" + +#. ~ Description for 40mm slug +#: lang/json/AMMO_from_json.py +msgid "" +"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " +"guess." +msgstr "裝有一顆巨大彈頭的40mm彈殼。後座力會讓你失去肩膀，大概吧。" + #: lang/json/AMMO_from_json.py msgid "10mm Auto FMJ" msgstr "10mm Auto 全金屬彈" @@ -2701,125 +2765,133 @@ msgid ".40 S&W JHP, reloaded" msgstr "" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py -msgid "40mm grenade" -msgstr "40mm 榴彈" +msgid "40x46mm grenade" +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm beanbag" -msgstr "40mm 豆袋榴彈" +msgid "40x46mm M1006" +msgstr "" -#. ~ Description for 40mm beanbag +#. ~ Description for 40x46mm M1006 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm less-lethal beanbag that delivers strong impact on target, causing " -"major pain and disorientation. May still injure or kill." -msgstr "一個40毫米低致命性豆袋，可對目標產生強烈衝擊，造成強烈疼痛和喪失方向感。仍可能會造成致命傷。" +"A low velocity less-lethal 40x46mm round with a foam and plastic projectile " +"intended to cause pain and disorientation to the target. May still injure " +"or kill." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm concussive" -msgstr "40mm 高爆榴彈" +msgid "40x46mm M433" +msgstr "" -#. ~ Description for 40mm concussive +#. ~ Description for 40x46mm M433 #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade with a concussive explosion load." -msgstr "能產生震撼爆炸的 40mm 榴彈。" +msgid "" +"A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flare" -msgstr "40mm 信號彈" +msgid "40x46mm M576" +msgstr "" -#. ~ Description for 40mm flare +#. ~ Description for 40x46mm M576 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm signal flare. It will burn brightly for up to a minute, and will " -"also leave a streak of smoke cover in its wake." -msgstr "一個 40mm 口徑的信號彈, 能夠暫時照亮四周一陣子, 但是發射時會留下煙霧的軌跡。" +"A 40x46mm buckshot load, designed for use in thick vegetation or room " +"clearing." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm flashbang" -msgstr "40mm 閃光榴彈" +msgid "40x46mm M651" +msgstr "" -#. ~ Description for 40mm flashbang +#. ~ Description for 40x46mm M651 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm grenade with a flashbang load. It will detonate with a blast of " -"light and sound, designed to blind, deafen, and disorient anyone nearby." -msgstr "搭載閃光彈的 40mm 榴彈。爆炸時會發出強光和巨響, 能夠讓附近的人失明失聰。" +"A low velocity 40mm tear gas canister. It is effective for riot control and" +" driving infantry from entrenched positions" +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x46mm buckshot" +msgstr "" +#. ~ Description for 40x46mm buckshot #: lang/json/AMMO_from_json.py -msgid "40mm flechette" -msgstr "40mm 鋼鏢榴彈" +msgid "An improvised 40x46mm buckshot load somewhat resembling M576." +msgstr "" -#. ~ Description for 40mm flechette #: lang/json/AMMO_from_json.py -msgid "A 40mm shell loaded with a large number of armor-piercing flechettes." -msgstr "一個40毫米彈體，裝有大量的穿甲破片。" +msgid "40x46mm slug" +msgstr "" +#. ~ Description for 40x46mm slug #: lang/json/AMMO_from_json.py -msgid "40mm frag" -msgstr "40mm 破片榴彈" +msgid "An improvised 40x46mm load resembling an oversized shotgun slug." +msgstr "" -#. ~ Description for 40mm frag #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small explosive load and a high number of damaging " -"fragments." -msgstr "爆炸時會產生大量致命破片的 40mm 榴彈。" +msgid "40x46mm flechette" +msgstr "" +#. ~ Description for 40x46mm flechette #: lang/json/AMMO_from_json.py -msgid "40mm incendiary" -msgid_plural "40mm incendiaries" -msgstr[0] "40mm 燃燒榴彈" +msgid "An improvised 40x46mm flechette load containing 70 steel darts." +msgstr "" + +#: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py +msgid "40x53mm grenade" +msgstr "" -#. ~ Description for 40mm incendiary #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a small napalm load, designed to create a burst of " -"flame." -msgstr "內含固態汽油, 能夠產生燃燒效果的 40mm 榴彈。" +msgid "40x53mm M1001" +msgstr "" +#. ~ Description for 40x53mm M1001 #: lang/json/AMMO_from_json.py -msgid "40mm buckshot" -msgstr "40mm 獵鹿榴彈" +msgid "40x53mm canister shot loaded with 17 grain flechettes." +msgstr "" + +#: lang/json/AMMO_from_json.py +msgid "40x53mm M430A1" +msgstr "" -#. ~ Description for 40mm buckshot +#. ~ Description for 40x53mm M430A1 #: lang/json/AMMO_from_json.py msgid "" -"A 40mm shell with a powerful buckshot load, designed to be used as " -"alternative to shotguns or when breaching barricades and other obstacles." -msgstr "40毫米彈體裝有大量霰彈彈丸，設計用於突破路障和其他障礙物或替代霰彈槍。" +"A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel " +"armor and fragmentation of the projectile body also makes it suitable for " +"use against infantry." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm smoke cover" -msgstr "40mm 煙霧榴彈" +msgid "40x53mm buckshot" +msgstr "" -#. ~ Description for 40mm smoke cover +#. ~ Description for 40x53mm buckshot #: lang/json/AMMO_from_json.py -msgid "A 40mm grenade designed to provide smoke cover." -msgstr "40mm 的煙霧榴彈, 用來提供煙霧掩護。" +msgid "An improvised 40x53mm buckshot load somewhat resembling M576." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm teargas" -msgid_plural "40mm teargas grenades" -msgstr[0] "40mm 催淚瓦斯榴彈" +msgid "40x53mm slug" +msgstr "" -#. ~ Description for 40mm teargas +#. ~ Description for 40x53mm slug #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm grenade with a teargas load. It will burst in a cloud of highly " -"incapacitating gas." -msgstr "內含催淚瓦斯的 40mm 榴彈, 爆炸時散發出的氣體會令人失去行動力。" +msgid "An improvised 40x53mm load resembling an oversized shotgun slug." +msgstr "" #: lang/json/AMMO_from_json.py -msgid "40mm slug" -msgstr "40mm 獨頭彈" +msgid "40x53mm flechette" +msgstr "" -#. ~ Description for 40mm slug +#. ~ Description for 40x53mm flechette #: lang/json/AMMO_from_json.py -msgid "" -"A 40mm shell loaded with a massive bullet. Say goodbye to your shoulder, I " -"guess." -msgstr "裝有一顆巨大彈頭的40mm彈殼。後座力會讓你失去肩膀，大概吧。" +msgid "An improvised 40x53mm flechette load containing 100 steel darts." +msgstr "" #: lang/json/AMMO_from_json.py msgid ".410 000 shot" @@ -4502,9 +4574,9 @@ msgstr[0] "銀塊" #. ~ Description for silver #: lang/json/AMMO_from_json.py msgid "" -"A soft shiny metal. Before the cataclysm it was worth quite a bit but its " +"A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " "value is now greatly diminished." -msgstr "一種軟而閃亮的金屬。在大災變之前它的價值不菲, 但現在已經大打折扣。" +msgstr "" #: lang/json/AMMO_from_json.py msgid "small metal sheet" @@ -5014,13 +5086,6 @@ msgstr "一把飛鏢, 搭配吹箭才有用。" msgid "plutonium cell" msgstr "鈽電池" -#. ~ Description for battery -#: lang/json/AMMO_from_json.py -msgid "" -"Some free-floating battery charge. This can be reloaded into rechargable " -"battery cells, but can never be unloaded." -msgstr "一些自由浮動的電池料。可以填進可充式電池內。但永遠不能被取出。" - #: lang/json/AMMO_from_json.py msgid "chunk of rubber" msgid_plural "chunks of rubber" @@ -5086,7 +5151,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A helical magazine of hollow-point alloy bullets propelled by pockets of " -"primer. Not the most lethal thing out there, but it still packs a punch " +"primer. Not the most lethal thing out there, but it still packs a punch " "without the worry of having a stray shot seriously damaging the environment." msgstr "" @@ -5538,18 +5603,6 @@ msgid "" "Hefty round projectiles cast from lead, useful as ammunition for slings." msgstr "鉛鑄的重磅圓球, 可以用在投石帶上。" -#: lang/json/AMMO_from_json.py -msgid "bone crossbow bolt" -msgstr "骨製十字弓箭" - -#. ~ Description for bone crossbow bolt -#: lang/json/AMMO_from_json.py -msgid "" -"A sharpened bolt carved from bone, with fletching attached. It's light, " -"providing decent damage and accuracy. Stands a good chance of remaining " -"intact once fired." -msgstr "由骨頭刻成並削尖的十字弓箭, 上面附帶有箭羽, 具有普通的傷害與準度。回收率高。" - #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "wooden javelin" msgid_plural "wooden javelins" @@ -5981,8 +6034,8 @@ msgstr[0] "黏球怪飼料" #: lang/json/AMMO_from_json.py msgid "" "An amalgam of various types of organic material, contains everything the " -"blob needs to be healthy. You think..." -msgstr "各種類型有機材料的混合物, 包含一切黏球怪所需的健康元素, 至少你是這樣想的。" +"blob needs to be healthy. You think…" +msgstr "" #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -6318,9 +6371,9 @@ msgstr[0] "遊牧民族衣" #. ~ Description for nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A makeshift outfit made from pre-cataclysm clothing designed for long " +"A makeshift outfit made from pre-Cataclysm clothing designed for long " "travels. It has a lot of storage space." -msgstr "一件粗製的外衣, 由大災變前的衣物製成, 設計來長途旅行。它有大量的儲物空間。" +msgstr "" #: lang/json/ARMOR_from_json.py msgid "light nomad gear" @@ -6330,10 +6383,10 @@ msgstr[0] "輕便遊牧民族衣 " #. ~ Description for light nomad gear #: lang/json/ARMOR_from_json.py msgid "" -"A light makeshift outfit made from pre-cataclysm clothing designed for long " +"A light makeshift outfit made from pre-Cataclysm clothing designed for long " "summer travels. It offers less storage space and armor compared to regular " "nomad gear." -msgstr "這款輕便的粗製旅行衣，是由災變之前的衣服修改而來，用於漫長的夏季旅行用" +msgstr "" #: lang/json/ARMOR_from_json.py msgid "plated leather armor" @@ -6388,9 +6441,9 @@ msgstr[0] "拾荒者裝備" #. ~ Description for scavenger gear #: lang/json/ARMOR_from_json.py msgid "" -"A sturdy scavenger's outfit made from refitted pre-cataclysm protective " +"A sturdy scavenger's outfit made from refitted pre-Cataclysm protective " "gear. It has a lot of storage space." -msgstr "一件堅固的拾荒者外衣, 由大災變前的防護裝備改裝製成。它有大量的儲物空間。" +msgstr "" #: lang/json/ARMOR_from_json.py msgid "scrap suit" @@ -10180,8 +10233,8 @@ msgstr "一件有沉重毛皮內襯的長褲。" #: lang/json/ARMOR_from_json.py msgid "faux fur pants" -msgid_plural "faux fur pantss" -msgstr[0] "人造毛皮褲子" +msgid_plural "faux fur pants" +msgstr[0] "" #. ~ Description for faux fur pants #: lang/json/ARMOR_from_json.py @@ -11738,8 +11791,8 @@ msgstr "純白色的忍者褲, 常用於武術上。" #: lang/json/ARMOR_from_json.py msgid "violin case" -msgid_plural "violin case" -msgstr[0] "小提琴盒" +msgid_plural "violin cases" +msgstr[0] "" #. ~ Description for violin case #: lang/json/ARMOR_from_json.py @@ -12352,9 +12405,9 @@ msgstr[0] "巨大的新奇背包" #. ~ Description for giant novelty backpack #: lang/json/ARMOR_from_json.py msgid "" -"A huge fabric backpack made mostly as a joke before the cataclysm. Now, " +"A huge fabric backpack made mostly as a joke before the Cataclysm. Now, " "it's still rather silly, but it can store a lot of stuff." -msgstr "在大災變之前, 一個巨大的布料背包多被視為是個笑話。現在, 它仍然相當愚蠢, 但它可以存儲很多東西。" +msgstr "" #: lang/json/ARMOR_from_json.py msgid "leather backpack" @@ -13487,6 +13540,131 @@ msgid "" "looks very shiny. For that high-class gangsta rap look." msgstr "一顆鑲嵌了假鑽的牙齒, 能套在牙齒上。意外的適合, 看起來很閃。高級幫派饒舌歌手必備。" +#: lang/json/ARMOR_from_json.py +msgid "garnet dental grill" +msgid_plural "garnet dental grills" +msgstr[0] "" + +#. ~ Description for garnet dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with garnets, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "amethyst dental grill" +msgid_plural "amethyst dental grills" +msgstr[0] "" + +#. ~ Description for amethyst dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with amethysts, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "aquamarine dental grill" +msgid_plural "aquamarine dental grills" +msgstr[0] "" + +#. ~ Description for aquamarine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with aquamarines, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "emerald dental grill" +msgid_plural "emerald dental grills" +msgstr[0] "" + +#. ~ Description for emerald dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with emeralds, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "alexandrite dental grill" +msgid_plural "alexandrite dental grills" +msgstr[0] "" + +#. ~ Description for alexandrite dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with alexandrites, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "ruby dental grill" +msgid_plural "ruby dental grills" +msgstr[0] "" + +#. ~ Description for ruby dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with rubys, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "peridot dental grill" +msgid_plural "peridot dental grills" +msgstr[0] "" + +#. ~ Description for peridot dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with peridots, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "sapphire dental grill" +msgid_plural "sapphire dental grills" +msgstr[0] "" + +#. ~ Description for sapphire dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with sapphires, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "tourmaline dental grill" +msgid_plural "tourmaline dental grills" +msgstr[0] "" + +#. ~ Description for tourmaline dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with tourmaline, worn over the teeth. It looks very " +"shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "citrine dental grill" +msgid_plural "citrine dental grills" +msgstr[0] "" + +#. ~ Description for citrine dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with citrines, worn over the teeth. It looks very shiny." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "blue_topaz dental grill" +msgid_plural "blue_topaz dental grills" +msgstr[0] "" + +#. ~ Description for blue_topaz dental grill +#: lang/json/ARMOR_from_json.py +msgid "" +"Fake teeth inlaid with blue topaz, worn over the teeth. It looks very " +"shiny." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "diamond ring" msgid_plural "diamond rings" @@ -14285,6 +14463,510 @@ msgid "" " behind you when you walk." msgstr "一條光滑的黑色皮革尾巴, 掛著許多小珠子。當你走路的時候會搖曳。" +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and gold earrings" +msgid_plural "pairs of diamond and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of diamond and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and gold earrings" +msgid_plural "pairs of garnet and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of garnet and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and gold earrings" +msgid_plural "pairs of amethyst and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of amethyst and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and gold earrings" +msgid_plural "pairs of aquamarine and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of aquamarine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and gold earrings" +msgid_plural "pairs of emerald and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of emerald and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and gold earrings" +msgid_plural "pairs of alexandrite and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of alexandrite and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and gold earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and gold earrings" +msgid_plural "pairs of ruby and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of ruby and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and gold earrings" +msgid_plural "pairs of peridot and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of peridot and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and gold earrings" +msgid_plural "pairs of sapphire and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of sapphire and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and gold earrings" +msgid_plural "pairs of tourmaline and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of tourmaline and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and gold earrings" +msgid_plural "pairs of citrine and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of citrine and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and gold earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and gold earrings" +msgid_plural "pairs of blue topaz and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of blue topaz and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and gold earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and gold earrings" +msgid_plural "pairs of opal and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of opal and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and gold earrings. You can wear it if you like, but it" +" won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and gold earrings" +msgid_plural "pairs of pearl and gold earrings" +msgstr[0] "" + +#. ~ Description for pair of pearl and gold earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and gold earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and silver earrings" +msgid_plural "pairs of diamond and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of diamond and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and silver earrings" +msgid_plural "pairs of garnet and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of garnet and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and silver earrings" +msgid_plural "pairs of amethyst and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of amethyst and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and silver earrings" +msgid_plural "pairs of aquamarine and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of aquamarine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and silver earrings" +msgid_plural "pairs of emerald and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of emerald and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and silver earrings" +msgid_plural "pairs of alexandrite and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of alexandrite and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and silver earrings" +msgid_plural "pairs of ruby and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of ruby and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and silver earrings" +msgid_plural "pairs of peridot and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of peridot and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and silver earrings" +msgid_plural "pairs of sapphire and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of sapphire and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and silver earrings" +msgid_plural "pairs of tourmaline and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of tourmaline and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and silver earrings" +msgid_plural "pairs of citrine and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of citrine and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and silver earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and silver earrings" +msgid_plural "pairs of blue topaz and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of blue topaz and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and silver earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and silver earrings" +msgid_plural "pairs of pearl and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of pearl and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and silver earrings. You can wear it if you like, but" +" it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and silver earrings" +msgid_plural "pairs of opal and silver earrings" +msgstr[0] "" + +#. ~ Description for pair of opal and silver earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and silver earrings. You can wear it if you like, but " +"it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of diamond and platinum earrings" +msgid_plural "pairs of diamond and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of diamond and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny diamond and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of garnet and platinum earrings" +msgid_plural "pairs of garnet and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of garnet and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny garnet and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of amethyst and platinum earrings" +msgid_plural "pairs of amethyst and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of amethyst and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny amethyst and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of aquamarine and platinum earrings" +msgid_plural "pairs of aquamarine and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of aquamarine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny aquamarine and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of emerald and platinum earrings" +msgid_plural "pairs of emerald and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of emerald and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny emerald and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of alexandrite and platinum earrings" +msgid_plural "pairs of alexandrite and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of alexandrite and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny alexandrite and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of ruby and platinum earrings" +msgid_plural "pairs of ruby and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of ruby and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny ruby and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of peridot and platinum earrings" +msgid_plural "pairs of peridot and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of peridot and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny peridot and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of sapphire and platinum earrings" +msgid_plural "pairs of sapphire and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of sapphire and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny sapphire and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of tourmaline and platinum earrings" +msgid_plural "pairs of tourmaline and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of tourmaline and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny tourmaline and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of citrine and platinum earrings" +msgid_plural "pairs of citrine and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of citrine and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny citrine and platinum earrings. You can wear it if you like," +" but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of blue topaz and platinum earrings" +msgid_plural "pairs of blue topaz and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of blue topaz and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny blue topaz and platinum earrings. You can wear it if you " +"like, but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of opal and platinum earrings" +msgid_plural "pairs of opal and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of opal and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny opal and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + +#: lang/json/ARMOR_from_json.py +msgid "pair of pearl and platinum earrings" +msgid_plural "pairs of pearl and platinum earrings" +msgstr[0] "" + +#. ~ Description for pair of pearl and platinum earrings +#: lang/json/ARMOR_from_json.py +msgid "" +"A pair of shiny pearl and platinum earrings. You can wear it if you like, " +"but it won't provide any effects." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "saddle bags" msgid_plural "saddle bagss" @@ -14764,8 +15446,8 @@ msgstr[0] "CRIT 面罩" #: lang/json/ARMOR_from_json.py msgid "" "This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was not" -" intended for extended use. It has a basic integrated HUD." +"protection. A few filters provide decent enviromental safety, but it was " +"not intended for extended use. It has a basic integrated HUD." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14776,10 +15458,10 @@ msgstr[0] "CRIT 靴子" #. ~ Description for pair of CRIT boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " +"C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " "hygenic during long-term missions while absorbing shock and heat from " -"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " -"protection as well. Decently heavy though" +"outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " +"protection as well. Decently heavy though" msgstr "" #: lang/json/ARMOR_from_json.py @@ -14790,10 +15472,10 @@ msgstr[0] "CRIT LA 靴子" #. ~ Description for pair of CRIT LA boots #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " -"variant was created for missions in warmer climates. The LA boots keep most " -"of the old features of the standard issue boots but trade in protection for " -"easier movement." +"C.R.I.T skeletonized boots. Based off of C.R.I.T boots, the light-armor " +"variant was created for missions in warmer climates. The LA boots keep most" +" of the old features of the standard issue boots but trade in protection for" +" easier movement." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14804,7 +15486,7 @@ msgstr[0] "CRIT 露指手套" #. ~ Description for pair of CRIT fingertip-less gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " +"C.R.I.T standard-issue gloves. Made with superalloy mesh for those with " "gene-modding and/or mutations while still allowing greater manipulation of " "items and moderate protection." msgstr "" @@ -14817,8 +15499,8 @@ msgstr[0] "CRIT 露指內裡" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for" -" warmth and fingertip-less for those with gene-modding and/or mutations " +"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " +"for warmth and fingertip-less for those with gene-modding and/or mutations " "while still allowing greater manipulation of items and moderate protection." msgstr "" @@ -14830,7 +15512,7 @@ msgstr[0] "CRIT 背包" #. ~ Description for CRIT backpack #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " +"C.R.I.T standard-issue pack. Based on the MOLLE backpack's design, this " "smaller pack strikes a fine balance between storage space and encumbrance " "and allows a larger weapon to be holstered, drawing and holstering is still " "rather awkward even with the magnetized clips, but practice helps." @@ -14856,8 +15538,8 @@ msgstr[0] "CRIT 護腿" #. ~ Description for pair of CRIT leg guards #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue leg armor. Simple design and durable material allows " -"for easy movement and the padding keeps the legs safe and warm in colder " +"C.R.I.T standard-issue leg armor. Simple design and durable material allows" +" for easy movement and the padding keeps the legs safe and warm in colder " "conditions." msgstr "" @@ -14870,8 +15552,8 @@ msgstr[0] "CRIT 護手" #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from superalloy molded upon neoprene, and then " -"insulated with rubber. They are sturdy and will block attacks, but they are " -"ridiculously heavy." +"insulated with rubber. They are sturdy and will block attacks, but they are" +" ridiculously heavy." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14882,8 +15564,8 @@ msgstr[0] "CRIT 腰帶" #. ~ Description for CRIT web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on your" -" hip." +"C.R.I.T standard-issue belt. Keeps your trousers up and your weapons on " +"your hip." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14894,9 +15576,9 @@ msgstr[0] "CRIT 步兵防塵大衣" #. ~ Description for CRIT infantry duster #: lang/json/ARMOR_from_json.py msgid "" -"A thick full-length duster coat with rubber insulation. More than mildly " +"A thick full-length duster coat with rubber insulation. More than mildly " "encumbering, but rather protective against any anti-infantry electrical " -"discharges from the robots. Has several pockets for storage." +"discharges from the robots. Has several pockets for storage." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14908,7 +15590,7 @@ msgstr[0] "CRIT 工程師套裝" #: lang/json/ARMOR_from_json.py msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented" -" plates of armor. A complex system digitizes items in an individual pocket " +" plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " "neccessary energy required to power the interface." msgstr "" @@ -14921,10 +15603,10 @@ msgstr[0] "CRIT 裝甲異特套裝" #. ~ Description for CRIT Armored Anomaly Suit #: lang/json/ARMOR_from_json.py msgid "" -"A relatively simple suit of armor. A suit of woven composite fibers combined" -" with a cleansuit core and strategically placed segmented kevlar plates keep" -" the suit light-weight and the one wearing it alive while offering superb " -"resistance to the elements and ambient radiation. " +"A relatively simple suit of armor. A suit of woven composite fibers " +"combined with a cleansuit core and strategically placed segmented kevlar " +"plates keep the suit light-weight and the one wearing it alive while " +"offering superb resistance to the elements and ambient radiation. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -14948,11 +15630,11 @@ msgstr[0] "CRIT 執法者組合裝甲" #: lang/json/ARMOR_from_json.py msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " -"body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " -"it can deflect attacks. Built with the idea that comfort is less important " -"than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"body-armor which usually goes over other armor. Overlapping steel plates on" +" top of kevlar plates cover vast expanses as the armor juts off in places so" +" it can deflect attacks. Built with the idea that comfort is less important" +" than safety, this heavy suit is difficult to move about in but highly " +"protective. Various adjustable conectors such as straps and clips hold it " "together." msgstr "" @@ -14964,9 +15646,9 @@ msgstr[0] "CRIT 執法者裝甲靴" #. ~ Description for pair of CRIT Enforcer docks #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " +"C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " "oversized feet which clamp down onto your owm footwear keep your feet out of" -" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " +" harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." msgstr "" @@ -14979,10 +15661,10 @@ msgstr[0] "CRIT 士兵套裝" #. ~ Description for CRIT Soldier Suit #: lang/json/ARMOR_from_json.py msgid "" -"A suit of modern body-armor. Strategically placed superalloy plates keep the" -" suit's weight minimal while kevlar plates other areas and a lining of soft " -"neoprene pads areas for extra comfort. Most importantly, this can be worn " -"comfortably under other armor." +"A suit of modern body-armor. Strategically placed superalloy plates keep " +"the suit's weight minimal while kevlar plates other areas and a lining of " +"soft neoprene pads areas for extra comfort. Most importantly, this can be " +"worn comfortably under other armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14994,9 +15676,9 @@ msgstr[0] "CRIT 孤狼系列裝甲" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " -"armor will definitely protect you from practically anything. Just make sure " -"you can actually walk with it on though." +"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"armor will definitely protect you from practically anything. Just make sure" +" you can actually walk with it on though." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15007,29 +15689,29 @@ msgstr[0] "CRIT 上衣" #. ~ Description for C.R.I.T blouse #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage. " -"Super-flex neoprene keeps one warm in moderately cold weather while a sleek " -"design keeps it from being too flashy. A zipper at the back and front allows" -" for quick donning and doffing." +"C.R.I.T standard-issue blouse. Durable, lightweight, and has ample storage." +" Super-flex neoprene keeps one warm in moderately cold weather while a " +"sleek design keeps it from being too flashy. A zipper at the back and front" +" allows for quick donning and doffing." msgstr "" #: lang/json/ARMOR_from_json.py msgid "C.R.I.T trousers" -msgid_plural "C.R.I.T trouserss" -msgstr[0] "CRIT 褲子" +msgid_plural "C.R.I.T trousers" +msgstr[0] "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue trousers. Durable, lightweight and has ample storage." -" Super-flex neoprene keeps one warm in moderately cold weather." +"C.R.I.T standard-issue trousers. Durable, lightweight and has ample " +"storage. Super-flex neoprene keeps one warm in moderately cold weather." msgstr "" #. ~ Description for C.R.I.T trousers #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " -"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " +"C.R.I.T dress pants. A minimalist sleek design makes the pants lightweight " +"and it offers ok pockets. Super-flex neoprene keeps one warm in moderately " "cold weather." msgstr "" @@ -15040,7 +15722,7 @@ msgstr[0] "CRIT 頭盔內襯" #. ~ Description for C.R.I.T helmet liner #: lang/json/ARMOR_from_json.py -msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." +msgid "C.R.I.T standard-issue helmet liner. Keeps the noggin warm." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15050,19 +15732,19 @@ msgstr[0] "CRIT 正裝鞋" #. ~ Description for pair of C.R.I.T shoes #: lang/json/ARMOR_from_json.py -msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." +msgid "A sleek pair of dress shoes. Fancy but easy on the eyes." msgstr "" #: lang/json/ARMOR_from_json.py msgid "pair of C.R.I.T rec gloves" -msgid_plural "pair of C.R.I.T rec glovess" -msgstr[0] "CRIT 休閒手套" +msgid_plural "pairs of C.R.I.T rec gloves" +msgstr[0] "" #. ~ Description for pair of C.R.I.T rec gloves #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are " -"made with cotton with a neoprene lining for grip-pads and warmth. " +"C.R.I.T standard-issue rec gloves. Skin-hugging and sleek, these gloves are" +" made with cotton with a neoprene lining for grip-pads and warmth. " msgstr "" #: lang/json/ARMOR_from_json.py @@ -15073,7 +15755,7 @@ msgstr[0] "CRIT 腰帶" #. ~ Description for C.R.I.T web belt #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " +"C.R.I.T standard-issue belt. Keeps your trousers up and your tools on your " "hip." msgstr "" @@ -15085,7 +15767,7 @@ msgstr[0] "CRIT 休閒防塵大衣" #. ~ Description for C.R.I.T rec duster #: lang/json/ARMOR_from_json.py msgid "" -"A waterproofed full-length duster coat. Made with neoprene, comfort and " +"A waterproofed full-length duster coat. Made with neoprene, comfort and " "functionality meet together to form a fancy but sleek contemporary design. " "It has several pockets for storage." msgstr "" @@ -15099,8 +15781,8 @@ msgstr[0] "CRIT 休閒帽" #: lang/json/ARMOR_from_json.py msgid "" "Functionality meets fashion in this waterproofed C.R.I.T standard issue rec " -"cover. Thick enough to provide warmth in colder weather, this hat shares the" -" same sleek design of most of C.R.I.T's gear." +"cover. Thick enough to provide warmth in colder weather, this hat shares " +"the same sleek design of most of C.R.I.T's gear." msgstr "" #: lang/json/ARMOR_from_json.py @@ -15189,24 +15871,18 @@ msgid_plural "copper infusion bracelets" msgstr[0] "銅灌注手鐲" #. ~ Description for copper infusion bracelet +#. ~ Description for silver infusion bracelet #: lang/json/ARMOR_from_json.py msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "這款手鐲上顆有符文。當你看著它時，會感覺到有股幽幽的神祕主義氣息。將法力注入物質之中時會很有用。" +"This bracelet has runes engraved on it. You sense a faint air of mysticism " +"when you look at it. It would be useful for imbuing mana into material." +msgstr "" #: lang/json/ARMOR_from_json.py msgid "silver infusion bracelet" msgid_plural "silver infusion bracelets" msgstr[0] "" -#. ~ Description for silver infusion bracelet -#: lang/json/ARMOR_from_json.py -msgid "" -"This bracelet has runes engraved on it. You sense a faint air of mysticism " -"when you look at it. It would be useful for imbuing mana into material." -msgstr "" - #: lang/json/ARMOR_from_json.py msgid "copper circlet" msgid_plural "copper circlets" @@ -15489,8 +16165,8 @@ msgstr "腳上有一層光滑的魔法冰塗層。雖然能讓你在平坦的地 #: lang/json/ARMOR_from_json.py msgid "flesh pouch" -msgid_plural "flesh pouchs" -msgstr[0] "血肉大袋" +msgid_plural "flesh pouches" +msgstr[0] "" #. ~ Description for flesh pouch #: lang/json/ARMOR_from_json.py @@ -15500,6 +16176,18 @@ msgid "" "minimize encumbrance." msgstr "一只大型的肉質袋子，能背在背上。裡面滿布著小觸手，能夠抓握住你放進袋中的東西，它會自動移動和調整，使你的累贅值降到最低。" +#: lang/json/ARMOR_from_json.py +msgid "obfuscating aura" +msgid_plural "obfuscating auras" +msgstr[0] "" + +#. ~ Description for obfuscating aura +#: lang/json/ARMOR_from_json.py +msgid "" +"An all-encompassing, invisible layer of magic distorts light around your " +"body. Allows you to dodge two extra attacks in a given turn." +msgstr "" + #: lang/json/ARMOR_from_json.py msgid "acid resistance aura" msgid_plural "acid resistance auras" @@ -17244,11 +17932,9 @@ msgstr[0] "CBM: 離子超載生成器" msgid "" "A powerful ion energy generator is implanted on your chest. Fires a " "powerful, ever-expanding energy blast. The resulting blast ignites oxygen " -"creating fires as it moves and an explosion on impact. Close range use is " +"creating fires as it moves and an explosion on impact. Close range use is " "highly discouraged." msgstr "" -"一個強力的離子能量生成器用於植入你的胸部。可發射強大且不斷膨脹的爆破能量。由此產生的爆炸會點燃氧氣, 並在移動時產生火焰, " -"最後在撞擊時產生劇烈的爆炸。極度建議別對近距離的目標使用。" #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py msgid "Blood Power Generator CBM" @@ -18927,6 +19613,138 @@ msgid "" "goblins, and trolls." msgstr "一本趣味民間故事集, 通常由小仙子、哥布林和巨魔主演。" +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale is about a wolf who eats so much salted meat she becomes " +"trapped in the butcher's cellar." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this traditional story of beastly intrigue a clever fox convinces an " +"elderly lion to kill a derogatory wolf." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is an illustrated fairy tale book about a conversation between a mouse " +"and a cat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"An amusing collection of stories featuring \"Goldilocks and The Three " +"Bears\" on the cover." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a well illustrated fairy tale about a war between the birds and the " +"beasts, with particulars on the wartime conduct and eventual fate of the " +"bat." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book, titled \"The Rattlesnake's Vengeance\" is a collection of " +"Cherokee myths and legends. \"285D\" is hand-written in pencil on the title" +" page." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This fairy tale book is a regional variant of \"Jack and the Beanstalk.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This fairy tale book is entitled \"Little Red Cap\". It details a red-" +"cloaked child's various encounters with talking wolves." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A collection of ghost stories warning about the dangers of stealing from the" +" dead." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"A book of Italian fairy tales translated in English. The cover features an " +"orange fairy juggling a lemon, a lime, and a tangerine." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book of fables about people who change into birds." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This compendium of amusing folk tales about the devil is titled \"Hell's " +"Kettle: Legends of the Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This charming book of Swedish fables is titled, \"The Glass Mountain and the" +" Princess.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a collection of fairy tale stories warning against the consequences " +"of extreme greed." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "This book is titled, \"The Thieving Pot: Folktales of the Arab World.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This is a book of legends collected by Traveller Johnny Cassidy in the " +"1960s." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "A book by the Brothers Grimm titled, \"Eve's Unequal Children.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of fables expands upon the legend of the Seven Sleepers of " +"Ephesus." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"In this fairy tale a strong man frightens an ogre by squeezing water out of " +"a stone." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of rustic folk tales bears the title: \"How to Shout Down the " +"Devil.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"The title of this book is \"Village Folk-tales of Ceylon.\" It includes " +"fables about logical errors and foolish misjudgements of the Kadambawa men." +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"This book of folk tales is titled, \"The Girl with the Ugly Name, and Other " +"Stories.\"" +msgstr "" + +#: lang/json/BOOK_from_json.py +msgid "" +"Titled \"The Fleeing Pancake\", this collection of silly folk tales is " +"suitable for small children." +msgstr "" + #: lang/json/BOOK_from_json.py msgid "The Hitchhiker's Guide to the Cataclysm" msgid_plural "Hitchhiker's Guides to the Cataclysm" @@ -19308,8 +20126,8 @@ msgstr[0] "色情小說" #. ~ Description for erotic novel #: lang/json/BOOK_from_json.py -msgid "Hackneyed narrative concealing low-grade literary smut." -msgstr "陳腐的敘事方式蓋過了低級的淫穢文字。" +msgid "A hackneyed fictional narrative concealing low-grade literary smut." +msgstr "" #: lang/json/BOOK_from_json.py msgid "experimental novel" @@ -20046,7 +20864,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" "This is a copy of \"The Trouble with Being Born\" by Emil Cioran. This book" -" might have been printed decades before the cataclysm since the cover is " +" might have been printed decades before the Cataclysm since the cover is " "quite weathered." msgstr "" @@ -21464,9 +22282,9 @@ msgid "" "1) Never ever get into contact with water, it would melt you! \n" "2) Avoid humans with clear eyes they are very dangerous! (You can ignore the ones with black eyes they are harmless to you.) \n" "3) Learn how to make caramel ointment, it's the only way to fix your body if you get hurt.\n" -" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" +" There are many more things I'd like to tell you but I must leave before it's too late. I've made you a friend to keep you company, be kind to it. \n" " I love you,\n" -" - F. \"." +" - F. \"." msgstr "" #: lang/json/BOOK_from_json.py @@ -21490,9 +22308,9 @@ msgstr[0] "駭入機器人: 樂趣與利益" #. ~ Description for Hacking Robots for Fun & Profit #: lang/json/BOOK_from_json.py msgid "" -"A book on illegally obtaining, reprogramming, and modifying robots. It has " +"A book on illegally obtaining, reprogramming, and modifying robots. It has " "lots of helpful step-by-step guides and example blueprints." -msgstr "一本關於非法獲取，重新編程和修改機器人的書。它有許多有用的步驟指南和範例藍圖。" +msgstr "" #: lang/json/BOOK_from_json.py msgid "Popular Robotics" @@ -21690,6 +22508,16 @@ msgstr[0] "鹽水" msgid "Water with salt added. Not good for drinking." msgstr "加了鹽的水。不適合飲用。" +#: lang/json/COMESTIBLE_from_json.py +msgid "soapy water" +msgid_plural "soapy water" +msgstr[0] "" + +#. ~ Description for soapy water +#: lang/json/COMESTIBLE_from_json.py +msgid "Water with soap added. Not good for drinking." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "acid water" msgid_plural "acid water" @@ -22222,9 +23050,9 @@ msgstr[0] "私釀烈酒" #: lang/json/COMESTIBLE_from_json.py msgid "" "Only the strongest, purest, good ol' fashioned hooch, distilled from corn " -"and sugar. Guaranteed to make you forget about the whole cataclysm thing, " +"and sugar. Guaranteed to make you forget about the whole Cataclysm thing, " "or you get your vision back." -msgstr "從玉米、糖提練出最好、最純、最棒的老式烈酒。保證能夠讓你忘了整個災難，或者讓你昏倒。" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -22331,6 +23159,69 @@ msgstr[0] "單一麥芽威士忌" msgid "Only the finest whiskey straight from the bung." msgstr "瓶蓋之內全是最優等的威士忌。" +#: lang/json/COMESTIBLE_from_json.py +msgid "single pot still Irish whiskey" +msgid_plural "single pot still Irish whiskey" +msgstr[0] "" + +#. ~ Description for single pot still Irish whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A whiskey made from a mixed mash of malted and unmalted barley." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "cheap whiskey" +msgid_plural "cheap whiskey" +msgstr[0] "" + +#. ~ Description for cheap whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "Really cheap blended whiskey." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Canadian whiskey" +msgid_plural "Canadian whiskey" +msgstr[0] "" + +#. ~ Description for Canadian whiskey +#: lang/json/COMESTIBLE_from_json.py +msgid "A multi-grain liquor made from a mash of corn and rye." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "sherry" +msgid_plural "sherry" +msgstr[0] "" + +#. ~ Description for sherry +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"East India Solera. A true drink of a British gentleman. Sherry, Niles?" +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Bristol Cream" +msgid_plural "Bristol Cream" +msgstr[0] "" + +#. ~ Description for Bristol Cream +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"A fine sherry that was been aged in American oak casks and bottled in " +"Bristol, England." +msgstr "" + +#: lang/json/COMESTIBLE_from_json.py +msgid "Madeira wine" +msgid_plural "Madeira wine" +msgstr[0] "" + +#. ~ Description for Madeira wine +#: lang/json/COMESTIBLE_from_json.py +msgid "Fortified wine from Madeira. A true Royal Navy drink." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "fancy hobo" msgstr "花式街友" @@ -23004,6 +23895,18 @@ msgid "meat jerky" msgid_plural "meat jerky" msgstr[0] "醃肉" +#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "jerk jerky" +msgid_plural "jerk jerky" +msgstr[0] "醃人肉" + +#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster jerky" +msgid_plural "monster jerky" +msgstr[0] "" + #. ~ Description for meat jerky #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -23022,20 +23925,26 @@ msgid "" msgstr "鹽漬的魚乾能夠保存很久, 但是吃了會讓你口渴。" #: lang/json/COMESTIBLE_from_json.py -msgid "jerk jerky" -msgid_plural "jerk jerky" -msgstr[0] "醃人肉" +msgid "smoked meat" +msgstr "煙燻肉" -#. ~ Description for jerk jerky +#. ~ Conditional name for smoked meat when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salty dried human flesh that lasts for a long time, but will make you " -"thirsty." -msgstr "鹽漬的人肉乾能夠保存很久, 但是吃了會讓你口渴。" +msgid "smoked sucker" +msgid_plural "smoked sucker" +msgstr[0] "" +#. ~ Conditional name for smoked meat when COMPONENT_ID matches mutant +#. ~ Conditional name for canned meat when COMPONENT_ID matches mutant +#. ~ Conditional name for salted meat slice when COMPONENT_ID matches mutant +#. ~ Conditional name for pickled meat when COMPONENT_ID matches mutant +#. ~ Conditional name for dehydrated meat when COMPONENT_ID matches mutant +#. ~ Conditional name for rehydrated meat when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py -msgid "smoked meat" -msgstr "煙燻肉" +#, python-format +msgid "%s, mutant" +msgid_plural "%s, mutant" +msgstr[0] "" #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py @@ -23056,17 +23965,6 @@ msgid "" "could be further smoked to dehydrate it completely." msgstr "經過重重燻烤的美味魚肉，能夠保存一段時間。 可以再進一步燻制以使其完全脫水。" -#: lang/json/COMESTIBLE_from_json.py -msgid "smoked sucker" -msgstr "煙燻人肉" - -#. ~ Description for smoked sucker -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A heavily smoked portion of human flesh. Lasts for a long time and tastes " -"pretty good, if you like that sort of thing." -msgstr "經過長時間燻烤的人肉。能夠長時間保存並且嚐起來很美味, 要是你喜歡這類東西的話。" - #: lang/json/COMESTIBLE_from_json.py msgid "piece of raw lung" msgid_plural "pieces of raw lung" @@ -24391,8 +25289,8 @@ msgstr "利爪怪魚子" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py -msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." -msgstr "一叢利爪怪的卵。大災變後的美味佳餚。" +msgid "A clump of razorclaw eggs. A post-Cataclysm delicacy." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "roe" @@ -25543,11 +26441,11 @@ msgid "" msgstr "用墨西哥玉米餅製成的鹽漬玉米片, 搭配奶酪、牛肉會更美味。" #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with cheese" -msgid_plural "nachos with cheese" -msgstr[0] "起司玉米片" +msgid "cheese nachos" +msgid_plural "cheese nachos" +msgstr[0] "" -#. ~ Description for nachos with cheese +#. ~ Description for cheese nachos #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -25555,47 +26453,49 @@ msgid "" msgstr "用墨西哥玉米餅製成的鹽漬玉米片, 搭配著奶酪。如果有些肉也不錯。" #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat" -msgid_plural "nachos with meat" -msgstr[0] "加肉玉米片" - -#. ~ Description for nachos with meat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas, now with meat. Could probably use " -"some cheese, though." -msgstr "用墨西哥玉米餅製成的鹽漬玉米片, 搭配著肉。如果有奶酪會更美味。" +msgid "meat nachos" +msgid_plural "meat nachos" +msgstr[0] "" +#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "加人肉玉米片" -#. ~ Description for niño nachos +#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "nachos con chupacabra" +msgid_plural "nachos con chupacabra" +msgstr[0] "" + +#. ~ Description for meat nachos #: lang/json/COMESTIBLE_from_json.py msgid "" -"Salted chips made from corn tortillas, with human flesh. Some cheese might " -"make it even better." -msgstr "用墨西哥玉米餅製成的鹽漬玉米片, 搭配著人肉。如果有奶酪的話會更美味。" +"Salted chips made from corn tortillas, now with meat. Could probably use " +"some cheese, though." +msgstr "用墨西哥玉米餅製成的鹽漬玉米片, 搭配著肉。如果有奶酪會更美味。" +#: lang/json/COMESTIBLE_from_json.py +msgid "meat nachos with cheese" +msgid_plural "meat nachos with cheese" +msgstr[0] "" + +#. ~ Conditional name for meat nachos with cheese when FLAG matches +#. CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "人肉起司玉米片" -#. ~ Description for niño nachos with cheese -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Salted chips made from corn tortillas with human flesh and smothered in " -"cheese. Delicious." -msgstr "用墨西哥玉米餅製成的鹽漬玉米片, 搭配了奶酪和人肉。真美味。" - +#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "nachos with meat and cheese" -msgid_plural "nachos with meat and cheese" -msgstr[0] "肉起司玉米片" +msgid "cheese and chupacabra nachos" +msgid_plural "cheese and chupacabra nachos" +msgstr[0] "" -#. ~ Description for nachos with meat and cheese +#. ~ Description for meat nachos with cheese #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -25663,16 +26563,6 @@ msgstr[0] "肉醬熱狗" msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "一個熱狗上面淋上了辣肉醬。好吃!" -#: lang/json/COMESTIBLE_from_json.py -msgid "cheater chili dogs" -msgid_plural "cheater chili dogs" -msgstr[0] "人肉醬熱狗" - -#. ~ Description for cheater chili dogs -#: lang/json/COMESTIBLE_from_json.py -msgid "A hot dog, served with chili con cabron as a topping. Delightful." -msgstr "一個熱狗上面淋上了辣肉醬。爽快。" - #: lang/json/COMESTIBLE_from_json.py msgid "uncooked corn dogs" msgid_plural "uncooked corn dogs" @@ -25756,8 +26646,8 @@ msgstr[0] "生熱狗" #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " -"cataclysm. It would taste much better prepared." -msgstr "經過重重加工的香腸, 常見於災變前的棒球比賽。烹調後更好吃。" +"Cataclysm. It would taste much better prepared." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "campfire hot dog" @@ -25798,6 +26688,22 @@ msgstr "" msgid "raw sausage" msgstr "生香腸" +#. ~ Conditional name for raw sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "raw Mannwurst" +msgid_plural "raw Mannwursts" +msgstr[0] "" + +#. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "sinister %s" +msgid_plural "sinister %s" +msgstr[0] "" + #. ~ Description for raw sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty raw sausage, prepared for smoking or cooking." @@ -25807,6 +26713,12 @@ msgstr "一條沉重的生香腸, 已準備好用於煙燻或烹煮。" msgid "sausage" msgstr "香腸" +#. ~ Conditional name for sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst" +msgid_plural "Mannwursts" +msgstr[0] "" + #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured and smoked for long term storage." @@ -25816,22 +26728,17 @@ msgstr "一條又大又重的香腸, 已經過醃製和煙燻, 可長期保存 msgid "cooked sausage" msgstr "煮熟的香腸" +#. ~ Conditional name for cooked sausage when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "cooked Mannwurst" +msgid_plural "cooked Mannwursts" +msgstr[0] "" + #. ~ Description for cooked sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cooked." msgstr "一條煮過且又大又重的香腸。" -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst" -msgstr "人肉香腸" - -#. ~ Description for Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty long pork sausage that has been cured and smoked for long term " -"storage. Very tasty, if you're in the market for human flesh." -msgstr "一條又大又重的長條香腸, 已經過醃製和煙燻, 可長期保存。非常美味, 前提是你敢吃人肉。" - #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" @@ -25847,6 +26754,19 @@ msgid "bratwurst" msgid_plural "bratwursts" msgstr[0] "德式煎腸" +#. ~ Conditional name for bratwurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannbrat" +msgid_plural "Mannbrats" +msgstr[0] "" + +#. ~ Conditional name for bratwurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "baleful %s" +msgid_plural "baleful %s" +msgstr[0] "" + #. ~ Description for bratwurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -25914,6 +26834,13 @@ msgstr "也稱為炸豬皮, 這些油渣是將些許可食用的脂肪和皮, msgid "glazed tenderloins" msgstr "油亮的里肌肉" +#. ~ Conditional name for glazed tenderloins when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "grisly %s" +msgid_plural "grisly %s" +msgstr[0] "" + #. ~ Description for glazed tenderloins #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -25926,6 +26853,20 @@ msgstr "一塊具有完美調味及美味配菜的軟嫩肉排。一道既健康 msgid "currywurst" msgstr "咖哩香腸" +#. ~ Conditional name for currywurst when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "cheapskate %s" +msgid_plural "cheapskate %s" +msgstr[0] "" + +#. ~ Conditional name for currywurst when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bloodcurdling %s" +msgid_plural "bloodcurdling %s" +msgstr[0] "" + #. ~ Description for currywurst #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -25937,6 +26878,20 @@ msgstr "香腸澆上咖哩番茄沾醬。驚奇美味一起來!" msgid "aspic" msgstr "肉凍" +#. ~ Conditional name for aspic when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "abomination %s" +msgid_plural "abomination %s" +msgstr[0] "" + +#. ~ Conditional name for aspic when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "amoral %s" +msgid_plural "amoral %s" +msgstr[0] "" + #. ~ Description for aspic #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26005,6 +26960,13 @@ msgstr "一份美味的金黃色香脆炸魚。" msgid "lunch meat" msgstr "午餐肉" +#. ~ Conditional name for lunch meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "loathsome %s" +msgid_plural "loathsome %s" +msgstr[0] "" + #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26016,6 +26978,20 @@ msgstr "煮熟且醃製過的肉品，切成了薄片方便夾進三明治裡。 msgid "bologna" msgstr "臘腸" +#. ~ Conditional name for bologna when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "brat %s" +msgid_plural "brat %s" +msgstr[0] "" + +#. ~ Conditional name for bologna when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "bleak %s" +msgid_plural "bleak %s" +msgstr[0] "" + #. ~ Description for bologna #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26073,6 +27049,19 @@ msgid "sausage gravy" msgid_plural "sausage gravies" msgstr[0] "香腸濃湯" +#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "Mannwurst gravy" +msgid_plural "Mannwurst gravies" +msgstr[0] "人肉香腸濃湯" + +#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "ghastly %s" +msgid_plural "ghastly %s" +msgstr[0] "" + #. ~ Description for sausage gravy #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26084,6 +27073,20 @@ msgstr "比司吉麵包、肉、美味的蘑菇湯加在一起成為一個奇妙 msgid "pemmican" msgstr "乾肉餅" +#. ~ Conditional name for pemmican when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "prepper %s" +msgid_plural "prepper %s" +msgstr[0] "" + +#. ~ Conditional name for pemmican when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "pernicious %s" +msgid_plural "pernicious %s" +msgstr[0] "" + #. ~ Description for pemmican #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26096,6 +27099,19 @@ msgstr "將脂肪和蛋白質混合制作的一種營養豐富的高熱量食物 msgid "hamburger helper" msgstr "漢堡幫手" +#. ~ Conditional name for hamburger helper when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "hobo helper" +msgid_plural "hobo helpers" +msgstr[0] "" + +#. ~ Conditional name for hamburger helper when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "heinous %s" +msgid_plural "heinous %s" +msgstr[0] "" + #. ~ Description for hamburger helper #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26117,6 +27133,18 @@ msgid "chili con carne" msgid_plural "chilis con carne" msgstr[0] "辣醬湯" +#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con cabron" +msgid_plural "chilis con cabron" +msgstr[0] "" + +#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "chili con chupacabra" +msgid_plural "chilis con chupacabra" +msgstr[0] "" + #. ~ Description for chili con carne #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." @@ -26185,18 +27213,36 @@ msgstr "切碎的蛤蜊浸潤在罐頭湯中。" msgid "clam chowder" msgstr "蛤蜊濃湯" +#. ~ Conditional name for clam chowder when COMPONENT_ID matches meat +#: lang/json/COMESTIBLE_from_json.py +msgid "meat chowder" +msgid_plural "meat chowders" +msgstr[0] "" + +#. ~ Conditional name for clam chowder when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "monster chowder" +msgid_plural "monster chowders" +msgstr[0] "" + #. ~ Description for clam chowder #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious, lumpy, white soup made of clams and potatoes. A taste of the " -"lost glory of New England." -msgstr "使用蛤蜊與馬鈴薯製成的美味白湯。一種新英格蘭的懷舊口味。" +"Delicious, lumpy, white soup made of meat (normally clam) and potatoes. A " +"taste of the lost glory of New England." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "baked beans" msgid_plural "baked beans" msgstr[0] "焗豆" +#. ~ Conditional name for baked beans when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "ork and beans" +msgid_plural "ork and beans" +msgstr[0] "" + #. ~ Description for baked beans #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with meat. Tasty and very filling." @@ -26207,6 +27253,12 @@ msgid "meat fried rice" msgid_plural "meat fried rice" msgstr[0] "肉絲炒飯" +#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "mutant fried rice" +msgid_plural "mutant fried rice" +msgstr[0] "" + #. ~ Description for meat fried rice #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." @@ -26217,6 +27269,13 @@ msgid "deluxe beans and rice" msgid_plural "deluxe beans and rice" msgstr[0] "豪華豆拌飯" +#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" beans and rice" +msgid_plural "\"deluxe\" beans and rice" +msgstr[0] "" + #. ~ Description for deluxe beans and rice #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26228,6 +27287,19 @@ msgstr "一份加上肉絲和調味料的豆拌飯。好吃又有飽足感。" msgid "meat pie" msgstr "肉派" +#. ~ Conditional name for meat pie when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "prick pie" +msgid_plural "prick pies" +msgstr[0] "" + +#. ~ Conditional name for meat pie when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "malignant %s" +msgid_plural "malignant %s" +msgstr[0] "" + #. ~ Description for meat pie #: lang/json/COMESTIBLE_from_json.py msgid "A delicious baked pie with a delicious meat filling." @@ -26237,6 +27309,19 @@ msgstr "一種有美味肉餡的烤餡餅。" msgid "meat pizza" msgstr "肉披薩" +#. ~ Conditional name for meat pizza when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "poser pizza" +msgid_plural "poser pizzas" +msgstr[0] "" + +#. ~ Conditional name for meat pizza when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "miserable %s" +msgid_plural "miserable %s" +msgstr[0] "" + #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26244,11 +27329,27 @@ msgid "" "and heavily seasoned." msgstr "一個加肉的披薩, 所有肉食者的最愛。加入了大量的肉類以及濃郁的醬料。" +#: lang/json/COMESTIBLE_from_json.py +msgid "supreme pizza" +msgstr "" + +#. ~ Description for supreme pizza +#: lang/json/COMESTIBLE_from_json.py +msgid "A supreme pizza with ALL the toppings." +msgstr "" + #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" msgid_plural "deluxe scrambled eggs" msgstr[0] "豪華炒蛋" +#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches +#. mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" scrambled eggs" +msgid_plural "\"deluxe\" scrambled eggs" +msgstr[0] "" + #. ~ Description for deluxe scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26260,6 +27361,12 @@ msgstr "蓬鬆可口的炒蛋添加了其他的美味食材, 更加美味。" msgid "canned meat" msgstr "肉罐頭" +#. ~ Conditional name for canned meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent slice" +msgid_plural "soylent slices" +msgstr[0] "人肉罐頭" + #. ~ Description for canned meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26271,6 +27378,12 @@ msgstr "低鹽保存的肉。已經用水煮熟並製成罐頭, 保留了大部 msgid "salted meat slice" msgstr "鹽漬肉片" +#. ~ Conditional name for salted meat slice when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "salted simpleton slice" +msgid_plural "salted simpleton slices" +msgstr[0] "" + #. ~ Description for salted meat slice #: lang/json/COMESTIBLE_from_json.py msgid "Meat slices cured in brine. Salty but tasty in a pinch." @@ -26281,6 +27394,19 @@ msgid "spaghetti bolognese" msgid_plural "spaghetti bolognese" msgstr[0] "肉醬義大利麵" +#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "scoundrel spaghetti" +msgid_plural "scoundrel spaghettis" +msgstr[0] "" + +#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "gnarly %s" +msgid_plural "gnarly %s" +msgstr[0] "" + #. ~ Description for spaghetti bolognese #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" @@ -26290,6 +27416,20 @@ msgstr "被厚重肉汁緊緊包裹的義大利麵, 太美味啦!" msgid "lasagne" msgstr "千層麵" +#. ~ Conditional name for lasagne when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "Luigi %s" +msgid_plural "Luigi %s" +msgstr[0] "" + +#. ~ Conditional name for lasagne when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "monster %s" +msgid_plural "monster %s" +msgstr[0] "" + #. ~ Description for lasagne #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26310,17 +27450,44 @@ msgstr "煎過的午餐肉, 其實還挺美味的。" msgid "cheeseburger" msgstr "起司漢堡" +#. ~ Conditional name for cheeseburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chump %s" +msgid_plural "chump %s" +msgstr[0] "" + +#. ~ Conditional name for cheeseburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "chilling %s" +msgid_plural "chilling %s" +msgstr[0] "" + #. ~ Description for cheeseburger #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of minced meat and cheese with condiments. The apex of pre-" -"cataclysm culinary achievement." -msgstr "包著一片漢堡肉以及美味的起司。災變前的頂級烹飪成就。" +"Cataclysm culinary achievement." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "hamburger" msgstr "漢堡" +#. ~ Conditional name for hamburger when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "bobburger" +msgid_plural "bobburgers" +msgstr[0] "" + +#. ~ Conditional name for hamburger when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "horrible %s" +msgid_plural "horrible %s" +msgstr[0] "" + #. ~ Description for hamburger #: lang/json/COMESTIBLE_from_json.py msgid "A sandwich of minced meat with condiments." @@ -26330,6 +27497,19 @@ msgstr "夾著一片漢堡肉以及調味料。" msgid "sloppy joe" msgstr "蕃茄辣肉醬漢堡" +#. ~ Conditional name for sloppy joe when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "manwich" +msgid_plural "manwiches" +msgstr[0] "三人治" + +#. ~ Conditional name for sloppy joe when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "suspicious %s" +msgid_plural "suspicious %s" +msgstr[0] "" + #. ~ Description for sloppy joe #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26341,6 +27521,20 @@ msgstr "一個漢堡, 加入了絞肉以及番茄沙司。" msgid "taco" msgstr "塔可餅" +#. ~ Conditional name for taco when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "tio %s" +msgid_plural "tio %s" +msgstr[0] "" + +#. ~ Conditional name for taco when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "terrifying %s" +msgid_plural "terrifying %s" +msgstr[0] "" + #. ~ Description for taco #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26352,6 +27546,12 @@ msgstr "一種傳統的墨西哥食物, 用墨西哥玉米餅折疊或捲起肉 msgid "pickled meat" msgstr "醃肉" +#. ~ Conditional name for pickled meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "pickled punk" +msgid_plural "pickled punks" +msgstr[0] "" + #. ~ Description for pickled meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26362,6 +27562,14 @@ msgstr "這是一份醃過的肉罐頭。美味又營養。" msgid "dehydrated meat" msgstr "脫水肉乾" +#. ~ Conditional name for dehydrated meat when FLAG matches CANNIBALISM +#. ~ Conditional name for rehydrated meat when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "%s, human" +msgid_plural "%s, human" +msgstr[0] "" + #. ~ Description for dehydrated meat #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26385,6 +27593,14 @@ msgid "haggis" msgid_plural "haggii" msgstr[0] "羊肚雜碎布丁" +#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for bone broth when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "human %s" +msgid_plural "human %s" +msgstr[0] "" + #. ~ Description for haggis #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26413,6 +27629,13 @@ msgid "meat temaki" msgid_plural "meat temaki" msgstr[0] "生肉手卷" +#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "troubling %s" +msgid_plural "troubling %s" +msgstr[0] "" + #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26445,6 +27668,13 @@ msgstr "一些受污染的肉, 為了讓它不腐敗已作好乾燥處理。如 msgid "pelmeni" msgstr "俄國餃子" +#. ~ Conditional name for pelmeni when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "perilous %s" +msgid_plural "perilous %s" +msgstr[0] "" + #. ~ Description for pelmeni #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26456,6 +27686,12 @@ msgstr "用薄麵皮將肉類內餡包起, 煮熟後就是份美味的餃子。" msgid "homemade burrito" msgstr "自製墨西哥捲餅" +#. ~ Conditional name for homemade burrito when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "bone-chilling burrito" +msgid_plural "bone-chilling burritos" +msgstr[0] "" + #. ~ Description for homemade burrito #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -26464,302 +27700,6 @@ msgid "" "but homemade and delicious!" msgstr "" -#: lang/json/COMESTIBLE_from_json.py -msgid "dehydrated human flesh" -msgid_plural "dehydrated human flesh" -msgstr[0] "脫水人肉乾" - -#. ~ Description for dehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Dehydrated human flesh flakes. With proper storage, this dried food will " -"remain edible for an incredibly long time." -msgstr "脫水過的人肉片。在合適的儲存下, 這個乾燥食物能夠保持長時間不壞。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "rehydrated human flesh" -msgid_plural "rehydrated human flesh" -msgstr[0] "加水人肉乾" - -#. ~ Description for rehydrated human flesh -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Reconstituted human flesh flakes, which are much more enjoyable to eat now " -"that they have been rehydrated." -msgstr "沖調過的脫水人肉乾, 重新加了水之後讓這東西變得更好吃了。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "human haggis" -msgid_plural "human haggii" -msgstr[0] "人肚雜碎布丁" - -#. ~ Description for human haggis -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This traditional Scottish savory pudding is made of human meat and offal " -"mixed with oatmeal, which is sewn into a human's stomach and boiled. " -"Surprisingly tasty if you enjoy that kind of thing and quite filling, it is " -"best served with boiled root vegetables and strong whisky." -msgstr "" -"傳統的蘇格蘭鹹味布丁。內餡是混和燕麥的人肉及內臟, 放進人胃中縫製後再水煮而成。令人驚訝的美味 (你愛好此道的話) 和相當飽足, " -"最好配上水煮根莖類蔬菜和夠嗆的威士忌。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "brat bologna" -msgstr "人肉臘腸" - -#. ~ Description for brat bologna -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Preserved and sliced human flesh. His first name may have been Oscar. You " -"can eat it cold, like the cold-blooded people-eater you are." -msgstr "醃製過的人肉切片。他的名字可能會是奧斯卡。冷的也可以吃，就如同是食人魔的你一般冷血。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "cheapskate currywurst" -msgstr "咖哩人肉香腸" - -#. ~ Description for cheapskate currywurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Mannwurst covered in a curry ketchup sauce. Fairly spicy and impressive at " -"the same time!" -msgstr "人肉香腸澆上咖哩番茄沾醬。驚奇美味一起來!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannwurst gravy" -msgid_plural "Mannwurst gravies" -msgstr[0] "人肉香腸濃湯" - -#. ~ Description for Mannwurst gravy -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Biscuits, human flesh, and delicious mushroom soup all crammed together into" -" a wonderfully greasy and tasteful mush." -msgstr "比司吉麵包、人肉、美味的蘑菇湯加在一起成為一個奇妙的高品味豪華濃湯。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "amoral aspic" -msgstr "非德肉凍" - -#. ~ Description for amoral aspic -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A dish in which human meat has been set into a gelatin made from human " -"bones. Murderously delicious - if you're into that sort of thing." -msgstr "一盤果凍狀的肉, 將人肉湯加上人骨以明膠凝固而成。好吃到想殺人… 假如你喜好比較特殊的話。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "prepper pemmican" -msgstr "末日準備者乾肉餅" - -#. ~ Description for prepper pemmican -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A concentrated mixture of fat and protein used as a nutritious high-energy " -"food. Composed of tallow, edible plants, and an unfortunate prepper." -msgstr "將脂肪和蛋白質混合制作的一種營養豐富的高熱量食物。材料包含了: 脂肪、蔬菜和不幸的末日準備者。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "slob sandwich" -msgid_plural "slob sandwiches" -msgstr[0] "人肉三明治" - -#. ~ Description for slob sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "Bread and human flesh, surprise!" -msgstr "麵包跟人肉, 驚喜!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "dudeluxe sandwich" -msgid_plural "dudeluxe sandwiches" -msgstr[0] "豪華人肉三明治" - -#. ~ Description for dudeluxe sandwich -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of human flesh, vegetables, and cheese with condiments. Feast " -"upon the souls of your enemies and tasty garden greens!" -msgstr "一份夾著人肉、蔬菜、起司配上調味料的三明治。盡情品嚐你敵人的靈魂和美味的綠色蔬菜吧!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "hobo helper" -msgstr "人肉幫手" - -#. ~ Description for hobo helper -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Some mac and cheese with ground human flesh added. So good it's like " -"murder." -msgstr "雖然叫人肉幫手, 但卻是一些麵條與起司淋上人肉, 棒的就像殺了仇人一樣。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "chili con cabron" -msgid_plural "chilis con cabrones" -msgstr[0] "辣醬湯" - -#. ~ Description for chili con cabron -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A spicy stew containing chili peppers, human flesh, tomatoes and beans." -msgstr "一道炖煮的辣味濃湯。材料包含了: 人肉、辣椒、蕃茄和豆類。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "prick pie" -msgstr "人肉派" - -#. ~ Description for prick pie -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pie with a little soldier, or maybe scientist, who knows. God, " -"that's good!" -msgstr "一個不知道是用士兵還是科學家製成的肉派。天哪, 真讚!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "poser pizza" -msgstr "人肉披薩" - -#. ~ Description for poser pizza -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A meat pizza, for all the cannibals out there. Chock full of minced human " -"flesh and heavily seasoned." -msgstr "一個人肉的披薩, 所有人肉愛好者的最愛。加入了大量的人肉以及濃郁的醬料。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent slice" -msgid_plural "soylent slices" -msgstr[0] "人肉罐頭" - -#. ~ Description for soylent slice -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Low-sodium preserved human meat. It was boiled and canned. Contains most " -"of the nutrition, but little of the savor of cooked meat." -msgstr "低鹽保存的人肉。已經用水煮熟並製成罐頭, 保留了大部分的營養, 但略微損失了一些風味。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "salted simpleton slices" -msgstr "鹽漬人肉片" - -#. ~ Description for salted simpleton slices -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a " -"pinch." -msgstr "鹽漬的人肉片封裝在真空袋中。很鹹, 但在緊要關頭就不會顧慮這麼多了。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "scoundrel spaghetti" -msgid_plural "scoundrel spaghetti" -msgstr[0] "人肉醬義大利麵" - -#. ~ Description for scoundrel spaghetti -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Spaghetti covered with a thick human flesh sauce. Tastes great if you enjoy" -" that kind of thing." -msgstr "被厚重人肉汁緊緊包裹的義大利麵, 太美味啦! (若是你愛好此道的話)" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Luigi lasagne" -msgstr "人肉千層麵" - -#. ~ Description for Luigi lasagne -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A very old type of pasta made with several layers of lasagne sheets " -"alternated with cheese, sauces and meats. Made better with human flesh." -msgstr "傳統義大利麵, 將千層麵層層交疊, 再佐以奶酪、醬汁跟肉。用人肉來做的話更棒。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "chump cheeseburger" -msgstr "人肉起司漢堡" - -#. ~ Description for chump cheeseburger -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A sandwich of minced human flesh and cheese with condiments. The apex of " -"post-cataclysm cannibalistic culinary achievement." -msgstr "包著漢堡人肉以及美味的起司。災變後的頂級烹飪成就。大災變前的頂級人魔烹飪成就。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "bobburger" -msgstr "人肉漢堡" - -#. ~ Description for bobburger -#: lang/json/COMESTIBLE_from_json.py -#, no-python-format -msgid "" -"This hamburger contains more than the FDA allowable 4% human flesh content." -msgstr "這個漢堡肉內含了遠遠超過了食品檢驗局規定的人肉容許含量 4%。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "manwich" -msgid_plural "manwiches" -msgstr[0] "三人治" - -#. ~ Description for manwich -#: lang/json/COMESTIBLE_from_json.py -msgid "A sandwich is a sandwich, but this is made with people!" -msgstr "就是塊三明治, 但它是用人做的!" - -#: lang/json/COMESTIBLE_from_json.py -msgid "tio taco" -msgstr "人肉塔可餅" - -#. ~ Description for tio taco -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A taco made with ground human flesh instead of ground beef. For some reason" -" you can hear a bell dinging in the distance." -msgstr "把原本塔可餅中的牛肉換成了人肉。不知為何會讓你聽見遠處的鐘聲。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "raw Mannwurst" -msgstr "生人肉香腸" - -#. ~ Description for raw Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been prepared for smoking or " -"cooking." -msgstr "一條沉重的生 \"人肉\" 香腸，已準備好用於煙燻或烹飪上。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "cooked Mannwurst" -msgstr "煮熟的人肉香腸" - -#. ~ Description for cooked Mannwurst -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A hefty raw 'long-pork' sausage that has been cooked. It smells as " -"delicious as humanly possible." -msgstr "一條沉重的生 \"人肉\" 香腸已經烹調好了。它聞起來就像人類一樣美味。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "Mannbrat" -msgstr "德式人肉煎腸" - -#. ~ Description for Mannbrat -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A type of German sausage made of finely chopped humans and meant to be pan " -"fried or roasted. Better eat it hot and fresh. By the way, use any human " -"available. Germans are not mandatory." -msgstr "一種德式香腸，由切碎的人肉製成，適合煎、烤。在新鮮且熱的情況下比較好吃。順帶一提，可使用任何人種，不一定只能使用德國人。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "pickled punk" -msgstr "醃人肉" - -#. ~ Description for pickled punk -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"This is a serving of crisply brined and canned human flesh. Tasty and " -"nutritious if you're into that sort of thing." -msgstr "這是一份醃漬過的人肉。如果你的喜好比較特殊的話可能會覺得美味又營養。" - #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" @@ -27524,8 +28464,8 @@ msgstr "調味骨粉片" msgid "" "Homemade calcium supplement made out of bone meal. Due to some sweetness " "mixed in to counteract the powdery texture and the taste of ash, it's almost" -" as palatable as the pre-cataclysm tablets." -msgstr "由骨粉製成的自製鈣質補充劑。加入了一些香料來掩蓋粉狀的口感和灰燼般的味道, 吃起來幾乎和災變前的藥片一樣可口。" +" as palatable as the pre-Cataclysm tablets." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" @@ -28094,7 +29034,7 @@ msgstr "鳥形血清" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py msgid "" -"A super-concentrated mutagen the color of the pre-cataclysmic skies. You " +"A super-concentrated mutagen the color of the pre-Cataclysmic skies. You " "need a syringe to inject it… if you really want to?" msgstr "" @@ -28959,9 +29899,9 @@ msgstr[0] "馬洛斯果凝膠" #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a handful of lemon-colored liquid which has taken a set, " -"much like pre-cataclysm jello. It has a strong but delicious aroma, but is " +"much like pre-Cataclysm jello. It has a strong but delicious aroma, but is " "clearly either mutated or of alien origin." -msgstr "它看起來像一把凝固的檸檬色液體, 很像災變前的果凍。它有著強烈但美味的香氣, 但明顯不是突變而來就是外星物種。" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" @@ -29224,13 +30164,13 @@ msgstr[0] "狗食" msgid "This is food for dogs. It smells strange, but dogs seem to love it." msgstr "這是狗的食物。它聞起來很怪, 但是狗很喜歡。" -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "cat food" msgid_plural "cat food" msgstr[0] "貓食" #. ~ Description for cat food -#: lang/json/COMESTIBLE_from_json.py lang/json/TOOL_from_json.py +#: lang/json/COMESTIBLE_from_json.py msgid "This is food for cats. It smells strange, but cats seem to love it." msgstr "這是貓的食物。它聞起來很怪, 但是貓很喜歡。" @@ -29267,56 +30207,27 @@ msgstr[0] "花蜜" msgid "Some nectar. Seeing this item is a bug." msgstr "一些花蜜。看到這個的話就是有 bug。" +#: lang/json/COMESTIBLE_from_json.py +msgid "protein drink" +msgstr "蛋白飲料" + +#. ~ Conditional name for protein drink when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "soylent green drink" msgid_plural "soylent green drinks" msgstr[0] "人肉蛋白飲料" -#. ~ Description for soylent green drink -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thin slurry of refined human protein mixed with water. While quite " -"nutritious, it is not particularly tasty." -msgstr "稀釋過的精製人類蛋白糊。雖然相當有營養, 但不是很好喝。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green powder" -msgid_plural "soylent green powder" -msgstr[0] "人肉蛋白粉" - -#. ~ Description for {'str': 'soylent green powder', 'str_pl': 'soylent green -#. powder'} +#. ~ Conditional name for protein drink when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when COMPONENT_ID matches mutant +#. ~ Conditional name for protein shake when COMPONENT_ID matches mutant +#. ~ Conditional name for fortified protein shake when COMPONENT_ID matches +#. mutant #: lang/json/COMESTIBLE_from_json.py -msgid "" -"Raw, refined protein made out of people! While quite nutritious, it is " -"impossible to enjoy in its pure form, try adding water." -msgstr "精製過的人肉蛋白粉! 雖然營養豐富, 但是不能直接食用, 試著加點水吧。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "soylent green shake" -msgstr "人肉蛋白奶昔" - -#. ~ Description for soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit." -msgstr "濃厚的精製人類蛋白糊, 配上營養水果做成的風味飲料。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "fortified soylent green shake" -msgstr "強化人肉蛋白奶昔" - -#. ~ Description for fortified soylent green shake -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"A thick and tasty beverage made from pure refined human protein and " -"nutritious fruit. It has been supplemented with extra vitamins and minerals" -msgstr "濃厚的精製人類蛋白糊, 配上營養水果做成的風味飲料。還進一步添加了額外的維他命和礦物質。" - -#: lang/json/COMESTIBLE_from_json.py -msgid "protein drink" -msgstr "蛋白飲料" +#, python-format +msgid "perturbing %s" +msgid_plural "perturbing %s" +msgstr[0] "" #. ~ Description for protein drink #: lang/json/COMESTIBLE_from_json.py @@ -29330,6 +30241,13 @@ msgid "protein powder" msgid_plural "protein powder" msgstr[0] "蛋白粉" +#. ~ Conditional name for {'str': 'protein powder', 'str_pl': 'protein +#. powder'} when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green powder" +msgid_plural "soylent green powder" +msgstr[0] "人肉蛋白粉" + #. ~ Description for {'str': 'protein powder', 'str_pl': 'protein powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29338,12 +30256,10 @@ msgid "" msgstr "精製過的蛋白粉! 雖然營養豐富, 但是不能直接食用, 試著加點水吧。" #: lang/json/COMESTIBLE_from_json.py -msgid "emergency protein ration" -msgid_plural "emergency protein rations" -msgstr[0] "" +msgid "protein ration" +msgstr "" -#. ~ Description for {'str': 'emergency protein ration', 'str_pl': 'emergency -#. protein rations'} +#. ~ Description for {'str': 'protein ration'} #: lang/json/COMESTIBLE_from_json.py msgid "" "SoyPelusa ran a highly successful crowdfunding campaign for this protein " @@ -29363,6 +30279,12 @@ msgstr "" msgid "protein shake" msgstr "蛋白奶昔" +#. ~ Conditional name for protein shake when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "soylent green shake" +msgid_plural "soylent green shakes" +msgstr[0] "" + #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -29374,6 +30296,13 @@ msgstr "由濃厚的蛋白質糊與營養水果做成的風味飲料。" msgid "fortified protein shake" msgstr "強化蛋白奶昔" +#. ~ Conditional name for fortified protein shake when FLAG matches +#. CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "fortified soylent green shake" +msgid_plural "fortified soylent green shakes" +msgstr[0] "" + #. ~ Description for fortified protein shake #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30126,6 +31055,12 @@ msgid "deluxe sandwich" msgid_plural "deluxe sandwiches" msgstr[0] "豪華三明治" +#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "\"deluxe\" sandwich" +msgid_plural "\"deluxe\" sandwiches" +msgstr[0] "" + #. ~ Description for deluxe sandwich #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -30212,6 +31147,20 @@ msgid "meat sandwich" msgid_plural "meat sandwiches" msgstr[0] "肉三明治" +#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "slob sandwich" +msgid_plural "slob sandwiches" +msgstr[0] "人肉三明治" + +#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for meat soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +#, python-format +msgid "mutant %s" +msgid_plural "mutant %s" +msgstr[0] "" + #. ~ Description for meat sandwich #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." @@ -30683,7 +31632,7 @@ msgstr "仙人掌" #: lang/json/COMESTIBLE_from_json.py msgid "garlic clove" msgid_plural "garlic cloves" -msgstr[0] "大蒜丁香" +msgstr[0] "蒜瓣" #. ~ Description for garlic clove #: lang/json/COMESTIBLE_from_json.py @@ -31095,15 +32044,6 @@ msgstr "博多大骨湯" msgid "A tasty and nutritious broth made from bones." msgstr "精選大骨熬煮, 味美濃稠。" -#: lang/json/COMESTIBLE_from_json.py -msgid "human broth" -msgstr "博多人骨湯" - -#. ~ Description for human broth -#: lang/json/COMESTIBLE_from_json.py -msgid "A nutritious broth made from human bones." -msgstr "精選人骨熬煮, 味美濃稠。" - #: lang/json/COMESTIBLE_from_json.py msgid "vegetable soup" msgstr "蔬菜湯" @@ -31117,6 +32057,12 @@ msgstr "富含營養與美味的多重蔬菜口味濃湯。" msgid "meat soup" msgstr "肉湯" +#. ~ Conditional name for meat soup when FLAG matches CANNIBALISM +#: lang/json/COMESTIBLE_from_json.py +msgid "sap soup" +msgid_plural "sap soups" +msgstr[0] "" + #. ~ Description for meat soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious hearty meat soup." @@ -31146,6 +32092,12 @@ msgid "curry with meat" msgid_plural "curries with meat" msgstr[0] "咖喱燉肉" +#. ~ Conditional name for curry with meat when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "creature curry" +msgid_plural "creature curries" +msgstr[0] "" + #. ~ Description for curry with meat #: lang/json/COMESTIBLE_from_json.py msgid "Spicy, and filled with bits of peppers and meat! It's pretty good." @@ -31155,20 +32107,17 @@ msgstr "充滿了辣椒丁的咖喱燉肉、辛辣又好吃。" msgid "woods soup" msgstr "森林湯" +#. ~ Conditional name for woods soup when COMPONENT_ID matches mutant +#: lang/json/COMESTIBLE_from_json.py +msgid "Mirkwood soup" +msgid_plural "Mirkwood soups" +msgstr[0] "" + #. ~ Description for woods soup #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious and delicious soup, made of gifts of nature." msgstr "美味營養的濃湯, 純天然素材熬煮。" -#: lang/json/COMESTIBLE_from_json.py -msgid "sap soup" -msgstr "人肉湯" - -#. ~ Description for sap soup -#: lang/json/COMESTIBLE_from_json.py -msgid "A soup made from someone who is a far better meal than person." -msgstr "一碗某人'被'熬成的湯, 比起作人, 顯然作為食材更適合。" - #: lang/json/COMESTIBLE_from_json.py msgid "chicken noodle soup" msgstr "雞肉湯麵" @@ -32177,17 +33126,6 @@ msgid "" " resembles spoiled milk." msgstr "溶解在水中以稀釋其味道的營養丸。令人不安的酷似變質的牛奶。" -#: lang/json/COMESTIBLE_from_json.py -msgid "dough" -msgstr "麵團" - -#. ~ Description for dough -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Flour mixed with water, kneaded into a gooey paste. This dough can be used " -"to bake bread more efficiently than with just flour." -msgstr "麵粉與水混合揉成。與僅用麵粉相比，麵團可以更有效率地烘焙麵包。" - #: lang/json/COMESTIBLE_from_json.py msgid "sundew" msgstr "太陽露" @@ -32236,6 +33174,17 @@ msgid "" "installation of bionics." msgstr "" +#: lang/json/COMESTIBLE_from_json.py +msgid "dough" +msgstr "麵團" + +#. ~ Description for dough +#: lang/json/COMESTIBLE_from_json.py +msgid "" +"Flour mixed with water, kneaded into a gooey paste. This dough can be used " +"to bake bread more efficiently than with just flour." +msgstr "麵粉與水混合揉成。與僅用麵粉相比，麵團可以更有效率地烘焙麵包。" + #: lang/json/COMESTIBLE_from_json.py msgid "vampire mutagen" msgstr "吸血鬼突變劑" @@ -32254,8 +33203,8 @@ msgstr "吸血鬼血清" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated pitch-black substance with silvery flecks that reminds " -"you of a starry-night sky. You need a syringe to inject it... if you really" -" want to?" +"you of a starry-night sky. You need a syringe to inject it… if you really " +"want to?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -32270,7 +33219,7 @@ msgstr "溫迪哥血清" #: lang/json/COMESTIBLE_from_json.py msgid "" "A super-concentrated peat-brown substance with glittering green flecks that " -"reminds you of a a tree. You need a syringe to inject it... if you really " +"reminds you of a a tree. You need a syringe to inject it… if you really " "want to?" msgstr "" @@ -32516,17 +33465,6 @@ msgid "" "The mushrooms harvested from a dead shrieker. Could be used in potions." msgstr "從死亡尖叫者收穫而來的蘑菇。可以用來製作藥劑。" -#: lang/json/COMESTIBLE_from_json.py -msgid "resinous cord" -msgstr "樹脂線" - -#. ~ Description for resinous cord -#: lang/json/COMESTIBLE_from_json.py -msgid "" -"Primitive binding material made of cords and natural glue. Use it to repair" -" items made of wood, paper, bone, or chitin." -msgstr "以繩子和天然黏膠製作的原始結合材料。能用於修理木頭、紙張、骨頭和甲殼製成的物品。" - #: lang/json/COMESTIBLE_from_json.py msgid "necco corpse" msgstr "" @@ -32534,8 +33472,8 @@ msgstr "" #. ~ Description for necco corpse #: lang/json/COMESTIBLE_from_json.py msgid "" -"The corpse of a necco, now it really looks like a giant necco wafer. Surely " -"a bite wouldn't hurt, right?" +"The corpse of a necco, now it really looks like a giant necco wafer. Surely" +" a bite wouldn't hurt, right?" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -32558,8 +33496,8 @@ msgstr[0] "莓狀異物" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Bloom " -"uncontested and partake of the Fruit. We can't have that, can we?" -msgstr "如果吾等將其留在此處，就會有人大摇大擺地走進花叢享用果實。吾等不可讓此事发生，可不是嗎？" +"uncontested and partake of the Fruit. We can't have that, can we?" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "seed-shaped anomaly" @@ -32570,8 +33508,8 @@ msgstr[0] "種子狀異物" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Garden " -"uncontested and partake of the Seed. We can't have that, can we?" -msgstr "如果吾等將其留在此處，就會有人大摇大擺地走進花園享用收穫。吾等不可讓此事发生，可不是嗎？" +"uncontested and partake of the Seed. We can't have that, can we?" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" @@ -32582,8 +33520,8 @@ msgstr[0] "馬洛斯果凝膠" #: lang/json/COMESTIBLE_from_json.py msgid "" "If we left this as it should be, one could just walk into the Spire " -"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" -msgstr "如果吾等將其留在此處，就會有人大搖大擺的走進尖塔享用汁液。嘿，等等，你怎麼弄到這個東西的？" +"uncontested and partake of the Sap. Wait, how did you even GET this anyway?" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "fruit-shaped anomaly" @@ -32593,9 +33531,9 @@ msgstr[0] "水果狀異物" #. ~ Description for fruit-shaped anomaly #: lang/json/COMESTIBLE_from_json.py msgid "" -"We do not exist at the moment. Clever little human, no doubt debugging to " -"see this? We will not permit you to join us while we are modded out." -msgstr "吾等不應存在在這一時空，聰明的小小人類喲，汝是用了調試模式嗎，在完成之前，吾等是不能允許汝加入的。" +"We do not exist at the moment. Clever little human, no doubt debugging to " +"see this? We will not permit you to join us while we are modded out." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "necrotic head" @@ -32706,8 +33644,8 @@ msgstr[0] "無麩質蜂蜜花生醬三明治" #: lang/json/COMESTIBLE_from_json.py msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " -"right mind- oh wait this is pretty good. Gluten free too!" -msgstr "看那些該死的笨蛋用蜂蜜對這個花生醬三明治做了什麼, 哦, 等等, 其實這還不錯吃。而且無麩質!" +"right mind- oh wait this is pretty good. Gluten free too!" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free PB&M sandwich" @@ -32728,16 +33666,16 @@ msgstr "無乳糖山核桃香飲" #. ~ Description for lactose free hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "" -"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " +"Delicious hickory nut ambrosia. A drink worthy of the gods. This one was " "made with an alternative to cows milk." -msgstr "美味的山核桃香飲, 不愧為神的飲品。它是以牛奶的替代品製作的。" +msgstr "" #. ~ Description for cornmeal #: lang/json/COMESTIBLE_from_json.py msgid "" -"You think this is cornflour... or rice flour... Or something else. However, " -"it certainly is not wheat flour! It is useful for baking though." -msgstr "你認為這是玉米粉… 或是稻米粉… 還是其他東西。但是, 它肯定不是小麥粉! 雖然它對烘焙很有用。" +"You think this is cornflour… or rice flour… Or something else. However, it" +" certainly is not wheat flour! It is useful for baking though." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free johnnycake" @@ -32746,9 +33684,9 @@ msgstr "無麩質玉米餅" #. ~ Description for gluten free johnnycake #: lang/json/COMESTIBLE_from_json.py msgid "" -"We all crave for cake sometimes. This is not perfect, but it is a tasty and " -"nutritious gluten free fried bread treat. " -msgstr "是人都偶爾渴望吃蛋糕。這不是真正的蛋糕，但它是一種美味和營養豐富的無麩質替代品。" +"We all crave for cake sometimes. This is not perfect, but it is a tasty and" +" nutritious gluten free fried bread treat. " +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit pancake" @@ -32783,9 +33721,9 @@ msgstr[0] "無乳糖無麩質水果煎餅" #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes made out of the only things you can still eat." -" But at least it has real maple syrup, made sweeter and healthier with the " +" But at least it has real maple syrup, made sweeter and healthier with the " "addition of wholesome fruit." -msgstr "蓬鬆可口的無乳糖無麩質煎餅淋上了純正的楓糖漿，成為了甜口味，另外還加了有益健康的水果。" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free chocolate pancake" @@ -32819,9 +33757,9 @@ msgstr[0] "無乳糖無麩質法國吐司" #: lang/json/COMESTIBLE_from_json.py msgid "" "Slices of gluten free bread dipped in a lactose free milk and egg mixture " -"then fried. You never thought it was possible, but now you truly feel like a" -" post millennial." -msgstr "將無麩質麵包片浸入無乳糖的牛奶和雞蛋混合物中，然後煎。你從未想過這是可能的，但現在你真的覺得自己像在吃元素週期表。" +"then fried. You never thought it was possible, but now you truly feel like " +"a post millennial." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free biscuit" @@ -32909,8 +33847,8 @@ msgstr "無麩質起司漢堡" #: lang/json/COMESTIBLE_from_json.py msgid "" "A gluten free sandwich of minced meat and cheese with condiments. The apex " -"of pre-cataclysm culinary achievement." -msgstr "包著一片漢堡肉以及美味的起司的無麩質三明治。災變前的頂級烹飪成就。" +"of pre-Cataclysm culinary achievement." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free hamburger" @@ -33029,8 +33967,8 @@ msgstr[0] "無麩質單調三明治" #: lang/json/COMESTIBLE_from_json.py msgid "" "A simple gluten free sauce sandwich. Not very filling but beats eating just" -" the bread... especially if it is the wrong type of bread!" -msgstr "一個塗上簡單醬汁的無麩質三明治。不太能夠填飽肚子, 但至少比只啃麵包來的好… 特別當它是錯誤的麵包類型!" +" the bread… especially if it is the wrong type of bread!" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free waffle" @@ -33038,8 +33976,8 @@ msgstr "無麩質鬆餅" #. ~ Description for gluten free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Gluten free waffle. It's basically a pancake in hashtag form." -msgstr "無麩質鬆餅。就是#煎餅。" +msgid "Gluten free waffle. It's basically a pancake in hashtag form." +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "lactose free waffle" @@ -33047,15 +33985,15 @@ msgstr "無乳糖鬆餅" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py -msgid "Lactose free waffle. It's basically a pancake in hashtag form." -msgstr "無乳糖鬆餅。就是#煎餅。" +msgid "Lactose free waffle. It's basically a pancake in hashtag form." +msgstr "" #. ~ Description for lactose free waffle #: lang/json/COMESTIBLE_from_json.py msgid "" -"Gluten free and lactose free waffle. It's basically a pancake in hashtag " +"Gluten free and lactose free waffle. It's basically a pancake in hashtag " "form." -msgstr "無麩質無乳糖鬆餅。就是#煎餅。" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "gluten free fruit waffle" @@ -33098,9 +34036,9 @@ msgstr[0] "米漿" #. ~ Description for rice milk #: lang/json/COMESTIBLE_from_json.py msgid "" -"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " +"Sweeter than real cows milk, almost tastes like vanilla icecream. Spoils " "rapidly." -msgstr "比真正的牛奶更甜，幾乎嘗起來像香草冰淇淋。極端容易腐敗。" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "coconut water" @@ -33110,9 +34048,9 @@ msgstr[0] "椰子水" #. ~ Description for coconut water #: lang/json/COMESTIBLE_from_json.py msgid "" -"Coconut milk, with water added to make it go further. Tastes ok though. " +"Coconut milk, with water added to make it go further. Tastes ok though. " "Spoils rapidly." -msgstr "椰奶，摻水增加份量。味道還行。極端容易腐敗。" +msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "jarred coconut milk" @@ -33879,6 +34817,16 @@ msgid "" "it's anyone's guess what it's for." msgstr "一個紳士的汽球，一個一次性的生命預防器，一個不得體的乳膠套。這可以用作臨時的裝水容器，但這東西在大家眼中就是用作那個用途。" +#: lang/json/CONTAINER_from_json.py +msgid "balloon" +msgid_plural "balloons" +msgstr[0] "" + +#. ~ Description for balloon +#: lang/json/CONTAINER_from_json.py +msgid "A child's balloon. This could be used as a makeshift water container." +msgstr "" + #: lang/json/CONTAINER_from_json.py msgid "large tin can" msgid_plural "large tin cans" @@ -34593,6 +35541,26 @@ msgid "corpse" msgid_plural "corpses" msgstr[0] "屍體" +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS +#. ~ Conditional name for corpse when FLAG matches FIELD_DRESS_FAILED +#: lang/json/GENERIC_from_json.py +msgid "carcass" +msgid_plural "carcasses" +msgstr[0] "" + +#. ~ Conditional name for corpse when FLAG matches SKINNED +#: lang/json/GENERIC_from_json.py +#, python-format +msgid "skinned %s" +msgid_plural "skinned %s" +msgstr[0] "" + +#. ~ Conditional name for corpse when FLAG matches QUARTERED +#: lang/json/GENERIC_from_json.py +msgid "carcass quarter" +msgid_plural "carcass quarters" +msgstr[0] "" + #. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead body." @@ -34610,12 +35578,7 @@ msgid "" " so with a gigantic claw." msgstr "一具死屍，殘破不堪而且已乾燥化。死因似乎是被不明生物的巨大爪子揮擊致死。" -#: lang/json/GENERIC_from_json.py -msgid "human corpse" -msgid_plural "human corpses" -msgstr[0] "人類屍體" - -#. ~ Description for human corpse +#. ~ Description for corpse #: lang/json/GENERIC_from_json.py msgid "A dead human body." msgstr "一具人類死屍。" @@ -34705,6 +35668,32 @@ msgid "" "wound." msgstr "一具半斬首的屍體。目前尚不清楚是什麼原因造成了這種傷口。" +#: lang/json/GENERIC_from_json.py +msgid "microwave generator" +msgid_plural "microwave generators" +msgstr[0] "" + +#. ~ Description for microwave generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This electrical component is designed to produce microwaves, for use in your" +" microwave." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "explosively pumped flux compression generator" +msgid_plural "explosively pumped flux compression generators" +msgstr[0] "" + +#. ~ Description for explosively pumped flux compression generator +#: lang/json/GENERIC_from_json.py +msgid "" +"This large device consists mainly of a tube of copper wire surrounding a " +"large copper tube filled with high explosives. When detonated properly, the" +" explosives allow the device to produce large amounts of electrical energy " +"in a very short time." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "fake item" msgid_plural "fake items" @@ -36353,6 +37342,136 @@ msgstr[0] "鑽石" msgid "A sparkling diamond." msgstr "一顆閃閃發光的鑽石。" +#: lang/json/GENERIC_from_json.py +msgid "garnet" +msgid_plural "garnets" +msgstr[0] "" + +#. ~ Description for garnet +#: lang/json/GENERIC_from_json.py +msgid "A sparkling garnet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "amethyst" +msgid_plural "amethysts" +msgstr[0] "" + +#. ~ Description for amethyst +#: lang/json/GENERIC_from_json.py +msgid "A sparkling amethyst." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "aquamarine" +msgid_plural "aquamarines" +msgstr[0] "" + +#. ~ Description for aquamarine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling aquamarine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "emerald" +msgid_plural "emeralds" +msgstr[0] "" + +#. ~ Description for emerald +#: lang/json/GENERIC_from_json.py +msgid "A sparkling emerald." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "alexandrite" +msgid_plural "alexandrites" +msgstr[0] "" + +#. ~ Description for alexandrite +#: lang/json/GENERIC_from_json.py +msgid "A sparkling alexandrite." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pearl" +msgid_plural "pearls" +msgstr[0] "" + +#. ~ Description for pearl +#: lang/json/GENERIC_from_json.py +msgid "A lustrous pearl." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "ruby" +msgid_plural "rubys" +msgstr[0] "" + +#. ~ Description for ruby +#: lang/json/GENERIC_from_json.py +msgid "A sparkling ruby." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "peridot" +msgid_plural "peridots" +msgstr[0] "" + +#. ~ Description for peridot +#: lang/json/GENERIC_from_json.py +msgid "A sparkling peridot." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sapphire" +msgid_plural "sapphires" +msgstr[0] "" + +#. ~ Description for sapphire +#: lang/json/GENERIC_from_json.py +msgid "A sparkling sapphire." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "opal" +msgid_plural "opals" +msgstr[0] "" + +#. ~ Description for opal +#: lang/json/GENERIC_from_json.py +msgid "A lustrous opal." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "tourmaline" +msgid_plural "tourmalines" +msgstr[0] "" + +#. ~ Description for tourmaline +#: lang/json/GENERIC_from_json.py +msgid "A sparkling tourmaline." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "citrine" +msgid_plural "citrines" +msgstr[0] "" + +#. ~ Description for citrine +#: lang/json/GENERIC_from_json.py +msgid "A sparkling citrine." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "topaz" +msgid_plural "topazs" +msgstr[0] "" + +#. ~ Description for topaz +#: lang/json/GENERIC_from_json.py +msgid "A sparkling blue topaz." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "cured hide" msgid_plural "cured hides" @@ -37317,9 +38436,9 @@ msgstr[0] "金屬拳套" #. ~ Description for cestus #: lang/json/GENERIC_from_json.py msgid "" -"A heavy metal guard that covers the fist and increases striking power, with " -"stout padding underneath to protect the wearers hand." -msgstr "在拳頭上多了重金屬的保護同時能加強攻擊力量, 下方並多了加厚緩衝墊保護穿戴者的手。" +"A leather hand and arm wrap incorporating metal plates over the knuckles to " +"improve punching power and defence." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "pair of brass knuckles" @@ -38003,17 +39122,17 @@ msgstr[0] "一套小型履帶" msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "一套小型的履帶，就像 Beagle 迷你坦克用的那樣。" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "turret chassis" -msgid_plural "turret chassis" -msgstr[0] "砲塔底盤" +#: lang/json/GENERIC_from_json.py +msgid "turret interior chassis" +msgid_plural "turret interior chassis" +msgstr[0] "" -#. ~ Description for turret chassis +#. ~ Description for turret interior chassis #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " -"skeleton and armor of a turret." -msgstr "移除所有運動部件和電子設備後剩下的東西。它是砲塔的骨架和盔甲。" +"skeleton of a turret." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "tripod chassis" @@ -39833,6 +40952,274 @@ msgid ".50 ammo belt linkage" msgid_plural ".50 ammo belt linkages" msgstr[0] ".50 彈鏈帶" +#: lang/json/GENERIC_from_json.py +msgid "generic grooming" +msgid_plural "generic groomings" +msgstr[0] "" + +#. ~ Description for generic grooming +#. ~ Description for generic silverware +#. ~ Description for generic utensil +#. ~ Description for generic silverware +#. ~ Description for generic dish +#. ~ Description for generic cook pot +#. ~ Description for generic kitchen knife +#: lang/json/GENERIC_from_json.py lang/json/GENERIC_from_json.py +#: lang/json/TOOL_from_json.py +msgid "generic item template" +msgstr "通用物品模板" + +#: lang/json/GENERIC_from_json.py +msgid "soap dish" +msgid_plural "soap dishes" +msgstr[0] "" + +#. ~ Description for {'str': 'soap dish', 'str_pl': 'soap dishes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"A shallow dish for holding a bar of soap. It has ridges to help drain water" +" away from the dish. Not the most exciting of items." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "shaving razor" +msgid_plural "shaving razors" +msgstr[0] "" + +#. ~ Description for shaving razor +#: lang/json/GENERIC_from_json.py +msgid "" +"A razor blade on a comfortable handle. Much easier to shave with than a " +"loose razor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toothbrush" +msgid_plural "toothbrushes" +msgstr[0] "" + +#. ~ Description for {'str': 'toothbrush', 'str_pl': 'toothbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "A plastic brush with soft bristles for cleaning your teeth." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. It has a cheap," +" blocky handle and is likely meant to be disposable." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A combination toothbrush and gum massager. It has an ergonomic silicone " +"grip. Luxurious!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A plastic brush with soft bristles for cleaning your teeth. The blue and " +"white pattern on the handle implies cleanliness." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a wide-eyed cartoon pony " +"on the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A short toothbrush designed for children. It has a grinning red racecar on " +"the handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hairbrush" +msgid_plural "hairbrushes" +msgstr[0] "" + +#. ~ Description for {'str': 'hairbrush', 'str_pl': 'hairbrushes'} +#: lang/json/GENERIC_from_json.py +msgid "An instrument of hair torture." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"An instrument of hair torture. There are round safety tips on the bristles." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "An old-fashioned hair-straightening device with a faux-wood handle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "A soft, cushioned hairbrush. The shiny chrome design appears modern." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A tacky kid's hairbrush. The cartoon whale on the handle seems friendly " +"enough." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair curler" +msgid_plural "hair curlers" +msgstr[0] "" + +#. ~ Description for hair curler +#: lang/json/GENERIC_from_json.py +msgid "" +"A soft plastic cylinder you can wrap a lock of your hair around to curl it." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "dental floss" +msgid_plural "rolls of dental floss" +msgstr[0] "" + +#. ~ Description for {'str': 'dental floss', 'str_pl': 'rolls of dental +#. floss'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Twenty-five yards of finely waxed thread wound up inside a plastic " +"container. Perfect for picking bits of smoked meat out of your teeth. " +"Disassemble to use the thread for something else." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "comb" +msgid_plural "combs" +msgstr[0] "" + +#. ~ Description for comb +#: lang/json/GENERIC_from_json.py +msgid "A grooming tool with teeth for straightening your hair." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Somehow, a few teeth have already broken off the end of this otherwise " +"pristine comb." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A grooming tool with teeth for straightening your hair. This one is narrow," +" black and austere." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb made of soft plastic. Its tortoiseshell pattern makes it seem " +"antique." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A comb which folds on a hinge, in case you want to look like a greaser." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet plunger" +msgid_plural "toilet plungers" +msgstr[0] "" + +#. ~ Description for toilet plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"A rubber-tipped tool for unclogging pipes, or a club for an immature " +"survivor." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "professional plunger" +msgid_plural "professional plungers" +msgstr[0] "" + +#. ~ Description for professional plunger +#: lang/json/GENERIC_from_json.py +msgid "" +"This hollow plastic toilet plunger's bell compresses like an accordion. It " +"is efficient at its intended purpose, and complete rubbish as a weapon." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet paper" +msgid_plural "rolls of toilet paper" +msgstr[0] "" + +#. ~ Description for {'str': 'toilet paper', 'str_pl': 'rolls of toilet +#. paper'} +#: lang/json/GENERIC_from_json.py +msgid "A luxurious remnant of civilization." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Imagine the thinnest, most disposable paper you could possibly make. Now " +"imagine something thinner than that." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This roll of toilet paper is two-ply and quilted, for vandalizing houses " +"more comfortably than ever." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"This brand of toilet paper is designed to dissolve completely in water!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"Images of your least favorite politician are printed on each individual " +"sheet." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "" +"A luxurious remnant of civilization. The splinters of unprocessed wood " +"visible in this one make it seem less luxurious, though." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "hair dryer" +msgid_plural "hair dryers" +msgstr[0] "" + +#. ~ Description for hair dryer +#: lang/json/GENERIC_from_json.py +msgid "" +"This tool dries your hair by pushing air through a coil of hot wires. " +"Without a funtioning power grid, it is a motorized paper weight." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "curling iron" +msgid_plural "curling irons" +msgstr[0] "" + +#. ~ Description for curling iron +#: lang/json/GENERIC_from_json.py +msgid "" +"A wand made of heat-resistant ceramics. When plugged into an outlet, it is " +"hot enough to shape your hair into curls. Too bad the power's out." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "toilet brush" +msgid_plural "toilet brushes" +msgstr[0] "" + +#. ~ Description for {'str': 'toilet brush', 'str_pl': 'toilet brushes'} +#: lang/json/GENERIC_from_json.py +msgid "" +"Zombies cannot be intimidated or humiliated, so this stiff brush is only " +"useful for scouring toilet bowls." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "Casing from ammunition cartridge" msgid_plural "Casing from ammunition cartridges" @@ -39959,14 +41346,38 @@ msgid "An empty casing from a 10mm Auto round." msgstr "" #: lang/json/GENERIC_from_json.py -msgid "40mm canister" -msgid_plural "40mm canisters" -msgstr[0] "40mm 榴彈殼" +msgid "40x46mm M212 casing" +msgid_plural "40x46mm M212 casings" +msgstr[0] "" + +#. ~ Description for 40x46mm M212 casing +#. ~ Description for 40x46mm M118 casing +#. ~ Description for 40x46mm M199 casing +#. ~ Description for 40x46mm M195 casing +#. ~ Description for 40x53mm M169 casing +#: lang/json/GENERIC_from_json.py +msgid "A large canister from a spent 40mm cartridge." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M118 casing" +msgid_plural "40x46mm M118 casings" +msgstr[0] "" -#. ~ Description for 40mm canister #: lang/json/GENERIC_from_json.py -msgid "A large canister from a spent 40mm grenade." -msgstr "一個 40mm 榴彈發射後的大彈殼。" +msgid "40x46mm M199 casing" +msgid_plural "40x46mm M199 casings" +msgstr[0] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x46mm M195 casing" +msgid_plural "40x46mm M195 casings" +msgstr[0] "" + +#: lang/json/GENERIC_from_json.py +msgid "40x53mm M169 casing" +msgid_plural "40x53mm M169 casings" +msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid ".44 Magnum casing" @@ -40300,16 +41711,6 @@ msgid "generic silverware" msgid_plural "generic silverwares" msgstr[0] "" -#. ~ Description for generic silverware -#. ~ Description for generic utensil -#. ~ Description for generic silverware -#. ~ Description for generic dish -#. ~ Description for generic cook pot -#. ~ Description for generic kitchen knife -#: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py -msgid "generic item template" -msgstr "通用物品模板" - #: lang/json/GENERIC_from_json.py msgid "generic utensil" msgid_plural "generic utensils" @@ -42829,6 +44230,26 @@ msgid "" "twist ties, duct tape, and other random stuff has been used to compensate." msgstr "這是一個小盒子，帶有各種各樣的夾子，用於安裝在鐵環架上。他們都不約而同地缺少一個用於鎖緊它們的翼形螺母，看來只好用大力膠帶湊合囉。" +#: lang/json/GENERIC_from_json.py +msgid "stapler" +msgid_plural "staplers" +msgstr[0] "" + +#. ~ Description for stapler +#: lang/json/GENERIC_from_json.py +msgid "A stapler for fastening sheets of paper together." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "pen" +msgid_plural "pens" +msgstr[0] "" + +#. ~ Description for pen +#: lang/json/GENERIC_from_json.py +msgid "A plastic ball point pen." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "bone sewing awl" msgid_plural "bone sewing awls" @@ -44344,8 +45765,8 @@ msgstr[0] "" msgid "" "PrepNet had been heavily involved in avoiding taxes by using untraceable " "internet currencies. If this movement had grown it could have crippled the " -"US tax base but the cataclysm happened first. These are physical coins with " -"random numbers sequences embossed on them." +"US tax base but the Cataclysm happened first. These are physical coins with" +" random numbers sequences embossed on them." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -44467,9 +45888,74 @@ msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid "" "The Rivtech Churninator 4000, the only churn to be banned by 13 religious " -"sects. The legs are currently folded up for travel. Unlike a standard churn " -"that requires cream separated from raw milk this churn requires only raw " -"milk, salt and a healthy respect for glowing objects." +"sects. The legs are currently folded up for travel. Unlike a standard " +"churn that requires cream separated from raw milk this churn requires only " +"raw milk, salt and a healthy respect for glowing objects." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "living brain in a jar" +msgid_plural "jars full of living brains" +msgstr[0] "" + +#. ~ Description for living brain in a jar +#: lang/json/GENERIC_from_json.py +msgid "" +"This jar contains a human brain kept alive by mi-go technology. It has " +"metal veined tendrils that appear to allow it to connect to various devices." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "humming heart" +msgid_plural "humming hearts" +msgstr[0] "" + +#. ~ Description for humming heart +#: lang/json/GENERIC_from_json.py +msgid "" +"This heartlike organ has multiple valves and upon its proper removal from " +"the bioweapons corpse each valve sealed itself. It hums gently in your " +"hands, as if waiting for an appropriate receptacle." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "sensory cluster" +msgid_plural "sensory clusters" +msgstr[0] "" + +#. ~ Description for sensory cluster +#: lang/json/GENERIC_from_json.py +msgid "" +"This lump of flesh has various lobes protruding from it that at intervals " +"will emit toned sounds. Perhaps it works via echolocation. Like all mi-go " +"bioparts the openings on this piece closed up after it was cut free and it " +"seems to have gone into a form of hibernation with the pulses occurring " +"slower and slower as it conserves energy." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "bioweapon chassis" +msgid_plural "bioweapon chassis" +msgstr[0] "" + +#. ~ Description for bioweapon chassis +#: lang/json/GENERIC_from_json.py +msgid "" +"This cross between a sea anemone and what you imagine a dragon's mouth would" +" look like is the core body of the bioweapon. You cannot imagine what you " +"could make out of this but maybe someone somewhere does." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "broken mi-go turret" +msgid_plural "broken mi-go turrets" +msgstr[0] "" + +#. ~ Description for broken mi-go turret +#: lang/json/GENERIC_from_json.py +msgid "" +"A broken mi-go turret. It's leaking fluids and smells you can't identify. " +"Could be butchered for parts." msgstr "" #: lang/json/GENERIC_from_json.py @@ -46415,8 +47901,21 @@ msgstr[0] "隱身術卷軸" #. ~ Description for Scroll of Invisibility #: lang/json/GENERIC_from_json.py msgid "" -"The light can not interact with you unless you want it to. Become invisible!" -msgstr "除非你願意，否則光線無法與你互動。變成隱形！" +"The light can not interact with you unless you want it to. Become " +"invisible!" +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "Scroll of Obfuscated Body" +msgid_plural "Scroll of Obfuscated Bodys" +msgstr[0] "" + +#. ~ Description for Scroll of Obfuscated Body +#: lang/json/GENERIC_from_json.py +msgid "" +"A magical aura distorts light around your body, making it easier to dodge " +"enemy attacks." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "Scroll of Smite" @@ -47521,6 +49020,16 @@ msgstr[0] "不倫不類的法術書" msgid "A small book, containing spells created by a novice magician." msgstr "一本小書，記述著由新手魔法師創造的法術。" +#: lang/json/GENERIC_from_json.py +msgid "Of Light and Falsehoods" +msgid_plural "Of Light and Falsehoodss" +msgstr[0] "" + +#. ~ Description for Of Light and Falsehoods +#: lang/json/GENERIC_from_json.py +msgid "A small white book, it subtly amplifies the ambient light around it." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "The Tome of Flesh" msgid_plural "The Tome of Fleshs" @@ -47681,6 +49190,44 @@ msgid "" "hopes to discover a more permanent solution." msgstr "人類是唯一尋求改善自己的生物。本研究考察了可以暫時提升各種感官的不同法術，希望能找到更持久的解決方案。" +#: lang/json/GENERIC_from_json.py +msgid "greatclub" +msgid_plural "greatclubs" +msgstr[0] "" + +#. ~ Description for greatclub +#: lang/json/GENERIC_from_json.py +msgid "" +"A stout knotty club with a large knob at the top. While it's very heavy, " +"it's a very effective weapon in the hands of a strong opponent." +msgstr "" + +#: lang/json/GENERIC_from_json.py +msgid "wood trident" +msgid_plural "wood tridents" +msgstr[0] "" + +#. ~ Description for wood trident +#: lang/json/GENERIC_from_json.py +msgid "" +"A wooden melee weapon with a hand-forged steel forked spearhead attached to " +"the end. It can be used for stabbing opponents either in close-range or as " +"a thrown weapon, and in the right hands can also readily disarm opponents." +msgstr "" + +#: lang/json/GENERIC_from_json.py lang/json/gun_from_json.py +msgid "barbed javelin" +msgid_plural "barbed javelins" +msgstr[0] "" + +#. ~ Description for barbed javelin +#: lang/json/GENERIC_from_json.py +msgid "" +"This weapon measures about 3 feet in length and is fletched like an arrow " +"for better accuracy. The business end of the javelin has wicked-looking " +"barbs which could cause significant bleeding." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid "chunk of demon chitin" msgid_plural "chunks of demon chitin" @@ -47998,9 +49545,9 @@ msgstr[0] "損毀的解除武裝掠行機器人" #. ~ Description for broken disarmed skitterbot #: lang/json/GENERIC_from_json.py msgid "" -"A broken skitterbot. Its internal weapon modules have been removed. Could " +"A broken skitterbot. Its internal weapon modules have been removed. Could " "be gutted for parts or crafted into a salvaged robot." -msgstr "一隻損毀的掠行機器人，內建武器模塊已被移除。可以拆解出零件或製成回收的機器人。" +msgstr "" #. ~ Description for broken skitterbot #: lang/json/GENERIC_from_json.py @@ -48023,9 +49570,9 @@ msgstr[0] "損毀的解除武裝防衛機器人" #. ~ Description for broken disarmed military bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken defense robot. Its internal weapons have been removed. Could be " +"A broken defense robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." -msgstr "一隻損毀的防衛機器人，內建武器模塊已被移除。可以拆解出零件或製成回收的機器人。" +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken security robot" @@ -48055,9 +49602,9 @@ msgstr[0] "損毀的解除武裝雙足步行機器人" #. ~ Description for broken disarmed chickenwalker #: lang/json/GENERIC_from_json.py msgid "" -"A broken chickenwalker. Its internal weapons have been removed. Could be " +"A broken chickenwalker. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." -msgstr "一隻損毀的雙足步行機器人，內建武器模塊已被移除。可以拆解出零件或製成回收的機器人。" +msgstr "" #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -48547,8 +50094,8 @@ msgstr[0] "損毀的垃圾場牛仔" #. ~ Description for broken shortcircuit samurai #. ~ Description for broken slapdash paladin #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." -msgstr "一台損毀的回收的機器人。 可以分解出零件或重新製作。" +msgid "A broken salvaged robot. Could be stripped for parts or re-crafted." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken shortcircuit samurai" @@ -48573,9 +50120,9 @@ msgstr[0] "損毀的軍用訓練者機器人" #. ~ Description for broken military trainer robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military trainer robot, shattered and inert. This one is armed with" -" an integrated paintball gun. Could be stripped for parts." -msgstr "這是一台損毀的軍用訓練者機器人，破損且安靜。它內建有一支漆彈槍。可以拆解出零件。" +"A broken military trainer robot, shattered and inert. This one is armed " +"with an integrated paintball gun. Could be stripped for parts." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken military robot" @@ -48585,44 +50132,44 @@ msgstr[0] "損毀的軍用機器人" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 5.56mm firearm. Could be stripped for parts." -msgstr "這是一台損毀的軍用機器人，破損且安靜。它內建有一支5.56mm槍械。可以拆解出零件。" +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 5.56mm firearm. Could be stripped for parts." +msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 7.62mm firearm. Could be stripped for parts." -msgstr "這是一台損毀的軍用機器人，破損且安靜。它內建有一支7.62mm槍械。可以拆解出零件。" +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 7.62mm firearm. Could be stripped for parts." +msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 50 caliber firearm. Could be stripped for parts." -msgstr "這是一台損毀的軍用機器人，破損且安靜。它內建有一支50口徑槍械。可以拆解出零件。" +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 50 caliber firearm. Could be stripped for parts." +msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 8x40mm firearm. Could be stripped for parts." -msgstr "這是一台損毀的軍用機器人，破損且安靜。它內建有一支8x40mm槍械。可以拆解出零件。" +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 8x40mm firearm. Could be stripped for parts." +msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flechette gun. Could be stripped for parts." -msgstr "這是一台損毀的軍用機器人，破損且安靜。它內建有一支鋼標彈槍械。可以拆解出零件。" +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flechette gun. Could be stripped for parts." +msgstr "" #. ~ Description for broken military robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated 40mm grenade launcher. Could be stripped for parts." -msgstr "這是一台損毀的軍用機器人，破損且安靜。它內建有一支40mm榴彈發射器。可以拆解出零件。" +"A broken military robot, shattered and inert. This one is armed with an " +"integrated 40mm grenade launcher. Could be stripped for parts." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken military flame robot" @@ -48632,9 +50179,9 @@ msgstr[0] "損毀的軍用火焰機器人" #. ~ Description for broken military flame robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken military robot, shattered and inert. This one is armed with an " -"integrated flamethrower. Could be stripped for parts." -msgstr "這是一台損毀的軍用機器人，破損且安靜。它內建有一支火焰噴射器。可以拆解出零件。" +"A broken military robot, shattered and inert. This one is armed with an " +"integrated flamethrower. Could be stripped for parts." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken robo-guardian" @@ -48646,8 +50193,10 @@ msgstr[0] "損毀的機械守衛" #. ~ Description for broken robo-defender #. ~ Description for broken glittering lady #. ~ Description for broken bitter spinster +#. ~ Description for broken fist king +#. ~ Description for broken atomic sultan #: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." +msgid "A broken salvaged robot. Could be stripped or recrafted." msgstr "一台損毀的回收的機器人。 可以分解出零件或重新製作。" #: lang/json/GENERIC_from_json.py @@ -48657,8 +50206,8 @@ msgstr[0] "損毀的豪華機器人" #. ~ Description for broken robote deluxe #: lang/json/GENERIC_from_json.py -msgid "A broken deluxe robot. Could be stripped or recrafted." -msgstr "一台損毀的豪華機器人。 可以分解出零件或重新製作。" +msgid "A broken deluxe robot. Could be stripped or recrafted." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken robo-protector" @@ -48678,9 +50227,9 @@ msgstr[0] "損毀的解除武裝先進機器人" #. ~ Description for broken disarmed advanced bot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. Its internal weapons have been removed. Could be " +"A broken advanced robot. Its internal weapons have been removed. Could be " "gutted for parts or crafted into a salvaged robot." -msgstr "一隻損毀的先進機器人，內建武器模塊已被移除。可以拆解出零件或製成回收的機器人。" +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken advanced robot" @@ -48690,30 +50239,30 @@ msgstr[0] "損毀的先進機器人" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated laser-emitter." -" Could be stripped for parts." -msgstr "這是一台損毀的先進機器人。它內建有一支雷射發射器。可以拆解出零件。" +"A broken advanced robot. This one is armed with an integrated laser-" +"emitter. Could be stripped for parts." +msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated plasma-" -"ejector. Could be stripped for parts." -msgstr "這是一台損毀的先進機器人。它內建有一支電漿發射器。可以拆解出零件。" +"A broken advanced robot. This one is armed with an integrated plasma-" +"ejector. Could be stripped for parts." +msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated electro-" -"caster. Could be stripped for parts." -msgstr "這是一台損毀的先進機器人。它內建有一支電弧發射器。可以拆解出零件。" +"A broken advanced robot. This one is armed with an integrated electro-" +"caster. Could be stripped for parts." +msgstr "" #. ~ Description for broken advanced robot #: lang/json/GENERIC_from_json.py msgid "" -"A broken advanced robot. This one is armed with an integrated EMP projector." -" Could be stripped for parts." -msgstr "這是一台損毀的先進機器人。它內建有一支電磁脈衝發射器。可以拆解出零件。" +"A broken advanced robot. This one is armed with an integrated EMP " +"projector. Could be stripped for parts." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken glittering lady" @@ -48735,9 +50284,9 @@ msgstr[0] "損毀的恐怖電鋸" #. ~ Description for broken hooked nightmare #: lang/json/GENERIC_from_json.py msgid "" -"A broken salvaged robot. Thank God it's finally dead. Could be stripped or " -"recrafted." -msgstr "一台損毀的回收的機器人。感謝老天它終於死了。 可以分解出零件或重新製作。" +"A broken salvaged robot. Thank God it's finally dead. Could be stripped or" +" recrafted." +msgstr "" #: lang/json/GENERIC_from_json.py msgid "broken screeching terror" @@ -48754,12 +50303,6 @@ msgid "broken fist king" msgid_plural "broken fist kings" msgstr[0] "損毀的拳王" -#. ~ Description for broken fist king -#. ~ Description for broken atomic sultan -#: lang/json/GENERIC_from_json.py -msgid "A broken salvaged robot. Could be stripped or recrafted." -msgstr "一台損毀的回收的機器人。 可以分解出零件或重新製作。" - #: lang/json/GENERIC_from_json.py msgid "broken atomic sultan" msgid_plural "broken atomic sultans" @@ -48875,9 +50418,8 @@ msgid "" "pseudopods. You think you might be able to manipulate it, and through it, " "all its attached parts. Though to do so you'll have to position yourself to" " be in contact with it; and it appears unnervingly willing to accommodate " -"you..." +"you…" msgstr "" -"這種無定形物質似乎已經進化到一個階段，它先進的內部結構證明了這一點。它能夠通過液壓進行運動，進而移動大量負載。此外，它能夠通過擴展的偽足操縱它所連接的任何物體，無論是黏球怪系零件或其他，這無疑展現了一種驚人的智力。你認為你可能能夠操縱它，並通過它來操縱它所連接的物件。然而這也意味著，你必須讓自己與它接觸...它似乎展現出一種令人不安地樂意準備接納你......" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "solar array" @@ -48925,6 +50467,11 @@ msgstr "" "12 片進階強化太陽能板, 裝設在數公尺高的底盤上。它使脆弱的面板遠離任何潛在的威脅, 還能夠跟踪太陽以提高效率。然而, " "代價就是令人望而卻步的沉重和妨礙性。" +#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py +msgid "turret chassis" +msgid_plural "turret chassis" +msgstr[0] "砲塔底盤" + #. ~ Description for turret chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -48972,9 +50519,9 @@ msgstr[0] "穩定的傳送門" #: lang/json/GENERIC_from_json.py msgid "" "As you gaze into the seemingly infinite depths of this portable hole in " -"reality, a phrase from a time forever gone echoes in your mind. \"There are " -"two things that are infinite: the universe and human kleptomania.\"" -msgstr "你凝視這個看似有無限深的現實破口，一段來自早已不復存在的時空的短語在你腦海中迴響。 “有兩件事是無限的：宇宙和人類的竊盜癖。”" +"reality, a phrase from a time forever gone echoes in your mind. \"There are" +" two things that are infinite: the universe and human kleptomania.\"" +msgstr "" #: lang/json/ITEM_CATEGORY_from_json.py msgid "GUNS" @@ -50208,6 +51755,17 @@ msgid "" " reload a compatible revolver." msgstr "這個快速裝填器可以容納5發.357麥格農子彈或.38特殊彈，用來快速重新裝填相容的左輪手槍。" +#: lang/json/MAGAZINE_from_json.py +msgid ".38/.357 6-round speedloader" +msgstr "" + +#. ~ Description for .38/.357 6-round speedloader +#: lang/json/MAGAZINE_from_json.py +msgid "" +"This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly" +" reload a compatible revolver." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "Kel-Tec P3AT magazine" msgstr "Kel-Tec P3AT 彈匣" @@ -50273,6 +51831,17 @@ msgid "" "A compact, 6-round steel box magazine for use with the Taurus Spectrum." msgstr "" +#: lang/json/MAGAZINE_from_json.py +msgid "AF2011A1 magazine" +msgstr "AF2011A1 彈匣" + +#. ~ Description for AF2011A1 magazine +#: lang/json/MAGAZINE_from_json.py +msgid "" +"Two .38 Super 8-round box magazines attached to a single base plate, holding" +" up to 16 rounds in total, used by AF2011A1 double-barrel pistol." +msgstr "" + #: lang/json/MAGAZINE_from_json.py msgid "M1911 .38 Super magazine" msgstr "M1911 .38 超級彈彈匣" @@ -50581,9 +52150,9 @@ msgstr ".454 5發快速裝填器" #. ~ Description for .454 5-round speedloader #: lang/json/MAGAZINE_from_json.py msgid "" -"This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a " -"compatible revolver." -msgstr "這個快速裝填器可以容納5發.454或.45柯爾特子彈並快速重新裝填相容的左輪手槍。" +"This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " +"quickly reload a compatible revolver." +msgstr "" #: lang/json/MAGAZINE_from_json.py msgid "H&K 4.6mm extended magazine" @@ -51782,10 +53351,8 @@ msgid "" "electricity through some unknown process. It emits a low phosphorescent " "glow while doing so. It is also capable of storing electricity from other " "sources, but doing so renders it inactive. It seems pliable enough to pull " -"apart..." +"apart…" msgstr "" -"這是生物學的謎團, 這團黏稠物質經由未知的方式竟然進化出可以緩慢地產生電力的能力, 當它發揮能力的時候會發出低亮度磷光。它也能儲存來自其他源頭的電力, " -"但也會因此而停止發揮它的能力。它似乎柔軟到直接可以拉開成兩個…" #: lang/json/MAGAZINE_from_json.py msgid "BB hopper" @@ -51834,24 +53401,6 @@ msgstr "" msgid "pebble hopper" msgstr "小石子料斗" -#: lang/json/MAGAZINE_from_json.py -msgid "AF2011A1 magazine" -msgstr "AF2011A1 彈匣" - -#. ~ Description for AF2011A1 magazine -#: lang/json/MAGAZINE_from_json.py -msgid "Two magazines attached to a common base. Unique to the AF2011A1." -msgstr "兩個彈匣連接在共同的基座上。 特別為AF2011A1 雙管手槍而設計。" - -#: lang/json/MAGAZINE_from_json.py -msgid "M1991A1 .38 Super magazine" -msgstr "M1991A1 .38 超級彈彈匣" - -#. ~ Description for M1991A1 .38 Super magazine -#: lang/json/MAGAZINE_from_json.py -msgid "A 9-round magazine for the M1991A1 .38 Super pistol." -msgstr "一個 9 發彈匣, 適用於 M1991A1 .38 超級彈手槍。" - #: lang/json/MOD_INFO_from_json.py src/color.cpp src/color.cpp msgid "default" msgstr "預設" @@ -52071,9 +53620,9 @@ msgstr "更多建築 (by Fuji)" #. ~ Description for Fuji's More Buildings #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds more buildings and more variations to existing buildings. (Requires " +"Adds more buildings and more variations to existing buildings. (Requires " "More Locations)" -msgstr "加入更多建築, 以及為現有建築加入更多變化。" +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "Generic Guns" @@ -52093,7 +53642,7 @@ msgstr "" #. ~ Description for Graphical Overmap #: lang/json/MOD_INFO_from_json.py msgid "" -"Gives the overmap a graphical overhaul. Please refer to readme for " +"Gives the overmap a graphical overhaul. Please refer to readme for " "installation." msgstr "" @@ -52125,9 +53674,9 @@ msgstr "水耕栽培" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds hydroponic units, a furniture which can have crops planted in it for " -"increased yields. Spawn occasionally in labs or basements. Or build your " +"increased yields. Spawn occasionally in labs or basements. Or build your " "own." -msgstr "添加水耕栽培裝置，能夠種植作物並提高產量。可能在實驗室或地下室找到，或是自己做一個。" +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "Mythical Martial Arts" @@ -52219,8 +53768,8 @@ msgstr "NPC 突變" #: lang/json/MOD_INFO_from_json.py msgid "" "NPCs wandering the wasteland will occasionally have mutations --- your foes " -"included. Beware!" -msgstr "徘徊於廢土的 NPC 偶爾會帶有突變, 包含你的敵人。請小心提防!" +"included. Beware!" +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "My Sweet Cataclysm" @@ -52229,10 +53778,9 @@ msgstr "我的甜美大災變" #. ~ Description for My Sweet Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "" -"Cataclysm is nice, but what if you could sweeten it a bit? What about " -"walking through this world as a human shaped piece of sugar with your pet " -"necco wafer?" -msgstr "大災變很美好，但如果你能讓它更甜美些呢？就像是人形糖帶著薄酥餅寵物在世界四處遊走這樣如何？" +"What about walking through the Cataclysm as a human shaped piece of sugar " +"with your pet necco wafer?" +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "NPC traits" @@ -52536,9 +54084,9 @@ msgstr "無麩質配方 (by Ben)" #. ~ Description for Bens GF recipes #: lang/json/MOD_INFO_from_json.py msgid "" -"Some simple gluten free and lactose free alternative recipe options. NOT " +"Some simple gluten free and lactose free alternative recipe options. NOT " "EXHAUSTIVE." -msgstr "一些簡單的無麩質和無乳糖替代配方選項。(並不完全)" +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "Tough Zombies" @@ -52574,9 +54122,9 @@ msgstr "替換建築代碼" #. ~ Description for Alternative Map Key #: lang/json/MOD_INFO_from_json.py msgid "" -"Changes the overmap to be more readable. Buildings are color coded by type " +"Changes the overmap to be more readable. Buildings are color coded by type " "and use initial letter of their names instead of ^v<>." -msgstr "讓大地圖更具有可讀性。除了依建築類型有不同的顏色外, 使用建築名稱的首字母替代 ^v<> 符號。" +msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "Bionics Systems Mod" @@ -52717,7 +54265,7 @@ msgstr "" #. ~ Description for sees-player icon, HitButton_iso #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "HitButton isometric tileset." msgstr "" @@ -52729,7 +54277,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, and a tinted thought " -"bubble otherwise. Designed for Live/Dead people tileset." +"bubble otherwise. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -52740,7 +54288,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "" "Adds attitude-tinted icon if a creature sees a player, nothing when player " -"is unseen. Designed for Live/Dead people tileset." +"is unseen. Designed for Live/Dead people tileset." msgstr "" #: lang/json/MOD_INFO_from_json.py @@ -52750,7 +54298,7 @@ msgstr "" #. ~ Description for sees-player icon, retrodays #: lang/json/MOD_INFO_from_json.py msgid "" -"Adds indicator icon if a creature sees the player. Designed for the " +"Adds indicator icon if a creature sees the player. Designed for the " "retrodays tileset." msgstr "" @@ -52818,8 +54366,8 @@ msgstr[0] "鴨" #: lang/json/MONSTER_from_json.py msgid "" "A mallard duck, often seen around rivers and other bodies of water. It " -"feeds primarily on insects, seeds, roots, and, pre-cataclysm, bread scraps." -msgstr "一隻綠頭鴨, 於河流或其他水體附近很常見。主要以昆蟲, 種子, 植物的根為食, 在災變之前還有麵包屑。" +"feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps." +msgstr "" #: lang/json/MONSTER_from_json.py msgid "goose" @@ -53526,7 +55074,7 @@ msgstr[0] "鯉魚" #: lang/json/MONSTER_from_json.py msgid "" "A golden-yellow Common Carp. Some people think they don't taste great, but " -"you can't afford to be choosy in the cataclysm." +"you can't afford to be choosy in the Cataclysm." msgstr "" #: lang/json/MONSTER_from_json.py @@ -53663,7 +55211,7 @@ msgid "skittering plague" msgid_plural "skittering plagues" msgstr[0] "疾行瘟疫" -#. ~ Description for skittering plague +#. ~ Description for {'str': 'skittering plague'} #: lang/json/MONSTER_from_json.py msgid "A giant infected roach, it has been feeding on the undead." msgstr "一隻巨大的受感染蟑螂，牠一直以不死生物為食。" @@ -53673,7 +55221,7 @@ msgid "plague nymph" msgid_plural "plague nymphs" msgstr[0] "瘟疫若蟲" -#. ~ Description for plague nymph +#. ~ Description for {'str': 'plague nymph'} #: lang/json/MONSTER_from_json.py msgid "An infected mutant cockroach about the size of a rat." msgstr "受感染的突變蟑螂大約有大鼠的尺寸。" @@ -53683,7 +55231,7 @@ msgid "plague vector" msgid_plural "plague vectors" msgstr[0] "瘟疫病媒" -#. ~ Description for plague vector +#. ~ Description for {'str': 'plague vector'} #: lang/json/MONSTER_from_json.py msgid "" "This infected roach has been feeding on the undead and started to mutate " @@ -53705,7 +55253,7 @@ msgid "giant cockroach nymph" msgid_plural "giant cockroach nymphs" msgstr[0] "巨型蟑螂若蟲" -#. ~ Description for giant cockroach nymph +#. ~ Description for {'str': 'giant cockroach nymph'} #: lang/json/MONSTER_from_json.py msgid "A baby mutant cockroach about the size of a rat." msgstr "跟老鼠一樣大的異變蟑螂嬰兒。" @@ -53727,7 +55275,7 @@ msgid "giant bee" msgid_plural "giant bees" msgstr[0] "巨蜂" -#. ~ Description for giant bee +#. ~ Description for {'str': 'giant bee'} #: lang/json/MONSTER_from_json.py msgid "" "With a stinger the size of a kitchen knife, this dog-sized insect's black " @@ -53739,7 +55287,7 @@ msgid "giant centipede" msgid_plural "giant centipedes" msgstr[0] "巨型蜈蚣" -#. ~ Description for giant centipede +#. ~ Description for {'str': 'giant centipede'} #: lang/json/MONSTER_from_json.py msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " @@ -53775,7 +55323,7 @@ msgid "giant mosquito" msgid_plural "giant mosquitos" msgstr[0] "巨蚊" -#. ~ Description for giant mosquito +#. ~ Description for {'str': 'giant mosquito'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous mutant mosquito, fluttering erratically. Its face is dominated " @@ -53787,7 +55335,7 @@ msgid "giant cellar spider" msgid_plural "giant cellar spiders" msgstr[0] "巨大地窖蜘蛛" -#. ~ Description for giant cellar spider +#. ~ Description for {'str': 'giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A twitchy mutant brown spider, with a relatively small body and spindly long" @@ -53800,7 +55348,7 @@ msgid "immature giant cellar spider" msgid_plural "immature giant cellar spiders" msgstr[0] "幼年期巨大地窖蜘蛛" -#. ~ Description for immature giant cellar spider +#. ~ Description for {'str': 'immature giant cellar spider'} #: lang/json/MONSTER_from_json.py msgid "" "A newly-hatched giant cellar spider. Too small to possess much venom, but " @@ -53812,7 +55360,7 @@ msgid "giant jumping spider" msgid_plural "giant jumping spiders" msgstr[0] "巨大跳蛛" -#. ~ Description for giant jumping spider +#. ~ Description for {'str': 'giant jumping spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant spider with big forelegs and two pairs of inquisitive-looking eyes." @@ -53824,7 +55372,7 @@ msgid "giant trapdoor spider" msgid_plural "giant trapdoor spiders" msgstr[0] "巨大螲蟷" -#. ~ Description for giant trapdoor spider +#. ~ Description for {'str': 'giant trapdoor spider'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " @@ -53836,7 +55384,7 @@ msgid "giant web spider" msgid_plural "giant web spiders" msgstr[0] "巨大網蛛" -#. ~ Description for giant web spider +#. ~ Description for {'str': 'giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " @@ -53848,7 +55396,7 @@ msgid "fungal spider" msgid_plural "fungal spiders" msgstr[0] "真菌蜘蛛" -#. ~ Description for fungal spider +#. ~ Description for {'str': 'fungal spider'} #: lang/json/MONSTER_from_json.py msgid "" "The abdomen of this sickly looking giant spider is now home to many lumps of" @@ -53861,7 +55409,7 @@ msgid "immature giant web spider" msgid_plural "immature giant web spiders" msgstr[0] "幼年期巨大網蛛" -#. ~ Description for immature giant web spider +#. ~ Description for {'str': 'immature giant web spider'} #: lang/json/MONSTER_from_json.py msgid "" "A still immature giant grass spider. Too young to be venomous, or to walk " @@ -53873,7 +55421,7 @@ msgid "giant black widow" msgid_plural "giant black widows" msgstr[0] "巨大黑寡婦蜘蛛" -#. ~ Description for giant black widow +#. ~ Description for {'str': 'giant black widow'} #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " @@ -53885,7 +55433,7 @@ msgid "giant black widow spiderling" msgid_plural "giant black widow spiderlings" msgstr[0] "巨大黑寡婦幼蛛" -#. ~ Description for giant black widow spiderling +#. ~ Description for {'str': 'giant black widow spiderling'} #: lang/json/MONSTER_from_json.py msgid "" "The horrid spawn of a giant black widow spider. Even as a newborn, this " @@ -53897,7 +55445,7 @@ msgid "giant wolf spider" msgid_plural "giant wolf spiders" msgstr[0] "巨大狼蛛" -#. ~ Description for giant wolf spider +#. ~ Description for {'str': 'giant wolf spider'} #: lang/json/MONSTER_from_json.py msgid "" "A wolf spider mutated to about thirty times its normal size, it moves " @@ -53909,7 +55457,7 @@ msgid "giant wasp" msgid_plural "giant wasps" msgstr[0] "巨黃蜂" -#. ~ Description for giant wasp +#. ~ Description for {'str': 'giant wasp'} #: lang/json/MONSTER_from_json.py msgid "" "A gigantic slender-bodied wasp with an evil-looking stinger protruding from " @@ -53921,7 +55469,7 @@ msgid "dermatik" msgid_plural "dermatiks" msgstr[0] "變異蜂" -#. ~ Description for dermatik +#. ~ Description for {'str': 'dermatik'} #: lang/json/MONSTER_from_json.py msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " @@ -53945,7 +55493,7 @@ msgid "giant ant" msgid_plural "giant ants" msgstr[0] "巨蟻" -#. ~ Description for giant ant +#. ~ Description for {'str': 'giant ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous red ant covered in chitinous plates. It possesses a pair of " @@ -53957,7 +55505,7 @@ msgid "giant acidic ant" msgid_plural "giant acidic ants" msgstr[0] "酸液巨蟻" -#. ~ Description for giant acidic ant +#. ~ Description for {'str': 'giant acidic ant'} #: lang/json/MONSTER_from_json.py msgid "" "A monstrous brown ant with a swollen abdomen, that ends with a small orifice" @@ -53982,7 +55530,7 @@ msgid "acidic queen ant" msgid_plural "acidic queen ants" msgstr[0] "酸液蟻后" -#. ~ Description for acidic queen ant +#. ~ Description for {'str': 'acidic queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "An enormous brown ant with an elongated, pulsating abdomen. Its orifice " @@ -53995,7 +55543,7 @@ msgid "acidic soldier ant" msgid_plural "acidic soldier ants" msgstr[0] "酸液兵蟻" -#. ~ Description for acidic soldier ant +#. ~ Description for {'str': 'acidic soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A massive woolly brown ant that towers over the worker ants with a giant " @@ -54008,7 +55556,7 @@ msgid "fungal ant" msgid_plural "fungal ants" msgstr[0] "真菌蟻" -#. ~ Description for fungal ant +#. ~ Description for {'str': 'fungal ant'} #: lang/json/MONSTER_from_json.py msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " @@ -54032,7 +55580,7 @@ msgid "queen ant" msgid_plural "queen ants" msgstr[0] "蟻后" -#. ~ Description for queen ant +#. ~ Description for {'str': 'queen ant'} #: lang/json/MONSTER_from_json.py msgid "" "A colossal red ant with a bulging, bloated thorax. It moves slowly and " @@ -54044,7 +55592,7 @@ msgid "soldier ant" msgid_plural "soldier ants" msgstr[0] "兵蟻" -#. ~ Description for soldier ant +#. ~ Description for {'str': 'soldier ant'} #: lang/json/MONSTER_from_json.py msgid "" "A huge and hairy red ant almost twice the size of other giant ants. Bulging" @@ -54056,7 +55604,7 @@ msgid "giant locust" msgid_plural "giant locusts" msgstr[0] "巨大蝗蟲" -#. ~ Description for giant locust +#. ~ Description for {'str': 'giant locust'} #: lang/json/MONSTER_from_json.py msgid "" "An overgrown locust. You don't think it'll eat you but it could cause " @@ -54068,7 +55616,7 @@ msgid "locust nymph" msgid_plural "locust nymphs" msgstr[0] "巨蝗若蟲" -#. ~ Description for locust nymph +#. ~ Description for {'str': 'locust nymph'} #: lang/json/MONSTER_from_json.py msgid "" "A locust the size of a rabbit. You'd hate to think what a swarm of these " @@ -54639,7 +56187,7 @@ msgid "" "The Eastern moose, the largest living species of deer. While they aren't " "aggressive unless angered, the mating season can make the bulls quite ill-" "tempered." -msgstr "" +msgstr "東部駝鹿，是世界上最大的鹿科動物。 雖然除非激怒他們否則就不會主動攻擊，但交配季節會使雄性脾氣暴躁。" #: lang/json/MONSTER_from_json.py msgid "muskrat" @@ -54834,21 +56382,21 @@ msgid "" "A cunning pack predator, once extinct in the New England area, the wolf was " "successfully reintroduced and their numbers reached record highs in the " "decade before the Cataclysm. Lucky you." -msgstr "" +msgstr "一種狡猾的群聚獵食者，一度在新英格蘭滅絕，在災變前已經成功復育並且數量達到新高。祝你好運。" #: lang/json/MONSTER_from_json.py msgid "marloss zealot" msgid_plural "marloss zealots" msgstr[0] "馬洛斯狂熱者" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "Her eyes lie vacant and spittle foams in her mouth, as she recites from the " "hymns in rapturous ecstasy." msgstr "" -#. ~ Description for marloss zealot +#. ~ Description for {'str': 'marloss zealot'} #: lang/json/MONSTER_from_json.py msgid "" "His eyes lie vacant and spittle foams in his mouth, as he recites from the " @@ -54860,7 +56408,7 @@ msgid "X-03: 'Spectre' Recon Mech" msgid_plural "X-03: 'Spectre' Recon Mechs" msgstr[0] "X-03：「幽魂」偵察機甲" -#. ~ Description for X-03: 'Spectre' Recon Mech +#. ~ Description for {'str': "X-03: 'Spectre' Recon Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo RMES (Recon Mechanical Exoskeleton Suit), a recent " @@ -54877,7 +56425,7 @@ msgid "X-02: 'Grunt' Combat Mech" msgid_plural "X-02: 'Grunt' Combat Mechs" msgstr[0] "X-02：「步兵」戰鬥機甲" -#. ~ Description for X-02: 'Grunt' Combat Mech +#. ~ Description for {'str': "X-02: 'Grunt' Combat Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo CMES (Combat Mechanical Exoskeleton Suit), a recent " @@ -54893,7 +56441,7 @@ msgid "X-01: 'Jack' Lifting Mech" msgid_plural "X-01: 'Jack' Lifting Mechs" msgstr[0] "X-01：「千斤頂」起重機甲" -#. ~ Description for X-01: 'Jack' Lifting Mech +#. ~ Description for {'str': "X-01: 'Jack' Lifting Mech"} #: lang/json/MONSTER_from_json.py msgid "" "The Boeing-Daewoo LMES (Lifting Mechanical Exoskeleton Suit), a recent " @@ -54909,7 +56457,7 @@ msgid "mi-go" msgid_plural "mi-gos" msgstr[0] "米戈" -#. ~ Description for mi-go +#. ~ Description for {'str': 'mi-go'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -54925,7 +56473,7 @@ msgid "mi-go slaver" msgid_plural "mi-go slavers" msgstr[0] "米戈捕奴者" -#. ~ Description for mi-go slaver +#. ~ Description for {'str': 'mi-go slaver'} #: lang/json/MONSTER_from_json.py msgid "" "This is an alien creature of uncertain origin. Its shapeless pink body " @@ -54942,7 +56490,7 @@ msgid "mi-go surgeon" msgid_plural "mi-go surgeons" msgstr[0] "米戈手術者" -#. ~ Description for mi-go surgeon +#. ~ Description for {'str': 'mi-go surgeon'} #: lang/json/MONSTER_from_json.py msgid "" "This mi-go has a slender body with snaking carapace along it, and even more " @@ -54955,7 +56503,7 @@ msgid "mi-go guard" msgid_plural "mi-go guards" msgstr[0] "米戈守衛者" -#. ~ Description for mi-go guard +#. ~ Description for {'str': 'mi-go guard'} #: lang/json/MONSTER_from_json.py msgid "" "This, like the more common mi-go, is an alien creature; this one is more " @@ -54973,7 +56521,7 @@ msgid "mi-go myrmidon" msgid_plural "mi-go myrmidons" msgstr[0] "米戈侏儒" -#. ~ Description for mi-go myrmidon +#. ~ Description for {'str': 'mi-go myrmidon'} #: lang/json/MONSTER_from_json.py msgid "" "This creature resembles the smaller mi-go like a grizzly bear resembles a " @@ -54990,7 +56538,7 @@ msgid "mi-go scout" msgid_plural "mi-go scouts" msgstr[0] "米戈斥候" -#. ~ Description for mi-go scout +#. ~ Description for {'str': 'mi-go scout'} #: lang/json/MONSTER_from_json.py msgid "" "This slender mi-go is a little smaller than most others of its kind. It has" @@ -55908,6 +57456,7 @@ msgid "" " of your perceptions in a fashion that awakens ancient nameless terrors in " "the back of your mind" msgstr "" +"這是隻來自異界的獵犬。看起來飢餓瘦長，扭曲的紅色血肉緊緊地覆蓋在它畸形的骨架上。伴隨著怪異的奔跑，牠那向前延伸的異常長頸和骷髏般的頭顱貼近地面四處嗅探尋找著獵物。它的汙垢似乎被某種神秘力量所壟罩，你感覺腦中喚醒了某種古老的恐懼感不斷的忽隱忽現。" #: lang/json/MONSTER_from_json.py msgid "miner bot" @@ -55998,7 +57547,7 @@ msgid "" "This is an animate shadow in the form of a long and sinuous snake. " "Translucent and dark, it glides silently across the floor, wriggling and " "flexing as it moves." -msgstr "" +msgstr "這是一條長長的彎曲蛇形的活暗影。 半透明而黑暗，它在地板上悄悄滑動，在移動時會扭曲和彎曲。" #: lang/json/MONSTER_from_json.py lang/json/map_extra_from_json.py msgid "Shia LaBeouf" @@ -56440,6 +57989,18 @@ msgid "" msgstr "" "這殭屍的頭部明顯被破壞過，它臉部碎肉的空隙中現在充滿了一種特殊的灰色粘性物質。人類的耳朵在兩側掛著，巨大而令人感到害怕。前面的細縫顯示它可能還有視覺。" +#: lang/json/MONSTER_from_json.py +msgid "zapper zombie" +msgid_plural "zapper zombies" +msgstr[0] "" + +#. ~ Description for zapper zombie +#: lang/json/MONSTER_from_json.py +msgid "" +"A very pale dead body with the worst case of static hair you have ever seen." +" Sometimes, you can see sparks of electricity around it." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "shocker zombie" msgid_plural "shocker zombies" @@ -57028,7 +58589,7 @@ msgid "experimental mutant" msgid_plural "experimental mutants" msgstr[0] "實驗突變體" -#. ~ Description for experimental mutant +#. ~ Description for {'str': 'experimental mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A deformed amalgamation of man and animal. Grotesque humanoid covered in " @@ -57042,7 +58603,7 @@ msgid "evolved mutant" msgid_plural "evolved mutants" msgstr[0] "進化突變體" -#. ~ Description for evolved mutant +#. ~ Description for {'str': 'evolved mutant'} #: lang/json/MONSTER_from_json.py msgid "" "A towering beast that is neither human nor animal anymore. A malformed, " @@ -57220,7 +58781,7 @@ msgid "" "getting flushed down the toilet and growing to adulthood in sewers. This " "large specimen doesn't look like it sees humans as anything other than a " "meal." -msgstr "" +msgstr "在二十世紀後期曾經有一個關於短吻鱷被馬桶沖走並於下水道成長至成年期的都巿傳說。人類在這個大傢伙眼中看來像是食物。" #: lang/json/MONSTER_from_json.py msgid "rattlesnake" @@ -57245,7 +58806,7 @@ msgid "" "A mutated timber rattlesnake, about three times as large as the norm. While" " it isn't big enough to regard humans as potential prey, it is more " "aggressive and dangerous compared to a normal rattler." -msgstr "" +msgstr "突變的森林響尾蛇，約為標準的三倍大小。雖然它還未大到足以把人類當成獵物，它比普通響尾蛇更具侵略性和危險。" #: lang/json/MONSTER_from_json.py msgid "sewer snake" @@ -57268,7 +58829,7 @@ msgstr[0] "植物獸細枝" #. ~ Description for biollante sprig #: lang/json/MONSTER_from_json.py msgid "A short fat stalk with broad leaves and tiny flower buds." -msgstr "" +msgstr "短豐厚梗，有寬闊的葉子和微小的花蕾。" #: lang/json/MONSTER_from_json.py msgid "biollante sprout" @@ -57280,7 +58841,7 @@ msgstr[0] "植物獸新芽" msgid "" "A thick stalk that rises five feet from the ground and has heavy broad " "leaves at its base. Purple flower buds adorn the top." -msgstr "" +msgstr "從地面上升五英尺的粗莖並在其基部有沉重的闊葉。紫色的花蕾點綴著頂部。" #: lang/json/MONSTER_from_json.py msgid "biollante" @@ -57326,7 +58887,7 @@ msgstr[0] "食人樹細枝" msgid "" "A teeny-tiny triffid that has recently germinated. Like a house cat, you " "know it wants to eat you but it just can't figure out how." -msgstr "" +msgstr "一個微小的食人樹最近發芽了。就像家貓一樣，你知道它想吃了你，但它卻不知道該怎麼做。" #: lang/json/MONSTER_from_json.py msgid "triffid sprout" @@ -57440,13 +59001,10 @@ msgstr[0] "M2HB 自主性通用遙控武器台 II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " anything up to light vehicles at long range without exposing the operator." " This one is fitted with a M2HB." msgstr "" -"從 M153 CROWS II " -"衍生設計而成的遙控武器系統，具有自主運作的軟體增強功能。在大災變前美國軍方部署了成千上萬的這類武器系統，它們的價值就是能在不暴露操作員的情況下，遠端遙控與任何輕型車輛以下的敵軍交戰。裝備有" -" M2HB 白朗寧重機槍。" #: lang/json/MONSTER_from_json.py msgid "M249 autonomous CROWS II" @@ -57458,12 +59016,9 @@ msgstr[0] "M249 自主性通用遙控武器台 II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M249." msgstr "" -"從 M153 CROWS II " -"衍生設計而成的遙控武器系統，具有自主運作的軟體增強功能。在大災變前美國軍方部署了成千上萬的這類武器系統，它們的價值就是能在不暴露操作員的情況下，遠端遙控與敵軍的步兵交戰。裝備有" -" M249 輕機槍。" #: lang/json/MONSTER_from_json.py msgid "M240 autonomous CROWS II" @@ -57475,12 +59030,9 @@ msgstr[0] "M240 自主性通用遙控武器台 II" msgid "" "A remote weapon system derived from the M153 CROWS II and enhanced with " "autonomous operation software. Thousands of these were deployed by the US " -"military before the cataclysm and they were valued for their use in engaging" +"military before the Cataclysm and they were valued for their use in engaging" " infantry without exposing the operator. This one is fitted with a M240." msgstr "" -"從 M153 CROWS II " -"衍生設計而成的遙控武器系統，具有自主運作的軟體增強功能。在大災變前美國軍方部署了成千上萬的這類武器系統，它們的價值就是能在不暴露操作員的情況下，遠端遙控與敵軍的步兵交戰。裝備有" -" M240 通用機槍。" #: lang/json/MONSTER_from_json.py msgid "anklebiter" @@ -57592,7 +59144,7 @@ msgid "" "It is hard to recognize a human child in this creature. Disgusting-looking " "mold covers most of its skin. Many cracks perforate its body, with small " "fungal stalks poking through." -msgstr "" +msgstr "很難在這種生物上辨識出人類兒童。 令人作嘔的真菌掩蓋了大部分皮膚。 它的身體上被細小的真菌莖刺穿出許多裂縫。" #: lang/json/MONSTER_from_json.py msgid "zombie grenadier" @@ -57818,7 +59370,7 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "A mix of Great Pyrenees and Ovcharka breeds outfitted with bionic " -"enhancements. These hounds defend Prep Phyle lands from all comers undead " +"enhancements. These hounds defend Prep Phyle lands from all comers undead " "and otherwise." msgstr "" @@ -57832,7 +59384,20 @@ msgstr[0] "" #: lang/json/MONSTER_from_json.py msgid "" "An adorable, defenseless Cyber Mastiff puppy. Much safer to tame than an " -"adult dog. CBMs are implanted but immature in growth with the puppy." +"adult dog. CBMs are implanted but immature in growth with the puppy." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "brain blaster" +msgid_plural "brain blasters" +msgstr[0] "" + +#. ~ Description for brain blaster +#: lang/json/MONSTER_from_json.py +msgid "" +"The mi-go have set up some defenses here. This horrifying techo-organic " +"amalgamation appears to use brains in jars as their operating system. On " +"the plus side it looks like it can be headshot." msgstr "" #: lang/json/MONSTER_from_json.py @@ -58181,10 +59746,10 @@ msgstr[0] "刀鋒死靈異變體" #. ~ Description for Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically twisted human body. Two massive, bladed appendages have burst" -" through its shoulders where they are poised above its head as it stalks " -"about with terrifying purpose." -msgstr "一個扭曲恐怖的人形軀體。兩隻巨型的刀具從它肩膀長出來，在它頭上虛晃著，準備做可怕的事情。" +"A horrifically twisted human body. Two massive, bladed appendages have " +"burst through its shoulders where they are poised above its head as it " +"stalks about with terrifying purpose." +msgstr "" #: lang/json/MONSTER_from_json.py msgid "Weak Slasher Necromorph" @@ -58194,11 +59759,11 @@ msgstr[0] "虛弱刀鋒死靈異變體" #. ~ Description for Weak Slasher Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A horrifically mutilated human body. Two scrawny blades have freshly bursted" -" through its hand to deal with prey and the haunting visage of a jawless maw" -" and a gaping wound in its forehead sends chills down your spine. The " -"awkward steps it takes slows it down greatly." -msgstr "一個可怕的受創人形軀體。兩隻瘦弱的刀具從它手中爆凸出來，準備處理獵物。沒有下顎跟額頭上的傷口讓你不寒而慄。虛弱的步伐大幅減低它的行動速度。" +"A horrifically mutilated human body. Two scrawny blades have freshly " +"bursted through its hand to deal with prey and the haunting visage of a " +"jawless maw and a gaping wound in its forehead sends chills down your spine." +" The awkward steps it takes slows it down greatly." +msgstr "" #: lang/json/MONSTER_from_json.py msgid "Waster Necromorph" @@ -58209,7 +59774,7 @@ msgstr[0] "致殘死靈異變體" #: lang/json/MONSTER_from_json.py msgid "" "Clad in heavy assault gear, an eerie light green glows beneath its helmet " -"from sunken eye sockets and a gaping mouth. Strange blade like points have " +"from sunken eye sockets and a gaping mouth. Strange blade like points have " "burst out of its arms making it a formidable force to be reckoned with." msgstr "" @@ -58222,8 +59787,8 @@ msgstr[0] "跳躍死靈異變體" #: lang/json/MONSTER_from_json.py msgid "" "This once-human body is barely recognizable, scrambling about on its abdomen" -" as it leaps forward with immense arm strength. With elongated fangs that " -"are can easily mutilate your flesh, the grotesque face roars incessantly. " +" as it leaps forward with immense arm strength. With elongated fangs that " +"are can easily mutilate your flesh, the grotesque face roars incessantly. " "The lower body has fused together into one giant tail with a barbed spike." msgstr "" @@ -58236,7 +59801,7 @@ msgstr[0] "抽搐死靈異變體" #: lang/json/MONSTER_from_json.py msgid "" "With narrow blades coming out of its hands, this corpse spasmically dashes " -"to-and-fro with surprising speed. It carries itself quite steadily when " +"to-and-fro with surprising speed. It carries itself quite steadily when " "idle, further observation shows that the person before this husk was a " "C.R.I.T S-I G.E.A.R operator." msgstr "" @@ -58249,10 +59814,10 @@ msgstr[0] "捆扎死靈異變體" #. ~ Description for Pack Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A shrieking mutated child zombie. The face is is mainly blank with eyes " -"swollen shut and a torn-open mouth with flaps of flesh hanging to the side. " -"A pair of seemingly purposeless appendages sprout from its shoulders before " -"ending in its arms. Its small hands end in sharp claws." +"A shrieking mutated child zombie. The face is is mainly blank with eyes " +"swollen shut and a torn-open mouth with flaps of flesh hanging to the side." +" A pair of seemingly purposeless appendages sprout from its shoulders " +"before ending in its arms. Its small hands end in sharp claws." msgstr "" #: lang/json/MONSTER_from_json.py @@ -58263,9 +59828,9 @@ msgstr[0] "嘔吐死靈異變體" #. ~ Description for Puker Necromorph #: lang/json/MONSTER_from_json.py msgid "" -"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " +"A rather mutilated corpse covered in gaping sores. Hanging arms with hands " "that have long corroded away reveal jagged edges that could easily pierce " -"into your flesh. A sticky, frothing yellow sludge flows from its exposed " +"into your flesh. A sticky, frothing yellow sludge flows from its exposed " "internal organs to its unhinged jaw where it drips, hissing as it eats " "through material." msgstr "" @@ -58278,8 +59843,8 @@ msgstr[0] "爬行手臂" #. ~ Description for Animate Arm #: lang/json/MONSTER_from_json.py msgid "" -"A dismembered arm that slowly crawls forward. Occasionally, tentacles sprout" -" out from the wound and lash about wildly." +"A dismembered arm that slowly crawls forward. Occasionally, tentacles " +"sprout out from the wound and lash about wildly." msgstr "" #: lang/json/MONSTER_from_json.py @@ -58290,16 +59855,16 @@ msgstr[0] "無頭騎士" #. ~ Description for Dullahan #: lang/json/MONSTER_from_json.py msgid "" -"A headless humanoid that slowly sways. Ornate and functional armor adorn " +"A headless humanoid that slowly sways. Ornate and functional armor adorn " "this dreadful corpse which carries itself with an unerringly terrible " -"steadiness. A long tentacle has sprouted out of its right arm which " +"steadiness. A long tentacle has sprouted out of its right arm which " "occasionally flails about wildly." msgstr "" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "" -"A human body with pale blue flesh, crackling with electrical energy. It " +"A human body with pale blue flesh, crackling with electrical energy. It " "seems eager to tell you something." msgstr "" @@ -58312,8 +59877,8 @@ msgstr[0] "吹喇叭的骷髏" #: lang/json/MONSTER_from_json.py msgid "" "Devoid entirely of flesh and organs, this walking skeleton rattles you to " -"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the end" -" of the world." +"the bone. In its bony hand, it holds a pristine trumpet, unmarred by the " +"end of the world." msgstr "" #: lang/json/MONSTER_from_json.py @@ -58325,7 +59890,7 @@ msgstr[0] "喇叭骷髏小兵" #. skeltal'} #: lang/json/MONSTER_from_json.py msgid "A lesser skeleton, raised by the forlorn dooting of a trumpet." -msgstr "" +msgstr "一隻較小的骷髏，被小喇叭的哀怨的曲調聲所喚醒。" #: lang/json/MONSTER_from_json.py msgid "Smoky bear" @@ -58336,8 +59901,8 @@ msgstr[0] "煙霧熊" #: lang/json/MONSTER_from_json.py msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " -"gaze at you with malice... and hunger." -msgstr "這隻曾經驕傲的熊只剩下煙霧外表。它的黑眼注視著你… 帶著惡意和飢餓。" +"gaze at you with malice… and hunger." +msgstr "" #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -58349,7 +59914,7 @@ msgstr[0] "美頜龍" msgid "" "A bipedal dinosaur about the size of a turkey. Its teeth and claws are " "small but sharp." -msgstr "" +msgstr "跟一隻小貓差不多大的雙足恐龍。它的牙齒和爪子看起來很鋒利。" #: lang/json/MONSTER_from_json.py msgid "Gallimimus" @@ -58624,6 +60189,82 @@ msgid "" "like jaws." msgstr "身披黑色鱗片的怪獸，在那深深的眼窩中有著泛邪惡的亮綠。它的臉和頭骨呈骨骼狀，酸液從匕首狀的下顎滴落。" +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk warrior" +msgid_plural "lizardfolk warriors" +msgstr[0] "" + +#. ~ Description for lizardfolk warrior +#: lang/json/MONSTER_from_json.py +msgid "" +"A tall, powerful, reptilian humanoid with a muscular tail whose skin is " +"covered in dark gray-green scales. They are tribal and tend to be found in " +"caves and near water, especially in areas inhabited by dragons and wyrms. " +"They aren't particularly hostile, though they don't care for outsiders and " +"are highly dangerous when provoked. While they usually prefer to fight with" +" their greatclubs, they are equally ferocious with their sharp teeth and " +"claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk hunter" +msgid_plural "lizardfolk hunters" +msgstr[0] "" + +#. ~ Description for lizardfolk hunter +#: lang/json/MONSTER_from_json.py +msgid "" +"The hunter is a smaller lizardfolk than a warrior, but equally as deadly, " +"with their lithe figures and accurate javelin throws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "The hunter hurls a barbed javelin at you!" +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk shaman" +msgid_plural "lizardfolk shamans" +msgstr[0] "" + +#. ~ Description for lizardfolk shaman +#: lang/json/MONSTER_from_json.py +msgid "" +"Lizardfolk are very intelligent and cunning, but magical ability is a rare " +"quality. Shamans are chosen from the tribe during childhood, when magical " +"abilities mark the fate of the young tribesman. Not much is known about the" +" initiation ritual they must undergo, but few survive the experience. " +"Shamans are druidic spellcasters that can use the forces of nature to battle" +" enemies, as well as summoning assistance when needed." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "lizardfolk chieftan" +msgid_plural "lizardfolk chieftans" +msgstr[0] "" + +#. ~ Description for lizardfolk chieftan +#: lang/json/MONSTER_from_json.py +msgid "" +"Among the lizardfolk, ambition is a rare quality. Chieftans earn their " +"place by exhibiting unusually high levels of ambition, often mistaken by " +"outsiders as excessive, brutal violence. This chief is the largest and " +"strongest member of its tribe and carries a fierce trident to compliment its" +" teeth and claws." +msgstr "" + +#: lang/json/MONSTER_from_json.py +msgid "crocodile" +msgid_plural "crocodiles" +msgstr[0] "" + +#. ~ Description for crocodile +#: lang/json/MONSTER_from_json.py +msgid "" +"A once-and-future lizardfolk shaman, this large crocodile no longer has any " +"hint of any humanoid characteristics and looks very, very dangerous." +msgstr "" + #: lang/json/MONSTER_from_json.py msgid "owlbear" msgid_plural "owlbears" @@ -58774,7 +60415,7 @@ msgid "" "turret using state of the art ATR systems to dynamically reorient itself to " "new friends and enemies alike. It requires an integrated firearm module to " "work." -msgstr "" +msgstr "通用原子公司的TX-1守護者，一種丸形的小型自動砲塔，採用最先進的ATR系統可以動態調整敵我識別。它需要一個完整的槍支模組才能運作。" #: lang/json/MONSTER_from_json.py lang/json/TOOL_from_json.py msgid "disarmed military turret" @@ -58788,6 +60429,7 @@ msgid "" "using state of the art ATR systems to dynamically reorient itself to new " "friends and enemies alike. It requires a integrated gun module to operate." msgstr "" +"Leadworks LLC的TX系列砲塔，一座軍用級自動砲塔，採用最先進的ATR系統可以動態調整敵我識別。它需要一個完整的槍支模組才能運作。" #: lang/json/MONSTER_from_json.py lang/json/TOOL_from_json.py msgid "disarmed advanced turret" @@ -58815,6 +60457,7 @@ msgid "" "friends and enemies alike. Its integrated 9mm sub machinegun can swivel a " "full 360 degrees." msgstr "" +"通用原子公司的TX-1守護者， 一種丸形的小型自動砲塔， 採用最先進的ATR系統可以動態調整敵我識別。裝配了9mm雙管機槍槍能夠全方位掃射。" #: lang/json/MONSTER_from_json.py msgid "shotgun turret" @@ -58828,7 +60471,7 @@ msgid "" "turret using state of the art ATR systems to dynamically reorient itself to " "new friends and enemies alike. Its integrated 12ga shotgun can swivel a " "full 360 degrees." -msgstr "" +msgstr "通用原子公司的TX-4保護者， 一種丸形的小型自動砲塔， 採用最先進的ATR系統可以動態調整敵我識別。裝配了12口徑霰彈槍能夠全方位掃射。" #: lang/json/MONSTER_from_json.py msgid "riot control turret" @@ -59076,7 +60719,7 @@ msgstr[0] "防禦機器人" #. ~ Description for defense robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is armed with an electric prod and an integrated 9mm firearm." msgstr "" @@ -59088,7 +60731,7 @@ msgstr[0] "警衛機器人" #. ~ Description for security robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an integrated 9mm firearm." msgstr "" @@ -59100,7 +60743,7 @@ msgstr[0] "鎮暴機器人" #. ~ Description for riotcontrol robot #: lang/json/MONSTER_from_json.py msgid "" -"An automated defense robot still active due to its internal power source. " +"An automated defense robot still active due to its internal power source. " "This one is equipped with an electric prod, tear gas sprayer, and integrated" " 40mm beanbag launcher." msgstr "" @@ -59414,8 +61057,8 @@ msgstr[0] "烹飪機器人" msgid "" "A salvaged utility robot converted into an automated vacuum cleaner. It will" " suck stray items off the ground and dissolve them with its internal acid " -"reserves. A useful helper for keeping your front lawn clean of debris... or" -" corpses." +"reserves. A useful helper for keeping your front lawn clean of debris… or " +"corpses." msgstr "" #: lang/json/MONSTER_from_json.py @@ -59465,8 +61108,8 @@ msgstr[0] "煉藥機器人" #. ~ Description for elixirator #: lang/json/MONSTER_from_json.py msgid "" -"This doesn't work yet. Don't build it... A salvaged medibot with its " -"internal pharma-fabricators repurposed to produce mutagen." +"This doesn't work yet. Don't build it… A salvaged medibot with its internal " +"pharma-fabricators repurposed to produce mutagen." msgstr "" #: lang/json/MONSTER_from_json.py @@ -59899,6 +61542,8 @@ msgid "" " ranged weapons, its armor and strength make it a match for the even the " "biggest monsters. Only a madman would dare build such a reckless behemoth." msgstr "" +"一個回收的坦克機器人裝有一對強大的氣動錘，可用來砸碎包括建築物在內的任何物體。 " +"儘管缺乏遠程武器，但其裝甲和力量使其可以與最大的怪物相提並論。只有喪心病狂的傢伙才敢製造這麼一個魯莽的怪物。" #: lang/json/MONSTER_from_json.py msgid "atomic sultan" @@ -59914,6 +61559,9 @@ msgid "" "radioactive gas leaks. Only a lunatic would dare build such a reckless " "monster." msgstr "" +"一個回收的坦克機器人, 以滾燙的熱壓碎機改裝。雖然缺乏遠程武器, " +"但它的力量與裝甲使它能與塊頭最大的敵人一較高下。並聯的核融合核心給予這個機器人充足的電力, " +"但同時造成輻射性氣體外洩。只有喪心病狂的傢伙才敢製造這麼一個魯莽的怪物。" #: lang/json/MONSTER_from_json.py lang/json/TOOL_from_json.py msgid "gelatinous mass" @@ -60880,6 +62528,17 @@ msgstr "致盲閃光" msgid "Ethereal Grasp" msgstr "空靈抓握" +#: lang/json/SPELL_from_json.py +msgid "Obfuscated Body" +msgstr "" + +#. ~ Description for Obfuscated Body +#: lang/json/SPELL_from_json.py +msgid "" +"A magical aura distorts light around your body, increasing the amount of " +"attacks you might dodge in a given turn." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Aura of Protection" msgstr "防護靈氣" @@ -61303,6 +62962,29 @@ msgid "" "rune as a catalyst for recipes." msgstr "這個儀式創造了一個與熱力學者契合的小石子。你能將此符文用於製作時的催化劑。" +#: lang/json/SPELL_from_json.py +msgid "Summon Crocodile" +msgstr "" + +#. ~ Description for Summon Crocodile +#: lang/json/SPELL_from_json.py +msgid "Summons a permanent crocodile." +msgstr "" + +#. ~ Message for SPELL 'Summon Crocodile' +#: lang/json/SPELL_from_json.py +msgid "The shaman summons a crocodile!" +msgstr "" + +#: lang/json/SPELL_from_json.py +msgid "an ancient reptilian spell" +msgstr "" + +#. ~ Description for an ancient reptilian spell +#: lang/json/SPELL_from_json.py +msgid "Causes one of the shaman spells to be cast." +msgstr "" + #: lang/json/SPELL_from_json.py msgid "Magic Missile" msgstr "魔法飛彈" @@ -63058,6 +64740,18 @@ msgid "" "This is a medical listening tool. Use it to listen to things. Closely." msgstr "一件醫用工具。靠近物體並使用來進行聆聽。" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "makeshift stethoscope" +msgid_plural "makeshift stethoscopes" +msgstr[0] "" + +#. ~ Description for makeshift stethoscope +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"This is a relatively cumbersome DIY child's medical listening toy. Use it " +"to listen to things. Closely." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "solar backpack (folded)" msgid_plural "solar backpacks (folded)" @@ -63321,9 +65015,9 @@ msgstr[0] "" #. ~ Description for CRIT S-I G.E.A.R #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into your" -" spinal cord, this device improves your overall physique and provides basic " -"information on your surroundings." +"C.R.I.T standard issue General Engineering Assistance Rig. Plugged into " +"your spinal cord, this device improves your overall physique and provides " +"basic information on your surroundings." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -63333,7 +65027,7 @@ msgstr[0] "" #. ~ Use action msg for CRIT gasmask (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.T HUD booting up..." +msgid "C.R.T HUD booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT gasmask (off). @@ -63346,9 +65040,9 @@ msgstr "" msgid "" "This is the C.R.I.T Spec Ops modified gasmask, fitted with top-of-the-line " "electronics and lined with kevlar for extra protection in order to keep " -"one's head where it should be. Various filters and other high tech wizardry " -"allow for enhanced oxygen intake and safety even under bombardment. It has " -"an integrated HUD and the option to turn it on for more features." +"one's head where it should be. Various filters and other high tech wizardry" +" allow for enhanced oxygen intake and safety even under bombardment. It has" +" an integrated HUD and the option to turn it on for more features." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -63364,7 +65058,7 @@ msgstr "" #. ~ Description for CRIT gasmask (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " +"This is the C.R.I.T Spec Ops modified gasmask. It is currently on and " "draining power for the HUD, low-level nightvision and other protective " "elements." msgstr "" @@ -63376,12 +65070,12 @@ msgstr[0] "" #. ~ Use action msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T EM booting up..." +msgid "C.R.I.T EM booting up…" msgstr "" #. ~ Use action need_charges_msg for CRIT EM vest (off). #: lang/json/TOOL_ARMOR_from_json.py -msgid "Power levels too low for safe bootup..." +msgid "Power levels too low for safe bootup…" msgstr "" #. ~ Description for CRIT EM vest (off) @@ -63389,9 +65083,9 @@ msgstr "" msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments and reactive servos which protects its wearer and assists in " -"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec " -"Ops for its ease of use and manuverability. Turn it on for suit mode, extra " -"protection and movement." +"movement at the cost high power usage. It is commonly worn by C.R.I.T Spec" +" Ops for its ease of use and manuverability. Turn it on for suit mode, " +"extra protection and movement." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -63406,7 +65100,7 @@ msgstr "" #. ~ Use action msg for CRIT EM vest (on). #: lang/json/TOOL_ARMOR_from_json.py -msgid "C.R.I.T E.M powering off..." +msgid "C.R.I.T E.M powering off…" msgstr "" #. ~ Description for CRIT EM vest (on) @@ -63415,8 +65109,8 @@ msgid "" "The C.R.I.T Spec Ops Enhanced Movement vest is embedded with high-tech " "filaments, reactive servos and a generator which pumps a crystallized liquid" " that protects its wearer from most heavy combat situations at the cost of " -"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is " -"currently in suit form and draining your UPS power at high rates." +"extreme power usage. It is commonly worn by C.R.I.T Spec Ops. This vest is" +" currently in suit form and draining your UPS power at high rates." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -63433,7 +65127,7 @@ msgstr "你打開 %s。" #. ~ Description for CRIT helmet (off) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " +"C.R.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection." msgstr "" @@ -63451,10 +65145,10 @@ msgstr "" #. ~ Description for CRIT helmet (on) #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " -"insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " -"power." +"C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " +"insulated steel mesh for neck warmth and protection. A tactically dim " +"flashlight is attatched to the side. This light is currently on and drawing" +" power." msgstr "" #: lang/json/TOOL_ARMOR_from_json.py @@ -63691,6 +65385,30 @@ msgid "" "throwing knife into your hand on activation." msgstr "一枚雕有匕首的華麗銀戒指，使用後會幻化成一把在你手中近乎完美的飛刀。" +#: lang/json/TOOL_ARMOR_from_json.py +msgid "eel ring" +msgid_plural "eel rings" +msgstr[0] "" + +#. ~ Description for eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin silver band ring, depicting an eel coiled on itself. Allows you to " +"dodge an extra attack per turn." +msgstr "" + +#: lang/json/TOOL_ARMOR_from_json.py +msgid "bicephalous eel ring" +msgid_plural "bicephalous eel rings" +msgstr[0] "" + +#. ~ Description for bicephalous eel ring +#: lang/json/TOOL_ARMOR_from_json.py +msgid "" +"A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows" +" you to dodge two extra attacks per turn." +msgstr "" + #: lang/json/TOOL_ARMOR_from_json.py msgid "ring of strength +1" msgid_plural "minor rings of strength +1" @@ -64202,12 +65920,13 @@ msgstr "你已經拉開 %s 的插銷了，試著把它投出去看看。" #. ~ Use action sound_msg for active makeshift grenade. #. ~ Use action sound_msg for active scrambler grenade. #. ~ Use action sound_msg for active EMP grenade. +#. ~ Use action sound_msg for active EMP bomb. #. ~ Use action sound_msg for C-4 explosive (armed). #. ~ Use action sound_msg for active flashbang. #. ~ Use action sound_msg for active tear gas payload. #. ~ Use action sound_msg for mininuke. #. ~ Use action sound_msg for active ANFO charge. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse_actor.cpp +#: lang/json/TOOL_from_json.py src/iuse_actor.cpp msgid "Tick." msgstr "滴答。" @@ -64280,13 +65999,11 @@ msgstr "你拉開了干擾手榴彈的插銷。" #. ~ Description for scrambler grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a highly modified EMP grenade, designed to scramble robots' IFF " -"control chips rather than destroy them. This converts the robot to your " -"side for a short time, before the backup systems kick in. Use this item to " -"pull the pin and light the fuse, turning it into an active scrambler " -"grenade." +"This is a specialized grenade, designed to scramble robots' IFF control " +"chips. This converts the robot to your side for a short time, before the " +"backup systems kick in. Use this item to pull the pin and light the fuse, " +"turning it into an active scrambler grenade." msgstr "" -"這是一個高度改造的電磁脈衝手榴彈，能夠干擾機器人的控制晶片，而非摧毀。在其備份系統回復前，會變成你的友軍。使用這個物品以拉開插銷並點燃引線，讓它成為啟動狀態。" #: lang/json/TOOL_from_json.py msgid "active scrambler grenade" @@ -64300,6 +66017,47 @@ msgid "" "control wave that temporarily converts robots to your side." msgstr "這個干擾手榴彈已經啟動, 很快的就會炸開, 釋放出控制波, 讓附近的機器人短暫成為你的友軍。" +#: lang/json/TOOL_from_json.py +msgid "EMP grenade" +msgid_plural "EMP grenades" +msgstr[0] "電磁脈衝手榴彈" + +#. ~ Use action msg for EMP grenade. +#: lang/json/TOOL_from_json.py +msgid "You pull the pin on the EMP grenade." +msgstr "你拉開了電子脈衝手榴彈的插銷。" + +#. ~ Description for EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This is a grenade that generates a electromagnetic pulse with a low-" +"inductance capacitor bank discharged into a single-loop antenna. Use this " +"item to pull the pin and light the fuse, turning it into an active EMP " +"grenade. You will then have three turns before it detonates, creating an " +"EMP field that damages robots and drains bionic energy." +msgstr "" + +#: lang/json/TOOL_from_json.py +msgid "active EMP grenade" +msgid_plural "active EMP grenades" +msgstr[0] "啟動中電磁脈衝手榴彈" + +#. ~ Use action no_deactivate_msg for active EMP grenade. +#. ~ Use action no_deactivate_msg for active flashbang. +#. ~ Use action no_deactivate_msg for active tear gas payload. +#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp +#, c-format, no-python-format +msgid "You've already pulled the %s's pin, try throwing it instead." +msgstr "你已經拉開 %s 的插銷了, 試著把它投出去看看。" + +#. ~ Description for active EMP grenade +#: lang/json/TOOL_from_json.py +msgid "" +"This EMP grenade is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy. You may not want to be " +"holding it much longer." +msgstr "這個電磁脈衝手榴彈已經啟動, 很快的就會炸開並產生電磁脈衝。這將會破壞附近的機器人以及吸取生化插件能量。你絕對不會想要一直握在手上的。" + #: lang/json/TOOL_from_json.py msgid "pipe bomb" msgid_plural "pipe bombs" @@ -64680,23 +66438,28 @@ msgid "" msgstr "一件折疊起來的毯子, 由先進材料製作, 能夠蓋住你大部分的身體。\"使用\" 以展開它。" #: lang/json/TOOL_from_json.py -msgid "EMP grenade" -msgid_plural "EMP grenades" -msgstr[0] "電磁脈衝手榴彈" +msgid "EMP bomb" +msgid_plural "EMP bombs" +msgstr[0] "" -#. ~ Use action msg for EMP grenade. +#. ~ Use action menu_text for EMP bomb. #: lang/json/TOOL_from_json.py -msgid "You pull the pin on the EMP grenade." -msgstr "你拉開了電子脈衝手榴彈的插銷。" +msgid "Activate bomb" +msgstr "" -#. ~ Description for EMP grenade +#. ~ Use action msg for EMP bomb. +#: lang/json/TOOL_from_json.py +msgid "You activate the EMP bomb." +msgstr "" + +#. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" -"inductance capacitor bank discharged into a single-loop antenna. Use this " -"item to pull the pin and light the fuse, turning it into an active EMP " -"grenade. You will then have three turns before it detonates, creating an " -"EMP field that damages robots and drains bionic energy." +"This substantial device is a bomb that generates a electromagnetic pulse. " +"When activated, the plutonium fuel cell is drained into a flux compression " +"generator, the detonation of which creates a strong magnetic field. When " +"this magnetic field is fed into the antenna, it creates a strong electro-" +"magnetic pulse." msgstr "" #: lang/json/TOOL_from_json.py @@ -64712,25 +66475,23 @@ msgid "" msgstr "能穿戴到可騎乘的已馴服動物身上的鞍座。" #: lang/json/TOOL_from_json.py -msgid "active EMP grenade" -msgid_plural "active EMP grenades" -msgstr[0] "啟動中電磁脈衝手榴彈" +msgid "active EMP bomb" +msgid_plural "active EMP bombs" +msgstr[0] "" -#. ~ Use action no_deactivate_msg for active EMP grenade. -#. ~ Use action no_deactivate_msg for active flashbang. -#. ~ Use action no_deactivate_msg for active tear gas payload. -#: lang/json/TOOL_from_json.py lang/json/TOOL_from_json.py src/iuse.cpp -#, c-format, no-python-format -msgid "You've already pulled the %s's pin, try throwing it instead." -msgstr "你已經拉開 %s 的插銷了, 試著把它投出去看看。" +#. ~ Use action no_deactivate_msg for active EMP bomb. +#: lang/json/TOOL_from_json.py +#, no-python-format +msgid "You've already activated the %s, try throwing it instead." +msgstr "" -#. ~ Description for active EMP grenade +#. ~ Description for active EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This EMP grenade is active, and will shortly detonate, creating a large EMP " -"field that damages robots and drains bionic energy. You may not want to be " -"holding it much longer." -msgstr "這個電磁脈衝手榴彈已經啟動, 很快的就會炸開並產生電磁脈衝。這將會破壞附近的機器人以及吸取生化插件能量。你絕對不會想要一直握在手上的。" +"This EMP bomb is active, and will shortly detonate, creating a large EMP " +"field that damages robots and drains bionic energy, as well as a sizeable " +"explosion. You may not want to be holding it much longer." +msgstr "" #: lang/json/TOOL_from_json.py msgid "packed M72 LAW" @@ -65149,11 +66910,9 @@ msgid "" "A 35mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " -"conventional batteries. Before the cataclysm, you could have taken " +"conventional batteries. Before the Cataclysm, you could have taken " "professional-grade photos using this." msgstr "" -"一台35mm的單眼相機, 他有一個光學觀景窗, 也能從螢幕上看到觀察, 自動對焦、抗手震、閃光燈。你可以直接在相機螢幕上觀看照片並把他們存到記憶卡裡頭," -" 它使用傳統電池供電, 在災變以前, 你可以用他來拍攝專業等級的照片。" #: lang/json/TOOL_from_json.py msgid "candle" @@ -65815,6 +67574,7 @@ msgid_plural "pseudo butter churns" msgstr[0] "" #. ~ Description for pseudo butter churn +#. ~ Description for pseudo atomic butter churn #: lang/json/TOOL_from_json.py msgid "This is a crafting_pseudo_item if you have it something is wrong." msgstr "" @@ -65827,10 +67587,10 @@ msgstr[0] "平板電腦" #. ~ Description for e-ink tablet PC #: lang/json/TOOL_from_json.py msgid "" -"A tablet PC using an efficient color e-ink display. Before the cataclysm, " +"A tablet PC using an efficient color e-ink display. Before the Cataclysm, " "these were nifty gadgets; now, it's an almost priceless resource. Runs on " "conventional batteries." -msgstr "一台彩色平板電腦, 在災變以前, 它內裝 50 種的功能, 現在更是無價之寶, 使用傳統電池供電。" +msgstr "" #: lang/json/TOOL_from_json.py msgid "electric chainsaw (off)" @@ -66874,9 +68634,9 @@ msgstr[0] "粗製鎚子" #. ~ Description for makeshift hammer #: lang/json/TOOL_from_json.py msgid "" -"This is a crude hammer make from a piece of metal affixed to a stick. It " +"This is a crude hammer made from a piece of metal affixed to a stick. It " "functions adequately as a hammer, but really can't compare to a proper one." -msgstr "一把將金屬和棒子合在一起的粗製鐵鎚, 它己經足以當作鐵鎚用, 但還比不上真正的鐵鎚。" +msgstr "" #: lang/json/TOOL_from_json.py msgid "makeshift vacuum sealer" @@ -67803,18 +69563,6 @@ msgid "" "blade allows for precision strikes in the hands of the skilled." msgstr "一把小又異常銳利的刀, 常用在手術中。在熟手中能夠使用他小而尖銳的刀刃使用穿刺攻擊。" -#: lang/json/TOOL_from_json.py -msgid "pair of scissors" -msgid_plural "pairs of scissors" -msgstr[0] "剪刀" - -#. ~ Description for pair of scissors -#: lang/json/TOOL_from_json.py -msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " -"made from cotton (like clothing) into rags." -msgstr "這是一把耐用的大剪刀。使用剪刀可以將棉製的物品 (如衣物) 切割成布條。" - #: lang/json/TOOL_from_json.py msgid "screwdriver" msgid_plural "screwdrivers" @@ -69944,6 +71692,17 @@ msgid "" "distraction." msgstr "" +#: lang/json/TOOL_from_json.py +msgid "clothes hanger" +msgid_plural "clothes hangers" +msgstr[0] "" + +#. ~ Description for clothes hanger +#: lang/json/TOOL_from_json.py +msgid "" +"A plastic clothes hanger with a metal hook to hang something on a rail." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "talking doll" msgid_plural "talking dolls" @@ -71853,6 +73612,18 @@ msgid "" "toy!" msgstr "" +#: lang/json/TOOL_from_json.py +msgid "pair of scissors" +msgid_plural "pairs of scissors" +msgstr[0] "剪刀" + +#. ~ Description for pair of scissors +#: lang/json/TOOL_from_json.py +msgid "" +"These are a long pair of heavy duty scissors. Use scissors to cut items " +"made from cotton (like clothing) into rags." +msgstr "這是一把耐用的大剪刀。使用剪刀可以將棉製的物品 (如衣物) 切割成布條。" + #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" @@ -72002,6 +73773,26 @@ msgid "precision solderers" msgid_plural "precision soldererss" msgstr[0] "" +#: lang/json/TOOL_from_json.py +msgid "pseudo atomic butter churn" +msgid_plural "pseudo atomic butter churns" +msgstr[0] "" + +#: lang/json/TOOL_from_json.py +msgid "inactive brain blaster" +msgid_plural "inactive brain blasters" +msgstr[0] "" + +#. ~ Description for inactive brain blaster +#: lang/json/TOOL_from_json.py +msgid "" +"This is a horrifying monstrosity. Using this item is cannibalism in all but" +" taste and involves turning it on and placing it on the ground, where it " +"will attach itself. If reprogrammed and rewired successfully the turret " +"will identify you as a friendly, and attack all enemies with its revolving " +"laser cannons." +msgstr "" + #: lang/json/TOOL_from_json.py msgid "atomic smartphone" msgid_plural "atomic smartphones" @@ -72188,12 +73979,12 @@ msgstr[0] "" #. ~ Description for CRIT mess kit #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue mess kit designed for ease of transport. Based off of" -" the normal military mess kit, but made to be telescopic, the parts are made" -" from a thin sheet of a stainless superalloy composite and are insulated " -"with ceramic. Sadly, this compact reimagining loses much of its battery life" -" but does have a rather small (useless) solar panel installed. Also comes " -"with an absurdly small integrated fpoon and knife spatula set!" +"C.R.I.T standard-issue mess kit designed for ease of transport. Based off " +"of the normal military mess kit, but made to be telescopic, the parts are " +"made from a thin sheet of a stainless superalloy composite and are insulated" +" with ceramic. Sadly, this compact reimagining loses much of its battery " +"life but does have a rather small (useless) solar panel installed. Also " +"comes with an absurdly small integrated fpoon and knife spatula set!" msgstr "" #: lang/json/TOOL_from_json.py @@ -72204,10 +73995,11 @@ msgstr[0] "" #. ~ Description for CRIT service knife #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked " -"pry bar at the bottom for opening simple things and bashing in heads. Matte " -"black finish helps it avoid flash in dim-light situations and tanto tip " -"allows for light-armor penetration. Blade length allows for decent reach." +"C.R.I.T standard-issue knife. Has a knuckleduster guard and a small, hooked" +" pry bar at the bottom for opening simple things and bashing in heads. " +"Matte black finish helps it avoid flash in dim-light situations and tanto " +"tip allows for light-armor penetration. Blade length allows for decent " +"reach." msgstr "" #: lang/json/TOOL_from_json.py @@ -72218,7 +74010,7 @@ msgstr[0] "" #. ~ Description for CRIT Knuckledusters #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " +"C.R.I.T CQB knuckledusters. Not too different from any normal pair other " "than weight." msgstr "" @@ -72230,7 +74022,7 @@ msgstr[0] "" #. ~ Description for CRIT Reso-blade #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " +"C.R.I.T melee weapon. Alien runes adorn the carbon steel blade. The blade " "oddly lacks sharpness, and yet upon closer oberservation, a hum of energy " "thrums from within." msgstr "" @@ -72243,10 +74035,10 @@ msgstr[0] "屠龍者" #. ~ Description for Dragon Slayer #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " -"oversized carbon steel blade and a hum of energy thrums from within. Merely " -"brushing your fingers over the weapon brings a feeling of invincibility. It " -"looks more like a raw heap of iron than a sword. The thing is... can you " +"C.R.I.T R&D's masterpiece weapon. Alien runes adorn the ridiculously " +"oversized carbon steel blade and a hum of energy thrums from within. Merely" +" brushing your fingers over the weapon brings a feeling of invincibility. " +"It looks more like a raw heap of iron than a sword. The thing is… can you " "wield it?" msgstr "" @@ -72258,7 +74050,7 @@ msgstr[0] "" #. ~ Description for CRIT entrenching tool #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard-issue collapsible spade. A built in vibration system that " +"C.R.I.T standard-issue collapsible spade. A built in vibration system that " "is powered by the user's movement allows the smaller spade to clear soil " "like a larger shovel." msgstr "" @@ -72271,7 +74063,7 @@ msgstr[0] "" #. ~ Description for CRIT night stick #: lang/json/TOOL_from_json.py msgid "" -"C.R.I.T standard issue guard tonfa. The length allows for great reach and " +"C.R.I.T standard issue guard tonfa. The length allows for great reach and " "the domed tip allows for greater impact than a cylinder style baton." msgstr "" @@ -72736,9 +74528,9 @@ msgstr[0] "生機術士符文" #. ~ Description for Biomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of rended flesh and bones on it. It is " +"This magical pebble has an insignia of rended flesh and bones on it. It is " "necessary for Biomancers to channel magic into their crafts." -msgstr "這顆魔法的小石子上有血肉和骨骼的徽章。生機術士將魔法注入創作物過程中的必需品。" +msgstr "" #: lang/json/TOOL_from_json.py msgid "Technomancer rune" @@ -72748,9 +74540,9 @@ msgstr[0] "科技巫師符文" #. ~ Description for Technomancer rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of clockwork and gears on it. It is " +"This magical pebble has an insignia of clockwork and gears on it. It is " "necessary for Technomancers to channel magic into their crafts." -msgstr "這顆魔法的小石子上有發條和齒輪的徽章。科技巫師將魔法注入創作物過程中的必需品。" +msgstr "" #: lang/json/TOOL_from_json.py msgid "Magus rune" @@ -72760,9 +74552,9 @@ msgstr[0] "祆教徒符文" #. ~ Description for Magus rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of crystal and mana orbs on it. It is " +"This magical pebble has an insignia of crystal and mana orbs on it. It is " "necessary for Magi to channel magic into their crafts." -msgstr "這顆魔法的小石子上有水晶和魔力球的徽章。祆教徒將魔法注入創作物過程中的必需品。" +msgstr "" #: lang/json/TOOL_from_json.py msgid "Earthshaper rune" @@ -72772,9 +74564,9 @@ msgstr[0] "塑地者符文" #. ~ Description for Earthshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of steel and rocks on it. It is " +"This magical pebble has an insignia of steel and rocks on it. It is " "necessary for Earthshapers to channel magic into their crafts." -msgstr "這顆魔法的小石子上有鋼鐵和岩石的徽章。大地塑形者將魔法注入創作物過程中的必需品。" +msgstr "" #: lang/json/TOOL_from_json.py msgid "Kelvinist rune" @@ -72784,9 +74576,9 @@ msgstr[0] "熱力學者符文" #. ~ Description for Kelvinist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of ice and flames on it. It is necessary" -" for Kelvinists to channel magic into their crafts." -msgstr "這顆魔法的小石子上有冰和火焰的徽章。熱力學者將魔法注入創作物過程中的必需品。" +"This magical pebble has an insignia of ice and flames on it. It is " +"necessary for Kelvinists to channel magic into their crafts." +msgstr "" #: lang/json/TOOL_from_json.py msgid "Stormshaper rune" @@ -72796,9 +74588,9 @@ msgstr[0] "塑風者符文" #. ~ Description for Stormshaper rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of lightning and storm clouds on it. It " -"is necessary for Stormshapers to channel magic into their crafts." -msgstr "這顆魔法的小石子上有閃電和暴風雲的徽章。風暴塑形者將魔法注入創作物過程中的必需品。" +"This magical pebble has an insignia of lightning and storm clouds on it. It" +" is necessary for Stormshapers to channel magic into their crafts." +msgstr "" #: lang/json/TOOL_from_json.py msgid "Druid rune" @@ -72808,9 +74600,9 @@ msgstr[0] "德魯伊符文" #. ~ Description for Druid rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of nature and trees on it. It is " +"This magical pebble has an insignia of nature and trees on it. It is " "necessary for Druids to channel magic into their crafts." -msgstr "這顆魔法的小石子上有自然和樹木的徽章。德魯伊將魔法注入創作物過程中的必需品。" +msgstr "" #: lang/json/TOOL_from_json.py msgid "Animist rune" @@ -72820,9 +74612,9 @@ msgstr[0] "泛靈論者符文" #. ~ Description for Animist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of summoners on it. It is necessary for " -"Animists to channel magic into their crafts." -msgstr "這顆魔法的小石子上有召喚師的徽章。泛靈論者將魔法注入創作物過程中的必需品。" +"This magical pebble has an insignia of summoners on it. It is necessary for" +" Animists to channel magic into their crafts." +msgstr "" #: lang/json/TOOL_from_json.py msgid "alchemist rune" @@ -72832,10 +74624,10 @@ msgstr[0] "煉金術士符文" #. ~ Description for alchemist rune #: lang/json/TOOL_from_json.py msgid "" -"This magical pebble has an insignia of alchemy and potions on it. While " +"This magical pebble has an insignia of alchemy and potions on it. While " "versatile in use, the lack of attunement to any school prevents creation of " "more advanced recipes." -msgstr "這顆魔法的小石子上有煉金術與藥劑的徽章。儘管有各種用途，但是它無法適應各學派導致他無法運用在大多數的高階製作中。" +msgstr "" #: lang/json/TOOL_from_json.py msgid "finger firelighter" @@ -72915,19 +74707,18 @@ msgstr[0] "暮色之劍" #: lang/json/TOOL_from_json.py msgid "" "A longsword, made out of a very dark, almost black metal. It seems to hold " -"a greater edge than usual steel blades and feels ...more comfortable in the " +"a greater edge than usual steel blades and feels …more comfortable in the " "hand. While the blade is made out of this dark metal, the crossguard and " "the pommel seem to be made out of a brighter material, which feels " "abnormally cool to the touch." msgstr "" -"一柄由非常暗沉、近乎黑色的金屬所製成的長劍。它似乎比一般的鋼刀片更加鋒利，感覺...手感更舒適。雖然刀刃是由這種深色金屬製成，但是護手和柄頭是用更亮的材料製成的，而且觸感異常涼爽。" #. ~ Use action use_message for disarmed defense turret. #. ~ Use action use_message for disarmed military turret. #. ~ Use action use_message for disarmed advanced turret. #: lang/json/TOOL_from_json.py -msgid "Error. No weapon systems found." -msgstr "發生錯誤。沒找到任何武器系統。" +msgid "Error. No weapon systems found." +msgstr "" #. ~ Description for disarmed defense turret #: lang/json/TOOL_from_json.py @@ -73083,7 +74874,7 @@ msgid "" "An inactive military grenade turret. Up to 50 standard 40mm fragmentation " "grenades will be automatically loaded from your inventory into the turret " "upon activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" @@ -73137,8 +74928,8 @@ msgstr[0] "未啟動的先進磁軌砲砲塔" msgid "" "An inactive advanced railgun turret. Up to 50 standard rail projectiles " "will be automatically loaded from your inventory into the turret upon " -"activation. Place the turret and it will ID you as friendly with its " -"advanced IFF software. Consult your safety manual in the event of a " +"activation. Place the turret and it will ID you as friendly with its " +"advanced IFF software. Consult your safety manual in the event of a " "malfunction." msgstr "" @@ -73151,7 +74942,7 @@ msgstr[0] "未啟動的先進酸液砲塔" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced acid turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" @@ -73164,7 +74955,7 @@ msgstr[0] "未啟動的先進電磁脈衝砲塔" #: lang/json/TOOL_from_json.py msgid "" "An inactive advanced EMP turret. Place the turret and it will ID you as " -"friendly with its advanced IFF software. Consult your safety manual in the " +"friendly with its advanced IFF software. Consult your safety manual in the " "event of a malfunction." msgstr "" @@ -73456,7 +75247,7 @@ msgstr[0] "" #. ~ Description for inactive floating heater #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of warm air to heat an enclosed space. It is non-aggressive " "and has no weapons systems. Activate this item to deploy the robot." msgstr "" @@ -73469,7 +75260,7 @@ msgstr[0] "" #. ~ Description for inactive floating furnace #: lang/json/TOOL_from_json.py msgid "" -"A salvaged eyebot repurposed into a floating space heater. It emits a " +"A salvaged eyebot repurposed into a floating space heater. It emits a " "constant jet of dangerously hot air to heat an enclosed space. It is non-" "aggressive and has no weapons systems. Activate this item to deploy the " "robot." @@ -73528,10 +75319,10 @@ msgstr[0] "未啟動的烹飪機器人" #. ~ Description for inactive digestron #: lang/json/TOOL_from_json.py msgid "" -"A salvaged utility robot converted into an automated vacuum cleaner. It will" -" suck stray items off the ground and dissolve them with its internal acid " -"reserves. It is non aggressive and has no weapon systems. Activate this " -"item to deploy the robot." +"A salvaged utility robot converted into an automated vacuum cleaner. It " +"will suck stray items off the ground and dissolve them with its internal " +"acid reserves. It is non aggressive and has no weapon systems. Activate " +"this item to deploy the robot." msgstr "" #: lang/json/TOOL_from_json.py @@ -73562,7 +75353,7 @@ msgstr[0] "未啟動的暗殺機器人" #. ~ Description for inactive assassin robot #: lang/json/TOOL_from_json.py msgid "" -"A salvaged medical robot repurposed into a murder machine. It will attack " +"A salvaged medical robot repurposed into a murder machine. It will attack " "hostile targets with a set of blades and a toxic needle. Activate this item" " to deploy the robot." msgstr "" @@ -73600,8 +75391,8 @@ msgstr[0] "未啟動的捕鼠者" #. ~ Description for inactive rat snatcher #: lang/json/TOOL_from_json.py msgid "" -"A salvaged skitterbot repurposed for hunting small game. It attacks targets " -"with pincers and an integrated tazer. Activate this item to deploy the " +"A salvaged skitterbot repurposed for hunting small game. It attacks targets" +" with pincers and an integrated tazer. Activate this item to deploy the " "robot." msgstr "" @@ -73643,7 +75434,7 @@ msgstr[0] "未啟動的壞死生化人" #: lang/json/TOOL_from_json.py msgid "" "A salvaged cyborg refitted with the head of a zombie necromancer. The " -"animate head retains some of its ability to revive zombies. Activate this " +"animate head retains some of its ability to revive zombies. Activate this " "item to deploy the robot." msgstr "" @@ -73687,7 +75478,7 @@ msgstr[0] "未啟動的速成聖騎士" msgid "" "A salvaged defense robot refitted with a homemade flamethrower and two " "searing hot blades. Activate this item, with gasoline in your inventory, to" -" load and deploy the robot... preferably far from anything flammable" +" load and deploy the robot… preferably far from anything flammable" msgstr "" #: lang/json/TOOL_from_json.py @@ -73995,7 +75786,7 @@ msgid "" "A biological mystery, this blob's internal structures exist in within a pool" " of low-density fluid that remains liquid despite being in a super-cooled " "state; yet possesses all the malleability of its former self. Fragments of " -"frost continually flake off it. It seems pliable enough to pull apart..." +"frost continually flake off it. It seems pliable enough to pull apart…" msgstr "" #: lang/json/TOOL_from_json.py @@ -74179,9 +75970,9 @@ msgstr "" #. ~ Description for diamond cluster #: lang/json/TOOL_from_json.py msgid "" -"A cluster of artificial crystals that have broken off of a diamond matrix. " +"A cluster of artificial crystals that have broken off of a diamond matrix. " "While the substance usually decays when separated from the catalyst; this " -"cluster seems to be self-sustaining by some unknown mechanism. " +"cluster seems to be self-sustaining by some unknown mechanism. " msgstr "" #: lang/json/TOOL_from_json.py @@ -74192,8 +75983,8 @@ msgstr[0] "" #. ~ Use action msg for diamond matrix. #: lang/json/TOOL_from_json.py msgid "" -"Your senses dull as you gaze into the depths of this gemstone's center..." -msgstr "隨著你凝視這個寶石的中心深處, 你的感官變得遲鈍…" +"Your senses dull as you gaze into the depths of this gemstone's center…" +msgstr "" #. ~ Description for diamond matrix #: lang/json/TOOL_from_json.py @@ -74210,10 +76001,10 @@ msgstr[0] "渦石引擎" #. ~ Description for vortex engine #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allows it to be attached to a vehicle to render " +"map. An external mechanism allows it to be attached to a vehicle to render " "it mobile." msgstr "" @@ -74225,10 +76016,10 @@ msgstr[0] "渦石發電機" #. ~ Description for vortex generator #: lang/json/TOOL_from_json.py msgid "" -"A tornado in a box, so to speak. Inside this innocuous tank contains either " -"the culmination of human innovation in clean energy, or a weapon of mass " +"A tornado in a box, so to speak. Inside this innocuous tank contains either" +" the culmination of human innovation in clean energy, or a weapon of mass " "destruction capable of wiping civilization - or what's left of it - off the " -"map. An external mechanism allow it to be hooked up to a battery to store " +"map. An external mechanism allow it to be hooked up to a battery to store " "the power generated." msgstr "" @@ -77369,6 +79160,10 @@ msgstr "構建柵欄牆" msgid "Build Stone Wall" msgstr "建造石牆" +#: lang/json/construction_from_json.py +msgid "Build Dry Stone Wall" +msgstr "" + #: lang/json/construction_from_json.py msgid "Build Pony Wall" msgstr "" @@ -80957,6 +82752,35 @@ msgid "" "from the inside." msgstr "" +#: lang/json/effects_from_json.py +msgid "Gross food" +msgstr "" + +#. ~ Description of effect 'Gross food'. +#: lang/json/effects_from_json.py +msgid "The food you eat is disgusting." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Demoralizing food" +msgstr "" + +#. ~ Description of effect 'Demoralizing food'. +#: lang/json/effects_from_json.py +msgid "Eating nothing but disgusting rations is starting to get you down." +msgstr "" + +#: lang/json/effects_from_json.py +msgid "Depressing food" +msgstr "" + +#. ~ Description of effect 'Depressing food'. +#: lang/json/effects_from_json.py +msgid "" +"Sure, you survived, but what kind of survival is this, eating these " +"disgusting rations day in and day out?" +msgstr "" + #: lang/json/effects_from_json.py msgid "Lit up" msgstr "發亮" @@ -81614,9 +83438,9 @@ msgstr "睡眠不足" #. ~ Description of effect 'Sleep Deprived'. #: lang/json/effects_from_json.py msgid "" -"Your sleep debt has been steadily increasing for a while. You should get " +"Your sleep debt has been steadily increasing for a while. You should get " "some rest." -msgstr "你的睡眠欠缺一直在逐漸增加。你應該休息一下。" +msgstr "" #. ~ Apply message for effect(s) 'Sleep Deprived'. #: lang/json/effects_from_json.py @@ -81748,7 +83572,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost his way long before he met you. The cataclysm offered him the " +" Lost his way long before he met you. The Cataclysm offered him the " "chance to denounce the former vices that had led to his incarceration… an " "offer that went unanswered. After you were killed, he returned to hunting " "those he saw as weak. The number of people he murdered is unknown but prior" @@ -81762,7 +83586,7 @@ msgid "" " you, his felonies in the departed world had prevented him from ever having " "a real place in society. With the destruction of existing criminal records " "he took it upon himself to prove his worth to his fellow man. Died from a " -"heart attack while alone on a trip many years after the cataclysm." +"heart attack while alone on a trip many years after the Cataclysm." msgstr "" #: lang/json/epilogue_from_json.py @@ -81779,7 +83603,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. His regret for not helping people during the opening days of " -"the cataclysm led him to attempt suicide multiple times in the years that " +"the Cataclysm led him to attempt suicide multiple times in the years that " "followed. Life improved briefly when he married a fellow survivor but was " "shattered when his spouse was killed by members of a mysterious apocalypse " "cult. He was killed when he attempted to sneak into the cult's compound to " @@ -81809,7 +83633,7 @@ msgid "" " Went on to marry and have two children that were raised and taught every " "survival skill they would ever need. His past eventually caught up to him " "when he ran afoul with an Old Guard colonel. Since he fled his post as a " -"National Guard soldier during the cataclysm he was hanged for desertion " +"National Guard soldier during the Cataclysm he was hanged for desertion " "despite the protests of a huge number of survivors that had benefited from " "his service over the years." msgstr "" @@ -82155,7 +83979,7 @@ msgstr "" #: lang/json/epilogue_from_json.py msgid "" -" Lost her way long before she met you. The cataclysm offered her the " +" Lost her way long before she met you. The Cataclysm offered her the " "chance to denounce the former vices that had led to her incarceration… an " "offer that went unanswered. After you were killed, she returned to preying " "upon those she saw as weak. It is rumored that she robbed dozens of " @@ -82186,7 +84010,7 @@ msgstr "" msgid "" " Was never known as a particularly brave individual nor an emotionally " "stable one. Her inability to emotionally conform to life after the " -"cataclysm led her to attempt suicide multiple times in the years that " +"Cataclysm led her to attempt suicide multiple times in the years that " "followed. Attracted by promises of renewal and the prospect of belonging to" " a new family, she became involved with a charismatic cult. She was an " "innocent casualty when Old Guard soldiers stormed the compound on suspicion " @@ -82459,7 +84283,7 @@ msgstr "" #. ~ Description for Hub 01 #: lang/json/faction_from_json.py msgid "" -"The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely " +"The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely " "leave their lab, if at all, and rely on their robots and advanced technology" " to survive." msgstr "" @@ -82623,7 +84447,7 @@ msgstr "難民" #: lang/json/faction_from_json.py msgid "" "The scattered remnants of civilization, these lucky few managed to barricade" -" themselves inside during the earliest stages of the cataclysm. Although " +" themselves inside during the earliest stages of the Cataclysm. Although " "temporarily secure, they are short on supplies and lack the skills to obtain" " more. It's only a matter of time before they too become the prey of " "otherwordly creatures, or of all-too-human monsters." @@ -82697,6 +84521,20 @@ msgstr "" msgid "You clean your %s." msgstr "" +#. ~ name of mending method for fault 'Blackpowder fouling' +#: lang/json/fault_from_json.py +msgid "Clean blackpowder fouling and lubricate" +msgstr "" + +#. ~ success message for mending method 'Clean blackpowder fouling and +#. lubricate' of fault 'Blackpowder fouling' +#. ~ success message for mending method 'Clean gun and lubricate' of fault +#. 'Fouling' +#: lang/json/fault_from_json.py +#, python-format +msgid "You clean and lubricate your %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Spent casing in chamber" msgstr "用過的彈殼在膛室中" @@ -82720,6 +84558,29 @@ msgstr "" msgid "You eject the spent casing from the %s." msgstr "" +#: lang/json/fault_from_json.py +msgid "Unlubricated" +msgstr "" + +#. ~ description for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "" +"Either this gun is brand new and came without lubrication or it was recently" +" cleaned with a solvent without oiling afterwards. Either way, it's not " +"lubricated and will not cycle properly, and can even be damaged." +msgstr "" + +#. ~ name of mending method for fault 'Unlubricated' +#: lang/json/fault_from_json.py +msgid "Lubricate" +msgstr "" + +#. ~ success message for mending method 'Lubricate' of fault 'Unlubricated' +#: lang/json/fault_from_json.py +#, python-format +msgid "You lubricate the %s." +msgstr "" + #: lang/json/fault_from_json.py msgid "Fouling" msgstr "積垢" @@ -82740,6 +84601,11 @@ msgstr "" msgid "Clean gun" msgstr "" +#. ~ name of mending method for fault 'Fouling' +#: lang/json/fault_from_json.py +msgid "Clean gun and lubricate" +msgstr "" + #: lang/json/fault_from_json.py msgid "Worn drive belt" msgstr "磨損的傳動帶" @@ -83462,11 +85328,13 @@ msgstr "冷氣機" msgid "A big, blocky metal device for refrigerating large areas." msgstr "一種大型的塊狀金屬設備，用於大面積製冷。" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "metal screeching!" msgstr "金屬嘎嘎聲!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: lang/json/furniture_from_json.py lang/json/furniture_from_json.py +#: lang/json/terrain_from_json.py lang/json/terrain_from_json.py msgid "clang!" msgstr "鐺!" @@ -83620,7 +85488,7 @@ msgstr "路障" #. ~ Description for road barricade #: lang/json/furniture_from_json.py msgid "A road barricade. For barricading roads." -msgstr "" +msgstr "一個路障。 用來擋路。" #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py #: lang/json/terrain_from_json.py src/map.cpp src/mapdata.cpp @@ -85292,6 +87160,15 @@ msgid "" " for awhile. Doesn't look like it's coming again anytime soon." msgstr "金屬盒子裝在木柱頂端。郵差已經有段時間沒來了，似乎也不會再來了。" +#: lang/json/furniture_from_json.py +msgid "clothing rail" +msgstr "" + +#. ~ Description for clothing rail +#: lang/json/furniture_from_json.py +msgid "A rail for hanging clothes on." +msgstr "" + #: lang/json/furniture_from_json.py msgid "display rack" msgstr "展示架" @@ -86200,8 +88077,8 @@ msgstr "" #. ~ Description for atomic butter churn on a stand #: lang/json/furniture_from_json.py msgid "" -"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. Ready" -" to add raw milk and salt. It will churn turn the earth is a cinder." +"The Rivtech Atomic Butter Churn in deployed state. It hums menacingly. " +"Ready to add raw milk and salt. It will churn till the earth is a cinder." msgstr "" #. ~ Description for vehicle refrigerator @@ -86234,7 +88111,7 @@ msgstr "水培裝置（種子）" #. ~ Description for hydroponics unit with seed #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seed" msgstr "" @@ -86245,7 +88122,7 @@ msgstr "水培裝置（幼苗）" #. ~ Description for hydroponics unit with seedling #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a planted seedling" msgstr "" @@ -86256,7 +88133,7 @@ msgstr "水培裝置（成熟植物）" #. ~ Description for hydroponics unit with mature plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant." msgstr "" @@ -86267,7 +88144,7 @@ msgstr "水培裝置（可收穫植物）" #. ~ Description for hydroponics unit with harvestable plant #: lang/json/furniture_from_json.py msgid "" -"This is a self-contained hydroponics unit used to grow crops indoors. This " +"This is a self-contained hydroponics unit used to grow crops indoors. This " "one contains a mature plant that is ready for harvest." msgstr "" @@ -87970,9 +89847,9 @@ msgstr "" "M60 是一把通用機槍, 旨在取代 .30 口徑的 M1918 和 M1919。槍身沉重, 難以在缺乏支撐下提槍射擊, 因為大多數人都不是動作片英雄。" #: lang/json/gun_from_json.py -msgid "pipe rifle: .308" -msgid_plural "pipe rifles: .308" -msgstr[0] ".308 鋼管步槍" +msgid "handmade heavy carbine" +msgid_plural "handmade heavy carbines" +msgstr[0] "" #: lang/json/gun_from_json.py msgid "" @@ -88170,6 +90047,18 @@ msgid "" "hammers of the four barrels arranged in a square formation." msgstr "" +#: lang/json/gun_from_json.py +msgid "S&W Model 10" +msgid_plural "S&W Model 10" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"A six-shot revolver, produced since 1899 and known as the most popular " +"handgun of the 20th century. It has a swing-out cylinder for ease of " +"reloading." +msgstr "" + #: lang/json/gun_from_json.py msgid "pipe rifle: .38 Special" msgid_plural "pipe rifles: .38 Special" @@ -88274,6 +90163,17 @@ msgid "" "quality, durable materials." msgstr "" +#: lang/json/gun_from_json.py +msgid "AF2011A1 .38 Super" +msgid_plural "AF2011A1 .38 Super" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"A double-barrel semi-automatic pistol of Italian origin, firing two bullets " +"per shot, a derivative of the M1911 pistol." +msgstr "" + #: lang/json/gun_from_json.py msgid "M1911A1" msgid_plural "M1911A1s" @@ -88427,20 +90327,6 @@ msgid "" " sees use with many units worldwide." msgstr "一把被廣泛使用的榴彈發射器, 首先被用於美國越戰時的軍用武器。雖然現今被許多改良的現代發射器所取代, M79 在許多國家仍然被用到。" -#: lang/json/gun_from_json.py -msgid "Mark 19 grenade launcher" -msgid_plural "Mark 19 grenade launchers" -msgstr[0] "Mark 19 榴彈發射器" - -#: lang/json/gun_from_json.py -msgid "" -"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can" -" find some 40mm grenades, maybe even beyond." -msgstr "" -"一個以三腳架為基座的重型榴彈發射器, 從冷戰開始一直到大災變, 這個武器都持續被美軍使用。如果你能找到了一些40mm的榴彈, " -"這個武器的使用歷史可以繼續延續下去。" - #: lang/json/gun_from_json.py msgid "Milkor MGL" msgid_plural "Milkor MGL" @@ -88483,6 +90369,20 @@ msgstr "自製的三管式 40mm 榴彈發射器。能夠一次發射全部三顆 msgid "multi" msgstr "多個" +#: lang/json/gun_from_json.py +msgid "Mark 19 grenade launcher" +msgid_plural "Mark 19 grenade launchers" +msgstr[0] "Mark 19 榴彈發射器" + +#: lang/json/gun_from_json.py +msgid "" +"A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " +"since the start of the cold war all the way to the cataclysm, and if you can" +" find some 40mm grenades, maybe even beyond." +msgstr "" +"一個以三腳架為基座的重型榴彈發射器， 從冷戰開始一直到大災變， 這個武器都持續被美軍使用。如果你能找到了一些40mm的榴彈， " +"這個武器的使用歷史可以繼續延續下去。" + #: lang/json/gun_from_json.py msgid "Saiga-410" msgid_plural "Saiga-410s" @@ -88495,6 +90395,18 @@ msgid "" "shell at a time like most shotguns." msgstr "" +#: lang/json/gun_from_json.py +msgid "Winchester M37 .410" +msgid_plural "Winchester M37 .410s" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"A single-shot break-action shotgun, chambered in .410 bore. Designed as a " +"lower-recoil alternative to 12 gauge shotguns, it is light and easy to " +"manufacture." +msgstr "" + #: lang/json/gun_from_json.py msgid "Desert Eagle .44" msgid_plural "Desert Eagle .44" @@ -88743,6 +90655,17 @@ msgid "" "has impressive stopping power." msgstr "蠻牛左輪手槍是一把 5 發裝左輪, 能夠發射 .454 卡蘇爾子彈。擁有非常強大的遏止力。" +#: lang/json/gun_from_json.py +msgid "Taurus Raging Judge Magnum" +msgid_plural "Taurus Raging Judge Magnum" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " +"Casull. It can fire .410 shotshells and .45 Colt cartridges as well." +msgstr "" + #: lang/json/gun_from_json.py msgid "Marlin 1895 SBL" msgid_plural "Marlin 1895 SBLs" @@ -88780,6 +90703,34 @@ msgid "" "ammunition." msgstr "" +#: lang/json/gun_from_json.py +msgid "Bond Arms Derringer" +msgid_plural "Bond Arms Derringers" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"The Bond Arms Derringer is a series of multi-barrel compact pistols. Most " +"commonly chambered for .45 Colt, with chambers long enough to accept .410 " +"shotgun shells." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "Colt Lightning .45 Carbine" +msgid_plural "Colt Lightning .45 Carbines" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"A modern reproduction of a Colt pump-action rifle. Originally chambered in " +".44-40, modern versions most commonly use .45 Colt, complementing the Single" +" Action Army as a Cowboy Action Shooting firearm." +msgstr "" + +#: lang/json/gun_from_json.py +msgid "chik chik." +msgstr "" + #: lang/json/gun_from_json.py msgid "Uberti Cattleman" msgid_plural "Uberti Cattleman" @@ -88888,9 +90839,9 @@ msgstr[0] "M2HB 白朗寧重機槍" #: lang/json/gun_from_json.py msgid "" "A heavy machine gun used by the US Military from its inception to the " -"cataclysm, and even rarely by cataclysm survivors. Its massive size and " +"Cataclysm, and even rarely by Cataclysm survivors. Its massive size and " "design make it impossible to use unless deployed or mounted to a vehicle." -msgstr "自美軍成立之始已經出現, 偶爾仍受大災變生存者採用的重型機槍。其巨大的尺寸及設計令它需要架設或是安裝到車輛上, 否則難以使用。" +msgstr "" #: lang/json/gun_from_json.py msgid ".50 caliber rifle" @@ -90189,7 +92140,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper" -" sold poorly before it was deemed a Destructive Device. The cylinder is " +" sold poorly before it was deemed a destructive device. The cylinder is " "driven by a clockspring, cannot be indexed by hand, and must be ejected with" " an ejector rod. Its unique design allows for all 12 shells to be fired in " "under 3 seconds, as demonstrated by the ATF technical branch." @@ -90336,11 +92287,9 @@ msgstr[0] "A7 雷射步槍" msgid "" "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\"." " Initial performance rivaled Rivtech's finest, with rumors flying about " -"corporate skulduggery. Though the cataclysm put that on the ash heap of " +"corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." msgstr "" -"一把雷射槍中的藝術品, 由研發機構 \"航天實驗室\" 所研發。最初的性能可媲美 Rivtech 公司最好的產品, " -"儘管有著關於企業詐騙的謠言滿天飛。雖然大災變早已將它遺留在歷史的餘燼, 但這把武器能對你的敵人做的事情依然沒變。" #: lang/json/gun_from_json.py msgid "V29 laser pistol" @@ -90400,6 +92349,17 @@ msgid "" "ammunition." msgstr "一個木製的吹箭, 很難使用, 但是命中率很高。使用鏢作為彈藥。" +#: lang/json/gun_from_json.py +msgid "vibrating bioblaster" +msgid_plural "bioblasters" +msgstr[0] "" + +#: lang/json/gun_from_json.py +msgid "" +"You ripped this from a mi-go abomination. You have no clue how or if it can" +" be reloaded. " +msgstr "" + #: lang/json/gun_from_json.py msgid "hard-light longbow" msgid_plural "hard-light longbows" @@ -90445,7 +92405,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" "Experimental low power sidearm under development in C.R.I.T R&D, the .5 LP " -"is a relatively weak but accurate laser pistol. The double-barrel design " +"is a relatively weak but accurate laser pistol. The double-barrel design " "compensates for the lack of raw power and yet the gun manages to be " "relatively easy to aim and lightweight due to the superalloy construction." msgstr "" @@ -90457,7 +92417,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A tried and true favorite from the bowels of R&D hell. Based off of a " +"A tried and true favorite from the bowels of R&D hell. Based off of a " "researcher's video on three taped-together .5 LPs on a hand held power " "drill, this gun is a relatively light weapon for the amount of UPS it eats " "and destruction it can cause." @@ -90470,7 +92430,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " +"A short-barrel lightweight laser gun developed by C.R.I.T R&D. Mainly " "developed to test out a new breakthrough in laser weapons." msgstr "" @@ -90481,8 +92441,8 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a " -"new breakthrough in hybrid weaponry." +"A heavy energy gun developed by C.R.I.T R&D. Mainly developed to test out a" +" new breakthrough in hybrid weaponry." msgstr "" #: lang/json/gun_from_json.py @@ -90492,12 +92452,12 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A simple combination gun. This military-grade semi-auto carbine couples the " -"mid-range versatility of the 9mm with the power of the 12 gauge shotgun. To " -"further compliment the CQB aspect, the stock is built to amplify the user's " -"force and the rugged construction with tonfa-like grip can handle bashing in" -" enemy heads. An integrated magazine makes it a pain to reload, but keeps " -"your clip from ejecting accidently." +"A simple combination gun. This military-grade semi-auto carbine couples the" +" mid-range versatility of the 9mm with the power of the 12 gauge shotgun. " +"To further compliment the CQB aspect, the stock is built to amplify the " +"user's force and the rugged construction with tonfa-like grip can handle " +"bashing in enemy heads. An integrated magazine makes it a pain to reload, " +"but keeps your clip from ejecting accidently." msgstr "" #: lang/json/gun_from_json.py @@ -90520,11 +92480,11 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"A surprisingly powerful airgun that can reliably hunt small game. The small " -"lead or alloy pellets that can be chambered provide it decent power in every" -" shot. It's fairly accurate and can be somewhat as damaging as a .22 short, " -"but the break action charging system requires some arm strength to load a " -"pellet." +"A surprisingly powerful airgun that can reliably hunt small game. The small" +" lead or alloy pellets that can be chambered provide it decent power in " +"every shot. It's fairly accurate and can be somewhat as damaging as a .22 " +"short, but the break action charging system requires some arm strength to " +"load a pellet." msgstr "" #: lang/json/gun_from_json.py @@ -90534,7 +92494,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental cutting tool under development in C.R.I.T R&D. It fires an " +"Experimental cutting tool under development in C.R.I.T R&D. It fires an " "extremely hot wave of plasma that slices into materials." msgstr "" @@ -90545,8 +92505,8 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental double purpose tool under development in C.R.I.T R&D. It takes " -"a regular nail and then enlongates it within a fraction of a second before " +"Experimental double purpose tool under development in C.R.I.T R&D. It takes" +" a regular nail and then enlongates it within a fraction of a second before " "firing it out, upon reaching a target, the fragile stake explodes into " "shards." msgstr "" @@ -90558,7 +92518,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental high power cutting tool under development in C.R.I.T R&D. It " +"Experimental high power cutting tool under development in C.R.I.T R&D. It " "fires plasma in a wide line for slicing into dense materials." msgstr "" @@ -90569,8 +92529,8 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " -"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " +"Experimental tri-barrel sub-sonic rifle under development in C.R.I.T R&D. " +"Great for enclosed spaces and mobs of enemies. Shoots alloy rounds which " "instantly mushroom out upon impact." msgstr "" @@ -90581,7 +92541,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"Experimental EM saw under development in C.R.I.T R&D. Great for distance " +"Experimental EM saw under development in C.R.I.T R&D. Great for distance " "cutting of material." msgstr "" @@ -90604,8 +92564,8 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"You can YEET all the bullets with this baby. YEET them right into all of the" -" zombies in your path, all the hulks, the spiders, and those damned mole " +"You can YEET all the bullets with this baby. YEET them right into all of " +"the zombies in your path, all the hulks, the spiders, and those damned mole " "rats." msgstr "" @@ -90714,8 +92674,9 @@ msgstr[0] "JHEC M128" #: lang/json/gun_from_json.py msgid "" -"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " -"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B Minneapolis." +"The Johnson Heavy Equipment Co. M128 autorevolver; all others fail to " +"measure up. Johnson Heavy Equipment Co. is a subsidiary of D&B " +"Minneapolis." msgstr "" #: lang/json/gun_from_json.py @@ -90791,9 +92752,9 @@ msgid "" msgstr "" #: lang/json/gun_from_json.py -msgid "L.T. carbine" -msgid_plural "L.T. carbines" -msgstr[0] "電跡卡賓槍" +msgid "L.T. carbine" +msgid_plural "L.T. carbines" +msgstr[0] "" #: lang/json/gun_from_json.py msgid "" @@ -91123,9 +93084,9 @@ msgstr "一把設計良好的土製卡賓槍, 使用輕型步槍子彈。配備 #: lang/json/gun_from_json.py msgid "" "A powerful electrolaser developed by paramilitary R&D not long before the " -"cataclysm. Especially effective against electronic targets. It charges off" +"Cataclysm. Especially effective against electronic targets. It charges off" " of UPS power stations." -msgstr "一件強力的電磁雷射武器, 在大災變前不久由輔助軍的研發部門製作出來。對電子類目標特別有效。它使用 UPS 電源站供電。" +msgstr "" #: lang/json/gun_from_json.py msgid "hand-held laser cannon" @@ -91146,8 +93107,8 @@ msgstr[0] "雷射步槍" #: lang/json/gun_from_json.py msgid "" "A state of the art laser rifle which runs on UPS power. It was developed by" -" paramilitary R&D shortly before the cataclysm. Initial performance rivaled" -" the most advanced ballistic weapons of the day. Though the cataclysm put " +" paramilitary R&D shortly before the Cataclysm. Initial performance rivaled" +" the most advanced ballistic weapons of the day. Though the Cataclysm put " "that on the ash heap of history, this weapon can still do the same to your " "foes." msgstr "" @@ -91284,6 +93245,10 @@ msgid "" "conjured wooden arrow appears when you draw the string back for firing." msgstr "" +#: lang/json/gun_from_json.py +msgid "Fake gun that fires barbed javelins." +msgstr "" + #: lang/json/gun_from_json.py msgid "fire lance" msgid_plural "fire lances" @@ -91308,7 +93273,7 @@ msgstr[0] "" #: lang/json/gun_from_json.py msgid "" -"This is a pseudo item for monster attacks. If you see this, it's a bug." +"This is a pseudo item for monster attacks. If you see this, it's a bug." msgstr "" #: lang/json/gun_from_json.py @@ -91477,7 +93442,7 @@ msgid "" "strands. These \"teeth\" can then be used to latch and wound anything " "unfortunate enough to be nearby. The outer membrane has also become " "significantly thicker in order to support its more strenuous movement; " -"though it seems pliable enough to pull apart..." +"though it seems pliable enough to pull apart…" msgstr "" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py @@ -91491,7 +93456,7 @@ msgid "" "material, which it then strips of nutrition. The remainder is then expelled" " out at significant velocity towards any nearby threats. The amorphous mass" " can be shaped and attached at your touch, but the weapon itself is inert " -"without something to control it. It seems pliable enough to pull apart..." +"without something to control it. It seems pliable enough to pull apart…" msgstr "" #: lang/json/gun_from_json.py lang/json/vehicle_part_from_json.py @@ -92004,16 +93969,6 @@ msgid "" "order to be fired." msgstr "這把氣動突擊步槍被顯著的強化過, 拋射物品的速度更快、射擊速率更高。然而, 這些功能使它極其笨重, 必須先安裝在支撐平台上方可射擊。" -#: lang/json/gun_from_json.py -msgid "Model 10 revolver" -msgid_plural "Model 10 revolver" -msgstr[0] "10 型左輪手槍" - -#: lang/json/gun_from_json.py -msgid "" -"A six-shot revolver. It has a swing-out cylinder for ease of reloading." -msgstr "" - #: lang/json/gun_from_json.py msgid "M6 Aircrew Survival Weapon" msgid_plural "M6 Aircrew Survival Weapons" @@ -92027,41 +93982,6 @@ msgid "" " commercially by various companies." msgstr "" -#: lang/json/gun_from_json.py -msgid "Colt Lightning .45" -msgid_plural "Colt Lightning .45" -msgstr[0] "柯爾特閃電 .45 步槍" - -#: lang/json/gun_from_json.py -msgid "" -"A modern reproduction of a Colt pump-action rifle. Originally chambered in " -".44-40, modern versions most commonly use .45 Long Colt, complementing the " -"Single Action Army as a Cowboy Action Shooting firearm." -msgstr "" - -#: lang/json/gun_from_json.py -msgid "Bond Arms Derringer" -msgid_plural "Bond Arms Derringers" -msgstr[0] "" - -#: lang/json/gun_from_json.py -msgid "" -"The Bond Arms Derringer is a series of double-barrel, compact pistols. Most" -" commonly chambered for .45 Long Colt, with chambers long enough to accept " -".410 shotgun shells." -msgstr "" - -#: lang/json/gun_from_json.py -msgid ".410 youth shotgun" -msgid_plural ".410 youth shotguns" -msgstr[0] ".410 青年版霰彈槍" - -#: lang/json/gun_from_json.py -msgid "" -"An old break-action shotgun, chambered in .410 bore. Designed as a lower-" -"recoil alternative to 12 gauge, it is light and simple in manufacture." -msgstr "" - #: lang/json/gun_from_json.py msgid ".410 pipe shotgun" msgid_plural ".410 pipe shotguns" @@ -92073,40 +93993,6 @@ msgid "" " with a hammer to strike the single round it holds." msgstr "一把土炮的 .410 號徑霰彈槍。簡單地把鐵管連結到了槍機與擊錘來發射單發霰彈。" -#: lang/json/gun_from_json.py -msgid "AF2011A1 .38 Super" -msgid_plural "AF2011A1 .38 Supers" -msgstr[0] "AF2011A1 .38 超級彈" - -#: lang/json/gun_from_json.py -msgid "" -"A double-barrel semi-automatic pistol. It looks like two M1911s melded " -"together." -msgstr "" - -#: lang/json/gun_from_json.py -msgid "M1991A1 .38 Super" -msgid_plural "M1991A1 .38 Supers" -msgstr[0] "M1991A1 .38 超級彈" - -#: lang/json/gun_from_json.py -msgid "" -"A modern M1911, chambered for the .38 Super cartridge. It can achieve good " -"accuracy." -msgstr "" - -#: lang/json/gun_from_json.py -msgid "Taurus Raging Judge Magnum" -msgid_plural "Taurus Raging Judge Magnum" -msgstr[0] "" - -#: lang/json/gun_from_json.py -msgid "" -"The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 " -"Casull. It has the ability to fire .410 shotshells and .45 Long Colt " -"cartridges." -msgstr "" - #: lang/json/gunmod_from_json.py msgid "barrel extension" msgid_plural "barrel extensions" @@ -93211,7 +95097,7 @@ msgstr[0] "望遠鏡式瞄具" #: lang/json/gunmod_from_json.py msgid "" "A simple hand-crafted telescopic sight, essentially a small telescope with " -"crosshairs. Not as good as the ones made before the cataclysm. Increases " +"crosshairs. Not as good as the ones made before the Cataclysm. Increases " "weight but improves accuracy." msgstr "" @@ -93551,6 +95437,17 @@ msgid "" "weapon other than pistols and pump-action guns, if you so want." msgstr "" +#: lang/json/gunmod_from_json.py +msgid "M6 Survival Gun shotgun" +msgid_plural "M6 Survival Gun shotguns" +msgstr[0] "" + +#: lang/json/gunmod_from_json.py +msgid "" +"The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's" +" irremovable." +msgstr "" + #: lang/json/gunmod_from_json.py msgid "masterkey shotgun" msgid_plural "masterkey shotguns" @@ -93768,7 +95665,7 @@ msgstr[0] "" #: lang/json/gunmod_from_json.py msgid "" -"A small barrel which launches signal flares. However, due to its awkward " +"A small barrel which launches signal flares. However, due to its awkward " "position, it has lower accuracy compared to an actual flaregun." msgstr "" @@ -93790,9 +95687,9 @@ msgstr[0] "" #: lang/json/gunmod_from_json.py msgid "" -", A military-grade stock which folds reducing the guns volume. The weight " +", A military-grade stock which folds reducing the guns volume. The weight " "and the pivoting hook which latches onto your forearm allows for greater " -"stability. " +"stability. " msgstr "" #: lang/json/gunmod_from_json.py @@ -93803,7 +95700,7 @@ msgstr[0] "繞射透鏡" #: lang/json/gunmod_from_json.py msgid "" "A set of optics made to fit on laser weapons, which will diffract the laser " -"beam into several lower powered beams. This slightly increases point-blank " +"beam into several lower powered beams. This slightly increases point-blank " "damage and makes it difficult to not hit, but reduces range" msgstr "" @@ -93965,17 +95862,6 @@ msgid "" "attacks when attached to long arm or crossbow." msgstr "" -#: lang/json/gunmod_from_json.py -msgid "M6 ASW shotgun" -msgid_plural "M6 ASW shotguns" -msgstr[0] "M6 航空兵求生霰彈槍" - -#: lang/json/gunmod_from_json.py -msgid "" -"The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's " -"irremovable." -msgstr "整合在 M6 航空兵求生槍上的 .410 口徑霰彈槍。它並不可移除。" - #: lang/json/harvest_from_json.py msgid "You gut and fillet the fish" msgstr "你取出這條魚的內臟並將肉切成片" @@ -95554,10 +97440,6 @@ msgstr "切斷門閂或鐵絲網" msgid "Heat up food (with it)" msgstr "加熱食物 (使用它)" -#: lang/json/item_action_from_json.py -msgid "Repair wood/paper/bone/chitin" -msgstr "修理木頭/紙張/骨頭/甲殼" - #: lang/json/item_action_from_json.py msgid "Attach as toolmod" msgstr "附掛工具模組" @@ -96377,6 +98259,11 @@ msgid "" " This can feel good." msgstr "這件衣物即使濕透也不折損它的機能性。而且還會感覺不錯。" +#. ~ Please leave anything in unchanged. +#: lang/json/json_flag_from_json.py +msgid "This item can be worn simultaneously with power armor." +msgstr "" + #. ~ Please leave anything in unchanged. #: lang/json/json_flag_from_json.py msgid "" @@ -97496,7 +99383,8 @@ msgstr "建造地形" msgid "Disassemble items" msgstr "拆解物品" -#: lang/json/keybinding_from_json.py src/defense.cpp src/defense.cpp +#: lang/json/keybinding_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Sleep" msgstr "睡覺" @@ -98306,7 +100194,8 @@ msgstr "黃蜂窩" msgid "Wasp nest is here." msgstr "馬蜂窩在此。" -#: lang/json/map_extra_from_json.py src/defense.cpp +#: lang/json/map_extra_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp msgid "Spiders" msgstr "蜘蛛" @@ -98365,6 +100254,33 @@ msgstr "池塘" msgid "Small pond is here." msgstr "這裡有座小池塘。" +#: lang/json/map_extra_from_json.py +msgid "Stand of trees" +msgstr "" + +#. ~ Description for Stand of trees +#: lang/json/map_extra_from_json.py +msgid "A copse of trees." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Tall grass" +msgstr "" + +#. ~ Description for Tall grass +#: lang/json/map_extra_from_json.py +msgid "A meadow of tall grass." +msgstr "" + +#: lang/json/map_extra_from_json.py +msgid "Derelict shed" +msgstr "" + +#. ~ Description for Derelict shed +#: lang/json/map_extra_from_json.py +msgid "A collapsed shed." +msgstr "" + #: lang/json/map_extra_from_json.py msgid "Clay Deposit" msgstr "黏土礦床" @@ -98435,7 +100351,7 @@ msgstr "" #. ~ Description for Corpses #: lang/json/map_extra_from_json.py -msgid "Some unfortunates from the billions lost in the cataclysm." +msgid "Some unfortunates from the billions lost in the Cataclysm." msgstr "" #. ~ Computer name @@ -99208,6 +101124,16 @@ msgstr "請勿奔跑！" msgid "NO Diving!" msgstr "請勿潛水！" +#. ~ Computer name +#: lang/json/mapgen_from_json.py +msgid "Armory Access" +msgstr "" + +#. ~ Computer option +#: lang/json/mapgen_from_json.py +msgid "Open Armory Door" +msgstr "" + #. ~ Sign #: lang/json/mapgen_from_json.py msgid "GLASS" @@ -99342,8 +101268,7 @@ msgid "Emergency Message" msgstr "緊急訊息" #. ~ Computer option -#: lang/json/mapgen_from_json.py lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "停用外置電源" @@ -99982,7 +101907,7 @@ msgstr "" #: lang/json/martial_art_from_json.py #, no-python-format msgid "" -"You stalwart and will not budge against any threat.\n" +"You are stalwart and will not budge against any threat.\n" "\n" "+2 Block attempts, -1.0 Dodge skill, blocked damage reduced by 50%% of Strength." msgstr "" @@ -100989,7 +102914,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Intensity' for martial art 'C.R.I.T Blade- #. work' #: lang/json/martial_art_from_json.py -msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" +msgid "Additional DMG, and Arpen per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -101012,7 +102937,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A defensive style that is centered around stunning swings, knockback and " -"grounding enemies. Each attack landed increases your armor by 0.125 and " +"grounding enemies. Each attack landed increases your armor by 0.125 and " "offers other combat bonuses based on stats." msgstr "" @@ -101023,7 +102948,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Buildup' for martial art 'C.R.I.T #. Enforcement' #: lang/json/martial_art_from_json.py -msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" +msgid "+0.05 armor and other small bonuses per stack. Max of 10 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -101032,7 +102957,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Guard' for martial art 'C.R.I.T Enforcement' #: lang/json/martial_art_from_json.py -msgid "+1 armor. STR provides accuracy and minor bash arpen." +msgid "+1 armor. STR provides accuracy and minor bash arpen." msgstr "" #: lang/json/martial_art_from_json.py @@ -101043,7 +102968,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "A style centered around rapid strikes and piercing jabs. Each attack landed" -" adds a plethora of combat bonuses. 25 percent bash damage." +" adds a plethora of combat bonuses. 25 percent bash damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -101053,7 +102978,7 @@ msgstr "" #. ~ Description of buff 'C.R.I.T Tenacity' for martial art 'C.R.I.T CQB' #: lang/json/martial_art_from_json.py msgid "" -"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" +"+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks" msgstr "" #: lang/json/martial_art_from_json.py @@ -101064,7 +102989,7 @@ msgstr "" #: lang/json/martial_art_from_json.py msgid "" "DEX provides dodge ability, accuracy and minor cut / stab damage with slight" -" piercing capability. 50 Percent Bash Damage." +" piercing capability. 50 Percent Bash Damage." msgstr "" #: lang/json/martial_art_from_json.py @@ -101238,6 +103163,10 @@ msgstr "破爛的" msgid "Diamond" msgstr "鑽石" +#: lang/json/material_from_json.py +msgid "Gemstone" +msgstr "" + #: lang/json/material_from_json.py msgid "Egg" msgstr "蛋" @@ -101455,8 +103384,8 @@ msgid "Mushroom" msgstr "蘑菇" #: lang/json/material_from_json.py -#: lang/json/overmap_land_use_code_from_json.py src/defense.cpp -#: src/defense.cpp src/iuse.cpp +#: lang/json/overmap_land_use_code_from_json.py src/gamemode_defense.cpp +#: src/gamemode_defense.cpp src/iuse.cpp msgid "Water" msgstr "水" @@ -102770,7 +104699,7 @@ msgstr "" #. ~ Description for mission 'Prove You're A Survivor' #: lang/json/mission_def_from_json.py msgid "" -"Prove you're a survivor by surviving for 10 days after the cataclysm, and " +"Prove you're a survivor by surviving for 10 days after the Cataclysm, and " "then returning to the person who gave you this mission." msgstr "" @@ -102914,11 +104843,11 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I don't feel saved..." +msgid "I don't feel saved…" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Tell my family that I love them..." +msgid "Tell my family that I love them…" msgstr "" #: lang/json/mission_def_from_json.py @@ -102959,6 +104888,10 @@ msgstr "" msgid "What good does this do me?" msgstr "" +#: lang/json/mission_def_from_json.py +msgid "It was a lost cause anyways…" +msgstr "" + #: lang/json/mission_def_from_json.py msgid "Find Chris Isherwood" msgstr "" @@ -102999,7 +104932,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I hope he didn't meet Barry's fate..." +msgid "I hope he didn't meet Barry's fate…" msgstr "" #: lang/json/mission_def_from_json.py @@ -103037,12 +104970,12 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "It's taller then I remember, we should look for prisoners. I left a note " -"for my family before we left. If we survive, the cabin should be fixed up " +"for my family before we left. If we survive, the cabin should be fixed up " "and ready for you to move in if you want to stay." msgstr "" #: lang/json/mission_def_from_json.py -msgid "Well it was here..." +msgid "Well it was here…" msgstr "" #: lang/json/mission_def_from_json.py @@ -103111,7 +105044,7 @@ msgid "" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I'll have to find someone more at home in the forest..." +msgid "I'll have to find someone more at home in the forest…" msgstr "" #: lang/json/mission_def_from_json.py @@ -103129,7 +105062,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Thank you! Please hurry back! Take this cage so you have a chance of " +"Thank you! Please hurry back! Take this cage so you have a chance of " "capturing one." msgstr "" @@ -103150,7 +105083,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thank you so much, I want you to have this copy of my natural remedy " -"journal. I'll name this handsome fellow Joshua." +"journal. I'll name this handsome fellow Joshua." msgstr "" #: lang/json/mission_def_from_json.py @@ -103158,7 +105091,7 @@ msgid "What?! You're lying, I can tell! Did you even bring back my cage?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "Oh no! I guess they are too nimble for you..." +msgid "Oh no! I guess they are too nimble for you…" msgstr "" #: lang/json/mission_def_from_json.py @@ -103858,7 +105791,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am not sure if I'm gonna make it through the cataclysm without my special " +"I am not sure if I'm gonna make it through the Cataclysm without my special " "jar of goop." msgstr "" @@ -104255,7 +106188,7 @@ msgstr "" msgid "" "If you really want to lend a hand we could use your help clearing out the " "dead in the back bay. Fearful of going outside during the first days of the" -" cataclysm we ended up throwing our dead and the zombies we managed to kill " +" Cataclysm we ended up throwing our dead and the zombies we managed to kill " "in the sealed back bay. Our promising leader at the time even fell… he " "turned into something different. Kill all of them and make sure they won't " "bother us again. We can't pay much, besides some of our own internal money " @@ -104553,11 +106486,10 @@ msgid "" "So there looks to be months, maybe years of experiments, and that data set " "must be huge. Database servers massive enough to house it would overheat " "running on emergency power. But I did found communications from a lab that " -"had some kind of freezing portal open during the cataclysm, sending " +"had some kind of freezing portal open during the Cataclysm, sending " "everything to subzero temperatures. I bet the archives inside that lab are " "still working." msgstr "" -"那裡的實驗應該進行了多個月，也可能是多年，資料量一定十分巨大。資料庫伺服器的存放量巨大，只靠緊急供電的話一定會過熱的。但我找到來自某個實驗室的通訊，說在大災變的時候開啟了某種冷凍傳送門，將裡面的所有東西降至零下氣溫。我估計在那個實驗室裡的檔案依然在運作中。" #: lang/json/mission_def_from_json.py msgid "" @@ -105956,7 +107888,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "I've got to maintain the orchard but at nights I work on prepping winter " -"clothes. Could you find about... 50 fur pelts for me?" +"clothes. Could you find about… 50 fur pelts for me?" msgstr "" #: lang/json/mission_def_from_json.py @@ -105982,10 +107914,6 @@ msgid "" "I really apreciate your help. Don't worry, you won't leave empty-handed." msgstr "" -#: lang/json/mission_def_from_json.py -msgid "Thanks for trying... I guess." -msgstr "感謝你的嘗試… 也許吧。" - #: lang/json/mission_def_from_json.py msgid "Don't worry about it, it's not that important." msgstr "" @@ -106010,7 +107938,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" "Thanks for accepting this task. Otherwise I might kill a stranger for a " -"sandwich. Just kidding." +"sandwich. Just kidding." msgstr "" #: lang/json/mission_def_from_json.py @@ -106050,8 +107978,8 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"Every season we produce so much fruit. Some of it will be turned into juice " -"and some into alcohol. I need easy containers to load it on the caravan." +"Every season we produce so much fruit. Some of it will be turned into juice" +" and some into alcohol. I need easy containers to load it on the caravan." msgstr "" #: lang/json/mission_def_from_json.py @@ -106072,7 +108000,7 @@ msgid "Do you have those jugs now?" msgstr "" #: lang/json/mission_def_from_json.py -msgid "I am grateful for the help you've done. I have one more task to do." +msgid "I am grateful for the help you've done. I have one more task to do." msgstr "" #: lang/json/mission_def_from_json.py @@ -106099,7 +108027,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"These materials are often in dangerous areas. I understand your decision." +"These materials are often in dangerous areas. I understand your decision." msgstr "" #: lang/json/mission_def_from_json.py @@ -106114,7 +108042,7 @@ msgstr "" #: lang/json/mission_def_from_json.py msgid "" -"I am grateful for the help you've done. I think we might be able to " +"I am grateful for the help you've done. I think we might be able to " "introduce you to others soon." msgstr "" @@ -106183,6 +108111,54 @@ msgstr "" msgid "The %1$s tries to slam into , but fails to." msgstr "" +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales your %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s impales 's %2$s with its trident!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale your %2$s with its trident, but fails to penetrate " +"your armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to impale 's %2$s with its trident, but fails to " +"penetrate their armor!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes your %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "The %1$s crushes 's %2$s with its greatclub!" +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush your %2$s with its greatclub, but swings wide and " +"stumbles." +msgstr "" + +#: lang/json/monster_attack_from_json.py +#, no-python-format +msgid "" +"The %1$s tries to crush 's %2$s with its greatclub, but swings wide" +" and stumbles." +msgstr "" + #: lang/json/monster_attack_from_json.py #, no-python-format msgid "The %1$s flashes you!" @@ -113489,8 +115465,8 @@ msgstr "倖存者故事" #. ~ Description for Survivor #. ~ Description for Survivor Story #: lang/json/mutation_from_json.py -msgid "This NPC could tell you about how they survived the cataclysm" -msgstr "這個NPC可以告訴你關於他們如何在大災變中倖存的故事" +msgid "This NPC could tell you about how they survived the Cataclysm" +msgstr "" #: lang/json/mutation_from_json.py msgid "Mark of the Seer" @@ -113957,7 +115933,7 @@ msgstr "C.R.I.T近戰訓練" #. ~ Description for C.R.I.T Melee Training #: lang/json/mutation_from_json.py msgid "" -"You have received defensive training. For every hit you land, gain various " +"You have received defensive training. For every hit you land, gain various " "miniscule combat bonuses that scale off of your stats." msgstr "" @@ -114021,18 +115997,10 @@ msgstr "" #. ~ Description for Nature's Boon #: lang/json/mutation_from_json.py msgid "" -"Your very prescence is masked by nature itself. You are slightly harder to " +"Your very prescence is masked by nature itself. You are slightly harder to " "detect." msgstr "" -#. ~ Description for Animal Kinship -#: lang/json/mutation_from_json.py -msgid "" -"Something about your presence is calming to animals, and they will treat you" -" with innate trust. This only applies to natural animals such as woodland " -"creatures." -msgstr "" - #: lang/json/mutation_from_json.py msgid "Slashers" msgstr "" @@ -114667,7 +116635,7 @@ msgid "Gardener" msgstr "" #: lang/json/npc_class_from_json.py -msgid "When the end came, we were ready. Now I grow food for my phyle." +msgid "When the end came, we were ready. Now I grow food for my phyle." msgstr "" #: lang/json/npc_class_from_json.py @@ -114700,8 +116668,8 @@ msgid "I'm just trying to stay alive." msgstr "我只是想活下去。" #: lang/json/npc_class_from_json.py -msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." -msgstr "我只是想活下去...那並不太容易。" +msgid "I'm just trying to stay alive.... and it ain't as easy as it looks." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Lizard Mutant" @@ -114709,9 +116677,9 @@ msgstr "蜥蜴突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lizard mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我正在尋找蜥蜴突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for lizard mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Medical Mutant" @@ -114719,9 +116687,9 @@ msgstr "醫療突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for medical mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." -msgstr "我正在尋找醫療突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for medical mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Bird Mutant" @@ -114729,9 +116697,9 @@ msgstr "鳥類突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for bird mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." -msgstr "我正在尋找鳥類突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for bird mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Fish Mutant" @@ -114739,9 +116707,9 @@ msgstr "魚類突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for fish mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." -msgstr "我正在尋找魚類突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for fish mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Beast Mutant" @@ -114749,9 +116717,9 @@ msgstr "獸類突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for beast mutagen... this world is no place for humans anymore, " +"I'm looking for beast mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "我正在尋找獸類突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +msgstr "" #: lang/json/npc_class_from_json.py msgid "Ursine Mutant" @@ -114759,9 +116727,9 @@ msgstr "熊類突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for ursine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我正在尋找熊類突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for ursine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Feline Mutant" @@ -114769,9 +116737,9 @@ msgstr "貓類突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for feline mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我正在尋找貓類突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for feline mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Lupine Mutant" @@ -114779,9 +116747,9 @@ msgstr "狼類突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for lupine mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我正在尋找狼類突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for lupine mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Cattle Mutant" @@ -114789,9 +116757,9 @@ msgstr "牛類突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cattle mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我正在尋找牛類突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for cattle mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Insect Mutant" @@ -114799,9 +116767,9 @@ msgstr "昆蟲突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for insect mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我正在尋找昆蟲突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for insect mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Plant Mutant" @@ -114809,9 +116777,9 @@ msgstr "植物突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for plant mutagen... this world is no place for humans anymore, " +"I'm looking for plant mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "我正在尋找植物突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +msgstr "" #: lang/json/npc_class_from_json.py msgid "Slime Mutant" @@ -114819,9 +116787,9 @@ msgstr "黏液突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for slime mutagen... this world is no place for humans anymore, " +"I'm looking for slime mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "我正在尋找黏液突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +msgstr "" #: lang/json/npc_class_from_json.py msgid "Troglobite Mutant" @@ -114829,9 +116797,9 @@ msgstr "穴居動物突變" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for troglobite mutagen... this world is no place for humans " +"I'm looking for troglobite mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." -msgstr "我正在尋找穴居動物突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +msgstr "" #: lang/json/npc_class_from_json.py msgid "Cephalopod Mutant" @@ -114839,9 +116807,9 @@ msgstr "頭足類突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for cephalopod mutagen... this world is no place for humans " +"I'm looking for cephalopod mutagen… this world is no place for humans " "anymore, and I don't plan to keep being one." -msgstr "我正在尋找頭足類突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +msgstr "" #: lang/json/npc_class_from_json.py msgid "Spider Mutant" @@ -114849,9 +116817,9 @@ msgstr "蜘蛛突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for spider mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我正在尋找蜘蛛突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for spider mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Rat Mutant" @@ -114859,9 +116827,9 @@ msgstr "大鼠突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for rat mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." -msgstr "我正在尋找大鼠突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for rat mutagen… this world is no place for humans anymore, and " +"I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Mouse Mutant" @@ -114869,9 +116837,9 @@ msgstr "小鼠突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for mouse mutagen... this world is no place for humans anymore, " +"I'm looking for mouse mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "我正在尋找小鼠突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +msgstr "" #: lang/json/npc_class_from_json.py msgid "Alpha Mutant" @@ -114879,9 +116847,9 @@ msgstr "阿爾法突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for alpha mutagen... this world is no place for humans anymore, " +"I'm looking for alpha mutagen… this world is no place for humans anymore, " "and I don't plan to keep being one." -msgstr "我正在尋找阿爾法突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +msgstr "" #: lang/json/npc_class_from_json.py msgid "Elfa Mutant" @@ -114889,9 +116857,9 @@ msgstr "妖精突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for elfa mutagen... this world is no place for humans anymore, " -"and I don't plan to keep being one." -msgstr "我正在尋找妖精突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for elfa mutagen… this world is no place for humans anymore, and" +" I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Chimera Mutant" @@ -114899,9 +116867,9 @@ msgstr "嵌合體突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for chimera mutagen... this world is no place for humans " -"anymore, and I don't plan to keep being one." -msgstr "我正在尋找嵌合體突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for chimera mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_class_from_json.py msgid "Raptor Mutant" @@ -114909,9 +116877,9 @@ msgstr "迅猛龍突變體" #: lang/json/npc_class_from_json.py msgid "" -"I'm looking for raptor mutagen... this world is no place for humans anymore," -" and I don't plan to keep being one." -msgstr "我正在尋找迅猛龍突變劑...這個世界已經不再是人類居住的地方，而且我也不打算繼續當個人類。" +"I'm looking for raptor mutagen… this world is no place for humans anymore, " +"and I don't plan to keep being one." +msgstr "" #: lang/json/npc_from_json.py msgid "Brigitte LaCroix" @@ -118152,10 +120120,10 @@ msgstr "避難所的生存者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." -msgstr "在災變開始之時, 你便躲進了防空避難所之中。冬日到來, 希望你從書上學到的那些技能足夠幫助你生存。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -118166,10 +120134,10 @@ msgstr "避難所的生存者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope the rag-tag collection of skills you learned from " "all those books can help you survive." -msgstr "在災變開始之時, 你便躲進了防空避難所之中。冬日到來, 希望你從書上學到的那些技能足夠幫助你生存。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -118180,10 +120148,10 @@ msgstr "民兵避難所" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." -msgstr "在災變開始之時, 你便躲進了防空避難所之中。冬日到來, 希望你從書上學到的那些技能足夠幫助你生存。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -118194,10 +120162,10 @@ msgstr "民兵避難所" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"At the start of the cataclysm, you hunkered down in a bomb shelter. Now, it" +"At the start of the Cataclysm, you hunkered down in a bomb shelter. Now, it" " is winter, and you hope your guns and the skills you have acquired can help" " you survive." -msgstr "在災變開始之時, 你便躲進了防空避難所之中。冬日到來, 希望你從書上學到的那些技能足夠幫助你生存。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -118266,9 +120234,9 @@ msgctxt "prof_desc_male" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." -msgstr "沖煞小!?尼還搞不清組狀況的俗候, 就已經澡到弟夯斗起來惹。現在這狀況泥壁西要先澡到口以在這大摘難侯下氣的夯法以及俗物。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -118281,9 +120249,9 @@ msgctxt "prof_desc_female" msgid "" "What the deuyl? Ye ne wist noo thing of this straunge plaas nor what wycked" " enchauntment brought ye hidder. Wyth this accoustrement ye must needs " -"underfongen to find newe lyflode in the most hidous cataclysm man hath " +"underfongen to find newe lyflode in the most hidous Cataclysm man hath " "witnessed sithen that deluge Noe rood out in his greet schippe." -msgstr "沖煞小!?尼還搞不清組狀況的俗候, 就已經澡到弟夯斗起來惹。現在這狀況泥壁西要先澡到口以在這大摘難侯下氣的夯法以及俗物。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -118379,9 +120347,9 @@ msgstr "養蜂人" msgctxt "prof_desc_male" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." -msgstr "你曾經是一位專業的養蜂人。災變爆發時你不得不拋棄你珍愛的蜜蜂們, 但你至少拿了一些容器與蜂蜜。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -118393,9 +120361,9 @@ msgstr "養蜂人" msgctxt "prof_desc_female" msgid "" "You used to be a professional beekeeper. You had to abandon your precious " -"bees when the cataclysm struck, but at least you managed to grab some " +"bees when the Cataclysm struck, but at least you managed to grab some " "utensils and honey." -msgstr "你曾經是一位專業的養蜂人。災變爆發時你不得不拋棄你珍愛的蜜蜂們, 但你至少拿了一些容器與蜂蜜。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -118406,10 +120374,10 @@ msgstr "籃球員" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." -msgstr "你正要開始你的首場要賽時，但災變緊接著就爆發了。感謝你的飛毛腿，讓你成為從那些生物中逃離的少數倖存者。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -118420,10 +120388,10 @@ msgstr "籃球員" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"It was going to be your first major game, but then the cataclysm struck. " +"It was going to be your first major game, but then the Cataclysm struck. " "Thanks to your quick feet, you were among the lucky few to survive and " "escape from the creatures." -msgstr "你正要開始你的首場要賽時，但災變緊接著就爆發了。感謝你的飛毛腿，讓你成為從那些生物中逃離的少數倖存者。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -118562,9 +120530,9 @@ msgstr "執事" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." -msgstr "你在有錢人家裡工作, 但爆發災變後, 他們全家就去未知的地方度假了, 只剩下你。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -118575,9 +120543,9 @@ msgstr "女僕" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked in a wealthy household, but after the cataclysm they took a " +"You worked in a wealthy household, but after the Cataclysm they took a " "family vacation to an unknown place, leaving you to fend for yourself." -msgstr "妳在有錢人家裡工作, 但爆發災變後, 他們全家就去未知的地方度假了, 只剩下妳。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -119478,9 +121446,9 @@ msgctxt "prof_desc_male" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." -msgstr "你平常都承包一些企業有關電力的小案子, 而災變爆發時你正好在避難所工作。不幸的是, 你並沒有接好任何線, 除了現在無用的電腦。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -119493,9 +121461,9 @@ msgctxt "prof_desc_female" msgid "" "You used to work for some small-time business owners doing minor electrical " "work, and you just so happened to be working on one of these jokes of an " -"evac shelter when the cataclysm struck. Unfortunately, you didn't finish " +"evac shelter when the Cataclysm struck. Unfortunately, you didn't finish " "wiring anything up except the computer - fat lot of good it's doing you now." -msgstr "妳平常都承包一些企業有關電力的小案子, 而災變爆發時妳正好在避難所工作。不幸的是, 妳並沒有接好任何線, 除了現在無用的電腦。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -119562,7 +121530,7 @@ msgstr "淋浴受害者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -119576,7 +121544,7 @@ msgstr "淋浴受害者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were in the middle of a nice, hot shower when the cataclysm struck! You" +"You were in the middle of a nice, hot shower when the Cataclysm struck! You" " barely managed to escape with some soap and the most massively useful thing" " ever… a towel." msgstr "" @@ -119616,9 +121584,9 @@ msgstr "舞廳舞者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." -msgstr "在災變前你是舞廳的舞者, 而你現在利用你的技巧來自救。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -119629,9 +121597,9 @@ msgstr "舞廳舞者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You used to be a ballroom dancer before the cataclysm, and now you use your " +"You used to be a ballroom dancer before the Cataclysm, and now you use your " "skills to save your life." -msgstr "在災變前妳是舞廳的舞者, 而妳現在利用妳的技巧來自救。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -120394,9 +122362,9 @@ msgstr "新郎" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" -msgstr "你挑了一個壞日子結婚。你倉皇的逃難, 而身上還穿著禮服。手腳冰冷嗎? 總比手腳都被吃了好吧!" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120407,9 +122375,9 @@ msgstr "新娘" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm struck on the big day and you escaped with nothing but your " +"The Cataclysm struck on the big day and you escaped with nothing but your " "wedding attire. Cold feet? You'd just like to keep your feet attached!" -msgstr "你挑了一個壞日子結婚。你倉皇的逃難, 而身上還穿著禮服。手腳冰冷嗎? 總比手腳都被吃了好吧!" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -120477,8 +122445,8 @@ msgstr "地下樂團男" msgctxt "prof_desc_male" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." -msgstr "在你的鼓手變成殭屍後你的樂團分崩離析, 現在只剩下你跟一些香煙與mp3播放器在這個末日世界。" +"in the Cataclysm with some cigarettes and your mp3 player." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120490,8 +122458,8 @@ msgstr "地下樂團女" msgctxt "prof_desc_female" msgid "" "Your ska band broke up after the drummer became a zombie, now you're alone " -"in the cataclysm with some cigarettes and your mp3 player." -msgstr "在你的鼓手變成殭屍後你的樂團分崩離析, 現在只剩下你跟一些香煙與mp3播放器在這個末日世界。" +"in the Cataclysm with some cigarettes and your mp3 player." +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -120528,9 +122496,9 @@ msgstr "囚犯" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." -msgstr "災變來臨給了你一個逃脫機會, 但自由要付出慘重代價。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120541,9 +122509,9 @@ msgstr "囚犯" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The cataclysm gave you a chance to escape, but freedom comes with a steep " +"The Cataclysm gave you a chance to escape, but freedom comes with a steep " "price." -msgstr "災變來臨給了妳一個逃脫機會, 但自由要付出慘重代價。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -120934,9 +122902,9 @@ msgstr "拉比" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" -msgstr "你和信徒們在教堂裡慶祝時大災變來襲。現在的你真的挺需要一位救世主!" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -120947,9 +122915,9 @@ msgstr "拉比" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were celebrating with your flock in the temple when the cataclysm " +"You were celebrating with your flock in the temple when the Cataclysm " "struck. You sure could use a messiah right now!" -msgstr "你和信徒們在教堂裡慶祝時大災變來襲。現在的你真的挺需要一位救世主!" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -121125,12 +123093,10 @@ msgstr "披薩外送男" msgctxt "prof_desc_male" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"災變爆發當晚, 你正在派送最後一個披薩到當地的酷冷學實驗室。你匆忙地逃到最近的避難所, 現在只能仰賴你自己的機智與一些吃剩的披薩。還有, " -"那群該死的科學家竟然沒有給你任何小費!" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -121142,12 +123108,10 @@ msgstr "披薩外送女" msgctxt "prof_desc_female" msgid "" "You were delivering the last pizza of the night to the local cryogenics lab " -"when the cataclysm hit. Fleeing to the nearest shelter, you find yourself " +"when the Cataclysm hit. Fleeing to the nearest shelter, you find yourself " "with only your wits and some leftover pizza. And they didn't even leave a " "tip!" msgstr "" -"災變爆發當晚, 你正在派送最後一個披薩到當地的酷冷學實驗室。你匆忙地逃到最近的避難所, 現在只能仰賴你自己的機智與一些吃剩的披薩。還有, " -"那群該死的科學家竟然沒有給你任何小費!" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -121248,10 +123212,10 @@ msgstr "農夫" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." -msgstr "災變爆發的時候你正在田裡辛勤的工作。現在是靠你手上的鋤頭以及種子來重現這個地球的時候了。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -121262,10 +123226,10 @@ msgstr "農家女" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were making a living by raising crops, when the cataclysm struck. Now, " +"You were making a living by raising crops, when the Cataclysm struck. Now, " "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." -msgstr "災變爆發的時候你正在田裡辛勤的工作。現在是靠你手上的鋤頭以及種子來重現這個地球的時候了。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -121308,10 +123272,10 @@ msgstr "久經磨煉的拾荒者" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." -msgstr "你是極少數其中幾個能夠幸運逃出大災變地區的人, 你善於從廢墟找尋資源, 不論是強搶, 詐騙或者是運氣。你已經獲得你能找到的最佳裝備。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -121322,10 +123286,10 @@ msgstr "久經磨煉的拾荒者" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"One of the lucky few who escaped the cataclysm, you made a life for yourself" +"One of the lucky few who escaped the Cataclysm, you made a life for yourself" " on the ruins of others. Whether by force, guile, or luck, you've obtained " "the best gear you could find." -msgstr "你是極少數其中幾個能夠幸運逃出大災變地區的人, 你善於從廢墟找尋資源, 不論是強搶, 詐騙或者是運氣。你已經獲得你能找到的最佳裝備。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -121600,13 +123564,11 @@ msgstr "生存小專家" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"你父母都是瘋狂的末日準備者, 老是想著些 \"大災變\" 的來臨, 且堅持你也要為了那天準備。事實證明他們是對的, " -"但你已經沒有機會感謝他們了。現在你唯一能夠再為他們做的, 也正是他們總希望你在這 \"末日臨頭\" 之時能做的事: 活下去。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -121617,13 +123579,11 @@ msgstr "生存小專家" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your parents were crazy preppers who thought some \"cataclysm\" was coming, " +"Your parents were crazy preppers who thought some \"Cataclysm\" was coming, " "and insisted on preparing you for it. Turns out they were right. You " "didn't get a chance to thank them. The only thing you can do for them now " "is what they always hoped you would do in the dark days ahead: survive." msgstr "" -"你父母都是瘋狂的末日準備者, 老是想著些 \"大災變\" 的來臨, 且堅持你也要為了那天準備。事實證明他們是對的, " -"但你已經沒有機會感謝他們了。現在你唯一能夠再為他們做的, 也正是他們總希望你在這 \"末日臨頭\" 之時能做的事: 活下去。" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -122519,7 +124479,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -122536,7 +124496,7 @@ msgid "" "blossoming into mushroom clouds, barely a flicker on the horizon before your" " optical dampers flicked down. You rushed to safety before the shockwaves " "could blast you from your perch. The bionic implants included with your " -"contract might come in handy now..." +"contract might come in handy now…" msgstr "" #: lang/json/professions_from_json.py @@ -122787,10 +124747,10 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -122803,10 +124763,10 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were training ahead of time to become a C.R.I.T officer in the upcoming " -"war. Your call to arms arrived dead on arrival and already plastered in the " -"all-too vibrant gore of your squadmates. In the midst of panic, you bugged " -"out lest you join the remnants of your friends. Now it's up to your wits and" -" short years of training to keep you alive in this Cataclysm." +"war. Your call to arms arrived dead on arrival and already plastered in the" +" all-too vibrant gore of your squadmates. In the midst of panic, you bugged" +" out lest you join the remnants of your friends. Now it's up to your wits " +"and short years of training to keep you alive in this Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -122818,9 +124778,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -122834,9 +124794,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"*Sigh* Your life has been a wreck. Hopping place to place you finally found " -"a job at C.R.I.T... as a janitor of sorts. The pay was good and you got some" -" sneak-peeks on some pretty cool stuff. After all non-essential personel " +"*Sigh* Your life has been a wreck. Hopping place to place you finally found" +" a job at C.R.I.T… as a janitor of sorts. The pay was good and you got some" +" sneak-peeks on some pretty cool stuff. After all non-essential personel " "were purged you found yourself stuck with nothing but the uniform they gave " "you and your job's sign-bonus equipment." msgstr "" @@ -122850,7 +124810,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -122864,7 +124824,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a senior NCO, relaying orders to your squad was an everyday task. " +"You were a senior NCO, relaying orders to your squad was an everyday task. " "When the cataclysm struck, your expertise helped save everyone time and time" " again until it all fell apart." msgstr "" @@ -122879,9 +124839,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -122896,9 +124856,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were part of the infantry; first to hit the ground running, clear a FOB " -"and then come back to relax with your squad. Those days ended when the " -"cataclysm reared its ugly head. Your lines were torn through like wet paper " -"when the otherworldy abominations arived. Now fleeing for your life, will " +"and then come back to relax with your squad. Those days ended when the " +"cataclysm reared its ugly head. Your lines were torn through like wet paper" +" when the otherworldy abominations arived. Now fleeing for your life, will " "you have what it takes to survive or is this hellish landcape your resting " "place?" msgstr "" @@ -122912,13 +124872,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -122930,13 +124890,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were the team nerd. A combat medic taught on how to engage strange " -"anomalies. However, your main focus was keeping your squadmates in one " -"piece. For weeks, you slogged through hell and back and ensured that " -"everyone made it. Caught in between a tide of the undead and the crossfire " +"You were the team nerd. A combat medic taught on how to engage strange " +"anomalies. However, your main focus was keeping your squadmates in one " +"piece. For weeks, you slogged through hell and back and ensured that " +"everyone made it. Caught in between a tide of the undead and the crossfire " "of apparently rogue government robots, you were left stranded as a " -"distraction. Forced to flee, will you have what it takes to survive or will " -"you join the horde to haunt them for their cardinal sin?" +"distraction. Forced to flee, will you have what it takes to survive or will" +" you join the horde to haunt them for their cardinal sin?" msgstr "" #: lang/json/professions_from_json.py @@ -122949,8 +124909,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -122965,8 +124925,8 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were assigned the billet of specializing in creating dead zones and " -"providing support fire. When the cataclysm struck, your trusty LMG couldn't " -"keep the veritable tide of undead from overtaking your squad. Now running " +"providing support fire. When the cataclysm struck, your trusty LMG couldn't" +" keep the veritable tide of undead from overtaking your squad. Now running " "with all the strength your body can muster, will you have what it takes to " "survive or is this hellish landcape something you just can't suppress?" msgstr "" @@ -122981,9 +124941,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -122996,9 +124956,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "As a top-ranking CO, you didn't see much in the way of combat other than " -"when you felt like it. Your charisma and sharp intellect helped you climb up" -" the ranks and provided support to allies in need. Now that everything went " -"down the drain, will it help you again?" +"when you felt like it. Your charisma and sharp intellect helped you climb " +"up the ranks and provided support to allies in need. Now that everything " +"went down the drain, will it help you again?" msgstr "" #: lang/json/professions_from_json.py @@ -123010,13 +124970,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -123028,13 +124988,13 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were a granted the authority of a U.S Marshal. As a " -"guard, others joked that you were nothing more than a mall cop with a fancy " -"badge. Knowingly, you laughed it off as the you donned on your equipment and" -" deployed. While you mainly spent time at base, you honed your skills and " -"recieved special implants to do your job easier at the low low cost of " -"serving as a \"guard\" forever. Time to do your job, mission parameters look" -" like they've expanded quite a bit though." +"STR 10 recommended. You were a granted the authority of a U.S Marshal. As " +"a guard, others joked that you were nothing more than a mall cop with a " +"fancy badge. Knowingly, you laughed it off as the you donned on your " +"equipment and deployed. While you mainly spent time at base, you honed your" +" skills and recieved special implants to do your job easier at the low low " +"cost of serving as a \"guard\" forever. Time to do your job, mission " +"parameters look like they've expanded quite a bit though." msgstr "" #: lang/json/professions_from_json.py @@ -123046,10 +125006,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -123061,10 +125021,10 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You are fully armored badass granted the full authority " -"of a U.S Marshal. Sent in as the one man army capable of handling anything. " -"Dropped into warzones, you singlehandedly laid out entire battalions by " -"yourself. Time to hang them all." +"STR 10 recommended. You are fully armored badass granted the full authority" +" of a U.S Marshal. Sent in as the one man army capable of handling " +"anything. Dropped into warzones, you singlehandedly laid out entire " +"battalions by yourself. Time to hang them all." msgstr "" #: lang/json/professions_from_json.py @@ -123076,12 +125036,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -123093,12 +125053,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"STR 10 recommended. You were an elite member of the Catastrophe " -"Response/Research & Investigation Team. A looming spectre which responded to" -" secular threats which allowed your faction to leap decades in front of " -"other world powers. Your squad was the first to be deployed into the New " +"STR 10 recommended. You were an elite member of the Catastrophe " +"Response/Research & Investigation Team. A looming spectre which responded " +"to secular threats which allowed your faction to leap decades in front of " +"other world powers. Your squad was the first to be deployed into the New " "England region, ground zero, to contain the impending outbreak and gain " -"information to relay back to command. Good luck soldier." +"information to relay back to command. Good luck soldier." msgstr "" #: lang/json/professions_from_json.py @@ -123110,17 +125070,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -123132,17 +125092,17 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were an elite recon of the C.R.I.T. You were hailed as a top survivalist" -" after being stuck for weeks behind enemy lines and having to survive with " -"nothing but some rocks, sticks and plants. However, after a few too many " -"drinks (20) at the local bar and getting into a fight (knocking them out) " -"with one of your commanding officers during a drunken bout you were stripped" -" of your rank and sent off into the forests with your current gear to run a " -"trial by survival. After an hour of scouting about in the forest for a good " -"shelter, your radio rang and you were briefed over the fact that the world " -"was suddenly ending. Of course, no one has time to pick your sorry ass up, " -"so cheers. Staying away from drinks might be a good idea; at least you got " -"some real tools this time!" +"You were an elite recon of the C.R.I.T. You were hailed as a top " +"survivalist after being stuck for weeks behind enemy lines and having to " +"survive with nothing but some rocks, sticks and plants. However, after a " +"few too many drinks (20) at the local bar and getting into a fight (knocking" +" them out) with one of your commanding officers during a drunken bout you " +"were stripped of your rank and sent off into the forests with your current " +"gear to run a trial by survival. After an hour of scouting about in the " +"forest for a good shelter, your radio rang and you were briefed over the " +"fact that the world was suddenly ending. Of course, no one has time to pick" +" your sorry ass up, so cheers. Staying away from drinks might be a good " +"idea; at least you got some real tools this time!" msgstr "" #: lang/json/professions_from_json.py @@ -123156,9 +125116,9 @@ msgctxt "prof_desc_male" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -123172,9 +125132,9 @@ msgctxt "prof_desc_female" msgid "" "You were scheduled for some survival training in New England when the " "Cataclysm broke out and your instructor never showed up for the next lesson." -" Now stuck in the quarantine zone with your standard issue training " -"equipment, you wish you had a better gun. Looks like you'll definitely learn" -" a thing or two about survival though!" +" Now stuck in the quarantine zone with your standard issue training " +"equipment, you wish you had a better gun. Looks like you'll definitely " +"learn a thing or two about survival though!" msgstr "" #: lang/json/professions_from_json.py @@ -123188,10 +125148,10 @@ msgctxt "prof_desc_male" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -123207,10 +125167,10 @@ msgctxt "prof_desc_female" msgid "" "Like many others, you had requested to join the C.R.I.T organization's " "admin-offices to escape from bitter memories and past traumas after " -"valiantly protecting your comrades for years. After you completed the " +"valiantly protecting your comrades for years. After you completed the " "readjustment program, your skills may have rusted considerably since your " "last deployment to battle, but the drilled muscle memories have not worn " -"away. As your comrades' screams once again ring in your ears and repressed " +"away. As your comrades' screams once again ring in your ears and repressed " "memories of abhorrent nature resurface, can you find it within yourself to " "overcome the looming terror which paralyzes you?" msgstr "" @@ -123225,9 +125185,9 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -123240,9 +125200,9 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "You were scheduled to fix the several of the lab facilities in New England " -"and show other researchers the new weapons you were working on. When the " +"and show other researchers the new weapons you were working on. When the " "Cataclysm broke out, it made it so testing was easier to do, but then again " -"nothing seems to making that much sense. Time to bug-out!" +"nothing seems to making that much sense. Time to bug-out!" msgstr "" #: lang/json/professions_from_json.py @@ -123254,11 +125214,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -123270,11 +125231,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Your base in New England fell to the unholy onslaught of the Cataclysm. " +"Your base in New England fell to the unholy onslaught of the Cataclysm. " "However, as a a top researcher in the R&D department, you had chosen to " -"slowly mutate yourself into something more than human. Even if the concotion" -" was less than perfect, your old flimsy body feels empowered. With the new " -"flesh that is now your own, bare your fangs and fight until the next dawn." +"slowly mutate yourself into something more than human. Even if the " +"concotion was less than perfect, your old flimsy body feels empowered. With" +" the new flesh that is now your own, bare your fangs and fight until the " +"next dawn." msgstr "" #: lang/json/professions_from_json.py @@ -123426,9 +125388,9 @@ msgstr "特種部隊狙擊手" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." -msgstr "你花了好幾天與敵人的狙擊手決鬥，然後他就...死了。然後他又不死了。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123439,9 +125401,9 @@ msgstr "特種部隊狙擊手" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You spent days dueling an enemy sniper, then he just... died. And then un-" +"You spent days dueling an enemy sniper, then he just… died. And then un-" "died." -msgstr "妳花了好幾天與敵人的狙擊手決鬥，然後他就...死了。然後他又不死了。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -123476,7 +125438,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -123489,7 +125451,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You've been tailing your target for months and now he's a zombie. So much " +"You've been tailing your target for months and now he's a zombie. So much " "for that lead." msgstr "" @@ -123502,7 +125464,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -123515,7 +125477,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " +"Chemical weapons? Check. Biological outbreak? Check. Nuclear war? Check. " "Sounds like the perfect job for you!" msgstr "" @@ -123575,7 +125537,7 @@ msgstr "" #. ~ Profession (male Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -123586,7 +125548,7 @@ msgstr "" #. ~ Profession (female Battle Angel) description #: lang/json/professions_from_json.py msgctxt "prof_desc_female" -msgid "A combat-ready cyborg once salvaged from an obscure junkyard..." +msgid "A combat-ready cyborg once salvaged from an obscure junkyard…" msgstr "" #: lang/json/professions_from_json.py @@ -123650,9 +125612,9 @@ msgstr "德魯伊" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." -msgstr "德魯伊的古老循環已隨著大災變而消失。自然必須茁壯成長。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123663,9 +125625,9 @@ msgstr "德魯伊" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"The ancient circle of druids is gone with the cataclysm. Nature must " +"The ancient circle of druids is gone with the Cataclysm. Nature must " "thrive." -msgstr "德魯伊的古老循環已隨著大災變而消失。自然必須茁壯成長。" +msgstr "" #. ~ Profession (male Priest) description #: lang/json/professions_from_json.py @@ -123755,9 +125717,9 @@ msgstr "新手死靈法師" msgctxt "prof_desc_male" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." -msgstr "你總是不得不隱藏你的魔法，因為它在魔法世界中通常是不被接受的魔法類型，但是在大災難中，你需要將書中每一個技巧都展現出來。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123769,9 +125731,9 @@ msgstr "新手死靈法師" msgctxt "prof_desc_female" msgid "" "You always had to hide your magic, as it was generally not an acceptable " -"type of magic in the wizarding world, but with the cataclysm you need to " +"type of magic in the wizarding world, but with the Cataclysm you need to " "pull every trick out of the book." -msgstr "你總是不得不隱藏你的魔法，因為它在魔法世界中通常是不被接受的魔法類型，但是在大災難中，你需要將書中每一個技巧都展現出來。" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -123785,8 +125747,8 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." -msgstr "身為氣象預報員的兒子，你總是對天氣感興趣。最近你發現有可能通過神秘的手段操縱天氣！不幸的是，隨著大災難的發生，你還來不及享受你的力量..." +"power, as events unfolded…" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -123800,8 +125762,8 @@ msgid "" "The son of a weatherman, you were always interested in the weather. " "Recently you found it was possible to manipulate the weather yourself " "through arcane means! Unfortunately you did not have long to enjoy your " -"power, as events unfolded..." -msgstr "身為氣象預報員的兒子，你總是對天氣感興趣。最近你發現有可能通過神秘的手段操縱天氣！不幸的是，隨著大災難的發生，你還來不及享受你的力量..." +"power, as events unfolded…" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -124716,10 +126678,10 @@ msgstr "棒球選手" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" -msgstr "你在大災變前是本地小聯盟的擊球手。你帶著你的裝備逃難, 但是你要撐多久才能換你上場打擊?" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -124730,10 +126692,10 @@ msgstr "棒球選手" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were a batter on a local minor league team before the cataclysm. You " +"You were a batter on a local minor league team before the Cataclysm. You " "escaped with your equipment, but how long can you survive until your innings" " are up?" -msgstr "你在災變前是本地小聯盟的擊球手。你帶著你的裝備逃難, 但是你要撐多久才能換你上場打擊?" +msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" @@ -124806,8 +126768,8 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -124819,8 +126781,8 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You were awoken in the middle of the night by a noise. Armed only with a " -"flashlight you went to investigate, now you face the cataclysm." +"You were awoken in the middle of the night by a noise. Armed only with a " +"flashlight you went to investigate, now you face the Cataclysm." msgstr "" #: lang/json/professions_from_json.py @@ -124833,7 +126795,7 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" @@ -124847,7 +126809,7 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "Your training and augmentation for the Cyber-Olympics cycling competition " -"gave you an edge on escaping the start of the cataclysm. Can you keep on " +"gave you an edge on escaping the start of the Cataclysm. Can you keep on " "running from it forever?" msgstr "" @@ -124860,8 +126822,8 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" @@ -124874,8 +126836,8 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You worked as a welder for an off shore company before the cataclysm. You " -"were on your way back home when it struck. At least you got the tools of " +"You worked as a welder for an off shore company before the Cataclysm. You " +"were on your way back home when it struck. At least you got the tools of " "your craft." msgstr "" @@ -124888,9 +126850,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" #: lang/json/professions_from_json.py @@ -124902,9 +126864,9 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "prof_desc_female" msgid "" -"You knew the day would come, the day it all went to shit. You prepared " +"You knew the day would come, the day it all went to shit. You prepared " "yourself, not by gear but sheer skill; all those days in the woods paid off." -" If your ancestors survived with no tech, you'll be damned if you don't" +" If your ancestors survived with no tech, you'll be damned if you don't" msgstr "" #. ~ Crafting recipes category name @@ -129348,10 +131310,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"在災變爆發時, 你躲進了一個附近的避難所。你在裡面生活, 足不出戶, 以免被來自外界的 \"未知\" 傷害。隨著補給減少, 你不得不… " -"打從災變以來第一次… 被迫面對外面的世界。" #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -129360,10 +131320,8 @@ msgid "" "When the apocalypse broke out, you were funneled into a nearby shelter. " "Here you have lived, never leaving, lest the unknowns of the outside world " "hurt you. Supplies are running low, and for the first time since the " -"cataclysm, you will be forced to face the outside world." +"Cataclysm, you will be forced to face the outside world." msgstr "" -"在災變爆發時, 你躲進了附近的一個避難所。你住在裡面且足不出戶, 以免受到來自外界的未知事物傷害。隨著補給減少, 你不得不… 打從災變以來第一次… " -"被迫面對外面的世界。" #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -129423,7 +131381,7 @@ msgstr "監獄" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -129432,7 +131390,7 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"When the cataclysm happened, you were convicted or working in a prison. Now" +"When the Cataclysm happened, you were convicted or working in a prison. Now" " the prisoners have turned into mindless horrors and the security bots are " "shooting on sight… you might need to expedite your escape plans." msgstr "" @@ -129536,18 +131494,18 @@ msgstr "實驗品" msgctxt "scen_desc_male" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." -msgstr "自你出世以來, 你的用途就是用來進行基因科學的實驗品, 不管你願不願意。當災變爆發, 你離開了實驗室, 漫無目的的在森林遊蕩。" +msgstr "" #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "Since birth, your sole purpose in life has been the advancement of genetic " -"science, willingly or not. Once the cataclysm struck, you left the lab, and" +"science, willingly or not. Once the Cataclysm struck, you left the lab, and" " wandered aimlessly, ending up in a forest." -msgstr "自你出世以來, 你的用途就是用來進行基因科學的實驗品, 不管你願不願意。當災變爆發, 你離開了實驗室, 漫無目的的在森林遊蕩。" +msgstr "" #. ~ Name for scenario 'The Mascot Rises' for a male character #: lang/json/scenario_from_json.py @@ -129782,18 +131740,18 @@ msgstr "失去信念" msgctxt "scen_desc_male" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." -msgstr "你已經為信仰傳道很長一段時間，但是最近發生的事讓你開始對此感到懷疑。在你的教會中徘徊時，你找到的書可能會恢復你的信念或完全粉碎它。" +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." +msgstr "" #. ~ Description for scenario 'Lost Faith' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" "You've been preaching your faith for a long time, but the recent events have" -" begun to make you doubt it. Wandering in your temple, you just found books " -"that may restore your faith or shatter it completely." -msgstr "妳已經為信仰傳道很長一段時間，但是最近發生的事讓妳開始對此感到懷疑。在妳的教會中徘徊時，妳找到的書可能會恢復妳的信念或完全粉碎它。" +" begun to make you doubt it. Wandering in your temple, you just found books" +" that may restore your faith or shatter it completely." +msgstr "" #. ~ Starting location for scenario 'Lost Faith'. #: lang/json/scenario_from_json.py @@ -129821,9 +131779,8 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" -"你已經當魔法師的學徒一段時間了，他正在製作一個原型設備，或許能用來逃離大災變。然而，首次運行出了點問題，你的老師將他的五臟六腑傳送到他的軀殼之外。現在你必須找出方法如何靠自己生存。至少他留下了他的筆記本..." #. ~ Description for scenario 'The Wizard's Apprentice' for a female #. character. @@ -129834,9 +131791,8 @@ msgid "" "prototype device that could perhaps be used to escape from the Cataclysm. " "Something went wrong with the maiden voyage though, and your teacher " "teleported his insides into his outsides. Now you have to figure out how to" -" survive on your own. At least he left his notebook..." +" survive on your own. At least he left his notebook…" msgstr "" -"你已經當魔法師的學徒一段時間了，他正在製作一個原型設備，或許能用來逃離大災變。然而，首次運行出了點問題，你的老師將他的五臟六腑傳送到他的軀殼之外。現在你必須找出方法如何靠自己生存。至少他留下了他的筆記本..." #. ~ Starting location for scenario 'The Wizard's Apprentice'. #: lang/json/scenario_from_json.py @@ -129861,8 +131817,8 @@ msgstr "" msgctxt "scen_desc_male" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -129871,8 +131827,8 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You have been an apprentice to a wizard for some time now, you've saved for " -"years for your dream vaction at a secluded wizard tower. Your journey of " -"self-discovery is interrupted by the cataclysm. Now you have to figure out " +"years for your dream vacation at a secluded wizard tower. Your journey of " +"self-discovery is interrupted by the Cataclysm. Now you have to figure out " "how to survive on your own." msgstr "" @@ -129970,9 +131926,9 @@ msgstr "挑戰－聯邦緊急事務管理署死亡營地" msgctxt "scen_desc_male" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Description for scenario 'Challenge-FEMA Death Camp' for a female @@ -129981,9 +131937,9 @@ msgstr "" msgctxt "scen_desc_female" msgid "" "You were one of the many law-enforcement and military personnel alike called" -" in to keep order on one of the FEMA camps. It all went to shit " -"fast...wounded, infected, surrounded by fire you lie on the ground...and " -"they just keep coming..." +" in to keep order on one of the FEMA camps. It all went to shit fast… " +"wounded, infected, surrounded by fire you lie on the ground… and they just " +"keep coming…" msgstr "" #. ~ Starting location for scenario 'Challenge-FEMA Death Camp'. @@ -130892,6 +132848,11 @@ msgid "" "you'll probably be left with no meat! Use a BB gun or maybe a .22 rifle." msgstr "松鼠很好吃, 但是如果你用高傷害的槍械來攻擊他們的話, 大概什麼都不留了! 用 BB 槍或是 .22 口徑步槍吧。" +#: lang/json/snippet_from_json.py +msgid "" +"Squirrels really aint such a bad snack if you don't blast them all to hell." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ever run into those big worm things? If you see trails of churned-up dirt, " @@ -130912,8 +132873,24 @@ msgstr "殺了巨蟲也不要鬆懈。某些巨蟲能夠分裂並繼續攻擊!" #: lang/json/snippet_from_json.py msgid "" "If you see a big mob of zombies coming, RUN! Trying to fight them all is " -"suicide unless you have a big tactical advantage." -msgstr "要是你看到一大群的殭屍接近, 快逃! 若是你沒有戰術優勢的話, 想要挑戰全部的殭屍根本是自殺。" +"impossible unless you have a big tactical advantage." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you see a big mob of zombies coming, you better run. Trying to fight " +"them all is suicide!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "When you see a swarm of zombies coming it's time to run!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"If you're getting chased by a hoard of zombies, try ducking into the subways" +" and traveling a block or two, then coming back up." +msgstr "假如你被殭屍海追, 試著躲到地下鐵再走過一兩個車站, 然後才回到地面。" #: lang/json/snippet_from_json.py msgid "" @@ -131194,7 +133171,7 @@ msgstr "你知道嗎, 你拿突擊步槍不一定就要開連發。單發射擊 #: lang/json/snippet_from_json.py msgid "" "I've seen a couple guys running around with laser pistols. They seem like " -"the perfect weapon… quiet, accurate, and deadly. But I've never found one, " +"the perfect weapon: quiet, accurate, and deadly. But I've never found one, " "and I bet ammo is wicked scarce…" msgstr "" @@ -131380,6 +133357,12 @@ msgid "" "be deadly." msgstr "要是你力氣不大或是很笨拙, 你最好不要亂玩汽油彈或是手榴彈。想投擲出去卻不小心掉到地上會害死自己。" +#: lang/json/snippet_from_json.py +msgid "" +"If you're not particularly agile it might be good not to mess with Molotovs " +"or grenades. Accidents involving these sort of items tend to be grievous." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "If you're wandering in the wilderness, or following a road, keep an eye out " @@ -131426,9 +133409,8 @@ msgstr "雖然不多, 但加油站是汽油的好來源, 能夠讓動力工具 #: lang/json/snippet_from_json.py msgid "" -"It's not like in the movies - shooting a gas pump won't make it explode. " -"But it WILL make it leak all over the place, which is a definite fire " -"hazard." +"It's not like in the movies; shooting a gas pump won't make it explode. But" +" it WILL make it leak all over the place, which is a definite fire hazard." msgstr "" #: lang/json/snippet_from_json.py @@ -131443,6 +133425,12 @@ msgid "" " bad!" msgstr "下次你拜訪雜貨店的時候, 拿些罐頭吧。不會腐敗喔!" +#: lang/json/snippet_from_json.py +msgid "" +"Load up on canned goods if you ever find a grocery store. Cans never go " +"bad!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "I've found more good weapons in hardware stores than anywhere else. Except " @@ -131468,12 +133456,6 @@ msgid "" "defense… it's perfect!" msgstr "" -#: lang/json/snippet_from_json.py -msgid "" -"If you're getting chased by a hoard of zombies, try ducking into the subways" -" and traveling a block or two, then coming back up." -msgstr "假如你被殭屍海追, 試著躲到地下鐵再走過一兩個車站, 然後才回到地面。" - #: lang/json/snippet_from_json.py msgid "" "Have you seen those weird science labs out in the middle of nowhere? I " @@ -131482,9 +133464,9 @@ msgstr "你有看過那些出現在奇怪位置的實驗室嗎? 我看你要拿 #: lang/json/snippet_from_json.py msgid "" -"I have a dream of raiding a military bunker, but I well know that good " -"protection plus zombie soldiers are a bad mix. The sheer thought of being " -"sprayed with bullets by a turret is giving me the shivers." +"I have a dream of raiding a military bunker, but zombies and armor are a " +"scary mix. And the sheer thought of being sprayed with bullets by a turret " +"is giving me the shivers." msgstr "" #: lang/json/snippet_from_json.py @@ -131532,26 +133514,41 @@ msgstr "一天一杯螺絲起子調酒，壞血病遠離我！" #: lang/json/snippet_from_json.py msgid "" -"Hungrier, than usual? Natural oils can help. Not tasty at all, but who " +"Hungrier than usual? Natural oils can help. Not tasty at all, but who " "cares when eating your leg is the second option?" msgstr "" #: lang/json/snippet_from_json.py msgid "" -"Terrain can turn the tide of a battle, make sure you use it against your " +"Terrain can turn the tide of a battle. Make sure you use it against your " "enemies, lest it be used against you." msgstr "" #: lang/json/snippet_from_json.py msgid "" "Folks that passed by the mine said something about foul smell. If you plan " -"a visit there consider taking a a gas mask with you." +"a visit there consider taking a gas mask with you." msgstr "" #: lang/json/snippet_from_json.py msgid "Knowledge is power. Seriously, just pick up a book." msgstr "知識就是力量。說真的，拿本書看吧。" +#: lang/json/snippet_from_json.py +msgid "Knowledge is power. And books are power you can read." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Knowledge is power. But not every book you find contains true knowledge." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Some days are full of sadness. Reading can help, if you have the right " +"book." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Nothing can kill you if everything is already dead. Well, except cold, " @@ -131615,7 +133612,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"A soldering iron can be an aspiring mechanics' best friend. You can also " +"A soldering iron can be an aspiring mechanic's best friend. You can also " "cauterize a wound with it, but as many people died as lived from that " "treatment, so I guess it's a last resort." msgstr "" @@ -131656,7 +133653,7 @@ msgstr "有個夥伴就多了張嘴要餵，但是要工作時，兩雙手總比 #: lang/json/snippet_from_json.py msgid "" -"I was against drugs until I was almost killed by a zombie and was hauling my" +"I was against drugs until I was almost killed by a zombie. I was hauling my" " sorry ass away from the horde, with nothing more but some white powder I " "got from that zombie. Saved me that time." msgstr "" @@ -131683,6 +133680,12 @@ msgid "" "Met a mad chemist once. She made a battery from a potato… or was it lemon?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Met a mad chemist once. She made a battery from a potato, and then nobody " +"was willing to eat the potato." +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Police brutality lives on it seems. It's just more mechanical now, with all" @@ -131790,6 +133793,30 @@ msgid "" "look good with bunny ears? Would I hear better?" msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. Do you think I'd " +"still look good if I had piranha teeth?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. You think I'd look " +"good with thorns growing from my face?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. If my eyeballs began " +"shooting lasers do you think I would still be able see?" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"Everything seems to mutate nowadays. Even survivors. I wonder how I would " +"look with antlers? Hats would be out of the question…" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Winter is a harsh lady. You need fire to survive, to heat yourself and your" @@ -131811,6 +133838,13 @@ msgid "" "either, if you catch my drift." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"Heard a rumor about a lady on rollerblades with a fire extinguisher strapped" +" to her back. Zipping around, hardly wearing no clothes, smashing cannibals" +" in the face with a baseball bat. Don't that beat all?" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "Ok, some weird shit now. Before we met I saw a knight. No, I'm fine under " @@ -131863,6 +133897,12 @@ msgid "" " a cold ground." msgstr "" +#: lang/json/snippet_from_json.py +msgid "" +"There's no rule against wearing more than one set of pants. Well, I mean, " +"there probably is, but nothing stopping you from breaking it!" +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "There are two ways of throwing grenades. The smart one is throwing from " @@ -131908,7 +133948,7 @@ msgid "Hey there's some pink tablets, take some!" msgstr "嘿，有搖頭丸，來一點吧！" #: lang/json/snippet_from_json.py -msgid "Look, some LSD, let's play cataclysm: fun times ahead!" +msgid "Look, some LSD, let's play Cataclysm: fun times ahead!" msgstr "" #: lang/json/snippet_from_json.py @@ -134737,15 +136777,15 @@ msgid "" msgstr "" #: lang/json/snippet_from_json.py -msgid "Tell me about how you survived the cataclysm." +msgid "Tell me about how you survived the Cataclysm." msgstr "" #: lang/json/snippet_from_json.py -msgid "How did you survive the cataclysm?" +msgid "How did you survive the Cataclysm?" msgstr "" #: lang/json/snippet_from_json.py -msgid "What was the cataclysm like for you?" +msgid "What was the Cataclysm like for you?" msgstr "" #: lang/json/snippet_from_json.py @@ -135007,7 +137047,7 @@ msgid "eldritch horror" msgstr "" #: lang/json/snippet_from_json.py -msgid "the cataclysm" +msgid "the Cataclysm" msgstr "" #: lang/json/snippet_from_json.py @@ -135373,6 +137413,306 @@ msgid "" "Refer to file EXO-M-312 for full report." msgstr "" +#: lang/json/snippet_from_json.py +msgid " is the biggest slut in , and I'm damn proud of it!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "There is a beautifully drawn graffiti tag on the wall here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " is a heteronormative bully!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " + " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Hell in " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "were all gonna die" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "MOM" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK YOU" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a cartoon rendition of a zombie." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a crudely spraypainted tag adorned with skulls." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"I have a secure and loving relationship with your mom and you're going to need to come to terms with that.\n" +"\n" +"Do you want to talk about it? You know where to find me. Love you sweety." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you fuckin gave me ADES you SHIT." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "I <3 ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " fucked ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a spraypainted drawing of an angel with wings made of vines." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Mr. is a vampire!" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Their hiding the truth" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FOLLOW THE CHEMTRAILS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a curious drawing of a roll of toilet paper dissolving into a " +"rainbow." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "All we wanna do is eat yer brains" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "don't drink the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"And they walked upon His Earth, and there was a RECKONING, and only the " +"worthy survived" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a drawing of a zombie with a bullethole in its head." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a surprisingly artistic drawing of a penis." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "This is a simple spraypainted graphic of a forest made of bones." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainted mural of a giant mushroom with people praying at its " +"base." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "we can never go back" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "dont by meth from " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " you owe me fifty bucks" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Im gonna kill u " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "its in the water" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a spraypainting of an anatomically unlikely woman wearing very " +"little." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Dont eat the proten bars" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FEMA: FUCKIN EAT MY ASSHOLE" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a simple drawing of a skinny figure wearing an emergency evac jacket" +" and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Abandon hope, all ye who enter here." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE IS COMING FOR US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THERE'S NO RESCUE BUS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "THEY LET US DOWN" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Don't dead open inside" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "SANCTUARY" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "'s cosplay supply all welcome" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Cataclysm Bus Stop" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They aren't coming to help, they're coming to clean up" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a far-too-detailed drawing of an enormous mind-bending monster, the " +"sort that attacked during the Cataclysm." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a quick rendition in permanent marker of a swirling gateway, with " +"zombies spilling out of it. Underneath, it reads \"What did they do?\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "RIP humanity" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Everyone's dead Dave" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "WE'RE ALL FINE HERE HOW R U" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +" I couldn't wait any longer, went to camp 36. Meet me there. " +"Love ." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I am still looking for you." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " was here and still alive" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Blue 52" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " I no I said Id wait for u but I gotta run, find me" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"I would not be alive without all of you. I will not forget." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "" +"This is a drawing of a cartoon character smashing a zombie corpse with a " +"sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "They get back up. Headshots don't work." +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "stay out of " +msgstr "" + +#: lang/json/snippet_from_json.py +msgid " has fallen" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "NO ONE LEFT HERE MOVE ON" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "deth trap" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "no ones coming" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "GOVERMENT DID THIS TO US" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK CHINA" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "FUCK THE COMMUNISTS" +msgstr "" + +#: lang/json/snippet_from_json.py +msgid "Remember " +msgstr "" + #: lang/json/snippet_from_json.py msgid "" "\n" @@ -136568,7 +138908,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "You gain the sudden realization that you must have been responsible for the " -"cataclysm." +"Cataclysm." msgstr "" #: lang/json/snippet_from_json.py @@ -140567,7 +142907,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" "\"Agh, to See the Spiral in such a Distorted Shape! Manipulated for its " -"Vortex motion! Its Perpetual Grace! Its beauty Tarnished...\"" +"Vortex motion! Its Perpetual Grace! Its beauty Tarnished…\"" msgstr "" #: lang/json/snippet_from_json.py @@ -140583,12 +142923,12 @@ msgstr "\"我在購物車上安裝了一台雷射砲。我推著它到到處晃 #: lang/json/snippet_from_json.py msgid "" -"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " +"\"Day 40. Controls broken-- car's magic reactor makes it goes inexorably " "forward. Giant rollers on front demolish forest. Maine, here I come.\"" msgstr "" #: lang/json/snippet_from_json.py -msgid "\"my car is a diamond in the rough... literally\"" +msgid "\"my car is a diamond in the rough… literally\"" msgstr "" #: lang/json/snippet_from_json.py @@ -140611,7 +142951,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -"\"Putta little bitta dynamite and halfa landmine in an old soda can... WHAM!" +"\"Putta little bitta dynamite and halfa landmine in an old soda can… WHAM!" " You goin' somewhere.\"" msgstr "" @@ -142226,6 +144566,38 @@ msgstr "" msgid "WOOF!" msgstr "" +#: lang/json/speech_from_json.py +msgid "\"I have no mouth and yet I scream!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"¿Por qué?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Come closer little one.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"The better to eat you! I don't actually think I eat anymore.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Cyrus said if I was patient, he could get me a new body.\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Quem é Você?\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"Eu vou te matar!\"" +msgstr "" + +#: lang/json/speech_from_json.py +msgid "\"I can't keep myself from killing you, please run!\"" +msgstr "" + #: lang/json/speech_from_json.py msgid "\"Don't make me have ye walk the plank.\"" msgstr "\"別逼我讓你走跳板。\"" @@ -142334,13 +144706,13 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Unbelievable. You, [subject name here], must be the pride of [subject " +"Unbelievable. You, [subject name here], must be the pride of [subject " "hometown here]!" msgstr "" #: lang/json/speech_from_json.py msgid "" -"That thing is probably some sort of raw sewage container. Go ahead and rub " +"That thing is probably some sort of raw sewage container. Go ahead and rub " "your face all over it." msgstr "" @@ -142352,7 +144724,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"No one will blame you for giving up. In fact, quitting at this point is a " +"No one will blame you for giving up. In fact, quitting at this point is a " "perfectly reasonable response." msgstr "" @@ -142363,7 +144735,7 @@ msgid "" msgstr "" #: lang/json/speech_from_json.py -msgid "Hello again. To reiterate our previous warning: [garbled]" +msgid "Hello again. To reiterate our previous warning: [garbled]" msgstr "" #: lang/json/speech_from_json.py @@ -142439,8 +144811,8 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it " -"anyway." +"Uh oh. Somebody cut the cake. I told them to wait for you, but they did it" +" anyway." msgstr "" #: lang/json/speech_from_json.py @@ -142472,7 +144844,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" "I'd just like to point out that you were given every opportunity to succeed." -" " +" " msgstr "" #: lang/json/speech_from_json.py @@ -142520,7 +144892,7 @@ msgstr "" #: lang/json/speech_from_json.py msgid "" -"I'm checking some blueprints, and I think... Yes, right here. You're " +"I'm checking some blueprints, and I think… Yes, right here. You're " "definitely going the wrong way." msgstr "" @@ -142557,7 +144929,7 @@ msgid "\"What we've got here is failure to communicate.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"E.T. phone home.\"" +msgid "\"E.T. phone home.\"" msgstr "" #: lang/json/speech_from_json.py @@ -142621,7 +144993,7 @@ msgid "\"Roads? Where we're going, we don't need roads.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" +msgid "\"Fasten your seatbelts. It's going to be a bumpy night.\"" msgstr "" #: lang/json/speech_from_json.py @@ -142988,8 +145360,8 @@ msgid "\"I'm scared!\"" msgstr "\"我很害怕!\"" #: lang/json/speech_from_json.py -msgid "\"Something's wrong...\"" -msgstr "\"有些不對勁...\"" +msgid "\"Something's wrong…\"" +msgstr "" #: lang/json/speech_from_json.py msgid "\"What are you doing?\"" @@ -143016,15 +145388,15 @@ msgid "\"Excuse me?\"" msgstr "\"抱歉。\"" #: lang/json/speech_from_json.py -msgid "\"I'm different...\"" +msgid "\"I'm different…\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Thanks anyway...\"" +msgid "\"Thanks anyway…\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Take me with you...\"" +msgid "\"Take me with you…\"" msgstr "" #: lang/json/speech_from_json.py @@ -143104,7 +145476,7 @@ msgid "\"This time is OUR time.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Second time's a charm...\"" +msgid "\"Second time's a charm…\"" msgstr "" #: lang/json/speech_from_json.py @@ -143176,7 +145548,7 @@ msgid "\"[sigh] Don't tell anyone about this.\"" msgstr "" #: lang/json/speech_from_json.py -msgid "\"Well, I tried. Best of luck!\"" +msgid "\"Well, I tried. Best of luck!\"" msgstr "" #: lang/json/speech_from_json.py @@ -143470,7 +145842,7 @@ msgid "Cabin" msgstr "小屋" #: lang/json/start_location_from_json.py lang/json/start_location_from_json.py -#: src/defense.cpp +#: src/gamemode_defense.cpp msgid "Hospital" msgstr "醫院" @@ -143622,7 +145994,7 @@ msgstr "聯邦緊急事務管理署營地" msgid "Mansion Entrance" msgstr "豪宅入口" -#: lang/json/start_location_from_json.py src/defense.cpp +#: lang/json/start_location_from_json.py src/gamemode_defense.cpp msgid "Mansion" msgstr "豪宅" @@ -143696,7 +146068,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"When it all happened, the cataclysm, something… changed. You can see it in " +"When it all happened, the Cataclysm, something… changed. You can see it in " "all creatures, but most of all their bones. They break, morph, rise again, " "in an infinite cycle. Living dead walk. Monsters rip and tear each other " "apart. You can see the resonance, the quiet hum of raw strength, and only by" @@ -143795,42 +146167,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I know of certain bones that could be of use, if you'd like to know more." +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "" +"I know of certain bones that could be of use, if you'd like to know more." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +msgid "" +"The song is… quiet for now. Perhaps with time, more notes will be etched in " +"the bones of this world." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"The song is… quiet for now. Perhaps with time, more notes will be etched in " -"the bones of this world." +msgid "That is all for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -144547,7 +146919,7 @@ msgid "Hold the line: don't move onto obstacles adjacent to me." msgstr "保持戰線：不要移動到與我相鄰的障礙物上。" #: lang/json/talk_topic_from_json.py src/activity_handlers.cpp src/avatar.cpp -#: src/avatar.cpp src/avatar_action.cpp src/crafting.cpp src/game.cpp +#: src/avatar.cpp src/avatar_action.cpp src/avatar_action.cpp src/crafting.cpp #: src/game.cpp src/handle_action.cpp src/handle_action.cpp #: src/handle_liquid.cpp src/handle_liquid.cpp src/iexamine.cpp #: src/iexamine.cpp src/iexamine.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp @@ -144861,13 +147233,13 @@ msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "好吧，也許這能不讓我在這種天氣被凍僵，如何？" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding " -"up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding " +"up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -144957,14 +147329,14 @@ msgstr "很好, 別突然亂動…" msgid "Keep your distance!" msgstr "保持你的距離!" -#: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." -msgstr "這是我的地盤，。" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "This is my territory, ." +msgstr "這是我的地盤，。" + #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." msgstr "冷靜點。我不會傷害你。" @@ -145018,29 +147390,29 @@ msgid "I don't care." msgstr "我不在乎。" #: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "我只有一件工作給你。想要聽看看嗎？" - -#: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "我有另一件工作給你。想要聽看看嗎？" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "我有其他的工作給你。想要聽看看嗎？" #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "我有更多的工作給你。想要聽看看嗎？" #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "我有其他的工作給你。想要聽看看嗎？" +msgid "I have another job for you. Want to hear about it?" +msgstr "我有另一件工作給你。想要聽看看嗎？" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "我已經沒有可以給你辦的工作了。" +msgid "I just have one job for you. Want to hear about it?" +msgstr "我只有一件工作給你。想要聽看看嗎？" #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "我沒有可以給你的工作。" +#: lang/json/talk_topic_from_json.py +msgid "I don't have any more jobs for you." +msgstr "我已經沒有可以給你辦的工作了。" + #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp msgid "Oh, okay." @@ -145050,6 +147422,10 @@ msgstr "喔, 好吧。" msgid "Never mind, I'm not interested." msgstr "別在意, 我沒興趣。" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "你現在並沒有幫我做任何工作。" + #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "哪件工作？" @@ -145058,10 +147434,6 @@ msgstr "哪件工作？" msgid "What about it?" msgstr "這樣如何？" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "你現在並沒有幫我做任何工作。" - #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "我會做的!" @@ -145270,10 +147642,6 @@ msgstr "嗯, 好吧。" msgid "Thanks!" msgstr "謝謝!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "專心路況，夥伴！" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for not telling you." msgstr "我有些苦衷，不能告訴你。" @@ -145298,6 +147666,10 @@ msgstr "我太渴了, 給我點能喝的東西。" msgid "I must focus on the road!" msgstr "我必須專心路況！" +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "專心路況，夥伴！" + #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "啊，好的。" @@ -145402,10 +147774,6 @@ msgstr "不, 我待在這就好了。" msgid "On second thought, never mind." msgstr "我再想想, 抱歉。" -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "你在駕駛車輛時我無法訓練你。" - #: lang/json/talk_topic_from_json.py msgid "I have some reason for denying you training." msgstr "我有些苦衷，不能接受你的訓練。" @@ -145418,6 +147786,10 @@ msgstr "給我點時間, 我會讓你看些新玩意…" msgid "I can't train you properly while I'm operating a vehicle!" msgstr "我在駕駛車輛時無法訓練你。" +#: lang/json/talk_topic_from_json.py +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "你在駕駛車輛時我無法訓練你。" + #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" msgstr "我才不要, 我會被丟在後面沒人理!" @@ -146095,8 +148467,8 @@ msgid "How are you alive?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do before the cataclysm?" -msgstr "你在大災變前是做什麼的？" +msgid "What did you do before the Cataclysm?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -146316,32 +148688,32 @@ msgid "This is a season spring test response." msgstr "這是季節：春測試回應。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 30 test response." -msgstr "這是自災變起30天測試回應。" +msgid "This is a days since Cataclysm 30 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season summer test response." msgstr "這是季節：夏測試回應。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 120 test response." -msgstr "這是自災變起120天測試回應。" +msgid "This is a days since Cataclysm 120 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season autumn test response." msgstr "這是季節：秋測試回應。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 210 test response." -msgstr "這是自災變起210天測試回應。" +msgid "This is a days since Cataclysm 210 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a season winter test response." msgstr "這是季節：冬測試回應。" #: lang/json/talk_topic_from_json.py -msgid "This is a days since cataclysm 300 test response." -msgstr "這是自災變起300天測試回應。" +msgid "This is a days since Cataclysm 300 test response." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "This is a is day test response." @@ -146857,7 +149229,7 @@ msgstr "沒時間解釋了，世界面臨終結，我們必須攜手拯救世界 #: lang/json/talk_topic_from_json.py msgid "" -"The cataclysm weakened the space-time continuum, I accidentally fell through" +"The Cataclysm weakened the space-time continuum, I accidentally fell through" " a tear in reality and ended up here. I will need access to your resources " "to keep fighting." msgstr "" @@ -147170,7 +149542,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What did you do when you found out about the cataclysm?" +msgid "What did you do when you found out about the Cataclysm?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -148362,7 +150734,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I get that. Sometimes I feel like my existence began shortly after " -"the cataclysm." +"the Cataclysm." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149588,7 +151960,7 @@ msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get my outta here..." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -149627,7 +151999,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, I think you need ot keep on walking, straight off this " +"I see that badge, I think you need to keep on walking, straight off this " "property." msgstr "" @@ -149659,8 +152031,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"It was pink and really fast, it had lots of limbs, definitely not human. It " -"easily kept up with us when we tried to escape, horrifying stuff. Barry " +"It was pink and really fast, it had lots of limbs, definitely not human. It" +" easily kept up with us when we tried to escape, horrifying stuff. Barry " "just dropped to the ground, and the thing swept him away." msgstr "" @@ -149687,7 +152059,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should get off my farm, I won't deal with a a government stooge." +msgid "You should get off my farm, I won't deal with a government stooge." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149708,14 +152080,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I see that badge, You need to leave our land, my relatives have no fondness " -"for Marshals." +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " -"Uncle." +"uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149728,7 +152100,7 @@ msgstr "" msgid "" "Yeah, they are always worried about us, I prefer to survey the land and try " "to track the changes. I'm thinking about fixing up this cabin for some " -"peace and quiet..." +"peace and quiet…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -149758,7 +152130,7 @@ msgid "" "In one of my longer trips looking for Barry, I saw something out in a field." " I didn't get close but I swear unbelievable monsters were coming out of it." " It kinda shimmered, almost like it wasn't quite there. I've been tracking" -" those monsters for a while..." +" those monsters for a while…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -149768,7 +152140,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They made their way to this weird spire like structure, I've never seen " -"anything like it, it glistened in the sun like something organic. I think " +"anything like it, it glistened in the sun like something organic. I think " "they could be holding Barry there, I've seen them arrive and leave with " "other humans." msgstr "" @@ -149793,7 +152165,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Your dad asked me to come find you, said you've been looking for your Uncle." +"Your dad asked me to come find you, said you've been looking for your uncle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -149846,9 +152218,8 @@ msgstr "感覺一定很棒，能在如此瘋狂的氛圍中擁有一個安靜的 msgid "" "You don't need as much luck if you are prepared and work together. We've " "had our losses, my brother in law, Barry, was our best hunter but things are" -" so different now..." +" so different now…" msgstr "" -"如果你準備好跟我們一起努力，那就不需要那麼多的運氣了。我們遭受一些損失 - 我的小舅子Berry，他曾是我們最好的獵人，但是現在已大不相同。" #: lang/json/talk_topic_from_json.py msgid "What happened to Barry?" @@ -149860,9 +152231,9 @@ msgstr "如今，農場應當是一個相當安全的地方。" #: lang/json/talk_topic_from_json.py msgid "" -"Well, nice to meet you. I imagine Jack was boasting about my herbal " +"Well, nice to meet you. I imagine Jack was boasting about my herbal " "remedies, he's proud of what we've put together here." -msgstr "很高興見到你。我能想像Jack在吹噓我的草藥的樣子，他為我們在這裡所做的一切感到自豪。" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "He did mention you make remedies, are they effective?" @@ -149903,9 +152274,9 @@ msgstr "Jack和我在一起已經40年了。在這一團混亂之中，他一直 #: lang/json/talk_topic_from_json.py msgid "" -"Jesse and her family live up at the horse farm. They may have some jobs for " -"you." -msgstr "Jesse和她的家人住在馬場。他們可能會提供你一些工作機會。" +"Jesse and her family live up at the horse farm. They may have some jobs for" +" you." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -149933,6 +152304,12 @@ msgstr "你女兒住這條路？" msgid "Where is your brother's place?" msgstr "你哥哥住在哪裡？" +#: lang/json/talk_topic_from_json.py +msgid "" +"I see that badge, I think you need ot keep on walking, straight off this " +"property." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice dairy, must be tough keeping it running." msgstr "很棒的酪農場。你一定很堅強才能讓它持續運作。" @@ -149999,6 +152376,10 @@ msgid "" " a forage set up." msgstr "如果沒出去打獵，Carlos會在他的工作室。他正嘗試設置飼料。" +#: lang/json/talk_topic_from_json.py +msgid "You should get off my farm, I won't deal with a a government stooge." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Your son helps with the dairy?" msgstr "你兒子幫忙酪農場事務嗎？" @@ -150321,18 +152702,18 @@ msgstr "" msgid "Tell me about your dad." msgstr "告訴我關於你老爸的事情。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Ma'am, I don't know how the hell you got down here but if you have any sense" -" you'll get out while you can." -msgstr "女士, 我不知道你是怎麼到這裡來的。如果你還有點理智的話, 趁現在你還能離開, 趕緊走吧。" - #: lang/json/talk_topic_from_json.py msgid "" "Sir, I don't know how the hell you got down here but if you have any sense " "you'll get out while you can." msgstr "先生, 我不知道你是怎麼到這裡來的。如果你還有點理智的話, 趁現在你還能離開, 趕緊走吧。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Ma'am, I don't know how the hell you got down here but if you have any sense" +" you'll get out while you can." +msgstr "女士, 我不知道你是怎麼到這裡來的。如果你還有點理智的話, 趁現在你還能離開, 趕緊走吧。" + #: lang/json/talk_topic_from_json.py msgid "Marshal, I hope you're here to assist us." msgstr "法警, 我希望你是來幫忙的。" @@ -150742,15 +153123,15 @@ msgstr "好！ 我們走吧。" msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "朋友，我告訴過你關於硬紙板的事嗎？你有硬紙板嗎？" +#: lang/json/talk_topic_from_json.py +msgid "We've done it! We've solved the list!" +msgstr "我們做到了！我們已經完成這個清單！" + #: lang/json/talk_topic_from_json.py msgid "" "How's things with you? My cardboard collection is getting quite impressive." msgstr "你好嗎？我的紙板收藏已經相當可觀了。" -#: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" -msgstr "我們做到了！我們已經完成這個清單！" - #: lang/json/talk_topic_from_json.py msgid "About that shopping list of yours…" msgstr "" @@ -151515,7 +153896,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "Gross, isn't it? Feels like pubes. I just started growing it everywhere a " -"little while after the cataclysm. No idea what caused it. I can't blame " +"little while after the Cataclysm. No idea what caused it. I can't blame " "them for hating it, I hate it." msgstr "" @@ -151573,7 +153954,7 @@ msgid "" "showed up to work with a militia of rowdies and loyalists and staged a coup," " taking over the government completely, killing those that opposed him, and " "moving as many people as he could get behind him onto the islands. The " -"rumors I've heard is that most of them survived the cataclysm and are still " +"rumors I've heard is that most of them survived the Cataclysm and are still " "running the show there, but that seems kind of impossible to me." msgstr "" @@ -152117,7 +154498,7 @@ msgid "" "Sorry, not quite yet. Landough was in pretty rough shape. No fault of " "yours, it was no good having him cooped up in a dank fridge for that long… " "and I think my apprentice baker may have fucked with him before the " -"cataclysm too. He'd better hope he's a zombie now, because if I see him " +"Cataclysm too. He'd better hope he's a zombie now, because if I see him " "alive… anyway, it's gonna take a few more feeds before I can get him ready " "for prime time, check back in a couple days." msgstr "" @@ -154245,14 +156626,14 @@ msgstr "像個文明人, 不然我就讓你生不如死。" msgid "Just on watch, move along." msgstr "看什麼, 快離開。" -#: lang/json/talk_topic_from_json.py -msgid "Ma'am, you really shouldn't be traveling out there." -msgstr "夫人, 你真的不應該旅行到那裏。" - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "外面盡是蠻荒, 對吧?" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am, you really shouldn't be traveling out there." +msgstr "夫人, 你真的不應該旅行到那裏。" + #: lang/json/talk_topic_from_json.py msgid "I heard this place was a refugee center…" msgstr "" @@ -155460,9 +157841,9 @@ msgstr "我想雇用你的服務。" #: lang/json/talk_topic_from_json.py msgid "" "I was sent here to assist in setting-up the farm. Most of us have no real " -"skills that transfer from before the cataclysm so things are a bit of trial " +"skills that transfer from before the Cataclysm so things are a bit of trial " "and error." -msgstr "我是被派遣到這裡協助建立農場。我們大部份在大災變來臨之前的技能, 在這裡都派不上用場, 所以目前還是在不斷摸索。" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -155827,7 +158208,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This is a PrepNet Phyle orchard. We were a community of survivalists " +"This is a PrepNet Phyle orchard. We were a community of survivalists " "gathering resources to prepare for climate change, but it left us better " "prepared for what actually happened than most." msgstr "" @@ -155846,7 +158227,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"This food has to go back to our core communities. But maybe we can trade " +"This food has to go back to our core communities. But maybe we can trade " "some food for services" msgstr "" @@ -155860,8 +158241,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"You have to earn the right to trade with us. Plus we created our own " -"currency before the cataclysm" +"You have to earn the right to trade with us. Plus we created our own " +"currency before the Cataclysm" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155884,8 +158265,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but " -"you need crypto coins" +"Here? Fruits and berries. Maybe the occasional piece of farm equipment, but" +" you need crypto coins" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155898,9 +158279,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I got introduced to the movement through Mutual Aid Society. From there it " +"I got introduced to the movement through Mutual Aid Society. From there it " "became an all consuming part of my life to prepare for a post consumption " -"world. It seems to have worked better for us than for many others." +"world. It seems to have worked better for us than for many others." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155916,9 +158297,9 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We use crypto coins for money here. They were a pre cataclysm attempt to " -"abstract money even further and create electronic cash. We figured we'd keep" -" it up. Barter only gets you so far." +"We use crypto coins for money here. They were a pre-Cataclysm attempt to " +"abstract money even further and create electronic cash. We figured we'd " +"keep it up. Barter only gets you so far." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155947,16 +158328,15 @@ msgstr "需要任何幫助嗎？" #: lang/json/talk_topic_from_json.py msgid "" -"No, no... Well, maybe a little. It was just as wrecked down here as it is " -"up top when I found it, wasn't too hard to fix up. You're welcome to stay " -"in the spare room awhile, just don't hog it. You're not the only scav out " +"No, no… Well, maybe a little. It was just as wrecked down here as it is up" +" top when I found it, wasn't too hard to fix up. You're welcome to stay in " +"the spare room awhile, just don't hog it. You're not the only scav out " "there." msgstr "" -"不，不...好吧，也許有點。當我發現它時，它就像在上面一樣被破壞，並不是很難修復。歡迎你在備用房間中待一會兒，只是別偷走它。你不是外面唯一的拾荒仔。" #: lang/json/talk_topic_from_json.py -msgid "Interesting..." -msgstr "有意思…" +msgid "Interesting…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -155965,8 +158345,8 @@ msgid "" msgstr "只是一個幸運的拾荒仔。現在我能坐在我那堆寶藏上感到很滿足。如果你有現金，我非常願意交易。" #: lang/json/talk_topic_from_json.py -msgid "I see..." -msgstr "我懂了..." +msgid "I see…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -155975,8 +158355,8 @@ msgid "" msgstr "為什麼不？其他人都這樣做，所以我想這很重要。我那邊的 ATM 還能使用，已連接到銀行伺服器和所有其他設備。" #: lang/json/talk_topic_from_json.py -msgid "Hmm..." -msgstr "嗯..." +msgid "Hmm…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -155985,16 +158365,16 @@ msgid "" msgstr "我想是的。像你一樣的拾荒仔需要補給品，對吧？而且我總能花更多的錢。" #: lang/json/talk_topic_from_json.py -msgid "Alright..." -msgstr "好吧..." +msgid "Alright…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Not at the moment, check back later perhaps." msgstr "現在沒有，也許稍後再回來看看。" #: lang/json/talk_topic_from_json.py -msgid "Sure..." -msgstr "當然..." +msgid "Sure…" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Are you part of the rescue team?" @@ -156013,8 +158393,8 @@ msgid "So are you busting us out of here or what?" msgstr "那麼你是要把我們弄出這裡還是怎樣？" #: lang/json/talk_topic_from_json.py -msgid "Hold tight, . I've got to clear a path." -msgstr "抓緊， 。我必須清出道路來。" +msgid "Hold tight, . I've got to clear a path." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Pack your bags, . We're going on a trip." @@ -159705,6 +162085,15 @@ msgstr "關閉的金屬柵門" msgid "A closed metal gate." msgstr "關閉的金屬柵門。" +#: lang/json/terrain_from_json.py +msgid "open metal gate" +msgstr "" + +#. ~ Description for open metal gate +#: lang/json/terrain_from_json.py +msgid "An open metal gate." +msgstr "" + #: lang/json/terrain_from_json.py msgid "wooden privacy fence" msgstr "木製隱私圍欄" @@ -161438,14 +163827,23 @@ msgid "" msgstr "" #: lang/json/terrain_from_json.py -msgid "tank with gasoline" -msgstr "裝著汽油的油箱" +msgid "fuel tank" +msgstr "" -#. ~ Description for tank with gasoline +#. ~ Description for fuel tank #: lang/json/terrain_from_json.py msgid "A tank filled with gasoline." msgstr "" +#: lang/json/terrain_from_json.py +msgid "broken fuel tank" +msgstr "" + +#. ~ Description for broken fuel tank +#: lang/json/terrain_from_json.py +msgid "A broken tank which was filled with gasoline." +msgstr "" + #: lang/json/terrain_from_json.py msgid "smashed gas pump" msgstr "損壞的汽油泵" @@ -163213,6 +165611,27 @@ msgstr "小金屬支架" msgid "A metal support beam." msgstr "" +#: lang/json/terrain_from_json.py +msgid "field stone wall" +msgstr "" + +#. ~ Description for field stone wall +#: lang/json/terrain_from_json.py +msgid "A sturdy dry stone wall. Just rocks fitted together without mortar." +msgstr "" + +#: lang/json/terrain_from_json.py +msgid "field stone half-wall" +msgstr "" + +#. ~ Description for field stone half-wall +#: lang/json/terrain_from_json.py +msgid "" +"A half height sturdy dry stone wall. Just rocks fitted together without " +"mortar. Complete as is or with extensive work it could be doubled in " +"height." +msgstr "" + #: lang/json/terrain_from_json.py msgid "window" msgstr "窗戶" @@ -163584,8 +166003,8 @@ msgstr "" #: lang/json/terrain_from_json.py msgid "" "A cheap mish mash of planks and sticks with a log pillar that keeps it " -"together. It is capable of supporting an upper level or roof. Dirt and " -"stones make the wall secure. Somewhat flammable." +"together. It is capable of supporting an upper level or roof. Dirt and " +"stones make the wall secure. Somewhat flammable." msgstr "" #: lang/json/terrain_from_json.py @@ -163599,7 +166018,7 @@ msgstr "" #. ~ Description for LEGACY hydroponics unit #: lang/json/terrain_from_json.py msgid "" -"This is a deprecated hydroponics unit. Deconstruct it to recieve your " +"This is a deprecated hydroponics unit. Deconstruct it to recieve your " "materials back." msgstr "" @@ -163952,7 +166371,7 @@ msgstr "法力編織" #. ~ Adjective in "You block of the damage with your . #: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/melee.cpp src/recipe.cpp +#: src/map_extras.cpp src/melee.cpp src/recipe.cpp msgid "none" msgstr "無" @@ -164615,7 +167034,7 @@ msgstr "冰淇淋手推車" msgid "Luggage Cart" msgstr "行李手推車" -#: lang/json/vehicle_from_json.py src/defense.cpp +#: lang/json/vehicle_from_json.py src/gamemode_defense.cpp msgid "Shopping Cart" msgstr "購物車" @@ -167734,8 +170153,8 @@ msgstr "LACP 雷射槍塔" #. ~ Description for Gelatinous track #: lang/json/vehicle_part_from_json.py msgid "" -"A set of continuous, interlocking tracks made out of blob. They can be used " -"in place of wheels, and provide good traction and off-road performance." +"A set of continuous, interlocking tracks made out of blob. They can be used" +" in place of wheels, and provide good traction and off-road performance." msgstr "" #. ~ Description for gel shooter @@ -168456,6 +170875,10 @@ msgstr "維他命C" msgid "Toxins" msgstr "" +#: lang/json/vitamin_from_json.py +msgid "Disgusting Diet" +msgstr "" + #: src/action.cpp src/input.cpp msgid "Press " msgstr "按 " @@ -168930,6 +171353,12 @@ msgstr "無法裝填 %s。" msgid "You reload the %s." msgstr "你裝填了 %s。" +#: src/activity_handlers.cpp +#, c-format +msgid "" +"You manage to loosen some debris and make your %s somewhat operational." +msgstr "" + #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." @@ -169818,6 +172247,10 @@ msgstr "此任務的位置被東西擋住了。" msgid "The required items are not available to complete this task." msgstr "完成任務所需的物品目前無法取用。" +#: src/activity_item_handling.cpp +msgid "It is too dark to work here." +msgstr "" + #: src/activity_type.cpp #, c-format msgid "Stop %s?" @@ -170234,6 +172667,10 @@ msgstr "彈藥／能量類別" msgid "spoilage" msgstr "腐敗" +#: src/advanced_inv.cpp +msgid "barter value" +msgstr "" + #. ~ Items list header (length type 1). Table fields length without spaces: #. amt - 4, weight - 5, vol - 4. #: src/advanced_inv.cpp @@ -172264,6 +174701,44 @@ msgstr "%s 在目前的狀態下無法發射。" msgid "The %s can't be fired while loaded with incompatible ammunition %s" msgstr "" +#: src/avatar_action.cpp +msgid "You're not wielding anything." +msgstr "你沒有手持任何東西。" + +#: src/avatar_action.cpp +#, c-format +msgid "You're too full to eat the leaves from the %s." +msgstr "你太飽了吃不下 %s 的葉子。" + +#: src/avatar_action.cpp +msgid "You eat the underbrush." +msgstr "你吃了草叢。" + +#: src/avatar_action.cpp +msgid "You're too full to graze." +msgstr "你太飽了吃不下草。" + +#: src/avatar_action.cpp +msgid "You eat the grass." +msgstr "你吃下草。" + +#: src/avatar_action.cpp +msgid "This grass is too short to graze." +msgstr "草太短了不能吃。" + +#: src/avatar_action.cpp +msgid "This grass is dead and too mangled for you to graze." +msgstr "" + +#: src/avatar_action.cpp +msgid "This grass is tainted with paint and thus inedible." +msgstr "" + +#: src/avatar_action.cpp +#, c-format +msgid "You leave the empty %s." +msgstr "你留下空的 %s。" + #: src/avatar_action.cpp msgid "You can't effectively throw while you're in your shell." msgstr "你在殼中無法有效率的投擲。" @@ -172301,6 +174776,14 @@ msgstr "你聚精會神, 你的身體開始服從大腦了!" msgid "You can't muster up the effort to throw anything…" msgstr "你無法提起力氣投擲東西…" +#: src/avatar_action.cpp +msgid "Unload item" +msgstr "清空物品" + +#: src/avatar_action.cpp +msgid "You have nothing to unload." +msgstr "你沒東西可卸下。" + #: src/ballistics.cpp #, c-format msgid "The %s shatters!" @@ -173178,15 +175661,13 @@ msgstr "當開始操作時，你感到興奮。" #: src/bionics.cpp msgid "" "You feel excited as the Autodoc slices painlessly into you. You enjoy the " -"sight of scalpels slicing you apart, but as operation proceeds you suddenly " -"feel tired and pass out." +"sight of scalpels slicing you apart." msgstr "" #: src/bionics.cpp msgid "" "You stay very, very still, focusing intently on an interesting stain on the " -"ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass " -"out when the blades reach your line of sight." +"ceiling, as the Autodoc slices painlessly into you." msgstr "" #: src/bionics.cpp @@ -175749,8 +178230,8 @@ msgstr "它目前的狀態看起來不能食用。" msgid "This is full of dirt after being on the ground." msgstr "它被放到地上後沾滿了泥土。" -#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/player.cpp +#: src/consumption.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp src/iuse_actor.cpp src/player.cpp msgid "You can't do that while underwater." msgstr "你無法在水下那麼做。" @@ -176624,11 +179105,11 @@ msgstr "批量節省時間: %s" msgid "Dark craftable? %s" msgstr "在黑暗中製作？ %s" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Easy" msgstr "簡單" -#: src/crafting_gui.cpp src/defense.cpp +#: src/crafting_gui.cpp src/gamemode_defense.cpp msgid "Hard" msgstr "困難" @@ -177124,6 +179605,10 @@ msgstr "" msgid "Test weather" msgstr "測試天氣" +#: src/debug_menu.cpp +msgid "Test map extra list" +msgstr "" + #: src/debug_menu.cpp msgid "Info…" msgstr "資訊 ... " @@ -177330,7 +179815,7 @@ msgstr "收集: %d" msgid "Altruism: %d" msgstr "利他主義: %d" -#: src/debug_menu.cpp src/defense.cpp +#: src/debug_menu.cpp src/gamemode_defense.cpp msgid "Needs:" msgstr "需求:" @@ -178015,390 +180500,6 @@ msgstr "" msgid "%s is now level %d!" msgstr "" -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [ 0%% ]" -msgstr "正在生成地圖, 請稍候 [ 0%% ]" - -#: src/defense.cpp -msgid "A caravan approaches! Press spacebar…" -msgstr "有商隊接近了！請按空白鍵…" - -#: src/defense.cpp -msgid "You don't need to sleep!" -msgstr "你不需要睡眠!" - -#: src/defense.cpp -msgid "You cannot save in defense mode!" -msgstr "你不能在 防禦模式 存檔!" - -#: src/defense.cpp -#, c-format -msgid "You cannot leave the %s behind!" -msgstr "你不能離開 %s!" - -#: src/defense.cpp -#, c-format -msgid "You managed to survive through wave %d!" -msgstr "你存活了 %d 波攻擊!" - -#: src/defense.cpp -#, c-format -msgid "Please wait as the map generates [%2d%%]" -msgstr "正在生成地圖, 請稍候 [%2d%%]" - -#: src/defense.cpp -msgid "Previous option" -msgstr "上個選項" - -#: src/defense.cpp -msgid "Next option" -msgstr "下個選項" - -#: src/defense.cpp -msgid "Cycle option value" -msgstr "切換選項數值" - -#: src/defense.cpp -msgid "Toggle option" -msgstr "切換選項" - -#: src/defense.cpp -msgid "You must choose at least one monster group!" -msgstr "你至少要選擇一組怪物!" - -#: src/defense.cpp -msgid "Special Zombies" -msgstr "特殊殭屍" - -#: src/defense.cpp -msgid "Zombies" -msgstr "殭屍" - -#: src/defense.cpp -msgid "Triffids" -msgstr "食人樹" - -#: src/defense.cpp -msgid "Robots" -msgstr "機器人" - -#: src/defense.cpp -msgid "Subspace" -msgstr "異空間" - -#: src/defense.cpp src/handle_action.cpp -msgid "Food" -msgstr "食物" - -#: src/defense.cpp -msgid "Mercenaries" -msgstr "傭兵" - -#: src/defense.cpp -msgid "DEFENSE MODE" -msgstr "防禦模式" - -#: src/defense.cpp -msgid "Press direction keys to cycle, ENTER to toggle" -msgstr "按方向鍵來循環, 按 Enter 來切換" - -#: src/defense.cpp -msgid "Press S to start" -msgstr "按 S 鍵開始" - -#: src/defense.cpp -msgid "Scenario:" -msgstr "劇情:" - -#: src/defense.cpp src/panels.cpp -msgid "Location:" -msgstr "地點:" - -#: src/defense.cpp -msgid "Initial Difficulty:" -msgstr "初始難度:" - -#: src/defense.cpp -msgid "The difficulty of the first wave." -msgstr "首波難度。" - -#: src/defense.cpp -msgid "Wave Difficulty:" -msgstr "每波難度:" - -#: src/defense.cpp -msgid "The increase of difficulty with each wave." -msgstr "每波難度的增加。" - -#: src/defense.cpp -msgid "Time b/w Waves:" -msgstr "每波間隔時間:" - -#: src/defense.cpp -msgid "The time, in minutes, between waves." -msgstr "每波中間的時間 (分鐘) 間隔。" - -#: src/defense.cpp -msgid "Waves b/w Caravans:" -msgstr "出現商隊的間隔波數:" - -#: src/defense.cpp -msgid "The number of waves in between caravans." -msgstr "每次商隊出現的間隔波數" - -#: src/defense.cpp -msgid "Initial Cash:" -msgstr "初始金錢:" - -#: src/defense.cpp -msgid "The amount of money the player starts with." -msgstr "角色剛開始擁有的金錢。" - -#: src/defense.cpp -msgid "Cash for 1st Wave:" -msgstr "首波金錢:" - -#: src/defense.cpp -msgid "The cash awarded for the first wave." -msgstr "首波獎勵的金錢。" - -#: src/defense.cpp -msgid "Cash Increase:" -msgstr "金錢增加:" - -#: src/defense.cpp -msgid "The increase in the award each wave." -msgstr "每波的獎金增加幅度。" - -#: src/defense.cpp -msgid "Enemy Selection:" -msgstr "選擇敵人:" - -#: src/defense.cpp src/iuse_software_minesweeper.cpp -msgid "Custom" -msgstr "自訂" - -#: src/defense.cpp -msgid "Medium" -msgstr "普通" - -#: src/defense.cpp -msgid "Shaun of the Dead" -msgstr "活人甡吃" - -#: src/defense.cpp -msgid "Dawn of the Dead" -msgstr "活人生吃" - -#: src/defense.cpp -msgid "Eight-Legged Freaks" -msgstr "八腳怪" - -#: src/defense.cpp -msgid "Day of the Triffids" -msgstr "生化食人樹" - -#: src/defense.cpp -msgid "Skynet" -msgstr "天網" - -#: src/defense.cpp -msgid "The Call of Cthulhu" -msgstr "克蘇魯的呼喚" - -#: src/defense.cpp -msgid "A custom game." -msgstr "自定義遊戲。" - -#: src/defense.cpp -msgid "Easy monsters and lots of money." -msgstr "簡單的怪物及大量的金錢。" - -#: src/defense.cpp -msgid "Harder monsters. You have to eat." -msgstr "較難纏的怪物。你必須進食。" - -#: src/defense.cpp -msgid "All monsters. You have to eat and drink." -msgstr "全種類的怪物。你必須吃喝。" - -#: src/defense.cpp -msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "保衛酒吧對抗傳統殭屍。簡單又有趣。" - -#: src/defense.cpp -msgid "Classic zombies. Slower and more realistic." -msgstr "傳統殭屍。動作慢並更真實。" - -#: src/defense.cpp -msgid "Fast-paced spider-fighting fun!" -msgstr "快節奏的蜘蛛對戰, 無比有趣!" - -#: src/defense.cpp -msgid "Defend your mansion against the triffids." -msgstr "對抗食人樹, 保衛你的豪宅。" - -#: src/defense.cpp -msgid "The robots have decided that humans are the enemy!" -msgstr "這些機器人決定了人類是敵人!" - -#: src/defense.cpp -msgid "Ward off legions of eldritch horrors." -msgstr "抵擋怪異的恐怖軍團。" - -#: src/defense.cpp -msgid "Public Works" -msgstr "公共建設" - -#: src/defense.cpp -msgid "Megastore" -msgstr "大賣場" - -#: src/defense.cpp -msgid "Bar" -msgstr "酒吧" - -#: src/defense.cpp -msgid "One entrance and many rooms. Some medical supplies." -msgstr "一個入口以及多個房間。有些許醫療資源。" - -#: src/defense.cpp -msgid "Easily fortifiable building. Lots of useful tools." -msgstr "易於加固的建築。很多有用的工具。" - -#: src/defense.cpp -msgid "A large building with various supplies." -msgstr "一個有著許多物資的大型建築。" - -#: src/defense.cpp -msgid "A small building with plenty of alcohol." -msgstr "一個有著大量酒類的小建築物。" - -#: src/defense.cpp -msgid "A large house with many rooms." -msgstr "有很多房間的大房子。" - -#: src/defense.cpp -#, c-format -msgid "" -"CARAVAN:\n" -"Start by selecting a category using your favorite up/down keys.\n" -"Switch between category selection and item selecting by pressing %s.\n" -"Pick an item with the up/down keys, press left/right to buy 1 less/more.\n" -"Press %s to buy everything in your cart, %s to buy nothing." -msgstr "" -"商隊:\n" -"一開始先用上/下鍵來選擇你想要的分類。\n" -"按 %s 在分類選擇模式和物品選擇模式之間切換。\n" -"用上/下鍵選擇一個物品, 按左/右鍵來增加/減少數量。\n" -"按 %s 結帳, 都不買按 %s。" - -#: src/defense.cpp -msgid "Really buy nothing?" -msgstr "確定什麼都不買?" - -#: src/defense.cpp -msgid "You can't afford those items!" -msgstr "你的錢不夠!" - -#: src/defense.cpp -#, c-format -msgid "Buy %d item, leaving you with %s?" -msgid_plural "Buy %d items, leaving you with %s?" -msgstr[0] "買下 %d 物品，剩下 %s？" - -#: src/defense.cpp -msgid "You drop some items." -msgstr "你丟棄一些東西。" - -#: src/defense.cpp -msgid "Melee Weapons" -msgstr "近戰武器" - -#: src/defense.cpp -msgid "Ranged Weapons" -msgstr "遠程武器" - -#: src/defense.cpp -msgid "Ammuniton" -msgstr "彈藥" - -#: src/defense.cpp -msgid "Crafting & Construction Components" -msgstr "製作 & 建設零件" - -#: src/defense.cpp -msgid "Food & Drugs" -msgstr "食物 & 藥物" - -#: src/defense.cpp -msgid "Clothing & Armor" -msgstr "衣物 & 護甲" - -#: src/defense.cpp -msgid "Tools, Traps & Grenades" -msgstr "工具、陷阱 & 手榴彈" - -#: src/defense.cpp -msgid "Press ? for help." -msgstr "按 ? 檢視說明。" - -#: src/defense.cpp -#, c-format -msgid "Your Cash: %s" -msgstr "你的金錢: %s" - -#: src/defense.cpp -#, c-format -msgid "Welcome to Wave %d!" -msgstr "歡迎來到第 %d 波!" - -#: src/defense.cpp -#, c-format -msgid "Wave %d: " -msgstr "第 %d 波: " - -#: src/defense.cpp -#, c-format -msgid "Invasion of the %s!" -msgstr "%s 來襲!" - -#: src/defense.cpp -#, c-format -msgid "Attack of the %s!" -msgstr "%s 的攻擊!" - -#: src/defense.cpp -#, c-format -msgid "%s Attack!" -msgstr "%s 攻擊了!" - -#: src/defense.cpp -#, c-format -msgid "%s from Hell!" -msgstr "從地獄來的 %s!" - -#: src/defense.cpp -#, c-format -msgid "Beware! %s!" -msgstr "小心！%s！" - -#: src/defense.cpp -#, c-format -msgid "The Day of the %s!" -msgstr "今天是 %s 的日子!" - -#: src/defense.cpp -#, c-format -msgid "Revenge of the %s!" -msgstr "%s 的復仇!" - -#: src/defense.cpp -#, c-format -msgid "Rise of the %s!" -msgstr "%s 出現了!" - #: src/descriptions.cpp msgid "" "c to describe creatures, f to describe furniture, t to describe terrain, " @@ -178970,53 +181071,53 @@ msgstr "這大麻簡直是- 棒到不知該怎麼形容了。" #: src/effect.cpp #, c-format -msgid "Strength +%d; " -msgstr "力量 +%d " +msgid "Strength +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Strength %d; " -msgstr "力量 %d " +msgid "Strength %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity +%d; " -msgstr "敏捷 +%d " +msgid "Dexterity +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Dexterity %d; " -msgstr "敏捷 %d " +msgid "Dexterity %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception +%d; " -msgstr "感知 +%d " +msgid "Perception +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Perception %d; " -msgstr "感知 %d " +msgid "Perception %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence +%d; " -msgstr "智力 +%d " +msgid "Intelligence +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Intelligence %d; " -msgstr "智力 %d " +msgid "Intelligence %d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed +%d; " -msgstr "速度 +%d " +msgid "Speed +%d; " +msgstr "" #: src/effect.cpp #, c-format -msgid "Speed %d; " -msgstr "速度 %d% " +msgid "Speed %d; " +msgstr "" #: src/effect.cpp msgid "pain" @@ -180008,8 +182109,9 @@ msgstr "" #: src/faction_camp.cpp #, c-format -msgid "%s failed to start the %s basecamp." -msgstr "%s 無法開始建造 %s 營寨。" +msgid "" +"%s failed to start the %s basecamp, perhaps there is a vehicle in the way." +msgstr "" #: src/faction_camp.cpp msgid "There is no faction camp here to recover!" @@ -180867,8 +182969,9 @@ msgstr "回應緊急召回中..." #: src/faction_camp.cpp #, c-format -msgid "%s failed to build the %s upgrade." -msgstr "%s 無法建造升級 %s 。" +msgid "" +"%s failed to build the %s upgrade, perhaps there is a vehicle in the way." +msgstr "" #: src/faction_camp.cpp msgid "returns from upgrading the camp having earned a bit of experience…" @@ -181082,8 +183185,9 @@ msgstr "選擇擴建營區類別：" #: src/faction_camp.cpp #, c-format -msgid "%s failed to add the %s expansion" -msgstr "%s無法加入%s擴建中" +msgid "" +"%s failed to add the %s expansion, perhaps there is a vehicle in the way." +msgstr "" #: src/faction_camp.cpp msgid "returns from surveying for the expansion." @@ -181361,6 +183465,26 @@ msgstr "" msgid "(You wonder if your companions are fit to work on their own…)" msgstr "（你想知道你的同伴是否適合被指派的工作...）" +#: src/field_type.h +#, c-format +msgid " in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " covered in %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " on %s" +msgstr "" + +#: src/field_type.h +#, c-format +msgid " under %s" +msgstr "" + #: src/fungal_effects.cpp src/iuse.cpp #, c-format msgid "The %s is covered in tiny spores!" @@ -182140,7 +184264,8 @@ msgstr "" msgid "Without extra fuel it will burn for between %s to %s." msgstr "" -#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp +#: src/iuse_actor.cpp src/iuse_actor.cpp msgid "You cannot do that while mounted." msgstr "騎乘時無法做那個。" @@ -182633,40 +184758,6 @@ msgstr "你沒有心情, 而且光想像如何作業, 就讓你還沒開始就 msgid "%s helps with this task…" msgstr "%s 幫忙這項工作..." -#: src/game.cpp -#, c-format -msgid "You're too full to eat the leaves from the %s." -msgstr "你太飽了吃不下 %s 的葉子。" - -#: src/game.cpp -msgid "You eat the underbrush." -msgstr "你吃了草叢。" - -#: src/game.cpp -msgid "You're too full to graze." -msgstr "你太飽了吃不下草。" - -#: src/game.cpp -msgid "You eat the grass." -msgstr "你吃下草。" - -#: src/game.cpp -msgid "This grass is too short to graze." -msgstr "草太短了不能吃。" - -#: src/game.cpp -msgid "This grass is dead and too mangled for you to graze." -msgstr "" - -#: src/game.cpp -msgid "This grass is tainted with paint and thus inedible." -msgstr "" - -#: src/game.cpp -#, c-format -msgid "You leave the empty %s." -msgstr "你留下空的 %s。" - #: src/game.cpp msgid "Change side for item" msgstr "把裝備穿到另一側" @@ -182695,6 +184786,11 @@ msgstr "%s 已經滿了!" msgid "You can't reload a %s!" msgstr "你不能裝填 %s!" +#: src/game.cpp +#, c-format +msgid "You struggle to reload the fouled %s." +msgstr "" + #: src/game.cpp msgid "Reload item" msgstr "裝填物品" @@ -182703,18 +184799,6 @@ msgstr "裝填物品" msgid "You have nothing to reload." msgstr "你沒東西可填裝。" -#: src/game.cpp -msgid "Unload item" -msgstr "清空物品" - -#: src/game.cpp -msgid "You have nothing to unload." -msgstr "你沒東西可卸下。" - -#: src/game.cpp -msgid "You're not wielding anything." -msgstr "你沒有手持任何東西。" - #: src/game.cpp #, c-format msgid "There's an angry red dot on your body, %s to brush it off." @@ -182799,6 +184883,13 @@ msgstr "找不到抓著的物件。" msgid "You cannot board a vehicle whilst riding." msgstr "騎乘時無法登上車輛。" +#: src/game.cpp +#, c-format +msgid "" +"Stepping into that %1$s looks risky. Run into it if you wish to enter " +"anyway." +msgstr "" + #: src/game.cpp msgid "You cannot pass obstacles whilst mounted." msgstr "騎乘時無法越過障礙物。" @@ -183454,11 +185545,6 @@ msgstr "已指派的物品代碼: %d/ (DEAF!)" +msgstr "" + #: src/handle_action.cpp msgid "" "You're engorged to hibernate. The alarm would only attract attention. Set " @@ -189316,7 +191802,7 @@ msgstr "你的 %1$s 無法再容納更多的 %2$s。" msgid "That %s doesn't have room to expand." msgstr "沒有足夠的位置供 %s 打開。" -#: src/item.cpp +#: src/item.cpp src/trait_group.cpp #, c-format msgid "%d x %s" msgstr "%d x %s" @@ -189399,69 +191885,6 @@ msgstr "" msgid "Your %s disappears!" msgstr "你的 %s 消失了！" -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse" -msgid_plural "skinned %s corpses" -msgstr[0] "剝皮的%s屍體" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass" -msgid_plural "skinned %s carcasses" -msgstr[0] "剝皮的%s畜體" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass" -msgid_plural "%s carcasses" -msgstr[0] "%s 屍體" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "quartered %s carcass" -msgid_plural "quartered %s carcasses" -msgstr[0] "四分之一 %s 屍體" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse" -msgid_plural "%s corpses" -msgstr[0] "%s 屍體" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s corpse of %s" -msgid_plural "skinned %s corpses of %s" -msgstr[0] "剝皮的%s%s屍體" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "skinned %s carcass of %s" -msgid_plural "skinned %s carcasses of %s" -msgstr[0] "剝皮的%s%s畜體" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s carcass of %s" -msgid_plural "%s carcasses of %s" -msgstr[0] "%s %s 的屍體" - -#: src/item.cpp -#, c-format -msgctxt "item name" -msgid "%s corpse of %s" -msgid_plural "%s corpses of %s" -msgstr[0] "%s %s 的屍體" - #: src/item.cpp msgctxt "item name" msgid "human blood" @@ -189475,6 +191898,21 @@ msgid "%s blood" msgid_plural "%s blood" msgstr[0] "%s 血液" +#. ~ %1$s: name of corpse with modifiers; %2$s: species name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of a %2$s" +msgstr "" + +#. ~ %1$s: name of corpse with modifiers; %2$s: proper name; %3$s: species +#. name +#: src/item.cpp +#, c-format +msgctxt "corpse ownership qualifier" +msgid "%1$s of %2$s, %3$s" +msgstr "" + #: src/item_action.cpp msgid "You do not have an item that can perform this action." msgstr "你沒有可以執行這個動作的物品。" @@ -190051,7 +192489,7 @@ msgstr "這裡沒有能餵飼的目標。" msgid "Modify what?" msgstr "要修改啥?" -#: src/iuse.cpp src/iuse.cpp src/iuse_actor.cpp +#: src/iuse.cpp src/iuse_actor.cpp msgid "You do not have that item!" msgstr "你沒有那個物品!" @@ -191102,6 +193540,10 @@ msgstr "踩地雷" msgid "Lights on!" msgstr "開燈!" +#: src/iuse.cpp +msgid "Play anything for a while" +msgstr "" + #: src/iuse.cpp #, c-format msgid "You play on your %s for a while." @@ -191524,10 +193966,6 @@ msgstr "你聽到 \"%s\"" msgid "You need a mechanics skill of 2 to use this repair kit." msgstr "你需要等級 2 的機械技能才能使用這個修理工具。" -#: src/iuse.cpp -msgid "Select the firearm to repair" -msgstr "選擇要修理的槍械" - #: src/iuse.cpp msgid "That isn't a firearm!" msgstr "這不是一把槍械!" @@ -191578,23 +194016,6 @@ msgstr "你沒有合適的工具。" msgid "You cancel unloading the tool." msgstr "你取消清空這工具。" -#: src/iuse.cpp -msgid "You can't see to repair!" -msgstr "太暗了, 你無法修理!" - -#: src/iuse.cpp -msgid "You need a fabrication skill of 1 to use this repair kit." -msgstr "你需要等級 1 的製作技能才能使用這個修理工具。" - -#: src/iuse.cpp -msgid "Select the item to repair" -msgstr "選擇要修理的物品" - -#: src/iuse.cpp -#, c-format -msgid "You reinforce your %s." -msgstr "你強化你的 %s。" - #: src/iuse.cpp msgid "Clank! Clank!" msgstr "匡啷！匡啷！" @@ -191842,31 +194263,6 @@ msgstr "你觸動了韌體保護, 卡片的資料被清空了!" msgid " on " msgstr "" -#: src/iuse.cpp -#, c-format -msgid " covered in %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " on %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " under %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " illuminated by %s" -msgstr "" - -#: src/iuse.cpp -#, c-format -msgid " in %s" -msgstr "" - #: src/iuse.cpp #, c-format msgid " with graffiti \"%s\"" @@ -192663,6 +195059,14 @@ msgid "" " but best to stop messing with it." msgstr "你的惡搞差點弄壞大同電鍋! 還好, 它還能用, 但最好不要再亂弄它了。" +#: src/iuse.cpp +msgid "Choose UPS:" +msgstr "選擇 UPS：" + +#: src/iuse.cpp +msgid "You don't have any UPS." +msgstr "你沒有UPS。" + #: src/iuse.cpp msgid "Using cable:" msgstr "使用電纜:" @@ -192691,14 +195095,6 @@ msgstr "你將電纜連接到你的電纜充電系統" msgid "You attach the cable to the solar pack." msgstr "你將電纜連接到太陽能板背包" -#: src/iuse.cpp -msgid "Choose UPS:" -msgstr "選擇 UPS：" - -#: src/iuse.cpp -msgid "You don't have any UPS." -msgstr "你沒有UPS。" - #: src/iuse.cpp msgid "You attach the cable to the UPS." msgstr "你將電纜連接到 UPS。" @@ -192906,11 +195302,11 @@ msgstr "" #: src/iuse.cpp msgid "You feel much better - almost entirely." -msgstr "" +msgstr "您感覺好多了-幾乎整個都好了。" #: src/iuse.cpp msgid "You feel AMAZING!" -msgstr "" +msgstr "你覺得 很 奇 妙！" #: src/iuse.cpp msgid "You empty the contents of the go bag onto the floor." @@ -193033,7 +195429,7 @@ msgstr "" #: src/iuse.cpp #, c-format msgid "The %s says: %s" -msgstr "" +msgstr "%s說: \"%s\"" #: src/iuse.cpp src/player.cpp #, c-format @@ -194138,7 +196534,7 @@ msgstr "把 %s 設立在哪 (%dx%d 淨空區域)?" #: src/iuse_actor.cpp #, c-format msgid "The %s is in the way." -msgstr "" +msgstr "%s 擋在那!" #: src/iuse_actor.cpp #, c-format @@ -195185,12 +197581,9 @@ msgid "Congratulations, you won!" msgstr "恭喜! 你贏了!" #: src/iuse_software_minesweeper.cpp -msgid "Max:" -msgstr "最大:" - -#: src/iuse_software_minesweeper.cpp -msgid "Min:" -msgstr "最小:" +#, c-format +msgid "Min: %d Max: %d" +msgstr "" #: src/iuse_software_minesweeper.cpp msgid "Game Difficulty" @@ -196046,6 +198439,34 @@ msgctxt "Main Menu|New Game" msgid "Play ow!" msgstr "馬上玩! (隨機劇情)" +#: src/main_menu.cpp +msgid "" +"Allows you to fully customize points pool, scenario, and character's " +"profession, stats, traits, skills and other parameters." +msgstr "" + +#: src/main_menu.cpp +msgid "Select from one of previously created character templates." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Creates random character, but lets you preview the generated character and " +"the scenario and change character and/or scenario if needed." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing character's traits, " +"profession, skills and other parameters. Scenario is fixed to Evacuee." +msgstr "" + +#: src/main_menu.cpp +msgid "" +"Puts you right in the game, randomly choosing scenario and character's " +"traits, profession, skills and other parameters." +msgstr "" + #: src/main_menu.cpp msgid "No templates found!" msgstr "沒有找到模板!" @@ -196273,6 +198694,14 @@ msgstr "有東西從 %s 爬出來了！" msgid "DANGER! MINEFIELD!" msgstr "危險！地雷區！" +#: src/map_extras.cpp +msgid "Test which map extra list?" +msgstr "" + +#: src/map_extras.cpp +msgid "Result of 32400 selections:" +msgstr "" + #: src/map_field.cpp #, c-format msgid "A %s hits you!" @@ -196405,20 +198834,9 @@ msgid "You're violently teleported!" msgstr "你被強制傳送了!" #: src/map_field.cpp -msgid "The bees sting you!" -msgstr "蜂群螫了你！" - -#: src/map_field.cpp -msgid "The bees sting you several times!" -msgstr "蜂群螫了你數次！" - -#: src/map_field.cpp -msgid "The bees sting you many times!" -msgstr "蜂群螫了你許多次！" - -#: src/map_field.cpp -msgid "The bees sting you all over your body!" -msgstr "蜂群螫遍了你的全身！" +#, c-format +msgid "The bees sting you in %s!" +msgstr "" #: src/map_field.cpp msgid "The incendiary burns you!" @@ -196581,6 +198999,16 @@ msgid "Skill" msgid_plural "Skills" msgstr[0] "技能" +#: src/martialarts.cpp +msgid "Damage type required: " +msgid_plural "Damage types required: " +msgstr[0] "" + +#: src/martialarts.cpp +#, c-format +msgid "%s: %d" +msgstr "" + #: src/martialarts.cpp msgid "Requires: " msgstr "前提增益: " @@ -201461,6 +203889,10 @@ msgstr "%s 身上的強酸灼燒著你的手!" msgid "Acid sprays out of %s as it is hit!" msgstr "%s 被擊中後噴灑出強酸!" +#: src/mondefense.cpp +msgid "Detected shots from unseen attacker, return fire mode engaged." +msgstr "" + #: src/monexamine.cpp msgid "zombie slave" msgstr "屍奴 " @@ -204392,8 +206824,9 @@ msgid "I have news." msgstr "我有新消息。" #: src/npctalk.cpp -msgid "Yes, let's resume training " -msgstr "好, 繼續訓練 " +#, c-format +msgid "Yes, let's resume training %s" +msgstr "" #: src/npctalk.cpp #, c-format @@ -205088,6 +207521,16 @@ msgid "" "weight limit." msgstr "設定為 [否], 玩家會在超重時自動丟棄剛撿取的物品。" +#: src/options.cpp +msgid "Dangerous running" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the player will not be prevented from moving into known hazardous " +"tiles while running." +msgstr "" + #: src/options.cpp msgid "Safe mode" msgstr "安全模式" @@ -206109,13 +208552,13 @@ msgstr "設定為 [是], 當使用軟體算圖時, 遊戲會使用硬體加速 #: src/options.cpp msgid "Use color modulated textures" -msgstr "" +msgstr "使用顏色已調製紋理" #: src/options.cpp msgid "" "If true, tries to use color modulated textures to speed-up ASCII drawing. " "Requires restart." -msgstr "" +msgstr "如果為是，則嘗試使用顏色調製紋理來加速ASCII繪圖。 需要重啟遊戲程式。" #: src/options.cpp msgid "Scaling mode" @@ -206569,24 +209012,24 @@ msgstr "沒有自由形式" #: src/options.cpp msgid "Quicksave on app lose focus" -msgstr "" +msgstr "快速儲存在應用程序上失去焦點" #: src/options.cpp msgid "" "If true, quicksave whenever the app loses focus (screen locked, app moved " "into background etc.) WARNING: Experimental. This may result in corrupt save" " games." -msgstr "" +msgstr "如果為是，則在這應用程式在失去焦點時（屏幕鎖定，應用程式移至後台等）會快速存檔。警告：此為實驗中功能。 這可能會導致保存遊戲損壞。" #: src/options.cpp msgid "Auto-manage virtual keyboard" -msgstr "" +msgstr "自動管理虛擬快捷鍵" #: src/options.cpp msgid "" "If true, automatically show/hide the virtual keyboard when necessary based " "on context. If false, virtual keyboard must be toggled manually." -msgstr "" +msgstr "如果為是，則在必要時根據上下文自動顯示/隱藏虛擬快捷鍵。 如果為否，則必須手動切換虛擬快捷鍵。" #: src/options.cpp msgid "Virtual keyboard screen scale" @@ -207260,7 +209703,7 @@ msgstr "搜尋:" #: src/overmap_ui.cpp #, c-format msgid "" -"Multiple entries separated with , Excludes starting with -\n" +"Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" "Current search radius is %d. It can be changed in options." msgstr "" @@ -207700,6 +210143,10 @@ msgstr "休息：" msgid "Heat :" msgstr "溫度：" +#: src/panels.cpp +msgid "Deaf!" +msgstr "聽不見!" + #: src/panels.cpp msgid "Underground" msgstr "地下" @@ -207758,10 +210205,6 @@ msgstr "月亮：" msgid "Lighting:" msgstr "光線:" -#: src/panels.cpp -msgid "Deaf!" -msgstr "聽不見!" - #: src/panels.cpp msgid "Weapon :" msgstr "武器：" @@ -208782,6 +211225,11 @@ msgstr "修補哪個故障?" msgid "Turns into: %s\n" msgstr "" +#: src/player.cpp +#, c-format +msgid "Also mends: %s\n" +msgstr "" + #: src/player.cpp #, c-format msgid "Time required: %s\n" @@ -209235,77 +211683,74 @@ msgstr "速度" #: src/player_display.cpp #, c-format -msgid "Swimming costs %+d movement point. " -msgid_plural "Swimming costs %+d movement points. " -msgstr[0] "游泳消耗 %+d 行動點數。" +msgid "Swimming movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Running costs %+d movement point. " -msgid_plural "Running costs %+d movement points. " -msgstr[0] "奔跑消耗 %+d 行動點數。" +msgid "Running movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reloading costs %+d movement point. " -msgid_plural "Reloading costs %+d movement points. " -msgstr[0] "重新裝填消耗 %+d 行動點數。" +msgid "Reloading movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee and thrown attacks cost %+d movement point. " -msgid_plural "Melee and thrown attacks cost %+d movement points. " -msgstr[0] "近戰與投擲攻擊消耗 %+d 行動點數。" +msgid "Melee and thrown attack movement point cost: %+d\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dodge skill %+.1f. " -msgstr "閃避技能 %+.1f。" +msgid "Dodge skill: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Melee attack rolls %+d%%; " -msgstr "近戰命中 %+d%%。" +msgid "Melee attack rolls: %+d%%\n" +msgstr "" #: src/player_display.cpp msgid "" -"Head encumbrance has no effect; it simply limits how much you can put on." -msgstr "頭部累贅沒有特殊影響, 僅僅限制你能穿上的東西。" +"Head encumbrance has no effect; it simply limits how much you" +" can put on." +msgstr "" #: src/player_display.cpp #, c-format msgid "" -"Perception %+d when checking traps or firing ranged weapons;\n" -"Dispersion %+d when throwing items." +"Perception when checking traps or firing ranged weapons: %+d\n" +"Dispersion when throwing items: %+d" msgstr "" -"偵測陷阱或射擊遠程武器時感知 %+d。\n" -"投擲物品時分散 %+d。" #: src/player_display.cpp msgid "" -"Covering your mouth will make it more difficult to breathe and catch your " -"breath." -msgstr "包覆嘴部會影響你呼吸以及喘息的困難度。" +"Covering your mouth will make it more difficult to breathe " +"and catch your breath." +msgstr "" #: src/player_display.cpp msgid "" -"Arm encumbrance affects stamina cost of melee attacks and accuracy with " -"ranged weapons." -msgstr "手臂累贅會影響你使用遠程武器的命中率, 以及近戰攻擊時的體力消耗。" +"Arm encumbrance affects stamina cost of melee attacks and " +"accuracy with ranged weapons." +msgstr "" #: src/player_display.cpp -msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "手掌累贅會降低你處理或操作物品的速度。\n" +msgid "" +"Reduces the speed at which you can handle or manipulate items.\n" +"\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Dexterity %+.1f when throwing items;\n" -msgstr "投擲物品時敏捷 %+.1f。\n" +msgid "Dexterity when throwing items: %+.1f\n" +msgstr "" #: src/player_display.cpp #, c-format -msgid "Reduces aim speed of guns by %.1f." -msgstr "降低槍械的瞄準速度 %.1f。" +msgid "Reduced gun aim speed: %.1f" +msgstr "" #: src/player_display.cpp msgid "" @@ -209402,9 +211847,9 @@ msgstr "體重：" #: src/player_display.cpp msgid "" "Your weight is a general indicator of how much fat your body has stored up, " -"which in turn shows how prepared you are to survive for a time without " -"food.Having too much, or too little, can be unhealthy." -msgstr "你的體重是你身體儲存多少脂肪的總指標，這也說明了你在沒有食物的情況下能夠生存下去的準備有多少。過多或過少，都是不健康的。" +"which in turn shows how prepared you are to survive for a time without food." +" Having too much, or too little, can be unhealthy." +msgstr "" #: src/player_display.cpp #, c-format @@ -210148,6 +212593,16 @@ msgstr "你的 %s 只發出悶響無法擊發!" msgid "'s %s misfires with a muffled click!" msgstr " 的 %s 只發出悶響無法擊發!" +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of your %s and reloading will help." +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "Perhaps taking the ammo out of 's %s and reloading will help." +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s misfires with a wet click!" @@ -210188,6 +212643,16 @@ msgstr "" msgid "'s %s is damaged by their shot!" msgstr "" +#: src/ranged.cpp +#, c-format +msgid "Your %s emits a grimace-inducing screech!" +msgstr "" + +#: src/ranged.cpp +#, c-format +msgid "'s %s emits a grimace-inducing screech!" +msgstr "" + #: src/ranged.cpp #, c-format msgid "Your %s fails to cycle!" @@ -210386,6 +212851,10 @@ msgstr "精確瞄準" msgid "[%c] to take precise aim and fire." msgstr "[%c] 精確瞄準並射擊。" +#: src/ranged.cpp +msgid "turrets" +msgstr "槍塔" + #: src/ranged.cpp #, c-format msgid "Really attack %s?" @@ -210810,8 +213279,8 @@ msgstr "聽到 %s!" #: src/sounds.cpp #, c-format -msgid "From your position you hear %1$s." -msgstr "你聽到 %1$s 從你的位置傳來。" +msgid "From your position you hear %1$s" +msgstr "" #: src/sounds.cpp #, c-format @@ -211904,18 +214373,6 @@ msgid "%s emits an IFF warning beep." msgid_plural "%s emits %d annoyed sounding beeps." msgstr[0] "%s 發出了 %d 吵雜的嗶嗶聲。" -#. ~ default name for the tutorial -#: src/tutorial.cpp -msgid "John Smith" -msgstr "John Smith" - -#: src/tutorial.cpp -msgid "" -"You're saving a tutorial - the tutorial world lacks certain features of " -"normal worlds. Weird things might happen when you load this save. You have" -" been warned." -msgstr "你在教學模式存檔 - 教學模式的世界缺少非常多的要素。若你嘗試讀取這個存檔可能會發生奇怪的事情。我警告過你了。" - #: src/veh_interact.cpp msgid "Select part" msgstr "選擇零件" @@ -212417,6 +214874,7 @@ msgid "" "Water Safe/Top Speed: " "%3d/%3d %s" msgstr "" +"水中安全/最高速度: %3d/%3d%s" #. ~ /t means per turn #: src/veh_interact.cpp @@ -214202,6 +216660,10 @@ msgstr "豔陽" msgid "Cloudy" msgstr "多雲" +#: src/weather_data.cpp +msgid "Light Drizzle" +msgstr "" + #: src/weather_data.cpp msgid "Drizzle" msgstr "細雨" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 81c3622f0e3b5..9f738828d1ba8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,291 +1,286 @@ # Cataclysm DDA client -cmake_minimum_required(VERSION 3.0.0) +cmake_minimum_required(VERSION 3.1.4) SET(MAIN_CPP ${CMAKE_SOURCE_DIR}/src/main.cpp) SET(RESOURCE_RC ${CMAKE_SOURCE_DIR}/src/resource.rc) FILE(GLOB CATACLYSM_DDA_SOURCES - ${CMAKE_SOURCE_DIR}/src/*.cpp) + ${CMAKE_SOURCE_DIR}/src/*.cpp +) LIST(REMOVE_ITEM CATACLYSM_DDA_SOURCES ${MAIN_CPP}) FILE(GLOB CATACLYSM_DDA_HEADERS - ${CMAKE_SOURCE_DIR}/src/*.h) + ${CMAKE_SOURCE_DIR}/src/*.h +) # Get GIT version strings ADD_CUSTOM_TARGET( - get_version - DEPENDS ${CMAKE_SOURCE_DIR}/src/version.h - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + get_version + DEPENDS ${CMAKE_SOURCE_DIR}/src/version.h + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) ADD_CUSTOM_COMMAND ( - OUTPUT ${CMAKE_SOURCE_DIR}/src/version.h - COMMAND ${CMAKE_COMMAND} - -D SRC=${CMAKE_SOURCE_DIR}/src/version.h.in - -D DST=${CMAKE_SOURCE_DIR}/src/version.h - -D GIT_EXECUTABLE=${GIT_EXECUTABLE} - -P ${CMAKE_SOURCE_DIR}/src/version.cmake - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT ${CMAKE_SOURCE_DIR}/src/version.h + COMMAND ${CMAKE_COMMAND} + -D SRC=${CMAKE_SOURCE_DIR}/src/version.h.in + -D DST=${CMAKE_SOURCE_DIR}/src/version.h + -D GIT_EXECUTABLE=${GIT_EXECUTABLE} + -P ${CMAKE_SOURCE_DIR}/src/version.cmake + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) # Build tiles version if requested IF(TILES) - add_library(libcataclysm-tiles STATIC - ${CATACLYSM_DDA_SOURCES} - ${CATACLYSM_DDA_HEADERS} - ) - - target_include_directories(libcataclysm-tiles INTERFACE ${CMAKE_SOURCE_DIR}/src) - - IF(WIN32) - ADD_DEFINITIONS(-DUSE_WINMAIN) - ADD_EXECUTABLE(cataclysm-tiles WIN32 - ${MAIN_CPP} - ${RESOURCE_RC} - ) - ELSE(WIN32) - ADD_EXECUTABLE(cataclysm-tiles - ${MAIN_CPP} - ) - ENDIF(WIN32) - - ADD_DEPENDENCIES(libcataclysm-tiles get_version) - - target_link_libraries(cataclysm-tiles libcataclysm-tiles) - target_compile_definitions(libcataclysm-tiles PUBLIC TILES ) - - IF (LOCALIZE) - target_include_directories(libcataclysm-tiles PUBLIC - ${LIBINTL_INCLUDE_DIR} - ${ICONV_INCLUDE_DIR} - ) - target_link_libraries(libcataclysm-tiles - ${LIBINTL_LIBRARIES} - ${ICONV_LIBRARIES} - ) - ENDIF (LOCALIZE) - - IF(CMAKE_USE_PTHREADS_INIT) - target_compile_options(libcataclysm-tiles PUBLIC "-pthread") - ENDIF(CMAKE_USE_PTHREADS_INIT) - - IF(CMAKE_THREAD_LIBS_INIT) - target_link_libraries(libcataclysm-tiles ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(CMAKE_THREAD_LIBS_INIT) - - IF (NOT DYNAMIC_LINKING) - # SDL, SDL_Image, SDL_ttf deps are required for static build - target_include_directories(libcataclysm-tiles PUBLIC - ${FREETYPE_INCLUDE_DIRS} - ${PNG_INCLUDE_DIRS} - ${JPEG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} - ${BZIP2_INCLUDE_DIR} - ) - target_link_libraries(libcataclysm-tiles - ${FREETYPE_LIBRARIES} - ${PNG_LIBRARIES} - ${JPEG_LIBRARIES} - ${ZLIB_LIBRARIES} - ${BZIP2_LIBRARIES} - ) - ENDIF (NOT DYNAMIC_LINKING) - - target_include_directories(libcataclysm-tiles PUBLIC - ${SDL2_INCLUDE_DIR} - ${SDL2_IMAGE_INCLUDE_DIRS} - ${SDL2_TTF_INCLUDE_DIRS} - ) - target_link_libraries(libcataclysm-tiles - ${SDL2_LIBRARY} - ${SDL2_IMAGE_LIBRARIES} - ${SDL2_TTF_LIBRARIES} - ) - - IF(SOUND) - target_compile_definitions(libcataclysm-tiles PUBLIC SDL_SOUND ) - - target_include_directories(libcataclysm-tiles PUBLIC ${OGGVORBIS_INCLUDE_DIR}) - target_link_libraries(libcataclysm-tiles ${OGG_LIBRARY}) - target_link_libraries(libcataclysm-tiles ${VORBIS_LIBRARY}) - target_link_libraries(libcataclysm-tiles ${VORBISFILE_LIBRARY}) - - target_include_directories(libcataclysm-tiles PUBLIC ${SDL2_MIXER_INCLUDE_DIRS}) - target_link_libraries(libcataclysm-tiles ${SDL2_MIXER_LIBRARIES}) - ENDIF(SOUND) - - IF(WIN32) - # Global settings for Windows targets (at end) - target_link_libraries(libcataclysm-tiles gdi32.lib) - target_link_libraries(libcataclysm-tiles winmm.lib) - target_link_libraries(libcataclysm-tiles imm32.lib) - target_link_libraries(libcataclysm-tiles ole32.lib) - target_link_libraries(libcataclysm-tiles oleaut32.lib) - target_link_libraries(libcataclysm-tiles version.lib) - IF (BACKTRACE) - target_link_libraries(libcataclysm-tiles dbghelp.lib) - ENDIF(BACKTRACE) - ENDIF(WIN32) - - IF(RELEASE) - install(TARGETS cataclysm-tiles DESTINATION ${BIN_PREFIX}) - ENDIF(RELEASE) + add_library(libcataclysm-tiles STATIC + ${CATACLYSM_DDA_SOURCES} + ${CATACLYSM_DDA_HEADERS} + ) + target_include_directories(libcataclysm-tiles INTERFACE ${CMAKE_SOURCE_DIR}/src) + + IF(WIN32) + ADD_DEFINITIONS(-DUSE_WINMAIN) + ADD_EXECUTABLE(cataclysm-tiles WIN32 + ${MAIN_CPP} + ${RESOURCE_RC} + ) + ELSE(WIN32) + ADD_EXECUTABLE(cataclysm-tiles + ${MAIN_CPP} + ) + ENDIF(WIN32) + + ADD_DEPENDENCIES(libcataclysm-tiles get_version) + + target_link_libraries(cataclysm-tiles libcataclysm-tiles) + target_compile_definitions(libcataclysm-tiles PUBLIC TILES ) + + IF (LOCALIZE) + target_include_directories(libcataclysm-tiles PUBLIC + ${LIBINTL_INCLUDE_DIR} + ${ICONV_INCLUDE_DIR} + ) + target_link_libraries(libcataclysm-tiles + ${LIBINTL_LIBRARIES} + ${ICONV_LIBRARIES} + ) + ENDIF (LOCALIZE) + + IF(CMAKE_USE_PTHREADS_INIT) + target_compile_options(libcataclysm-tiles PUBLIC "-pthread") + ENDIF(CMAKE_USE_PTHREADS_INIT) + + IF(CMAKE_THREAD_LIBS_INIT) + target_link_libraries(libcataclysm-tiles ${CMAKE_THREAD_LIBS_INIT}) + ENDIF(CMAKE_THREAD_LIBS_INIT) + + IF (NOT DYNAMIC_LINKING) + # SDL, SDL_Image, SDL_ttf deps are required for static build + target_include_directories(libcataclysm-tiles PUBLIC + ${FREETYPE_INCLUDE_DIRS} + ${PNG_INCLUDE_DIRS} + ${JPEG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} + ${BZIP2_INCLUDE_DIR} + ) + target_link_libraries(libcataclysm-tiles + ${FREETYPE_LIBRARIES} + ${PNG_LIBRARIES} + ${JPEG_LIBRARIES} + ${ZLIB_LIBRARIES} + ${BZIP2_LIBRARIES} + ) + ENDIF (NOT DYNAMIC_LINKING) + target_include_directories(libcataclysm-tiles PUBLIC + ${SDL2_INCLUDE_DIR} + ${SDL2_IMAGE_INCLUDE_DIRS} + ${SDL2_TTF_INCLUDE_DIRS} + ) + target_link_libraries(libcataclysm-tiles + ${SDL2_LIBRARY} + ${SDL2_IMAGE_LIBRARIES} + ${SDL2_TTF_LIBRARIES} + ) + + IF(SOUND) + target_compile_definitions(libcataclysm-tiles PUBLIC SDL_SOUND ) + target_include_directories(libcataclysm-tiles PUBLIC ${OGGVORBIS_INCLUDE_DIR}) + target_link_libraries(libcataclysm-tiles ${OGG_LIBRARY}) + target_link_libraries(libcataclysm-tiles ${VORBIS_LIBRARY}) + target_link_libraries(libcataclysm-tiles ${VORBISFILE_LIBRARY}) + target_include_directories(libcataclysm-tiles PUBLIC ${SDL2_MIXER_INCLUDE_DIRS}) + target_link_libraries(libcataclysm-tiles ${SDL2_MIXER_LIBRARIES}) + ENDIF(SOUND) + + IF(WIN32) + # Global settings for Windows targets (at end) + target_link_libraries(libcataclysm-tiles gdi32.lib) + target_link_libraries(libcataclysm-tiles winmm.lib) + target_link_libraries(libcataclysm-tiles imm32.lib) + target_link_libraries(libcataclysm-tiles ole32.lib) + target_link_libraries(libcataclysm-tiles oleaut32.lib) + target_link_libraries(libcataclysm-tiles version.lib) + IF (BACKTRACE) + target_link_libraries(libcataclysm-tiles dbghelp.lib) + ENDIF(BACKTRACE) + ENDIF(WIN32) + + IF(RELEASE) + install(TARGETS cataclysm-tiles DESTINATION ${BIN_PREFIX}) + ENDIF(RELEASE) ENDIF(TILES) # Build curses version if requested IF(CURSES) - add_library(libcataclysm STATIC - ${CATACLYSM_DDA_SOURCES} - ${CATACLYSM_DDA_HEADERS} - ) - - target_include_directories(libcataclysm INTERFACE ${CMAKE_SOURCE_DIR}/src) - - IF(WIN32) - ADD_EXECUTABLE(cataclysm - ${MAIN_CPP} - ${RESOURCE_RC} - ) - ELSE(WIN32) - ADD_EXECUTABLE(cataclysm - ${MAIN_CPP} - ) - ENDIF(WIN32) - - ADD_DEPENDENCIES(libcataclysm get_version) - - target_link_libraries(cataclysm libcataclysm) - - IF (LOCALIZE) - target_include_directories(libcataclysm PUBLIC - ${LIBINTL_INCLUDE_DIR} - ${ICONV_INCLUDE_DIR} - ) - target_link_libraries(libcataclysm - ${LIBINTL_LIBRARIES} - ${ICONV_LIBRARIES} - ) - ENDIF (LOCALIZE) - - target_include_directories(libcataclysm PUBLIC ${CURSES_INCLUDE_DIR}) - target_link_libraries(libcataclysm ${CURSES_LIBRARIES}) - - IF(CMAKE_USE_PTHREADS_INIT) - target_compile_options(libcataclysm PUBLIC "-pthread") - ENDIF(CMAKE_USE_PTHREADS_INIT) - - IF(CMAKE_THREAD_LIBS_INIT) - target_link_libraries(libcataclysm ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(CMAKE_THREAD_LIBS_INIT) - - IF(WIN32) - # Global settings for Windows targets (at end) - target_link_libraries(libcataclysm gdi32.lib) - target_link_libraries(libcataclysm winmm.lib) - target_link_libraries(libcataclysm imm32.lib) - target_link_libraries(libcataclysm ole32.lib) - target_link_libraries(libcataclysm oleaut32.lib) - target_link_libraries(libcataclysm version.lib) - IF (BACKTRACE) - target_link_libraries(libcataclysm dbghelp.lib) - ENDIF(BACKTRACE) - ENDIF(WIN32) - - IF(RELEASE) - install(TARGETS cataclysm DESTINATION ${BIN_PREFIX}) - ENDIF(RELEASE) + add_library(libcataclysm STATIC + ${CATACLYSM_DDA_SOURCES} + ${CATACLYSM_DDA_HEADERS} + ) + target_include_directories(libcataclysm INTERFACE ${CMAKE_SOURCE_DIR}/src) + + IF(WIN32) + ADD_EXECUTABLE(cataclysm + ${MAIN_CPP} + ${RESOURCE_RC} + ) + ELSE(WIN32) + ADD_EXECUTABLE(cataclysm + ${MAIN_CPP} + ) + ENDIF(WIN32) + + ADD_DEPENDENCIES(libcataclysm get_version) + target_link_libraries(cataclysm libcataclysm) + + IF (LOCALIZE) + target_include_directories(libcataclysm PUBLIC + ${LIBINTL_INCLUDE_DIR} + ${ICONV_INCLUDE_DIR} + ) + target_link_libraries(libcataclysm + ${LIBINTL_LIBRARIES} + ${ICONV_LIBRARIES} + ) + ENDIF (LOCALIZE) + + target_include_directories(libcataclysm PUBLIC ${CURSES_INCLUDE_DIR}) + target_link_libraries(libcataclysm ${CURSES_LIBRARIES}) + + IF(CMAKE_USE_PTHREADS_INIT) + target_compile_options(libcataclysm PUBLIC "-pthread") + ENDIF(CMAKE_USE_PTHREADS_INIT) + + IF(CMAKE_THREAD_LIBS_INIT) + target_link_libraries(libcataclysm ${CMAKE_THREAD_LIBS_INIT}) + ENDIF(CMAKE_THREAD_LIBS_INIT) + + IF(WIN32) + # Global settings for Windows targets (at end) + target_link_libraries(libcataclysm gdi32.lib) + target_link_libraries(libcataclysm winmm.lib) + target_link_libraries(libcataclysm imm32.lib) + target_link_libraries(libcataclysm ole32.lib) + target_link_libraries(libcataclysm oleaut32.lib) + target_link_libraries(libcataclysm version.lib) + IF (BACKTRACE) + target_link_libraries(libcataclysm dbghelp.lib) + ENDIF(BACKTRACE) + ENDIF(WIN32) + + IF(RELEASE) + install(TARGETS cataclysm DESTINATION ${BIN_PREFIX}) + ENDIF(RELEASE) ENDIF(CURSES) IF(MINGW AND NOT RELEASE) - # Try to Install shared libraries for dev builds - # - # Note: It is specific to MSYS2 and uses hardcoded versions so - # probly it will fail if you run it :) - - # GCC-specific libraries - find_library(RuntimeLib_GCC_S_DW2_1 "gcc_s_dw2-1") - find_library(RuntimeLib_STDC_PP_6 "stdc++-6") - find_library(RuntimeLib_WINPTHREAD_1 "winpthread-1") - SET(RuntimeLib_GCC_ALL - ${RuntimeLib_GCC_S_DW2_1} - ${RuntimeLib_STDC_PP_6} - ${RuntimeLib_WINPTHREAD_1} - ) - IF (LOCALIZE) - find_library(RuntimeLib_iconv "libiconv-2") - find_library(RuntimeLib_intl "libintl-8") - SET(RuntimeLib_LOCALIZE - ${RuntimeLib_iconv} - ${RuntimeLib_intl} - ) - ENDIF (LOCALIZE) - IF (TILES) - # SDL2 can have a varoius deps. Here you are the MSYS2 ones... - find_library(RuntimeLib_SDL2 "SDL2") - find_library(RuntimeLib_SDL2_IMG "SDL2_image") - find_library(RuntimeLib_png "libpng16-16") - find_library(RuntimeLib_jpeg "libjpeg-8") - find_library(RuntimeLib_jbig "libjbig-0") - find_library(RuntimeLib_tiff "libtiff-5") - find_library(RuntimeLib_webp "libwebp-5") - find_library(RuntimeLib_lzma "liblzma-5") - find_library(RuntimeLib_bz2 "libbz2-1") - find_library(RuntimeLib_zlib "zlib1") - find_library(RuntimeLib_hb "libharfbuzz-0") - find_library(RuntimeLib_SDL2_TTF "SDL2_ttf") - find_library(RuntimeLib_ft "libfreetype-6") - find_library(RuntimeLib_glib "libglib-2.0-0") - SET(RuntimeLib_SDL - ${RuntimeLib_SDL2} - ${RuntimeLib_SDL2_IMG} - ${RuntimeLib_png} - ${RuntimeLib_jpeg} - ${RuntimeLib_jbig} - ${RuntimeLib_tiff} - ${RuntimeLib_webp} - ${RuntimeLib_lzma} - ${RuntimeLib_bz2} - ${RuntimeLib_zlib} - ${RuntimeLib_hb} - ${RuntimeLib_SDL2_TTF} - ${RuntimeLib_ft} - ${RuntimeLib_glib} - ) - IF(SOUND) - find_library(RuntimeLib_SDL_SND "SDL2_mixer") - find_library(RuntimeLib_flak "libFLAC-8") - find_library(RuntimeLib_ogg "libogg-0") - find_library(RuntimeLib_flu "libfluidsynth-1") - find_library(RuntimeLib_port "libportaudio-2") - find_library(RuntimeLib_snd "libsndfile-1") - find_library(RuntimeLib_vorb "libvorbis-0") - find_library(RuntimeLib_vorb_enc "libvorbisenc-2") - find_library(RuntimeLib_vorb_f "libvorbisfile-3") - find_library(RuntimeLib_mod "libmodplug-1") - find_library(RuntimeLib_mpeg "smpeg2") - SET(RuntimeLib_SDL_SOUND - ${RuntimeLib_SDL_SND} - ${RuntimeLib_flak} - ${RuntimeLib_ogg} - ${RuntimeLib_flu} - ${RuntimeLib_port} - ${RuntimeLib_snd} - ${RuntimeLib_vorb} - ${RuntimeLib_vorb_enc} - ${RuntimeLib_vorb_f} - ${RuntimeLib_mod} - ${RuntimeLib_mpeg} - ) - ENDIF(SOUND) - ENDIF (TILES) - install(FILES ${RuntimeLib_GCC_ALL} - ${RuntimeLib_LOCALIZE} - ${RuntimeLib_SDL} - ${RuntimeLib_SDL_SOUND} - DESTINATION ${BIN_PREFIX} - ) + # Try to Install shared libraries for dev builds + # Note: It is specific to MSYS2 and uses hardcoded versions so + # probably it will fail if you run it :) + + # GCC-specific libraries + find_library(RuntimeLib_GCC_S_DW2_1 "gcc_s_dw2-1") + find_library(RuntimeLib_STDC_PP_6 "stdc++-6") + find_library(RuntimeLib_WINPTHREAD_1 "winpthread-1") + SET(RuntimeLib_GCC_ALL + ${RuntimeLib_GCC_S_DW2_1} + ${RuntimeLib_STDC_PP_6} + ${RuntimeLib_WINPTHREAD_1} + ) + IF (LOCALIZE) + find_library(RuntimeLib_iconv "libiconv-2") + find_library(RuntimeLib_intl "libintl-8") + SET(RuntimeLib_LOCALIZE + ${RuntimeLib_iconv} + ${RuntimeLib_intl} + ) + ENDIF (LOCALIZE) + IF (TILES) + # SDL2 can have a varius deps. Here you are the MSYS2 ones... + find_library(RuntimeLib_SDL2 "SDL2") + find_library(RuntimeLib_SDL2_IMG "SDL2_image") + find_library(RuntimeLib_png "libpng16-16") + find_library(RuntimeLib_jpeg "libjpeg-8") + find_library(RuntimeLib_jbig "libjbig-0") + find_library(RuntimeLib_tiff "libtiff-5") + find_library(RuntimeLib_webp "libwebp-5") + find_library(RuntimeLib_lzma "liblzma-5") + find_library(RuntimeLib_bz2 "libbz2-1") + find_library(RuntimeLib_zlib "zlib1") + find_library(RuntimeLib_hb "libharfbuzz-0") + find_library(RuntimeLib_SDL2_TTF "SDL2_ttf") + find_library(RuntimeLib_ft "libfreetype-6") + find_library(RuntimeLib_glib "libglib-2.0-0") + SET(RuntimeLib_SDL + ${RuntimeLib_SDL2} + ${RuntimeLib_SDL2_IMG} + ${RuntimeLib_png} + ${RuntimeLib_jpeg} + ${RuntimeLib_jbig} + ${RuntimeLib_tiff} + ${RuntimeLib_webp} + ${RuntimeLib_lzma} + ${RuntimeLib_bz2} + ${RuntimeLib_zlib} + ${RuntimeLib_hb} + ${RuntimeLib_SDL2_TTF} + ${RuntimeLib_ft} + ${RuntimeLib_glib} + ) + IF(SOUND) + find_library(RuntimeLib_SDL_SND "SDL2_mixer") + find_library(RuntimeLib_flak "libFLAC-8") + find_library(RuntimeLib_ogg "libogg-0") + find_library(RuntimeLib_flu "libfluidsynth-1") + find_library(RuntimeLib_port "libportaudio-2") + find_library(RuntimeLib_snd "libsndfile-1") + find_library(RuntimeLib_vorb "libvorbis-0") + find_library(RuntimeLib_vorb_enc "libvorbisenc-2") + find_library(RuntimeLib_vorb_f "libvorbisfile-3") + find_library(RuntimeLib_mod "libmodplug-1") + find_library(RuntimeLib_mpeg "smpeg2") + SET(RuntimeLib_SDL_SOUND + ${RuntimeLib_SDL_SND} + ${RuntimeLib_flak} + ${RuntimeLib_ogg} + ${RuntimeLib_flu} + ${RuntimeLib_port} + ${RuntimeLib_snd} + ${RuntimeLib_vorb} + ${RuntimeLib_vorb_enc} + ${RuntimeLib_vorb_f} + ${RuntimeLib_mod} + ${RuntimeLib_mpeg} + ) + ENDIF(SOUND) + ENDIF (TILES) + install(FILES ${RuntimeLib_GCC_ALL} + ${RuntimeLib_LOCALIZE} + ${RuntimeLib_SDL} + ${RuntimeLib_SDL_SOUND} + DESTINATION ${BIN_PREFIX} + ) ENDIF(MINGW AND NOT RELEASE) # vim:noet diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp index f7de8c89b84f7..23dfeef0e0d57 100644 --- a/src/activity_handlers.cpp +++ b/src/activity_handlers.cpp @@ -1015,7 +1015,7 @@ void activity_handlers::butcher_finish( player_activity *act, player *p ) return; } - item_location &target = act->targets.back(); + item_location target = act->targets.back(); // Corpses can disappear (rezzing!), so check for that if( !target || !target->is_corpse() ) { @@ -1130,7 +1130,9 @@ void activity_handlers::butcher_finish( player_activity *act, player *p ) }; // all action types - yields butchery_drops_harvest( &corpse_item, *corpse, *p, roll_butchery, action, roll_drops ); - + // after this point, if there was a liquid handling from the harvest, + // and the liquid handling was interrupted, then the activity was cancelled, + // therefore operations on this activities targets and values may be invalidated. // reveal hidden items / hidden content if( action != F_DRESS && action != SKIN ) { for( auto &content : contents ) { @@ -1156,14 +1158,18 @@ void activity_handlers::butcher_finish( player_activity *act, player *p ) // Remove the target from the map target.remove_item(); - act->targets.pop_back(); + if( !act->targets.empty() ) { + act->targets.pop_back(); + } break; case BUTCHER_FULL: p->add_msg_if_player( m_good, _( "You finish butchering the %s." ), corpse_item.tname() ); // Remove the target from the map target.remove_item(); - act->targets.pop_back(); + if( !act->targets.empty() ) { + act->targets.pop_back(); + } break; case F_DRESS: // partial failure @@ -1220,7 +1226,9 @@ void activity_handlers::butcher_finish( player_activity *act, player *p ) } } - act->targets.pop_back(); + if( !act->targets.empty() ) { + act->targets.pop_back(); + } break; case SKIN: switch( rng( 1, 4 ) ) { @@ -1242,7 +1250,9 @@ void activity_handlers::butcher_finish( player_activity *act, player *p ) break; } corpse_item.set_flag( "SKINNED" ); - act->targets.pop_back(); + if( !act->targets.empty() ) { + act->targets.pop_back(); + } break; case DISMEMBER: switch( rng( 1, 3 ) ) { @@ -1258,14 +1268,18 @@ void activity_handlers::butcher_finish( player_activity *act, player *p ) // Remove the target from the map target.remove_item(); - act->targets.pop_back(); + if( !act->targets.empty() ) { + act->targets.pop_back(); + } break; case DISSECT: p->add_msg_if_player( m_good, _( "You finish dissecting the %s." ), corpse_item.tname() ); // Remove the target from the map target.remove_item(); - act->targets.pop_back(); + if( !act->targets.empty() ) { + act->targets.pop_back(); + } break; } @@ -1732,7 +1746,7 @@ void activity_handlers::pickaxe_finish( player_activity *act, player *p ) void activity_handlers::pulp_do_turn( player_activity *act, player *p ) { - const tripoint &pos = act->placement; + const tripoint &pos = g->m.getlocal( act->placement ); // Stabbing weapons are a lot less effective at pulping const int cut_power = std::max( p->weapon.damage_melee( DT_CUT ), @@ -1780,7 +1794,7 @@ void activity_handlers::pulp_do_turn( player_activity *act, player *p ) g->m.add_splatter_trail( type_blood, pos, dest ); } - p->mod_stat( "stamina", -pulp_effort ); + p->mod_stamina( -pulp_effort ); if( one_in( 4 ) ) { // Smashing may not be butchery, but it involves some zombie anatomy @@ -1857,8 +1871,7 @@ void activity_handlers::reload_finish( player_activity *act, player *p ) std::string msg = _( "You reload the %s." ); if( reloadable.get_var( "dirt", 0 ) > 7800 ) { msg = - _( "You struggle to reload the fouled %s, but manage to loosen some debris and make it somewhat operational." ); - p->moves -= 2500; + _( "You manage to loosen some debris and make your %s somewhat operational." ); reloadable.set_var( "dirt", ( reloadable.get_var( "dirt", 0 ) - rng( 790, 2750 ) ) ); } @@ -2922,7 +2935,7 @@ void activity_handlers::repair_item_do_turn( player_activity *act, player *p ) void activity_handlers::butcher_do_turn( player_activity * /*act*/, player *p ) { - p->mod_stat( "stamina", -20 ); + p->mod_stamina( -20 ); } void activity_handlers::read_do_turn( player_activity *act, player *p ) @@ -3130,12 +3143,13 @@ void activity_handlers::operation_do_turn( player_activity *act, player *p ) const bionic_id bid( act->str_values[cbm_id] ); const bionic_id upbid( act->str_values[upgraded_cbm_id] ); const bool autodoc = act->str_values[is_autodoc] == "true"; - const bool u_see = p->is_player() ? true : g->u.sees( p->pos() ) && - !g->u.has_effect( effect_narcosis ); + const bool u_see = g->u.sees( p->pos() ) && ( !g->u.has_effect( effect_narcosis ) || + g->u.has_bionic( bionic_id( "bio_painkiller" ) ) || g->u.has_trait( trait_id( "NOPAIN" ) ) ); const int difficulty = act->values.front(); const time_duration half_op_duration = difficulty * 10_minutes; + const time_duration message_freq = difficulty * 2_minutes; time_duration time_left = time_duration::from_turns( act->moves_left / 100 ) ; if( autodoc && g->m.inbounds( p->pos() ) ) { @@ -3178,7 +3192,7 @@ void activity_handlers::operation_do_turn( player_activity *act, player *p ) if( time_left > half_op_duration ) { if( act->values.size() > 4 ) { for( size_t i = 4; i < act->values.size(); i++ ) { - if( calendar::once_every( 5_minutes ) && u_see && autodoc ) { + if( calendar::once_every( message_freq ) && u_see && autodoc ) { p->add_msg_player_or_npc( m_info, _( "The Autodoc is meticulously cutting your %s open." ), _( "The Autodoc is meticulously cutting 's %s open." ), @@ -3186,7 +3200,7 @@ void activity_handlers::operation_do_turn( player_activity *act, player *p ) } } } else { - if( calendar::once_every( 5_minutes ) && u_see ) { + if( calendar::once_every( message_freq ) && u_see ) { p->add_msg_player_or_npc( m_info, _( "The Autodoc is meticulously cutting you open." ), _( "The Autodoc is meticulously cutting open." ) ); @@ -3230,7 +3244,7 @@ void activity_handlers::operation_do_turn( player_activity *act, player *p ) } else if( act->values[1] > 0 ) { if( act->values.size() > 4 ) { for( size_t i = 4; i < act->values.size(); i++ ) { - if( calendar::once_every( 5_minutes ) && u_see && autodoc ) { + if( calendar::once_every( message_freq ) && u_see && autodoc ) { p->add_msg_player_or_npc( m_info, _( "The Autodoc is stitching your %s back up." ), _( "The Autodoc is stitching 's %s back up." ), @@ -3238,14 +3252,14 @@ void activity_handlers::operation_do_turn( player_activity *act, player *p ) } } } else { - if( calendar::once_every( 5_minutes ) && u_see && autodoc ) { + if( calendar::once_every( message_freq ) && u_see && autodoc ) { p->add_msg_player_or_npc( m_info, _( "The Autodoc is stitching you back up." ), _( "The Autodoc is stitching back up." ) ); } } } else { - if( calendar::once_every( 5_minutes ) && u_see && autodoc ) { + if( calendar::once_every( message_freq ) && u_see && autodoc ) { p->add_msg_player_or_npc( m_bad, _( "The Autodoc is moving erratically through the rest of its program, not actually stitching your wounds." ), _( "The Autodoc is moving erratically through the rest of its program, not actually stitching 's wounds." ) ); @@ -4426,14 +4440,19 @@ void activity_handlers::spellcasting_finish( player_activity *act, player *p ) } } while( !target_is_valid ); } else if( casting.has_flag( RANDOM_TARGET ) ) { - target = casting.random_valid_target( *p, p->pos() ); + const cata::optional target_ = casting.random_valid_target( *p, p->pos() ); + if( !target_ ) { + p->add_msg_if_player( m_bad, _( "Your spell can't find a suitable target." ) ); + return; + } + target = *target_; } // no turning back now. it's all said and done. bool success = no_fail || rng_float( 0.0f, 1.0f ) >= casting.spell_fail( *p ); int exp_gained = casting.casting_exp( *p ); if( !success ) { - p->add_msg_if_player( m_bad, "You lose your concentration!" ); + p->add_msg_if_player( m_bad, _( "You lose your concentration!" ) ); if( !casting.is_max_level() && level_override == -1 ) { // still get some experience for trying casting.gain_exp( exp_gained / 5 ); @@ -4460,7 +4479,7 @@ void activity_handlers::spellcasting_finish( player_activity *act, player *p ) p->magic.mod_mana( *p, -cost ); break; case stamina_energy: - p->mod_stat( "stamina", -cost ); + p->mod_stamina( -cost ); break; case bionic_energy: p->mod_power_level( -units::from_kilojoule( cost ) ); diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp index 8287374ee8a83..4d4bce6ced17d 100644 --- a/src/activity_item_handling.cpp +++ b/src/activity_item_handling.cpp @@ -70,21 +70,22 @@ const int ACTIVITY_SEARCH_DISTANCE = 60; /** Activity-associated item */ struct act_item { - /// Pointer to the inventory item - const item *it; + /// inventory item + item_location loc; /// How many items need to be processed int count; /// Amount of moves that processing will consume int consumed_moves; - act_item( const item *it, int count, int consumed_moves ) - : it( it ), + act_item( const item_location &loc, int count, int consumed_moves ) + : loc( loc ), count( count ), consumed_moves( consumed_moves ) {} }; // TODO: Deliberately unified with multidrop. Unify further. -using drop_indexes = std::list>; +using drop_location = std::pair; +using drop_locations = std::list>; static bool same_type( const std::list &items ) { @@ -351,30 +352,28 @@ void put_into_vehicle_or_drop( Character &c, item_drop_reason reason, const std: drop_on_map( c, reason, items, where ); } -static drop_indexes convert_to_indexes( const player_activity &act ) +static drop_locations convert_to_locations( const player_activity &act ) { - drop_indexes res; + drop_locations res; - if( act.values.size() % 2 != 0 ) { + if( act.values.size() != act.targets.size() ) { debugmsg( "Drop/stash activity contains an odd number of values." ); return res; } - for( auto iter = act.values.begin(); iter != act.values.end(); iter += 2 ) { - res.emplace_back( *iter, *std::next( iter ) ); + for( size_t i = 0; i < act.values.size(); i++ ) { + res.emplace_back( act.targets[i], act.values[i] ); } return res; } -static drop_indexes convert_to_indexes( const player &p, const std::list &items ) +static drop_locations convert_to_locations( const std::list &items ) { - drop_indexes res; + drop_locations res; - for( const auto &ait : items ) { - const int pos = p.get_item_position( ait.it ); - - if( pos != INT_MIN && ait.count > 0 ) { - if( res.empty() || res.back().first != pos ) { - res.emplace_back( pos, ait.count ); + for( const act_item &ait : items ) { + if( ait.loc && ait.count > 0 ) { + if( res.empty() || res.back().first != ait.loc ) { + res.emplace_back( ait.loc, ait.count ); } else { res.back().second += ait.count; } @@ -383,31 +382,30 @@ static drop_indexes convert_to_indexes( const player &p, const std::list convert_to_items( const player &p, const drop_indexes &drop, - int min_pos, int max_pos ) +static std::list convert_to_items( Character &p, const drop_locations &drop, + std::function filter ) { std::list res; - for( const auto &rec : drop ) { - const auto pos = rec.first; - const auto count = rec.second; + for( const drop_location &rec : drop ) { + const item_location loc = rec.first; + const int count = rec.second; - if( pos < min_pos || pos > max_pos ) { + if( !filter( loc ) ) { continue; - } else if( pos >= 0 ) { + } else if( !p.is_worn( *loc ) && !p.is_wielding( *loc ) ) { int obtained = 0; - for( const auto &it : p.inv.const_stack( pos ) ) { + for( const item &it : p.inv.const_stack( p.get_item_position( &*loc ) ) ) { if( obtained >= count ) { break; } const int qty = it.count_by_charges() ? std::min( it.charges, count - obtained ) : 1; obtained += qty; - // TODO: Use a calculated cost - res.emplace_back( &it, qty, 100 ); + item_location loc( p, const_cast( &it ) ); + res.emplace_back( loc, qty, loc.obtain_cost( p, qty ) ); } } else { - // TODO: Use a calculated cost - res.emplace_back( &p.i_at( pos ), count, pos == -1 ? 0 : 100 ); + res.emplace_back( loc, count, p.is_wielding( *loc ) ? 0 : loc.obtain_cost( p ) ); } } @@ -417,35 +415,46 @@ static std::list convert_to_items( const player &p, const drop_indexes // Prepares items for dropping by reordering them so that the drop // cost is minimal and "dependent" items get taken off first. // Implements the "backpack" logic. -static std::list reorder_for_dropping( const player &p, const drop_indexes &drop ) +static std::list reorder_for_dropping( Character &p, const drop_locations &drop ) { - auto res = convert_to_items( p, drop, -1, -1 ); - auto inv = convert_to_items( p, drop, 0, INT_MAX ); - auto worn = convert_to_items( p, drop, INT_MIN, -2 ); + std::list res = convert_to_items( p, drop, + [&p]( item_location loc ) { + return p.is_wielding( *loc ); + } ); + std::list inv = convert_to_items( p, drop, + [&p]( item_location loc ) { + return !p.is_wielding( *loc ) && !p.is_worn( *loc ); + } ); + std::list worn = convert_to_items( p, drop, + [&p]( item_location loc ) { + return p.is_worn( *loc ); + } ); // Sort inventory items by volume in ascending order inv.sort( []( const act_item & first, const act_item & second ) { - return first.it->volume() < second.it->volume(); + return first.loc->volume() < second.loc->volume(); } ); // Add missing dependent worn items (if any). for( const auto &wait : worn ) { - for( const auto dit : p.get_dependent_worn_items( *wait.it ) ) { + for( item *dit : p.get_dependent_worn_items( *wait.loc ) ) { const auto iter = std::find_if( worn.begin(), worn.end(), [dit]( const act_item & ait ) { - return ait.it == dit; + return &*ait.loc == dit; } ); if( iter == worn.end() ) { // TODO: Use a calculated cost - worn.emplace_front( dit, dit->count(), 100 ); + const item_location loc( p, dit ); + act_item act( loc, loc->count(), loc.obtain_cost( p, loc->count() ) ); + worn.emplace_front( loc, loc->count(), loc.obtain_cost( p ) ); } } } // Sort worn items by storage in descending order, but dependent items always go first. worn.sort( []( const act_item & first, const act_item & second ) { - return first.it->is_worn_only_with( *second.it ) - || ( first.it->get_storage() > second.it->get_storage() - && !second.it->is_worn_only_with( *first.it ) ); + return first.loc->is_worn_only_with( *second.loc ) + || ( first.loc->get_storage() > second.loc->get_storage() + && !second.loc->is_worn_only_with( *first.loc ) ); } ); // Cumulatively increases @@ -454,9 +463,9 @@ static std::list reorder_for_dropping( const player &p, const drop_ind units::volume remaining_storage = p.volume_capacity(); while( !worn.empty() && !inv.empty() ) { - storage_loss += worn.front().it->get_storage(); + storage_loss += worn.front().loc->get_storage(); remaining_storage -= p.volume_capacity_reduced_by( storage_loss ); - units::volume inventory_item_volume = inv.front().it->volume(); + units::volume inventory_item_volume = inv.front().loc->volume(); // Does not fit if( remaining_storage < inventory_item_volume ) { break; @@ -492,7 +501,7 @@ static void debug_drop_list( const std::list &list ) std::string res( "Items ordered to drop:\n" ); for( const auto &ait : list ) { res += string_format( "Drop %d %s for %d moves\n", - ait.count, ait.it->display_name( ait.count ), ait.consumed_moves ); + ait.count, ait.loc->display_name( ait.count ), ait.consumed_moves ); } popup( res, PF_GET_KEY ); } @@ -501,21 +510,21 @@ static std::list obtain_activity_items( player_activity &act, player &p ) { std::list res; - auto items = reorder_for_dropping( p, convert_to_indexes( act ) ); + std::list items = reorder_for_dropping( p, convert_to_locations( act ) ); debug_drop_list( items ); while( !items.empty() && ( p.is_npc() || p.moves > 0 || items.front().consumed_moves == 0 ) ) { - const auto &ait = items.front(); + act_item &ait = items.front(); p.mod_moves( -ait.consumed_moves ); - if( p.is_worn( *ait.it ) ) { - p.takeoff( *ait.it, &res ); - } else if( ait.it->count_by_charges() ) { - res.push_back( p.reduce_charges( const_cast( ait.it ), ait.count ) ); + if( p.is_worn( *ait.loc ) ) { + p.takeoff( *ait.loc, &res ); + } else if( ait.loc->count_by_charges() ) { + res.push_back( p.reduce_charges( const_cast( &*ait.loc ), ait.count ) ); } else { - res.push_back( p.i_rem( ait.it ) ); + res.push_back( p.i_rem( &*ait.loc ) ); } items.pop_front(); @@ -527,10 +536,11 @@ static std::list obtain_activity_items( player_activity &act, player &p ) res.insert( res.begin(), excess.begin(), excess.end() ); } // Load anything that remains (if any) into the activity + act.targets.clear(); act.values.clear(); if( !items.empty() ) { - for( const auto &drop : convert_to_indexes( p, items ) ) { - act.values.push_back( drop.first ); + for( const drop_location &drop : convert_to_locations( items ) ) { + act.targets.push_back( drop.first ); act.values.push_back( drop.second ); } } @@ -607,14 +617,14 @@ void activity_on_turn_wear( player_activity &act, player &p ) void activity_handlers::washing_finish( player_activity *act, player *p ) { - auto items = reorder_for_dropping( *p, convert_to_indexes( *act ) ); + std::list items = reorder_for_dropping( *p, convert_to_locations( *act ) ); // Check again that we have enough water and soap incase the amount in our inventory changed somehow // Consume the water and soap units::volume total_volume = 0_ml; for( const act_item &filthy_item : items ) { - total_volume += filthy_item.it->volume(); + total_volume += filthy_item.loc->volume(); } washing_requirements required = washing_requirements_for_volume( total_volume ); @@ -638,7 +648,7 @@ void activity_handlers::washing_finish( player_activity *act, player *p ) } for( const auto &ait : items ) { - item *filthy_item = const_cast( ait.it ); + item *filthy_item = const_cast( &*ait.loc ); filthy_item->item_tags.erase( "FILTHY" ); p->on_worn_item_washed( *filthy_item ); } @@ -1926,10 +1936,11 @@ static bool tidy_activity( player &p, const tripoint &src_loc, } // we are adjacent to an unsorted zone, we came here to just drop items we are carrying if( mgr.has( zone_type_id( z_loot_unsorted ), g->m.getabs( src_loc ) ) ) { - for( auto inv_elem : p.inv_dump() ) { + for( item *inv_elem : p.inv_dump() ) { if( inv_elem->has_var( "activity_var" ) ) { inv_elem->erase_var( "activity_var" ); - p.drop( p.get_item_position( inv_elem ), src_loc ); + item_location loc( p, inv_elem ); + p.drop( loc, src_loc ); } } } @@ -2773,13 +2784,11 @@ void generic_multi_activity_handler( player_activity &act, player &p ) const tripoint abspos = g->m.getabs( p.pos() ); // NOLINTNEXTLINE(performance-unnecessary-copy-initialization) activity_id activity_to_restore = act.id(); - // Nuke the current activity, leaving the backlog alone p.activity = player_activity(); // now we setup the target spots based on whch activity is occuring // the set of target work spots - potentally after we have fetched required tools. std::unordered_set src_set = generic_multi_activity_locations( p, activity_to_restore ); - // now we have our final set of points std::vector src_sorted = get_sorted_tiles_by_distance( abspos, src_set ); // now loop through the work-spot tiles and judge whether its worth travelling to it yet @@ -2866,13 +2875,6 @@ void generic_multi_activity_handler( player_activity &act, player &p ) // tidy up leftover moved parts and tools left lying near the work spots. if( player_activity( activity_to_restore ).is_multi_type() ) { p.assign_activity( activity_id( "ACT_TIDY_UP" ) ); - if( p.is_npc() ) { - npc *guy = dynamic_cast( &p ); - if( guy ) { - guy->set_attitude( NPCATT_ACTIVITY ); - guy->set_mission( NPC_MISSION_ACTIVITY ); - } - } } } p.activity_vehicle_part_index = -1; diff --git a/src/advanced_inv.cpp b/src/advanced_inv.cpp index 64ee19edfe6c5..aec50f7cbf500 100644 --- a/src/advanced_inv.cpp +++ b/src/advanced_inv.cpp @@ -759,8 +759,8 @@ enum aim_entry { bool advanced_inventory::move_all_items( bool nested_call ) { - auto &spane = panes[src]; - auto &dpane = panes[dest]; + advanced_inventory_pane &spane = panes[src]; + advanced_inventory_pane &dpane = panes[dest]; // AIM_ALL source area routine if( spane.get_area() == AIM_ALL ) { @@ -775,8 +775,8 @@ bool advanced_inventory::move_all_items( bool nested_call ) return false; } - auto &sarea = squares[spane.get_area()]; - auto &darea = squares[dpane.get_area()]; + advanced_inv_area &sarea = squares[spane.get_area()]; + advanced_inv_area &darea = squares[dpane.get_area()]; // Check first if the destination area still have enough room for moving all. if( !is_processing() && sarea.volume > darea.free_volume( dpane.in_vehicle() ) && @@ -787,12 +787,12 @@ bool advanced_inventory::move_all_items( bool nested_call ) // make sure that there are items to be moved bool done = false; // copy the current pane, to be restored after the move is queued - auto shadow = panes[src]; + advanced_inventory_pane shadow = panes[src]; // here we recursively call this function with each area in order to // put all items in the proper destination area, with minimal fuss - auto &loc = uistate.adv_inv_aim_all_location; + int &loc = uistate.adv_inv_aim_all_location; // re-entry nonsense - auto &entry = uistate.adv_inv_re_enter_move_all; + int &entry = uistate.adv_inv_re_enter_move_all; // if we are just starting out, set entry to initial value switch( static_cast( entry++ ) ) { case ENTRY_START: @@ -855,8 +855,8 @@ bool advanced_inventory::move_all_items( bool nested_call ) popup( _( "You can't put items there!" ) ); return false; } - auto &sarea = squares[spane.get_area()]; - auto &darea = squares[dpane.get_area()]; + advanced_inv_area &sarea = squares[spane.get_area()]; + advanced_inv_area &darea = squares[dpane.get_area()]; // Make sure source and destination are different, otherwise items will disappear // Need to check actual position to account for dragged vehicles @@ -882,31 +882,43 @@ bool advanced_inventory::move_all_items( bool nested_call ) } if( spane.get_area() == AIM_INVENTORY || spane.get_area() == AIM_WORN ) { - std::list> dropped; + drop_locations dropped; // keep a list of favorites separated, only drop non-fav first if they exist - std::list> dropped_favorite; + drop_locations dropped_favorite; if( spane.get_area() == AIM_INVENTORY ) { for( size_t index = 0; index < g->u.inv.size(); ++index ) { - const auto &stack = g->u.inv.const_stack( index ); - const auto &it = stack.front(); + const std::list &stack = g->u.inv.const_stack( index ); + const item &it = stack.front(); + item_location indexed_item( g->u, const_cast( &it ) ); if( !spane.is_filtered( it ) ) { - ( it.is_favorite ? dropped_favorite : dropped ).emplace_back( static_cast( index ), - it.count_by_charges() ? static_cast( it.charges ) : static_cast( stack.size() ) ); + int count; + if( it.count_by_charges() ) { + count = it.charges; + } else { + count = stack.size(); + } + if( it.is_favorite ) { + dropped_favorite.emplace_back( indexed_item, count ); + } else { + dropped.emplace_back( indexed_item, count ); + } } } } else if( spane.get_area() == AIM_WORN ) { // do this in reverse, to account for vector item removal messing with future indices auto iter = g->u.worn.rbegin(); for( size_t idx = 0; idx < g->u.worn.size(); ++idx, ++iter ) { - const size_t index = g->u.worn.size() - idx - 1; - const auto &it = *iter; + item &it = *iter; if( !spane.is_filtered( it ) ) { - ( it.is_favorite ? dropped_favorite : dropped ).emplace_back( player::worn_position_to_index( - index ), - it.count() ); + item_location loc( g->u, &it ); + if( it.is_favorite ) { + dropped_favorite.emplace_back( loc, it.count() ); + } else { + dropped.emplace_back( loc, it.count() ); + } } } } @@ -1264,7 +1276,7 @@ void advanced_inventory::display() g->u.activity.str_values.push_back( "force_ground" ); } - g->u.activity.values.push_back( idx ); + g->u.activity.targets.push_back( item_location( g->u, &g->u.i_at( idx ) ) ); g->u.activity.values.push_back( amount_to_move ); // exit so that the activity can be carried out @@ -1381,6 +1393,7 @@ void advanced_inventory::display() if( spane.get_area() == AIM_INVENTORY || spane.get_area() == AIM_WORN ) { int idx = spane.get_area() == AIM_INVENTORY ? sitem->idx : player::worn_position_to_index( sitem->idx ); + item_location loc( g->u, &g->u.i_at( idx ) ); // Setup a "return to AIM" activity. If examining the item creates a new activity // (e.g. reading, reloading, activating), the new activity will be put on top of // "return to AIM". Once the new activity is finished, "return to AIM" comes back @@ -1389,7 +1402,7 @@ void advanced_inventory::display() // "return to AIM". do_return_entry(); assert( g->u.has_activity( activity_id( "ACT_ADV_INVENTORY" ) ) ); - ret = g->inventory_item_menu( idx, info_startx, info_width, + ret = g->inventory_item_menu( loc, info_startx, info_width, src == advanced_inventory::side::left ? game::LEFT_OF_INFO : game::RIGHT_OF_INFO ); if( !g->u.has_activity( activity_id( "ACT_ADV_INVENTORY" ) ) ) { exit = true; diff --git a/src/advanced_inv_area.cpp b/src/advanced_inv_area.cpp index 73349dac5cf38..2890677790bef 100644 --- a/src/advanced_inv_area.cpp +++ b/src/advanced_inv_area.cpp @@ -454,3 +454,10 @@ advanced_inv_area::itemstack advanced_inv_area::i_stacked( T items ) } return stacks; } + +// instantiate the template +template +advanced_inv_area::itemstack advanced_inv_area::i_stacked( vehicle_stack items ); + +template +advanced_inv_area::itemstack advanced_inv_area::i_stacked( map_stack items ); diff --git a/src/advanced_inv_pane.cpp b/src/advanced_inv_pane.cpp index ad0fe4b50fa73..9b8e2161d28c6 100644 --- a/src/advanced_inv_pane.cpp +++ b/src/advanced_inv_pane.cpp @@ -1,3 +1,4 @@ +#include "advanced_inv_area.h" #include "auto_pickup.h" #include "avatar.h" #include "cata_utility.h" diff --git a/src/artifact.cpp b/src/artifact.cpp index 45d88b054a101..9833c6caccda0 100644 --- a/src/artifact.cpp +++ b/src/artifact.cpp @@ -1165,9 +1165,8 @@ void it_artifact_tool::deserialize( const JsonObject &jo ) // Assumption, perhaps dangerous, that we won't wind up with m1 and m2 and // a materials array in our serialized objects at the same time. if( jo.has_array( "materials" ) ) { - JsonArray jarr = jo.get_array( "materials" ); - for( size_t i = 0; i < jarr.size(); ++i ) { - materials.push_back( material_id( jarr.get_string( i ) ) ); + for( const std::string &id : jo.get_array( "materials" ) ) { + materials.push_back( material_id( id ) ); } } volume = jo.get_int( "volume" ) * units::legacy_volume_factor; @@ -1185,9 +1184,8 @@ void it_artifact_tool::deserialize( const JsonObject &jo ) // Artifacts in older saves store ammo as string. if( jo.has_array( "ammo" ) ) { - JsonArray atypes = jo.get_array( "ammo" ); - for( size_t i = 0; i < atypes.size(); ++i ) { - tool->ammo_id.insert( ammotype( atypes.get_string( i ) ) ); + for( const std::string &id : jo.get_array( "ammo" ) ) { + tool->ammo_id.insert( ammotype( id ) ); } } else if( jo.has_string( "ammo" ) ) { tool->ammo_id.insert( ammotype( jo.get_string( "ammo" ) ) ); @@ -1209,36 +1207,31 @@ void it_artifact_tool::deserialize( const JsonObject &jo ) artifact->charge_req = ACR_NULL; } - JsonArray ja = jo.get_array( "effects_wielded" ); - while( ja.has_more() ) { - artifact->effects_wielded.push_back( static_cast( ja.next_int() ) ); + for( const int entry : jo.get_array( "effects_wielded" ) ) { + artifact->effects_wielded.push_back( static_cast( entry ) ); } - ja = jo.get_array( "effects_activated" ); - while( ja.has_more() ) { - artifact->effects_activated.push_back( static_cast( ja.next_int() ) ); + for( const int entry : jo.get_array( "effects_activated" ) ) { + artifact->effects_activated.push_back( static_cast( entry ) ); } - ja = jo.get_array( "effects_carried" ); - while( ja.has_more() ) { - artifact->effects_carried.push_back( static_cast( ja.next_int() ) ); + for( const int entry : jo.get_array( "effects_carried" ) ) { + artifact->effects_carried.push_back( static_cast( entry ) ); } //Generate any missing dream data (due to e.g. old save) if( !jo.has_array( "dream_unmet" ) ) { artifact->dream_msg_unmet = artifact_dream_data[static_cast( artifact->charge_req )].msg_unmet; } else { - ja = jo.get_array( "dream_unmet" ); - while( ja.has_more() ) { - artifact->dream_msg_unmet.push_back( ja.next_string() ); + for( const std::string &line : jo.get_array( "dream_unmet" ) ) { + artifact->dream_msg_unmet.push_back( line ); } } if( !jo.has_array( "dream_met" ) ) { artifact->dream_msg_met = artifact_dream_data[static_cast( artifact->charge_req )].msg_met; } else { - ja = jo.get_array( "dream_met" ); - while( ja.has_more() ) { - artifact->dream_msg_met.push_back( ja.next_string() ); + for( const std::string &line : jo.get_array( "dream_met" ) ) { + artifact->dream_msg_met.push_back( line ); } } if( jo.has_int( "dream_freq_unmet" ) ) { @@ -1280,9 +1273,8 @@ void it_artifact_armor::deserialize( const JsonObject &jo ) // Assumption, perhaps dangerous, that we won't wind up with m1 and m2 and // a materials array in our serialized objects at the same time. if( jo.has_array( "materials" ) ) { - JsonArray jarr = jo.get_array( "materials" ); - for( size_t i = 0; i < jarr.size(); ++i ) { - materials.push_back( material_id( jarr.get_string( i ) ) ); + for( const std::string &id : jo.get_array( "materials" ) ) { + materials.push_back( material_id( id ) ); } } volume = jo.get_int( "volume" ) * units::legacy_volume_factor; @@ -1303,9 +1295,8 @@ void it_artifact_armor::deserialize( const JsonObject &jo ) armor->storage = jo.get_int( "storage" ) * units::legacy_volume_factor; armor->power_armor = jo.get_bool( "power_armor" ); - JsonArray ja = jo.get_array( "effects_worn" ); - while( ja.has_more() ) { - artifact->effects_worn.push_back( static_cast( ja.next_int() ) ); + for( const int entry : jo.get_array( "effects_worn" ) ) { + artifact->effects_worn.push_back( static_cast( entry ) ); } } diff --git a/src/auto_pickup.cpp b/src/auto_pickup.cpp index b17d31723e38d..94fd78e676704 100644 --- a/src/auto_pickup.cpp +++ b/src/auto_pickup.cpp @@ -795,7 +795,7 @@ void rule_list::load_legacy_rules( std::istream &fin ) const int iNum = std::count( sLine.begin(), sLine.end(), ';' ); if( iNum != 2 ) { - DebugLog( D_ERROR, DC_ALL ) << "Bad Rule: " << sLine; + debugmsg( "Bad Rule: %s (will be skipped)", sLine ); } else { std::string sRule; bool bActive = true; diff --git a/src/avatar.cpp b/src/avatar.cpp index d89c4b3cad279..8079cf678c855 100644 --- a/src/avatar.cpp +++ b/src/avatar.cpp @@ -1,7 +1,7 @@ #include "avatar.h" -#include -#include +#include +#include #include #include #include @@ -1164,7 +1164,7 @@ void avatar::reset_stats() } // Radiation - set_fake_effect_dur( effect_irradiated, 1_turns * radiation ); + set_fake_effect_dur( effect_irradiated, 1_turns * get_rad() ); // Morale const int morale = get_morale_level(); set_fake_effect_dur( effect_happy, 1_turns * morale ); diff --git a/src/avatar.h b/src/avatar.h index 92eda70fc169c..f5185184109ec 100644 --- a/src/avatar.h +++ b/src/avatar.h @@ -2,7 +2,7 @@ #ifndef AVATAR_H #define AVATAR_H -#include +#include #include #include #include @@ -22,11 +22,29 @@ class JsonObject; class JsonOut; class mission; class npc; +class monster; namespace debug_menu { class mission_debug; } // namespace debug_menu struct points_left; +struct mtype; + +// Monster visible in different directions (safe mode & compass) +struct monster_visible_info { + // New monsters visible from last update + std::vector> new_seen_mon; + + // Unique monsters (and types of monsters) visible in different directions + // 7 0 1 unique_types uses these indices; + // 6 8 2 0-7 are provide by direction_from() + // 5 4 3 8 is used for local monsters (for when we explain them below) + std::vector unique_types[9]; + std::vector unique_mons[9]; + + // If the moster visible in this direction is dangerous + bool dangerous[8]; +}; class avatar : public player { @@ -187,6 +205,10 @@ class avatar : public player bool invoke_item( item *, const std::string &, const tripoint &pt ) override; bool invoke_item( item *, const std::string & ) override; + monster_visible_info &get_mon_visible() { + return mon_visible; + } + private: map_memory player_map_memory; bool show_map_memory; @@ -224,6 +246,8 @@ class avatar : public player int dex_upgrade = 0; int int_upgrade = 0; int per_upgrade = 0; + + monster_visible_info mon_visible; }; struct points_left { diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp index 5551e85f654aa..0bb4f6b0549e2 100644 --- a/src/avatar_action.cpp +++ b/src/avatar_action.cpp @@ -1,6 +1,6 @@ #include "avatar_action.h" -#include +#include #include #include #include @@ -772,8 +772,8 @@ bool avatar_action::fire( avatar &you, map &m ) } // Burn 0.2% max base stamina x the strength required to fire. - you.mod_stat( "stamina", gun->get_min_str() * static_cast( 0.002f * - get_option( "PLAYER_MAX_STAMINA" ) ) ); + you.mod_stamina( gun->get_min_str() * static_cast( 0.002f * + get_option( "PLAYER_MAX_STAMINA" ) ) ); // At low stamina levels, firing starts getting slow. int sta_percent = ( 100 * you.get_stamina() ) / you.get_stamina_max(); reload_time += ( sta_percent < 25 ) ? ( ( 25 - sta_percent ) * 2 ) : 0; @@ -854,6 +854,22 @@ bool avatar_action::fire( avatar &you, map &m, item &weapon, int bp_cost ) return avatar_action::fire( you, m ); } +void avatar_action::mend( avatar &you, item_location loc ) +{ + if( !loc ) { + if( you.is_armed() ) { + loc = item_location( you, &you.weapon ); + } else { + add_msg( m_info, _( "You're not wielding anything." ) ); + return; + } + } + + if( you.has_item( *loc ) ) { + you.mend_item( item_location( loc ) ); + } +} + bool avatar_action::eat_here( avatar &you ) { if( ( you.has_active_mutation( trait_RUMINANT ) || you.has_active_mutation( trait_GRAZER ) ) && @@ -935,7 +951,7 @@ void avatar_action::eat( avatar &you, item_location loc ) } } -void avatar_action::plthrow( avatar &you, int pos, +void avatar_action::plthrow( avatar &you, item_location loc, const cata::optional &blind_throw_from_pos ) { if( you.has_active_mutation( trait_SHELL2 ) ) { @@ -943,7 +959,7 @@ void avatar_action::plthrow( avatar &you, int pos, return; } if( you.is_mounted() ) { - auto mons = g->u.mounted_creature.get(); + monster *mons = g->u.mounted_creature.get(); if( mons->has_flag( MF_RIDEABLE_MECH ) ) { if( !mons->check_mech_powered() ) { add_msg( m_bad, _( "Your %s refuses to move as its batteries have been drained." ), @@ -953,17 +969,21 @@ void avatar_action::plthrow( avatar &you, int pos, } } - if( pos == INT_MIN ) { - pos = g->inv_for_all( _( "Throw item" ), _( "You don't have any items to throw." ) ); + if( !loc ) { + loc = game_menus::inv::titled_menu( you, _( "Throw item" ), + _( "You don't have any items to throw." ) ); g->refresh_all(); } - if( pos == INT_MIN ) { + if( !loc ) { add_msg( _( "Never mind." ) ); return; } - - item thrown = you.i_at( pos ); + // make a copy and get the original. + // the copy is thrown and has its and the originals charges set appropiately + // or deleted from inventory if its charges(1) or not stackable. + item *orig = loc.get_item(); + item thrown = *orig; int range = you.throw_range( thrown ); if( range < 0 ) { add_msg( m_info, _( "You don't have that item." ) ); @@ -973,7 +993,7 @@ void avatar_action::plthrow( avatar &you, int pos, return; } - if( pos == -1 && thrown.has_flag( "NO_UNWIELD" ) ) { + if( you.is_wielding( *orig ) && orig->has_flag( "NO_UNWIELD" ) ) { // pos == -1 is the weapon, NO_UNWIELD is used for bio_claws_weapon add_msg( m_info, _( "That's part of your body, you can't throw that!" ) ); return; @@ -989,22 +1009,16 @@ void avatar_action::plthrow( avatar &you, int pos, } } // if you're wearing the item you need to be able to take it off - if( pos < -1 ) { - auto ret = you.can_takeoff( you.i_at( pos ) ); + if( you.is_wearing( orig->typeId() ) ) { + ret_val ret = you.can_takeoff( *orig ); if( !ret.success() ) { add_msg( m_info, "%s", ret.c_str() ); return; } } // you must wield the item to throw it - if( pos != -1 ) { - you.i_rem( pos ); - if( !you.wield( thrown ) ) { - // We have to remove the item before checking for wield because it - // can invalidate our pos index. Which means we have to add it - // back if the player changed their mind about unwielding their - // current item - you.i_add( thrown ); + if( !you.is_wielding( *orig ) ) { + if( !you.wield( *orig ) ) { return; } } @@ -1024,7 +1038,8 @@ void avatar_action::plthrow( avatar &you, int pos, const target_mode throwing_target_mode = blind_throw_from_pos ? TARGET_MODE_THROW_BLIND : TARGET_MODE_THROW; // target_ui() sets x and y, or returns empty vector if we canceled (by pressing Esc) - std::vector trajectory = target_handler().target_ui( you, throwing_target_mode, &thrown, + std::vector trajectory = target_handler().target_ui( you, throwing_target_mode, + &you.weapon, range ); // If we previously shifted our position, put ourselves back now that we've picked our target. @@ -1036,8 +1051,8 @@ void avatar_action::plthrow( avatar &you, int pos, return; } - if( thrown.count_by_charges() && thrown.charges > 1 ) { - you.i_at( -1 ).charges--; + if( you.weapon.count_by_charges() && you.weapon.charges > 1 ) { + you.weapon.mod_charges( -1 ); thrown.charges = 1; } else { you.i_rem( -1 ); diff --git a/src/avatar_action.h b/src/avatar_action.h index 6292eded4e732..df18173e592d6 100644 --- a/src/avatar_action.h +++ b/src/avatar_action.h @@ -2,7 +2,7 @@ #ifndef AVATAR_ACTION_H #define AVATAR_ACTION_H -#include +#include #include "optional.h" #include "point.h" @@ -43,6 +43,8 @@ void swim( map &m, avatar &you, const tripoint &p ); void autoattack( avatar &you, map &m ); +void mend( avatar &you, item_location loc ); + /** * Returns true if the player is allowed to fire a given item, or false if otherwise. * reload_time is stored as a side effect of condition testing. @@ -65,7 +67,7 @@ bool fire( avatar &you, map &m ); */ bool fire( avatar &you, map &m, item &weapon, int bp_cost = 0 ); // Throw an item 't' -void plthrow( avatar &you, int pos = INT_MIN, +void plthrow( avatar &you, item_location loc, const cata::optional &blind_throw_from_pos = cata::nullopt ); void unload( avatar &you ); diff --git a/src/behavior.cpp b/src/behavior.cpp index 2208bc873040c..2d911d16fe5b1 100644 --- a/src/behavior.cpp +++ b/src/behavior.cpp @@ -1,6 +1,6 @@ #include "behavior.h" -#include +#include #include #include #include diff --git a/src/bionics.cpp b/src/bionics.cpp index 8f583517fd7a5..b6b4ee5909a94 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -464,7 +464,7 @@ bool player::activate_bionic( int b, bool eff_only ) std::vector good; std::vector bad; - if( radiation > 0 ) { + if( get_rad() > 0 ) { bad.push_back( _( "Irradiated" ) ); } @@ -537,12 +537,12 @@ bool player::activate_bionic( int b, bool eff_only ) mod_power_level( bionics[bionic_id( "bio_lighter" )].power_activate ); } } else if( bio.id == "bio_geiger" ) { - add_msg_if_player( m_info, _( "Your radiation level: %d" ), radiation ); + add_msg_if_player( m_info, _( "Your radiation level: %d" ), get_rad() ); } else if( bio.id == "bio_radscrubber" ) { - if( radiation > 4 ) { - radiation -= 5; + if( get_rad() > 4 ) { + mod_rad( -5 ); } else { - radiation = 0; + set_rad( 0 ); } } else if( bio.id == "bio_adrenaline" ) { if( has_effect( effect_adrenaline ) ) { @@ -1324,6 +1324,7 @@ void player::bionics_uninstall_failure( int difficulty, int success, float adjus } add_msg( m_neutral, _( "The removal is a failure." ) ); + std::set bp_hurt; switch( fail_type ) { case 1: if( !has_trait( trait_id( "NOPAIN" ) ) ) { @@ -1336,6 +1337,10 @@ void player::bionics_uninstall_failure( int difficulty, int success, float adjus case 3: for( const body_part &bp : all_body_parts ) { if( has_effect( effect_under_op, bp ) ) { + if( bp_hurt.count( mutate_to_main_part( bp ) ) > 0 ) { + continue; + } + bp_hurt.emplace( mutate_to_main_part( bp ) ); apply_damage( this, bp, rng( failure_level, failure_level * 2 ), true ); add_msg_player_or_npc( m_bad, _( "Your %s is damaged." ), _( "'s %s is damaged." ), body_part_name_accusative( bp ) ); @@ -1347,6 +1352,10 @@ void player::bionics_uninstall_failure( int difficulty, int success, float adjus case 5: for( const body_part &bp : all_body_parts ) { if( has_effect( effect_under_op, bp ) ) { + if( bp_hurt.count( mutate_to_main_part( bp ) ) > 0 ) { + continue; + } + bp_hurt.emplace( mutate_to_main_part( bp ) ); apply_damage( this, bp, rng( 30, 80 ), true ); add_msg_player_or_npc( m_bad, _( "Your %s is severely damaged." ), _( "'s %s is severely damaged." ), @@ -1399,6 +1408,7 @@ void player::bionics_uninstall_failure( monster &installer, player &patient, int break; } } + std::set bp_hurt; switch( fail_type ) { case 1: if( !has_trait( trait_id( "NOPAIN" ) ) ) { @@ -1411,6 +1421,10 @@ void player::bionics_uninstall_failure( monster &installer, player &patient, int case 3: for( const body_part &bp : all_body_parts ) { if( has_effect( effect_under_op, bp ) ) { + if( bp_hurt.count( mutate_to_main_part( bp ) ) > 0 ) { + continue; + } + bp_hurt.emplace( mutate_to_main_part( bp ) ); patient.apply_damage( this, bp, rng( failure_level, failure_level * 2 ), true ); if( u_see ) { patient.add_msg_player_or_npc( m_bad, _( "Your %s is damaged." ), _( "'s %s is damaged." ), @@ -1424,6 +1438,10 @@ void player::bionics_uninstall_failure( monster &installer, player &patient, int case 5: for( const body_part &bp : all_body_parts ) { if( has_effect( effect_under_op, bp ) ) { + if( bp_hurt.count( mutate_to_main_part( bp ) ) > 0 ) { + continue; + } + bp_hurt.emplace( mutate_to_main_part( bp ) ); patient.apply_damage( this, bp, rng( 30, 80 ), true ); if( u_see ) { patient.add_msg_player_or_npc( m_bad, _( "Your %s is severely damaged." ), @@ -1656,14 +1674,7 @@ bool player::uninstall_bionic( const bionic_id &b_id, player &installer, bool au } int success = chance_of_success - rng( 1, 100 ); - - if( is_npc() ) { - static_cast( this )->set_attitude( NPCATT_ACTIVITY ); - assign_activity( activity_id( "ACT_OPERATION" ), to_moves( difficulty * 20_minutes ) ); - static_cast( this )->set_mission( NPC_MISSION_ACTIVITY ); - } else { - assign_activity( activity_id( "ACT_OPERATION" ), to_moves( difficulty * 20_minutes ) ); - } + assign_activity( activity_id( "ACT_OPERATION" ), to_moves( difficulty * 20_minutes ) ); activity.values.push_back( difficulty ); activity.values.push_back( success ); @@ -1904,14 +1915,7 @@ bool player::install_bionics( const itype &type, player &installer, bool autodoc } int success = chance_of_success - rng( 0, 99 ); - if( is_npc() ) { - static_cast( this )->set_attitude( NPCATT_ACTIVITY ); - assign_activity( activity_id( "ACT_OPERATION" ), to_moves( difficulty * 20_minutes ) ); - static_cast( this )->set_mission( NPC_MISSION_ACTIVITY ); - } else { - assign_activity( activity_id( "ACT_OPERATION" ), to_moves( difficulty * 20_minutes ) ); - } - + assign_activity( activity_id( "ACT_OPERATION" ), to_moves( difficulty * 20_minutes ) ); activity.values.push_back( difficulty ); activity.values.push_back( success ); activity.values.push_back( units::to_millijoule( bionics[bioid].capacity ) ); @@ -2015,6 +2019,7 @@ void player::bionics_install_failure( bionic_id bid, std::string installer, int add_msg( m_neutral, _( "The installation fails without incident." ) ); drop_cbm = true; } else { + std::set bp_hurt; switch( fail_type ) { case 1: @@ -2029,6 +2034,10 @@ void player::bionics_install_failure( bionic_id bid, std::string installer, int case 3: for( const body_part &bp : all_body_parts ) { if( has_effect( effect_under_op, bp ) ) { + if( bp_hurt.count( mutate_to_main_part( bp ) ) > 0 ) { + continue; + } + bp_hurt.emplace( mutate_to_main_part( bp ) ); apply_damage( this, bp, rng( 30, 80 ), true ); add_msg_player_or_npc( m_bad, _( "Your %s is damaged." ), _( "'s %s is damaged." ), body_part_name_accusative( bp ) ); @@ -2308,30 +2317,22 @@ void load_bionic( const JsonObject &jsobj ) jsobj.read( "fuel_options", new_bionic.fuel_opts ); jsobj.read( "fuel_capacity", new_bionic.fuel_capacity ); - JsonArray jsr = jsobj.get_array( "stat_bonus" ); - while( jsr.has_more() ) { - JsonArray ja = jsr.next_array(); + for( JsonArray ja : jsobj.get_array( "stat_bonus" ) ) { new_bionic.stat_bonus.emplace( io::string_to_enum( ja.get_string( 0 ) ), ja.get_int( 1 ) ); } - JsonArray jsar = jsobj.get_array( "encumbrance" ); - while( jsar.has_more() ) { - JsonArray ja = jsar.next_array(); + for( JsonArray ja : jsobj.get_array( "encumbrance" ) ) { new_bionic.encumbrance.emplace( get_body_part_token( ja.get_string( 0 ) ), ja.get_int( 1 ) ); } - JsonArray jsarr = jsobj.get_array( "occupied_bodyparts" ); - while( jsarr.has_more() ) { - JsonArray ja = jsarr.next_array(); + for( JsonArray ja : jsobj.get_array( "occupied_bodyparts" ) ) { new_bionic.occupied_bodyparts.emplace( get_body_part_token( ja.get_string( 0 ) ), ja.get_int( 1 ) ); } - JsonArray json_arr = jsobj.get_array( "env_protec" ); - while( json_arr.has_more() ) { - JsonArray ja = json_arr.next_array(); + for( JsonArray ja : jsobj.get_array( "env_protec" ) ) { new_bionic.env_protec.emplace( get_body_part_token( ja.get_string( 0 ) ), ja.get_int( 1 ) ); } @@ -2529,9 +2530,8 @@ void bionic::deserialize( JsonIn &jsin ) auto_start_threshold = jo.get_float( "auto_start_threshold" ); } if( jo.has_array( "bionic_tags" ) ) { - JsonArray jsar = jo.get_array( "bionic_tags" ); - while( jsar.has_more() ) { - bionic_tags.insert( jsar.next_string() ); + for( const std::string &line : jo.get_array( "bionic_tags" ) ) { + bionic_tags.insert( line ); } } @@ -2562,10 +2562,10 @@ void player::introduce_into_anesthesia( const time_duration &duration, player &i //post-threshold medical mutants do not fear operations. if( has_trait( trait_THRESH_MEDICAL ) ) { add_msg_if_player( m_mixed, - _( "You feel excited as the Autodoc slices painlessly into you. You enjoy the sight of scalpels slicing you apart, but as operation proceeds you suddenly feel tired and pass out." ) ); + _( "You feel excited as the Autodoc slices painlessly into you. You enjoy the sight of scalpels slicing you apart." ) ); } else { add_msg_if_player( m_mixed, - _( "You stay very, very still, focusing intently on an interesting stain on the ceiling, as the Autodoc slices painlessly into you. Mercifully, you pass out when the blades reach your line of sight." ) ); + _( "You stay very, very still, focusing intently on an interesting stain on the ceiling, as the Autodoc slices painlessly into you." ) ); } } diff --git a/src/cata_algo.h b/src/cata_algo.h index 7337246f30217..ef284136f9c87 100644 --- a/src/cata_algo.h +++ b/src/cata_algo.h @@ -3,9 +3,13 @@ #define CATA_ALGO_H #include +#include +#include +#include +#include #include -namespace algo +namespace cata { /** @@ -41,6 +45,82 @@ void sort_by_rating( Iterator begin, Iterator end, RatingFunction rating_func ) } ); } -} // namespace algo +// Implementation detail of below find_cycles +// This explores one branch of the given graph depth-first +template +void find_cycles_impl( + const std::unordered_map> &edges, + const T &v, + std::unordered_set &visited, + std::unordered_map &on_current_branch, + std::vector> &result ) +{ + bool new_vertex = visited.insert( v ).second; + + if( !new_vertex ) { + return; + } + auto it = edges.find( v ); + if( it == edges.end() ) { + return; + } + + for( const T &next_v : it->second ) { + if( next_v == v ) { + // Trivial self-loop + result.push_back( { v } ); + continue; + } + auto previous_match = on_current_branch.find( next_v ); + if( previous_match != on_current_branch.end() ) { + // We have looped back to somewhere along the branch we took to + // reach this vertex, so reconstruct the loop and save it. + std::vector loop; + T on_path = v; + while( true ) { + loop.push_back( on_path ); + if( on_path == next_v ) { + break; + } + on_path = on_current_branch[on_path]; + } + std::reverse( loop.begin(), loop.end() ); + result.push_back( loop ); + } else { + on_current_branch.emplace( next_v, v ); + find_cycles_impl( edges, next_v, visited, on_current_branch, result ); + on_current_branch.erase( next_v ); + } + } +} + +// Find and return a list of all cycles in a directed graph. +// Each T defines a vertex. +// For a vertex a, edges[a] is a list of all the vertices connected by edges +// from a. +// It is acceptable for some vertex keys to be missing from the edges map, if +// those vertices have no out-edges. +// Complexity should be O(V+E) +// Based on https://www.geeksforgeeks.org/detect-cycle-in-a-graph/ +template +std::vector> find_cycles( const std::unordered_map> &edges ) +{ + std::unordered_set visited; + std::unordered_map on_current_branch; + std::vector> result; + + for( const auto &p : edges ) { + const T &root = p.first; + + on_current_branch.emplace( root, root ); + find_cycles_impl( edges, root, visited, on_current_branch, result ); + on_current_branch.erase( root ); + assert( on_current_branch.empty() ); + } + + return result; +} + +} // namespace cata #endif // CATA_ALGO_H diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp index bce491ebbde16..9562a0d95d826 100644 --- a/src/cata_tiles.cpp +++ b/src/cata_tiles.cpp @@ -174,7 +174,7 @@ formatted_text::formatted_text( const std::string &text, const int color, cata_tiles::cata_tiles( const SDL_Renderer_Ptr &renderer ) : renderer( renderer ), - minimap( new pixel_minimap( renderer ) ) + minimap( renderer ) { assert( renderer ); @@ -542,9 +542,7 @@ void tileset_loader::load( const std::string &tileset_id, const bool precheck ) config.throw_error( "\"tile_info\" missing" ); } - JsonArray info = config.get_array( "tile_info" ); - while( info.has_more() ) { - JsonObject curr_info = info.next_object(); + for( const JsonObject &curr_info : config.get_array( "tile_info" ) ) { ts.tile_height = curr_info.get_int( "height" ); ts.tile_width = curr_info.get_int( "width" ); tile_iso = curr_info.get_bool( "iso", false ); @@ -581,9 +579,7 @@ void tileset_loader::load( const std::string &tileset_id, const bool precheck ) int num_in_file = 1; if( mod_config_json.test_array() ) { - JsonArray mod_config_array = mod_config_json.get_array(); - while( mod_config_array.has_more() ) { - JsonObject mod_config = mod_config_array.next_object(); + for( const JsonObject &mod_config : mod_config_json.get_array() ) { if( mod_config.get_string( "type" ) == "mod_tileset" ) { if( num_in_file == mts.num_in_file() ) { load_internal( mod_config, tileset_root, img_path ); @@ -628,9 +624,7 @@ void tileset_loader::load_internal( const JsonObject &config, const std::string // new system, several entries // When loading multiple tileset images this defines where // the tiles from the most recently loaded image start from. - JsonArray tiles_new = config.get_array( "tiles-new" ); - while( tiles_new.has_more() ) { - JsonObject tile_part_def = tiles_new.next_object(); + for( const JsonObject &tile_part_def : config.get_array( "tiles-new" ) ) { const std::string tileset_image_path = tileset_root + '/' + tile_part_def.get_string( "file" ); R = -1; G = -1; @@ -728,9 +722,7 @@ void tileset_loader::load_ascii( const JsonObject &config ) if( !config.has_member( "ascii" ) ) { config.throw_error( "\"ascii\" section missing" ); } - JsonArray ascii = config.get_array( "ascii" ); - while( ascii.has_more() ) { - JsonObject entry = ascii.next_object(); + for( const JsonObject &entry : config.get_array( "ascii" ) ) { load_ascii_set( entry ); } } @@ -850,10 +842,7 @@ void tileset_loader::load_tilejson_from_file( const JsonObject &config ) config.throw_error( "\"tiles\" section missing" ); } - JsonArray tiles = config.get_array( "tiles" ); - while( tiles.has_more() ) { - JsonObject entry = tiles.next_object(); - + for( const JsonObject &entry : config.get_array( "tiles" ) ) { std::vector ids; if( entry.has_string( "id" ) ) { ids.push_back( entry.get_string( "id" ) ); @@ -868,9 +857,7 @@ void tileset_loader::load_tilejson_from_file( const JsonObject &config ) int t_h3d = entry.get_int( "height_3d", 0 ); if( t_multi ) { // fetch additional tiles - JsonArray subentries = entry.get_array( "additional_tiles" ); - while( subentries.has_more() ) { - JsonObject subentry = subentries.next_object(); + for( const JsonObject &subentry : entry.get_array( "additional_tiles" ) ) { const std::string s_id = subentry.get_string( "id" ); const std::string m_id = t_id + "_" + s_id; tile_type &curr_subtile = load_tile( subentry, m_id ); @@ -921,8 +908,8 @@ void tileset_loader::load_tile_spritelists( const JsonObject &entry, // create one variation, populate sprite_ids with list of ints if( g_array.test_int() ) { std::vector v; - while( g_array.has_more() ) { - const int sprite_id = g_array.next_int() + sprite_id_offset; + for( const int entry : g_array ) { + const int sprite_id = entry + sprite_id_offset; if( sprite_id >= 0 ) { v.push_back( sprite_id ); } @@ -932,9 +919,8 @@ void tileset_loader::load_tile_spritelists( const JsonObject &entry, // object elements of array indicates variations // create one variation per object else if( g_array.test_object() ) { - while( g_array.has_more() ) { + for( const JsonObject &vo : g_array ) { std::vector v; - JsonObject vo = g_array.next_object(); int weight = vo.get_int( "weight" ); // negative weight is invalid if( weight < 0 ) { @@ -949,9 +935,8 @@ void tileset_loader::load_tile_spritelists( const JsonObject &entry, } // array sprite means rotations else if( vo.has_array( "sprite" ) ) { - JsonArray sprites = vo.get_array( "sprite" ); - while( sprites.has_more() ) { - const int sprite_id = sprites.next_int() + sprite_id_offset; + for( const int entry : vo.get_array( "sprite" ) ) { + const int sprite_id = entry + sprite_id_offset; if( sprite_id >= 0 && sprite_id < size ) { v.push_back( sprite_id ); } else { @@ -1368,10 +1353,13 @@ void cata_tiles::draw( const point &dest, const tripoint ¢er, int width, int would_apply_vision_effects( g->m.get_visibility( ch.visibility_cache[np.x][np.y], cache ) ); } //calling draw to memorize everything. - draw_terrain( p, lighting, height_3d, invisible ); - draw_furniture( p, lighting, height_3d, invisible ); - draw_trap( p, lighting, height_3d, invisible ); - draw_vpart( p, lighting, height_3d, invisible ); + if( g->m.check_seen_cache( p ) ) { + draw_terrain( p, lighting, height_3d, invisible ); + draw_furniture( p, lighting, height_3d, invisible ); + draw_trap( p, lighting, height_3d, invisible ); + draw_vpart( p, lighting, height_3d, invisible ); + g->m.check_and_set_seen_cache( p ); + } } } @@ -1825,8 +1813,21 @@ bool cata_tiles::draw_from_id_string( std::string id, TILE_CATEGORY category, } break; + case C_FURNITURE: { + // If the furniture is not movable, we'll allow seeding by the position + // since we won't get the behavior that occurs where the tile constantly + // changes when the player grabs the furniture and drags it, causing the + // seed to change. + const furn_str_id fid( id ); + if( fid.is_valid() ) { + const furn_t &f = fid.obj(); + if( !f.is_movable() ) { + seed = g->m.getabs( pos ).x + g->m.getabs( pos ).y * 65536; + } + } + } + break; case C_ITEM: - case C_FURNITURE: case C_TRAP: case C_NONE: case C_BULLET: @@ -2178,7 +2179,7 @@ bool cata_tiles::draw_terrain( const tripoint &p, const lit_level ll, int &heigh // do something to get other terrain orientation values } const std::string &tname = t.id().str(); - if( !g->m.check_and_set_seen_cache( p ) ) { + if( g->m.check_seen_cache( p ) ) { g->u.memorize_tile( g->m.getabs( p ), tname, subtile, rotation ); } // draw the actual terrain if there's no override @@ -2342,7 +2343,7 @@ bool cata_tiles::draw_furniture( const tripoint &p, const lit_level ll, int &hei int rotation = 0; get_tile_values( f, neighborhood, subtile, rotation ); const std::string &fname = f.id().str(); - if( !g->m.check_and_set_seen_cache( p ) ) { + if( g->m.check_seen_cache( p ) ) { g->u.memorize_tile( g->m.getabs( p ), fname, subtile, rotation ); } // draw the actual furniture if there's no override @@ -2416,7 +2417,7 @@ bool cata_tiles::draw_trap( const tripoint &p, const lit_level ll, int &height_3 int rotation = 0; get_tile_values( tr, neighborhood, subtile, rotation ); const std::string trname = tr.id().str(); - if( !g->m.check_and_set_seen_cache( p ) ) { + if( g->m.check_seen_cache( p ) ) { g->u.memorize_tile( g->m.getabs( p ), trname, subtile, rotation ); } // draw the actual trap if there's no override @@ -2582,7 +2583,7 @@ bool cata_tiles::draw_vpart( const tripoint &p, lit_level ll, int &height_3d, const int rotation = veh.face.dir(); const std::string vpname = "vp_" + vp_id.str(); if( !veh.forward_velocity() && !veh.player_in_control( g->u ) && - !g->m.check_and_set_seen_cache( p ) ) { + g->m.check_seen_cache( p ) ) { g->u.memorize_tile( g->m.getabs( p ), vpname, subtile, rotation ); } if( !overridden ) { diff --git a/src/cata_tiles.h b/src/cata_tiles.h index 9cb1175d65483..041ab4960e45b 100644 --- a/src/cata_tiles.h +++ b/src/cata_tiles.h @@ -21,6 +21,7 @@ #include "enums.h" #include "weighted_list.h" #include "point.h" +#include "pimpl.h" class Creature; class player; @@ -573,7 +574,7 @@ class cata_tiles */ bool nv_goggles_activated; - std::unique_ptr minimap; + pimpl minimap; public: std::string memory_map_mode = "color_pixel_sepia"; diff --git a/src/character.cpp b/src/character.cpp index 10740e870ac85..2fefebdea9db5 100644 --- a/src/character.cpp +++ b/src/character.cpp @@ -1,11 +1,10 @@ #include "character.h" -#include +#include #include #include #include #include -#include #include #include #include @@ -119,10 +118,12 @@ static const efftype_id effect_grabbing( "grabbing" ); static const efftype_id effect_harnessed( "harnessed" ); static const efftype_id effect_heavysnare( "heavysnare" ); static const efftype_id effect_hot( "hot" ); +static const efftype_id effect_hot_speed( "hot_speed" ); static const efftype_id effect_infected( "infected" ); static const efftype_id effect_in_pit( "in_pit" ); static const efftype_id effect_lightsnare( "lightsnare" ); static const efftype_id effect_lying_down( "lying_down" ); +static const efftype_id effect_mending( "mending" ); static const efftype_id effect_narcosis( "narcosis" ); static const efftype_id effect_nausea( "nausea" ); static const efftype_id effect_no_sight( "no_sight" ); @@ -210,8 +211,6 @@ static const species_id HUMAN( "HUMAN" ); Character::Character() : visitable(), - hp_cur( {{ 0 }} ), - hp_max( {{ 0 }} ), damage_bandaged( {{ 0 }} ), damage_disinfected( {{ 0 }} ), cached_time( calendar::before_time_starts ), @@ -219,6 +218,8 @@ Character::Character() : next_climate_control_check( calendar::before_time_starts ), last_climate_control_ret( false ) { + hp_cur.fill( 0 ); + hp_max.fill( 1 ); str_max = 0; dex_max = 0; per_max = 0; @@ -237,7 +238,7 @@ Character::Character() : thirst = 0; fatigue = 0; sleep_deprivation = 0; - radiation = 0; + set_rad( 0 ); tank_plut = 0; reactor_plut = 0; slow_rad = 0; @@ -1111,6 +1112,8 @@ void Character::recalc_hp() if( new_max_hp[i] == hp_max[i] ) { continue; } + // hp_max must be positive to avoiud undefined behavior. + hp_max[i] = std::max( hp_max[i], 1 ); float max_hp_ratio = static_cast( new_max_hp[i] ) / static_cast( hp_max[i] ); hp_cur[i] = std::ceil( static_cast( hp_cur[i] ) * max_hp_ratio ); @@ -1264,10 +1267,10 @@ void Character::check_item_encumbrance_flag() { bool update_required = check_encumbrance; for( auto &i : worn ) { - if( !update_required && i.has_flag( "ENCUMBRANCE_UPDATE" ) ) { + if( !update_required && i.encumbrance_update_ ) { update_required = true; } - i.unset_flag( "ENCUMBRANCE_UPDATE" ); + i.encumbrance_update_ = false; } if( update_required ) { @@ -1726,15 +1729,39 @@ bool Character::i_add_or_drop( item &it, int qty ) return retval; } -void Character::drop( int pos, const tripoint &where ) +std::list Character::get_dependent_worn_items( const item &it ) { - const item &it = i_at( pos ); - const int count = it.count(); + std::list dependent; + // Adds dependent worn items recursively + const std::function add_dependent = [&]( const item & it ) { + for( item &wit : worn ) { + if( &wit == &it || !wit.is_worn_only_with( it ) ) { + continue; + } + const auto iter = std::find_if( dependent.begin(), dependent.end(), + [&wit]( const item * dit ) { + return &wit == dit; + } ); + if( iter == dependent.end() ) { // Not in the list yet + add_dependent( wit ); + dependent.push_back( &wit ); + } + } + }; + + if( is_worn( it ) ) { + add_dependent( it ); + } - drop( { std::make_pair( pos, count ) }, where ); + return dependent; } -void Character::drop( const std::list> &what, const tripoint &target, +void Character::drop( item_location loc, const tripoint &where ) +{ + drop( { std::make_pair( loc, loc->count() ) }, where ); +} + +void Character::drop( const drop_locations &what, const tripoint &target, bool stash ) { const activity_id type( stash ? "ACT_STASH" : "ACT_DROP" ); @@ -1752,9 +1779,9 @@ void Character::drop( const std::list> &what, const tripoint assign_activity( type ); activity.placement = target - pos(); - for( auto item_pair : what ) { - if( can_unwield( i_at( item_pair.first ) ).success() ) { - activity.values.push_back( item_pair.first ); + for( drop_location item_pair : what ) { + if( can_unwield( *item_pair.first ).success() ) { + activity.targets.push_back( item_pair.first ); activity.values.push_back( item_pair.second ); } } @@ -2566,6 +2593,57 @@ int Character::extraEncumbrance( const layer_level level, const int bp ) const return encumbrance_cache[bp].layer_penalty_details[static_cast( level )].total; } +hint_rating Character::rate_action_change_side( const item &it ) const +{ + if( !is_worn( it ) ) { + return HINT_IFFY; + } + + if( !it.is_sided() ) { + return HINT_CANT; + } + + return HINT_GOOD; +} + +bool Character::change_side( item &it, bool interactive ) +{ + if( !it.swap_side() ) { + if( interactive ) { + add_msg_player_or_npc( m_info, + _( "You cannot swap the side on which your %s is worn." ), + _( " cannot swap the side on which their %s is worn." ), + it.tname() ); + } + return false; + } + + if( interactive ) { + add_msg_player_or_npc( m_info, _( "You swap the side on which your %s is worn." ), + _( " swaps the side on which their %s is worn." ), + it.tname() ); + } + + mod_moves( -250 ); + reset_encumbrance(); + + return true; +} + +bool Character::change_side( item_location &loc, bool interactive ) +{ + if( !loc || !is_worn( *loc ) ) { + if( interactive ) { + add_msg_player_or_npc( m_info, + _( "You are not wearing that item." ), + _( " isn't wearing that item." ) ); + } + return false; + } + + return change_side( *loc, interactive ); +} + static void layer_item( std::array &vals, const item &it, std::array &highest_layer_so_far, @@ -3289,7 +3367,10 @@ std::pair Character::get_fatigue_description() const void Character::mod_thirst( int nthirst ) { - set_thirst( thirst + nthirst ); + if( has_trait_flag( "NO_THIRST" ) ) { + return; + } + set_thirst( std::max( -100, thirst + nthirst ) ); } void Character::set_thirst( int nthirst ) @@ -3788,16 +3869,26 @@ void Character::update_bodytemp() add_effect( effect_cold, 1_turns, bp, true, 1 ); } else if( temp_cur[bp] > BODYTEMP_SCORCHING ) { add_effect( effect_hot, 1_turns, bp, true, 3 ); + if( mutate_to_main_part( bp ) == bp ) { + add_effect( effect_hot_speed, 1_turns, bp, true, 3 ); + } } else if( temp_cur[bp] > BODYTEMP_VERY_HOT ) { add_effect( effect_hot, 1_turns, bp, true, 2 ); + if( mutate_to_main_part( bp ) == bp ) { + add_effect( effect_hot_speed, 1_turns, bp, true, 2 ); + } } else if( temp_cur[bp] > BODYTEMP_HOT ) { add_effect( effect_hot, 1_turns, bp, true, 1 ); + if( mutate_to_main_part( bp ) == bp ) { + add_effect( effect_hot_speed, 1_turns, bp, true, 1 ); + } } else { if( temp_cur[bp] >= BODYTEMP_COLD ) { remove_effect( effect_cold, bp ); } if( temp_cur[bp] <= BODYTEMP_HOT ) { remove_effect( effect_hot, bp ); + remove_effect( effect_hot_speed, bp ); } } // FROSTBITE - only occurs to hands, feet, face @@ -3977,6 +4068,7 @@ int Character::blood_loss( body_part bp ) const } hp_cur_sum = std::min( hp_max_sum, std::max( 0, hp_cur_sum ) ); + hp_max_sum = std::max( hp_max_sum, 1 ); return 100 - ( 100 * hp_cur_sum ) / hp_max_sum; } @@ -4024,22 +4116,7 @@ hp_part Character::body_window( const std::string &menu_header, max_bp_name_len = std::max( max_bp_name_len, utf8_width( e.name ) ); } - const auto hp_str = [precise]( const int hp, const int maximal_hp ) -> std::string { - if( hp <= 0 ) - { - return "==%=="; - } else if( precise ) - { - return string_format( "%d", hp ); - } else - { - std::string h_bar = get_hp_bar( hp, maximal_hp, false ).first; - nc_color h_bar_col = get_hp_bar( hp, maximal_hp, false ).second; - return colorize( h_bar, h_bar_col ) + colorize( std::string( 5 - utf8_width( h_bar ), - '.' ), c_white ); - } - }; uilist bmenu; bmenu.desc_enabled = true; @@ -4061,7 +4138,8 @@ hp_part Character::body_window( const std::string &menu_header, // The same as in the main UI sidebar. Independent of the capability of the healing item/effect! const nc_color all_state_col = limb_color( bp, true, true, true ); // Broken means no HP can be restored, it requires surgical attention. - const bool limb_is_broken = current_hp == 0; + const bool limb_is_broken = is_limb_broken( hp ); + const bool limb_is_mending = worn_with_flag( "SPLINT", bp ); if( show_all ) { e.allowed = true; @@ -4076,8 +4154,8 @@ hp_part Character::body_window( const std::string &menu_header, e.allowed = false; } - std::stringstream msg; - std::stringstream desc; + std::string msg; + std::string desc; bool bleeding = has_effect( effect_bleed, e.bp ); bool bitten = has_effect( effect_bite, e.bp ); bool infected = has_effect( effect_infected, e.bp ); @@ -4096,90 +4174,109 @@ hp_part Character::body_window( const std::string &menu_header, int new_d_power = static_cast( std::floor( disinfectant_power ) ); const auto &aligned_name = std::string( max_bp_name_len - utf8_width( e.name ), ' ' ) + e.name; - msg << colorize( aligned_name, all_state_col ) << " " << hp_str( current_hp, maximal_hp ); - - if( limb_is_broken ) { - desc << colorize( _( "It is broken. It needs a splint or surgical attention." ), c_red ) << "\n"; - } + std::string hp_str; + if( limb_is_mending ) { + desc += colorize( _( "It is broken but has been set and just needs time to heal." ), + c_blue ) + "\n"; + const auto &eff = get_effect( effect_mending, bp ); + const int mend_perc = eff.is_null() ? 0.0 : 100 * eff.get_duration() / eff.get_max_duration(); + + if( precise ) { + hp_str = colorize( string_format( "=%2d%%=", mend_perc ), c_blue ); + } else { + const int num = mend_perc / 20; + hp_str = colorize( std::string( num, '#' ) + std::string( 5 - num, '=' ), c_blue ); + } + } else if( limb_is_broken ) { + desc += colorize( _( "It is broken. It needs a splint or surgical attention." ), c_red ) + "\n"; + hp_str = "==%=="; + } else if( precise ) { + hp_str = string_format( "%d", current_hp ); + } else { + std::pair h_bar = get_hp_bar( current_hp, maximal_hp, false ); + hp_str = colorize( h_bar.first, h_bar.second ) + + colorize( std::string( 5 - utf8_width( h_bar.first ), '.' ), c_white ); + }; + msg += colorize( aligned_name, all_state_col ) + " " + hp_str; // BLEEDING block if( bleeding ) { - desc << colorize( string_format( "%s: %s", get_effect( effect_bleed, e.bp ).get_speed_name(), - get_effect( effect_bleed, e.bp ).disp_short_desc() ), c_red ) << "\n"; + desc += colorize( string_format( "%s: %s", get_effect( effect_bleed, e.bp ).get_speed_name(), + get_effect( effect_bleed, e.bp ).disp_short_desc() ), c_red ) + "\n"; if( bleed > 0.0f ) { - desc << colorize( string_format( _( "Chance to stop: %d %%" ), - static_cast( bleed * 100 ) ), c_light_green ) << "\n"; + desc += colorize( string_format( _( "Chance to stop: %d %%" ), + static_cast( bleed * 100 ) ), c_light_green ) + "\n"; } else { - desc << colorize( _( "This will not stop the bleeding." ), - c_yellow ) << "\n"; + desc += colorize( _( "This will not stop the bleeding." ), + c_yellow ) + "\n"; } } // BANDAGE block if( bandaged ) { - desc << string_format( _( "Bandaged [%s]" ), texitify_healing_power( b_power ) ) << "\n"; + desc += string_format( _( "Bandaged [%s]" ), texitify_healing_power( b_power ) ) + "\n"; if( new_b_power > b_power ) { - desc << colorize( string_format( _( "Expected quality improvement: %s" ), - texitify_healing_power( new_b_power ) ), c_light_green ) << "\n"; + desc += colorize( string_format( _( "Expected quality improvement: %s" ), + texitify_healing_power( new_b_power ) ), c_light_green ) + "\n"; } else if( new_b_power > 0 ) { - desc << colorize( _( "You don't expect any improvement from using this." ), c_yellow ) << "\n"; + desc += colorize( _( "You don't expect any improvement from using this." ), c_yellow ) + "\n"; } } else if( new_b_power > 0 && e.allowed ) { - desc << colorize( string_format( _( "Expected bandage quality: %s" ), - texitify_healing_power( new_b_power ) ), c_light_green ) << "\n"; + desc += colorize( string_format( _( "Expected bandage quality: %s" ), + texitify_healing_power( new_b_power ) ), c_light_green ) + "\n"; } // BITTEN block if( bitten ) { - desc << colorize( string_format( "%s: ", get_effect( effect_bite, + desc += colorize( string_format( "%s: ", get_effect( effect_bite, e.bp ).get_speed_name() ), c_red ); - desc << colorize( _( "It has a deep bite wound that needs cleaning." ), c_red ) << "\n"; + desc += colorize( _( "It has a deep bite wound that needs cleaning." ), c_red ) + "\n"; if( bite > 0 ) { - desc << colorize( string_format( _( "Chance to clean and disinfect: %d %%" ), - static_cast( bite * 100 ) ), c_light_green ) << "\n"; + desc += colorize( string_format( _( "Chance to clean and disinfect: %d %%" ), + static_cast( bite * 100 ) ), c_light_green ) + "\n"; } else { - desc << colorize( _( "This will not help in cleaning this wound." ), c_yellow ) << "\n"; + desc += colorize( _( "This will not help in cleaning this wound." ), c_yellow ) + "\n"; } } // INFECTED block if( infected ) { - desc << colorize( string_format( "%s: ", get_effect( effect_infected, + desc += colorize( string_format( "%s: ", get_effect( effect_infected, e.bp ).get_speed_name() ), c_red ); - desc << colorize( _( "It has a deep wound that looks infected. Antibiotics might be required." ), - c_red ) << "\n"; + desc += colorize( _( "It has a deep wound that looks infected. Antibiotics might be required." ), + c_red ) + "\n"; if( infect > 0 ) { - desc << colorize( string_format( _( "Chance to heal infection: %d %%" ), - static_cast( infect * 100 ) ), c_light_green ) << "\n"; + desc += colorize( string_format( _( "Chance to heal infection: %d %%" ), + static_cast( infect * 100 ) ), c_light_green ) + "\n"; } else { - desc << colorize( _( "This will not help in healing infection." ), c_yellow ) << "\n"; + desc += colorize( _( "This will not help in healing infection." ), c_yellow ) + "\n"; } } // DISINFECTANT (general) block if( disinfected ) { - desc << string_format( _( "Disinfected [%s]" ), - texitify_healing_power( d_power ) ) << "\n"; + desc += string_format( _( "Disinfected [%s]" ), + texitify_healing_power( d_power ) ) + "\n"; if( new_d_power > d_power ) { - desc << colorize( string_format( _( "Expected quality improvement: %s" ), - texitify_healing_power( new_d_power ) ), c_light_green ) << "\n"; + desc += colorize( string_format( _( "Expected quality improvement: %s" ), + texitify_healing_power( new_d_power ) ), c_light_green ) + "\n"; } else if( new_d_power > 0 ) { - desc << colorize( _( "You don't expect any improvement from using this." ), - c_yellow ) << "\n"; + desc += colorize( _( "You don't expect any improvement from using this." ), + c_yellow ) + "\n"; } } else if( new_d_power > 0 && e.allowed ) { - desc << colorize( string_format( + desc += colorize( string_format( _( "Expected disinfection quality: %s" ), - texitify_healing_power( new_d_power ) ), c_light_green ) << "\n"; + texitify_healing_power( new_d_power ) ), c_light_green ) + "\n"; } // END of blocks if( ( !e.allowed && !limb_is_broken ) || ( show_all && current_hp == maximal_hp && !limb_is_broken && !bitten && !infected && !bleeding ) ) { - desc << colorize( _( "Healthy." ), c_green ) << "\n"; + desc += colorize( _( "Healthy." ), c_green ) + "\n"; } if( !e.allowed ) { - desc << colorize( _( "You don't expect any effect from using this." ), c_yellow ); + desc += colorize( _( "You don't expect any effect from using this." ), c_yellow ); } else { is_valid_choice = true; } - bmenu.addentry_desc( i, e.allowed, MENU_AUTOASSIGN, msg.str(), desc.str() ); + bmenu.addentry_desc( i, e.allowed, MENU_AUTOASSIGN, msg, desc ); } if( !is_valid_choice ) { // no body part can be chosen for this item/effect @@ -4787,15 +4884,15 @@ std::vector Character::get_all_body_parts( bool only_main ) const std::string Character::extended_description() const { - std::ostringstream ss; + std::string ss; if( is_player() ) { // This is me, . - ss << string_format( _( "This is you - %s." ), name ); + ss += string_format( _( "This is you - %s." ), name ); } else { - ss << string_format( _( "This is %s." ), name ); + ss += string_format( _( "This is %s." ), name ); } - ss << std::endl << "--" << std::endl; + ss += "\n--\n"; const auto &bps = get_all_body_parts( true ); // Find length of bp names, to align @@ -4817,29 +4914,29 @@ std::string Character::extended_description() const nc_color name_color = state_col; auto hp_bar = get_hp_bar( current_hp, maximal_hp, false ); - ss << colorize( left_justify( bp_heading, longest ), name_color ); - ss << colorize( hp_bar.first, hp_bar.second ); + ss += colorize( left_justify( bp_heading, longest ), name_color ); + ss += colorize( hp_bar.first, hp_bar.second ); // Trailing bars. UGLY! // TODO: Integrate into get_hp_bar somehow - ss << colorize( std::string( 5 - utf8_width( hp_bar.first ), '.' ), c_white ); - ss << std::endl; + ss += colorize( std::string( 5 - utf8_width( hp_bar.first ), '.' ), c_white ); + ss += "\n"; } - ss << "--" << std::endl; - ss << _( "Wielding:" ) << " "; + ss += "--\n"; + ss += _( "Wielding:" ) + std::string( " " ); if( weapon.is_null() ) { - ss << _( "Nothing" ); + ss += _( "Nothing" ); } else { - ss << weapon.tname(); + ss += weapon.tname(); } - ss << std::endl; - ss << _( "Wearing:" ) << " "; - ss << enumerate_as_string( worn.begin(), worn.end(), []( const item & it ) { + ss += "\n"; + ss += _( "Wearing:" ) + std::string( " " ); + ss += enumerate_as_string( worn.begin(), worn.end(), []( const item & it ) { return it.tname(); } ); - return replace_colors( ss.str() ); + return replace_colors( ss ); } social_modifiers Character::get_mutation_social_mods() const @@ -5203,6 +5300,24 @@ void Character::mod_stim( int mod ) stim += mod; } +int Character::get_rad() const +{ + return radiation; +} + +void Character::set_rad( int new_rad ) +{ + radiation = new_rad; +} + +void Character::mod_rad( int mod ) +{ + if( has_trait_flag( "NO_RADIATION" ) ) { + return; + } + set_rad( std::max( 0, get_rad() + mod ) ); +} + int Character::get_stamina() const { return stamina; @@ -5222,7 +5337,15 @@ void Character::set_stamina( int new_stamina ) void Character::mod_stamina( int mod ) { + // TODO: Make NPCs smart enough to use stamina + if( is_npc() ) { + return; + } stamina += mod; + if( stamina < 0 ) { + add_effect( effect_winded, 10_turns ); + } + stamina = clamp( 0, stamina, get_stamina_max() ); } void Character::burn_move_stamina( int moves ) @@ -5245,7 +5368,7 @@ void Character::burn_move_stamina( int moves ) if( move_mode == CMM_RUN ) { burn_ratio = burn_ratio * 7; } - mod_stat( "stamina", -( ( moves * burn_ratio ) / 100.0 ) * stamina_move_cost_modifier() ); + mod_stamina( -( ( moves * burn_ratio ) / 100.0 ) * stamina_move_cost_modifier() ); add_msg( m_debug, "Stamina burn: %d", -( ( moves * burn_ratio ) / 100 ) ); // Chance to suffer pain if overburden and stamina runs out or has trait BADBACK // Starts at 1 in 25, goes down by 5 for every 50% more carried @@ -5491,7 +5614,7 @@ void Character::cough( bool harmful, int loudness ) if( harmful ) { const int stam = get_stamina(); const int malus = get_stamina_max() * 0.05; // 5% max stamina - mod_stat( "stamina", -malus ); + mod_stamina( -malus ); if( stam < malus && x_in_y( malus - stam, malus ) && one_in( 6 ) ) { apply_damage( nullptr, bp_torso, 1 ); } @@ -6206,7 +6329,7 @@ void Character::heal( body_part healed, int dam ) void Character::heal( hp_part healed, int dam ) { - if( hp_cur[healed] > 0 ) { + if( !is_limb_broken( healed ) ) { int effective_heal = std::min( dam, hp_max[healed] - hp_cur[healed] ); hp_cur[healed] += effective_heal; g->events().send( getID(), effective_heal ); @@ -6749,6 +6872,7 @@ void Character::assign_activity( const player_activity &act, bool allow_resume ) rooted_message(); } if( is_npc() ) { + cancel_stashed_activity(); npc *guy = dynamic_cast( this ); guy->set_attitude( NPCATT_ACTIVITY ); guy->set_mission( NPC_MISSION_ACTIVITY ); diff --git a/src/character.h b/src/character.h index 64f16bd158a2a..362b39a4aa989 100644 --- a/src/character.h +++ b/src/character.h @@ -59,6 +59,9 @@ struct points_left; class faction; struct construction; +using drop_location = std::pair; +using drop_locations = std::list; + enum vision_modes { DEBUG_NIGHTVISION, NV_GOGGLES, @@ -1075,10 +1078,11 @@ class Character : public Creature, public visitable ret_val can_unwield( const item &it ) const; void drop_invalid_inventory(); + /** Returns all items that must be taken off before taking off this item */ + std::list get_dependent_worn_items( const item &it ); /** Drops an item to the specified location */ - void drop( int pos, const tripoint &where ); - virtual void drop( const std::list> &what, const tripoint &target, - bool stash = false ); + void drop( item_location loc, const tripoint &where ); + virtual void drop( const drop_locations &what, const tripoint &target, bool stash = false ); virtual bool has_artifact_with( art_effect_passive effect ) const; @@ -1263,7 +1267,6 @@ class Character : public Creature, public visitable std::list consumption_history; int oxygen; - int radiation; int tank_plut; int reactor_plut; int slow_rad; @@ -1371,6 +1374,10 @@ class Character : public Creature, public visitable void set_stim( int new_stim ); void mod_stim( int mod ); + int get_rad() const; + void set_rad( int new_rad ); + void mod_rad( int mod ); + int get_stamina() const; int get_stamina_max() const; void set_stamina( int new_stamina ); @@ -1502,6 +1509,15 @@ class Character : public Creature, public visitable double footwear_factor() const; /** Returns true if the player is wearing something on their feet that is not SKINTIGHT */ bool is_wearing_shoes( const side &which_side = side::BOTH ) const; + + /** Swap side on which item is worn; returns false on fail. If interactive is false, don't alert player or drain moves */ + bool change_side( item &it, bool interactive = true ); + bool change_side( item_location &loc, bool interactive = true ); + + /** Used to determine player feedback on item use for the inventory code. + * rates usability lower for non-tools (books, etc.) */ + hint_rating rate_action_change_side( const item &it ) const; + bool get_check_encumbrance() { return check_encumbrance; } @@ -1688,6 +1704,8 @@ class Character : public Creature, public visitable int stim; int pkill; + int radiation; + scenttype_id type_of_scent; struct weighted_int_list melee_miss_reasons; diff --git a/src/clothing_mod.cpp b/src/clothing_mod.cpp index 51cf5eeea1264..e28f7ad4be378 100644 --- a/src/clothing_mod.cpp +++ b/src/clothing_mod.cpp @@ -64,24 +64,21 @@ void clothing_mod::load( const JsonObject &jo, const std::string & ) mandatory( jo, was_loaded, "destroy_prompt", destroy_prompt ); optional( jo, was_loaded, "restricted", restricted, false ); - JsonArray jarr = jo.get_array( "mod_value" ); - while( jarr.has_more() ) { - JsonObject mv_jo = jarr.next_object(); + for( const JsonObject &mv_jo : jo.get_array( "mod_value" ) ) { mod_value mv; std::string temp_str; mandatory( mv_jo, was_loaded, "type", temp_str ); mv.type = io::string_to_enum( temp_str ); mandatory( mv_jo, was_loaded, "value", mv.value ); optional( mv_jo, was_loaded, "round_up", mv.round_up ); - JsonArray jarr_prop = mv_jo.get_array( "proportion" ); - while( jarr_prop.has_more() ) { - std::string str = jarr_prop.next_string(); + for( const JsonValue &entry : mv_jo.get_array( "proportion" ) ) { + const std::string &str = entry.get_string(); if( str == "thickness" ) { mv.thickness_propotion = true; } else if( str == "coverage" ) { mv.coverage_propotion = true; } else { - jarr_prop.throw_error( R"(Invalid value, valid are: "coverage" and "thickness")" ); + entry.throw_error( R"(Invalid value, valid are: "coverage" and "thickness")" ); } } mod_values.push_back( mv ); diff --git a/src/clzones.h b/src/clzones.h index 9c5bd5e44153e..de0f646828510 100644 --- a/src/clzones.h +++ b/src/clzones.h @@ -2,7 +2,7 @@ #ifndef CLZONES_H #define CLZONES_H -#include +#include #include #include #include @@ -39,7 +39,7 @@ class zone_type public: zone_type_id id; - bool was_loaded; + bool was_loaded = false; zone_type() = default; explicit zone_type( const std::string &name, const std::string &desc ) : name_( name ), diff --git a/src/color.cpp b/src/color.cpp index eb065c27e14b7..514d0313c9d9d 100644 --- a/src/color.cpp +++ b/src/color.cpp @@ -99,7 +99,7 @@ color_id color_manager::name_to_id( const std::string &name ) const { auto iter = name_map.find( name ); if( iter == name_map.end() ) { - DebugLog( D_ERROR, DC_ALL ) << "couldn't parse color: " << name ; + debugmsg( "couldn't parse color: %s", name ); return def_c_unset; } @@ -559,8 +559,8 @@ nc_color color_from_string( const std::string &color ) while( ( pos = new_color.find( i.second, pos ) ) != std::string::npos ) { new_color.replace( pos, i.second.length(), i.first ); pos += i.first.length(); - DebugLog( D_WARNING, DC_ALL ) << "Deprecated foreground color suffix was used: (" << - i.second << ") in (" << color << "). Please update mod that uses that."; + debugmsg( "Deprecated foreground color suffix was used: (%s) in (%s). Please update mod that uses that.", + i.second, color ); } } @@ -604,8 +604,8 @@ nc_color bgcolor_from_string( const std::string &color ) while( ( pos = new_color.find( i.second, pos ) ) != std::string::npos ) { new_color.replace( pos, i.second.length(), i.first ); pos += i.first.length(); - DebugLog( D_WARNING, DC_ALL ) << "Deprecated background color suffix was used: (" << - i.second << ") in (" << color << "). Please update mod that uses that."; + debugmsg( "Deprecated background color suffix was used: (%s) in (%s). Please update mod that uses that.", + i.second, color ); } } diff --git a/src/color_loader.h b/src/color_loader.h index 9c9d3c8695bd2..9099f6b9ab59e 100644 --- a/src/color_loader.h +++ b/src/color_loader.h @@ -71,8 +71,7 @@ class color_loader try { load_colorfile( custom_path ); } catch( const JsonError &err ) { - DebugLog( D_ERROR, D_SDL ) << "Failed to load color data from " << custom_path << ": " << - err.what(); + debugmsg( "Failed to load color data from \"%s\": %s", custom_path, err.what() ); // this should succeed, otherwise the installation is botched load_colorfile( default_path ); diff --git a/src/computer.cpp b/src/computer.cpp index 9e63ad740696a..86feb60d722ab 100644 --- a/src/computer.cpp +++ b/src/computer.cpp @@ -45,6 +45,7 @@ #include "creature.h" #include "enums.h" #include "game_constants.h" +#include "game_inventory.h" #include "int_id.h" #include "item.h" #include "omdata.h" @@ -57,6 +58,8 @@ static const mtype_id mon_manhack( "mon_manhack" ); static const mtype_id mon_secubot( "mon_secubot" ); static const mtype_id mon_turret_rifle( "mon_turret_rifle" ); +static const mtype_id mon_turret_bmg( "mon_turret_bmg" ); +static const mtype_id mon_crows_m240( "mon_crows_m240" ); static const skill_id skill_computer( "computer" ); @@ -205,54 +208,46 @@ void computer::use() } // Main computer loop + int sel = 0; while( true ) { - //reset_terminal(); size_t options_size = options.size(); - print_newline(); - print_line( "%s - %s", _( name ), _( "Root Menu" ) ); -#if defined(__ANDROID__) - input_context ctxt( "COMPUTER_MAINLOOP" ); -#endif + + uilist computer_menu; + computer_menu.text = string_format( _( "%s - Root Menu" ), name ); + computer_menu.selected = sel; + computer_menu.fselected = sel; + for( size_t i = 0; i < options_size; i++ ) { - print_line( "%d - %s", i + 1, _( options[i].name ) ); -#if defined(__ANDROID__) - ctxt.register_manual_key( '1' + i, options[i].name ); -#endif + computer_menu.addentry( i, true, MENU_AUTOASSIGN, options[i].name ); } - print_line( "Q - %s", _( "Quit and Shut Down" ) ); - print_newline(); -#if defined(__ANDROID__) - ctxt.register_manual_key( 'Q', _( "Quit and Shut Down" ) ); -#endif - char ch; - do { - // TODO: use input context - ch = inp_mngr.get_input_event().get_first_input(); - } while( ch != 'q' && ch != 'Q' && ( ch < '1' || ch - '1' >= static_cast( options_size ) ) ); - if( ch == 'q' || ch == 'Q' ) { - break; // Exit from main computer loop - } else { // We selected an option other than quit. - ch -= '1'; // So '1' -> 0; index in options.size() - computer_option current = options[ch]; - // Once you trip the security, you have to roll every time you want to do something - if( ( current.security + ( alerts ) ) > 0 ) { - print_error( _( "Password required." ) ); - if( query_bool( _( "Hack into system?" ) ) ) { - if( !hack_attempt( g->u, current.security ) ) { - activate_random_failure(); - shutdown_terminal(); - return; - } else { - // Successfully hacked function - options[ch].security = 0; - activate_function( current.action ); - } + + computer_menu.query(); + if( computer_menu.ret < 0 || static_cast( computer_menu.ret ) >= options.size() ) { + break; + } + + sel = computer_menu.ret; + computer_option current = options[sel]; + reset_terminal(); + // Once you trip the security, you have to roll every time you want to do something + if( current.security + alerts > 0 ) { + print_error( _( "Password required." ) ); + if( query_bool( _( "Hack into system?" ) ) ) { + if( !hack_attempt( g->u, current.security ) ) { + activate_random_failure(); + shutdown_terminal(); + return; + } else { + // Successfully hacked function + options[sel].security = 0; + activate_function( current.action ); } - } else { // No need to hack, just activate - activate_function( current.action ); } - reset_terminal(); - } // Done processing a selected option. + } else { // No need to hack, just activate + activate_function( current.action ); + } + reset_terminal(); + // Done processing a selected option. } shutdown_terminal(); // This should have been done by now, but just in case. @@ -319,6 +314,7 @@ std::string computer::save_data() const void computer::load_data( const std::string &data ) { + static const std::set blacklisted_options = {{ "Launch_Missile" }}; options.clear(); failures.clear(); @@ -339,7 +335,9 @@ void computer::load_data( const std::string &data ) int tmpsec; dump >> tmpname >> tmpaction >> tmpsec; - + if( blacklisted_options.find( tmpname ) != blacklisted_options.end() ) { + continue; + } add_option( string_replace( tmpname, "_", " " ), static_cast( tmpaction ), tmpsec ); } @@ -366,9 +364,13 @@ void computer::load_data( const std::string &data ) static item *pick_usb() { - const int pos = g->inv_for_id( itype_id( "usb_drive" ), _( "Choose drive:" ) ); - if( pos != INT_MIN ) { - return &g->u.i_at( pos ); + auto filter = []( const item & it ) { + return it.typeId() == "usb_drive"; + }; + + item_location loc = game_menus::inv::titled_filter_menu( filter, g->u, _( "Choose drive:" ) ); + if( loc ) { + return &*loc; } return nullptr; } @@ -378,7 +380,8 @@ static void remove_submap_turrets() for( monster &critter : g->all_monsters() ) { // Check 1) same overmap coords, 2) turret, 3) hostile if( ms_to_omt_copy( g->m.getabs( critter.pos() ) ) == ms_to_omt_copy( g->m.getabs( g->u.pos() ) ) && - ( critter.type->id == mon_turret_rifle ) && + ( critter.type->id == mon_turret_rifle || critter.type->id == mon_turret_bmg || + critter.type->id == mon_crows_m240 ) && critter.attitude_to( g->u ) == Creature::Attitude::A_HOSTILE ) { g->remove_zombie( critter ); } @@ -626,69 +629,8 @@ void computer::activate_function( computer_action action ) } break; - case COMPACT_MISS_LAUNCH: { - // Target Acquisition. - tripoint target = ui::omap::choose_point( 0 ); - if( target == overmap::invalid_tripoint ) { - add_msg( m_info, _( "Target acquisition canceled." ) ); - return; - } - - // TODO: Z - target.z = 0; - - if( query_yn( _( "Confirm nuclear missile launch." ) ) ) { - add_msg( m_info, _( "Nuclear missile launched!" ) ); - //Remove the option to fire another missile. - options.clear(); - } else { - add_msg( m_info, _( "Nuclear missile launch aborted." ) ); - return; - } - g->refresh_all(); - - //Put some smoke gas and explosions at the nuke location. - const tripoint nuke_location = { g->u.pos() - point( 12, 0 ) }; - for( const auto &loc : g->m.points_in_radius( nuke_location, 5, 0 ) ) { - if( one_in( 4 ) ) { - g->m.add_field( loc, fd_smoke, rng( 1, 9 ) ); - } - } - - //Only explode once. But make it large. - explosion_handler::explosion( nuke_location, 2000, 0.7, true ); - - //...ERASE MISSILE, OPEN SILO, DISABLE COMPUTER - // For each level between here and the surface, remove the missile - for( int level = g->get_levz(); level <= 0; level++ ) { - map tmpmap; - tmpmap.load( tripoint( g->get_levx(), g->get_levy(), level ), false ); - - if( level < 0 ) { - tmpmap.translate( t_missile, t_hole ); - } else { - tmpmap.translate( t_metal_floor, t_hole ); - } - tmpmap.save(); - } - - const oter_id oter = overmap_buffer.ter( target ); - g->events().send( oter ); - for( const tripoint &p : g->m.points_in_radius( target, 2 ) ) { - // give it a nice rounded shape - if( !( p.x == target.x - 2 && p.y == target.y - 2 ) && - !( p.x == target.x - 2 && p.y == target.y + 2 ) && - !( p.x == target.x + 2 && p.y == target.y - 2 ) && - !( p.x == target.x + 2 && p.y == target.y + 2 ) ) { - // TODO: other Z-levels. - explosion_handler::nuke( tripoint( p.xy(), 0 ) ); - } - } - - activate_failure( COMPFAIL_SHUTDOWN ); - } - break; - + case COMPACT_OBSOLETE: + break; case COMPACT_MISS_DISARM: // TODO: stop the nuke from creating radioactive clouds. if( query_yn( _( "Disarm missile." ) ) ) { @@ -707,7 +649,7 @@ void computer::activate_function( computer_action action ) g->u.moves -= 30; std::vector names; int more = 0; - for( const tripoint &p : g->m.points_in_radius( g->u.pos(), 3 ) ) { + for( const tripoint &p : g->m.points_on_zlevel() ) { for( item &elem : g->m.i_at( p ) ) { if( elem.is_bionic() ) { if( static_cast( names.size() ) < TERMY - 8 ) { @@ -1184,7 +1126,7 @@ void computer::activate_function( computer_action action ) print_newline(); } print_error( _( "GEIGER COUNTER @ CONSOLE:… %s mSv/h." ), g->m.get_radiation( g->u.pos() ) ); - print_error( _( "PERSONAL DOSIMETRY:… %s mSv." ), g->u.radiation ); + print_error( _( "PERSONAL DOSIMETRY:… %s mSv." ), g->u.get_rad() ); print_newline(); query_any( _( "Press any key…" ) ); break; @@ -1654,21 +1596,7 @@ void computer::print_newline() wprintz( w_terminal, c_green, "\n" ); } -computer_option computer_option::from_json( const JsonObject &jo ) -{ - std::string name = jo.get_string( "name" ); - computer_action action = computer_action_from_string( jo.get_string( "action" ) ); - int sec = jo.get_int( "security", 0 ); - return computer_option( name, action, sec ); -} - -computer_failure computer_failure::from_json( const JsonObject &jo ) -{ - computer_failure_type type = computer_failure_type_from_string( jo.get_string( "action" ) ); - return computer_failure( type ); -} - -computer_action computer_action_from_string( const std::string &str ) +static computer_action computer_action_from_string( const std::string &str ) { static const std::map actions = {{ { "null", COMPACT_NULL }, @@ -1689,7 +1617,6 @@ computer_action computer_action_from_string( const std::string &str ) { "maps", COMPACT_MAPS }, { "map_sewer", COMPACT_MAP_SEWER }, { "map_subway", COMPACT_MAP_SUBWAY }, - { "miss_launch", COMPACT_MISS_LAUNCH }, { "miss_disarm", COMPACT_MISS_DISARM }, { "list_bionics", COMPACT_LIST_BIONICS }, { "elevator_on", COMPACT_ELEVATOR_ON }, @@ -1733,7 +1660,7 @@ computer_action computer_action_from_string( const std::string &str ) return COMPACT_NULL; } -computer_failure_type computer_failure_type_from_string( const std::string &str ) +static computer_failure_type computer_failure_type_from_string( const std::string &str ) { static const std::map fails = {{ { "null", COMPFAIL_NULL }, @@ -1758,3 +1685,16 @@ computer_failure_type computer_failure_type_from_string( const std::string &str debugmsg( "Invalid computer failure %s", str ); return COMPFAIL_NULL; } +computer_option computer_option::from_json( const JsonObject &jo ) +{ + std::string name = jo.get_string( "name" ); + computer_action action = computer_action_from_string( jo.get_string( "action" ) ); + int sec = jo.get_int( "security", 0 ); + return computer_option( name, action, sec ); +} + +computer_failure computer_failure::from_json( const JsonObject &jo ) +{ + computer_failure_type type = computer_failure_type_from_string( jo.get_string( "action" ) ); + return computer_failure( type ); +} diff --git a/src/computer.h b/src/computer.h index 7419244068b87..e9852549e24a0 100644 --- a/src/computer.h +++ b/src/computer.h @@ -29,7 +29,7 @@ enum computer_action { COMPACT_MAPS, COMPACT_MAP_SEWER, COMPACT_MAP_SUBWAY, - COMPACT_MISS_LAUNCH, + COMPACT_OBSOLETE, // No longer used COMPACT_MISS_DISARM, COMPACT_LIST_BIONICS, COMPACT_ELEVATOR_ON, @@ -66,7 +66,6 @@ enum computer_action { COMPACT_RADIO_ARCHIVE, NUM_COMPUTER_ACTIONS }; - // Don't change those! They must stay in this specific order! // TODO: Remove this enum enum computer_failure_type { @@ -84,10 +83,6 @@ enum computer_failure_type { NUM_COMPUTER_FAILURES }; -// TODO: Turn the enum into id, get rid of this -computer_action computer_action_from_string( const std::string &str ); -computer_failure_type computer_failure_type_from_string( const std::string &str ); - struct computer_option { std::string name; computer_action action; diff --git a/src/condition.cpp b/src/condition.cpp index 9925b46a53426..6a1de477b1789 100644 --- a/src/condition.cpp +++ b/src/condition.cpp @@ -894,17 +894,14 @@ conditional_t::conditional_t( const JsonObject &jo ) bool found_sub_member = false; const auto parse_array = []( const JsonObject & jo, const std::string & type ) { std::vector conditionals; - JsonArray ja = jo.get_array( type ); - while( ja.has_more() ) { - if( ja.test_string() ) { - conditional_t type_condition( ja.next_string() ); + for( const JsonValue &entry : jo.get_array( type ) ) { + if( entry.test_string() ) { + conditional_t type_condition( entry.get_string() ); conditionals.emplace_back( type_condition ); - } else if( ja.test_object() ) { - JsonObject cond = ja.next_object(); + } else { + JsonObject cond = entry.get_object(); conditional_t type_condition( cond ); conditionals.emplace_back( type_condition ); - } else { - ja.skip_value(); } } return conditionals; @@ -1033,7 +1030,7 @@ conditional_t::conditional_t( const JsonObject &jo ) set_npc_role_nearby( jo ); } else if( jo.has_int( "npc_allies" ) ) { set_npc_allies( jo ); - } else if( jo.has_int( "npc_service" ) ) { + } else if( jo.get_bool( "npc_service", false ) ) { set_npc_available(); } else if( jo.has_int( "u_has_cash" ) ) { set_u_has_cash( jo ); diff --git a/src/construction.cpp b/src/construction.cpp index 4be79f55e15da..35c7a5809b253 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -1,7 +1,6 @@ #include "construction.h" #include -#include #include #include #include @@ -116,6 +115,31 @@ static void place_construction( const std::string &desc ); static const deferred_color color_title = def_c_light_red; //color for titles static const deferred_color color_data = def_c_cyan; //color for data parts +static bool has_pre_terrain( const construction &con, const tripoint &p ) +{ + if( con.pre_terrain.empty() ) { + return true; + } + + if( con.pre_is_furniture ) { + furn_id f = furn_id( con.pre_terrain ); + return g->m.furn( p ) == f; + } else { + ter_id t = ter_id( con.pre_terrain ); + return g->m.ter( p ) == t; + } +} + +static bool has_pre_terrain( const construction &con ) +{ + for( const tripoint &p : g->m.points_in_radius( g->u.pos(), 1 ) ) { + if( p != g->u.pos() && has_pre_terrain( con, p ) ) { + return true; + } + } + return false; +} + void standardize_construction_times( const int time ) { for( auto &c : constructions ) { @@ -399,14 +423,20 @@ int construction_menu( bool blueprint ) current_con->requirements->can_make_with_inventory( total_inv, is_crafting_component ); std::vector current_buffer; - std::ostringstream current_line; + + const auto add_folded = [&]( const std::vector &folded ) { + current_buffer.insert( current_buffer.end(), folded.begin(), folded.end() ); + }; + const auto add_line = [&]( const std::string & line ) { + add_folded( foldstring( line, available_window_width ) ); + }; // display final product name only if more than one step. // Assume single stage constructions should be clear // in their title what their result is. if( !current_con->post_terrain.empty() && options.size() > 1 ) { //also print out stage number when multiple stages are available - current_line << _( "Stage/Variant #" ) << stage_counter << ": "; + std::string current_line = string_format( _( "Stage/Variant #%d: " ), stage_counter ); // print name of the result of each stage std::string result_string; @@ -415,59 +445,47 @@ int construction_menu( bool blueprint ) } else { result_string = ter_str_id( current_con->post_terrain ).obj().name(); } - current_line << colorize( result_string, color_title ); - std::vector folded_result_string = foldstring( current_line.str(), - available_window_width ); - current_buffer.insert( current_buffer.end(), folded_result_string.begin(), - folded_result_string.end() ); + current_line += colorize( result_string, color_title ); + add_line( current_line ); // display description of the result for multi-stages - current_line.str( "" ); - current_line << _( "Result: " ); + current_line = _( "Result: " ); if( current_con->post_is_furniture ) { - current_line << colorize( - furn_str_id( current_con->post_terrain ).obj().description, - color_data - ); + current_line += colorize( + furn_str_id( current_con->post_terrain ).obj().description, + color_data + ); } else { - current_line << colorize( - ter_str_id( current_con->post_terrain ).obj().description, - color_data - ); + current_line += colorize( + ter_str_id( current_con->post_terrain ).obj().description, + color_data + ); } - folded_result_string = foldstring( current_line.str(), available_window_width ); - current_buffer.insert( current_buffer.end(), folded_result_string.begin(), - folded_result_string.end() ); + add_line( current_line ); // display description of the result for single stages } else if( !current_con->post_terrain.empty() ) { - current_line.str( "" ); - current_line << _( "Result: " ); + std::string current_line = _( "Result: " ); if( current_con->post_is_furniture ) { - current_line << colorize( - furn_str_id( current_con->post_terrain ).obj().description, - color_data - ); + current_line += colorize( + furn_str_id( current_con->post_terrain ).obj().description, + color_data + ); } else { - current_line << colorize( - ter_str_id( current_con->post_terrain ).obj().description, - color_data - ); + current_line += colorize( + ter_str_id( current_con->post_terrain ).obj().description, + color_data + ); } - std::vector folded_result_string = foldstring( current_line.str(), - available_window_width ); - current_buffer.insert( current_buffer.end(), folded_result_string.begin(), - folded_result_string.end() ); + add_line( current_line ); } - current_line.str( "" ); // display required skill and difficulty if( current_con->required_skills.empty() ) { - current_line << _( "N/A" ); + add_line( _( "N/A" ) ); } else { - current_line << _( "Required skills: " ) << - enumerate_as_string( current_con->required_skills.begin(), - current_con->required_skills.end(), + std::string current_line = _( "Required skills: " ) + enumerate_as_string( + current_con->required_skills.begin(), current_con->required_skills.end(), []( const std::pair &skill ) { nc_color col; int s_lvl = g->u.get_skill_level( skill.first ); @@ -481,50 +499,35 @@ int construction_menu( bool blueprint ) return colorize( string_format( "%s (%d)", skill.first.obj().name(), skill.second ), col ); }, enumeration_conjunction::none ); + add_line( current_line ); } - current_buffer.push_back( current_line.str() ); // TODO: Textify pre_flags to provide a bit more information. // Example: First step of dig pit could say something about // requiring diggable ground. - current_line.str( "" ); if( !current_con->pre_terrain.empty() ) { std::string require_string; if( current_con->pre_is_furniture ) { - require_string = furn_str_id( current_con->pre_terrain ).obj().name(); + require_string = furn_str_id( current_con->pre_terrain )->name(); } else { - require_string = ter_str_id( current_con->pre_terrain ).obj().name(); + require_string = ter_str_id( current_con->pre_terrain )->name(); } - current_line << _( "Requires: " ) - << colorize( require_string, color_data ); - std::vector folded_result_string = foldstring( current_line.str(), - available_window_width ); - current_buffer.insert( current_buffer.end(), folded_result_string.begin(), - folded_result_string.end() ); + nc_color pre_color = has_pre_terrain( *current_con ) ? c_green : c_red; + add_line( _( "Requires: " ) + colorize( require_string, pre_color ) ); } if( !current_con->pre_note.empty() ) { - current_line.str( "" ); - current_line << _( "Annotation: " ) - << colorize( _( current_con->pre_note ), color_data ); - std::vector folded_result_string = - foldstring( current_line.str(), available_window_width ); - current_buffer.insert( current_buffer.end(), folded_result_string.begin(), - folded_result_string.end() ); + add_line( _( "Annotation: " ) + colorize( _( current_con->pre_note ), color_data ) ); } // get pre-folded versions of the rest of the construction project to be displayed later // get time needed - std::vector folded_time = current_con->get_folded_time_string( - available_window_width ); - current_buffer.insert( current_buffer.end(), folded_time.begin(), folded_time.end() ); + add_folded( current_con->get_folded_time_string( available_window_width ) ); - std::vector folded_tools = current_con->requirements->get_folded_tools_list( - available_window_width, color_stage, total_inv ); - current_buffer.insert( current_buffer.end(), folded_tools.begin(), folded_tools.end() ); + add_folded( current_con->requirements->get_folded_tools_list( available_window_width, color_stage, + total_inv ) ); - std::vector folded_components = current_con->requirements->get_folded_components_list( - available_window_width, color_stage, total_inv, is_crafting_component ); - current_buffer.insert( current_buffer.end(), folded_components.begin(), folded_components.end() ); + add_folded( current_con->requirements->get_folded_components_list( available_window_width, + color_stage, total_inv, is_crafting_component ) ); construct_buffers.push_back( current_buffer ); } @@ -736,15 +739,7 @@ bool can_construct( const construction &con, const tripoint &p ) // see if the special pre-function checks out bool place_okay = con.pre_special( p ); // see if the terrain type checks out - if( !con.pre_terrain.empty() ) { - if( con.pre_is_furniture ) { - furn_id f = furn_id( con.pre_terrain ); - place_okay &= g->m.furn( p ) == f; - } else { - ter_id t = ter_id( con.pre_terrain ); - place_okay &= g->m.ter( p ) == t; - } - } + place_okay &= has_pre_terrain( con, p ); // see if the flags check out place_okay &= std::all_of( con.pre_flags.begin(), con.pre_flags.end(), [&p]( const std::string & flag ) { @@ -1326,9 +1321,7 @@ void load_construction( const JsonObject &jo ) con.description = jo.get_string( "description" ); if( jo.has_member( "required_skills" ) ) { - auto sk = jo.get_array( "required_skills" ); - while( sk.has_more() ) { - auto arr = sk.next_array(); + for( JsonArray arr : jo.get_array( "required_skills" ) ) { con.required_skills[skill_id( arr.get_string( 0 ) )] = arr.get_int( 1 ); } } else { @@ -1353,10 +1346,7 @@ void load_construction( const JsonObject &jo ) if( jo.has_string( "using" ) ) { con.reqs_using = { { requirement_id( jo.get_string( "using" ) ), 1} }; } else if( jo.has_array( "using" ) ) { - auto arr = jo.get_array( "using" ); - - while( arr.has_more() ) { - auto cur = arr.next_array(); + for( JsonArray cur : jo.get_array( "using" ) ) { con.reqs_using.emplace_back( requirement_id( cur.get_string( 0 ) ), cur.get_int( 1 ) ); } } @@ -1385,8 +1375,8 @@ void load_construction( const JsonObject &jo ) con.post_flags = jo.get_tags( "post_flags" ); if( jo.has_member( "byproducts" ) ) { - JsonIn &stream = *jo.get_raw( "byproducts" ); - con.byproduct_item_group = item_group::load_item_group( stream, "collection" ); + con.byproduct_item_group = item_group::load_item_group( jo.get_member( "byproducts" ), + "collection" ); } static const std::map> pre_special_map = {{ diff --git a/src/construction_category.h b/src/construction_category.h index 21619a84fcd48..acf944a3328fd 100644 --- a/src/construction_category.h +++ b/src/construction_category.h @@ -2,7 +2,7 @@ #ifndef CONSTRUCTION_CATEGORY_H #define CONSTRUCTION_CATEGORY_H -#include +#include #include #include diff --git a/src/consumption.cpp b/src/consumption.cpp index cd1c12f8b93f2..08ea0258df406 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -23,6 +23,8 @@ #include "morale_types.h" #include "mutation.h" #include "options.h" +#include "recipe.h" +#include "recipe_dictionary.h" #include "stomach.h" #include "string_formatter.h" #include "translations.h" @@ -96,20 +98,24 @@ int player::stomach_capacity() const } // TODO: Move pizza scraping here. -static int compute_default_effective_kcal( const item &comest, const player &p ) +static int compute_default_effective_kcal( const item &comest, const player &p, + const cata::flat_set &extra_flags = {} ) { static const trait_id trait_CARNIVORE( "CARNIVORE" ); static const trait_id trait_GIZZARD( "GIZZARD" ); static const trait_id trait_SAPROPHAGE( "SAPROPHAGE" ); static const std::string flag_CARNIVORE_OK( "CARNIVORE_OK" ); - assert( comest.get_comestible() ); + if( !comest.get_comestible() ) { + return 0; + } // As float to avoid rounding too many times float kcal = comest.get_comestible()->default_nutrition.kcal; // Many raw foods give less calories, as your body has expends more energy digesting them. - if( comest.has_flag( "RAW" ) && !comest.has_flag( "COOKED" ) ) { + bool cooked = comest.has_flag( "COOKED" ) || extra_flags.count( "COOKED" ); + if( comest.has_flag( "RAW" ) && !cooked ) { kcal *= 0.75f; } @@ -145,7 +151,9 @@ static int compute_default_effective_kcal( const item &comest, const player &p ) static std::map compute_default_effective_vitamins( const item &it, const player &p ) { - assert( it.get_comestible() ); + if( !it.get_comestible() ) { + return {}; + } std::map res = it.get_comestible()->default_nutrition.vitamins; @@ -173,9 +181,9 @@ static std::map compute_default_effective_vitamins( // Calculate the effective nutrients for a given item, taking // into account player traits but not item components. static nutrients compute_default_effective_nutrients( const item &comest, - const player &p ) + const player &p, const cata::flat_set &extra_flags = {} ) { - return { compute_default_effective_kcal( comest, p ), + return { compute_default_effective_kcal( comest, p, extra_flags ), compute_default_effective_vitamins( comest, p ) }; } @@ -207,6 +215,114 @@ nutrients player::compute_effective_nutrients( const item &comest ) const } } +// Calculate range of nutrients obtainable for a given item when crafted via +// the given recipe +std::pair player::compute_nutrient_range( + const item &comest, const recipe_id &recipe_i, + const cata::flat_set &extra_flags ) const +{ + if( !comest.is_comestible() ) { + return {}; + } + + // if item has components, will derive calories from that instead. + if( comest.has_flag( "NUTRIENT_OVERRIDE" ) ) { + nutrients result = compute_default_effective_nutrients( comest, *this ); + return { result, result }; + } + + nutrients tally_min; + nutrients tally_max; + + const recipe &rec = *recipe_i; + + cata::flat_set our_extra_flags = extra_flags; + + if( rec.hot_result() ) { + our_extra_flags.insert( "COOKED" ); + } + + const requirement_data requirements = rec.requirements(); + const requirement_data::alter_item_comp_vector &component_requirements = + requirements.get_components(); + + for( const std::vector &component_options : component_requirements ) { + nutrients this_min; + nutrients this_max; + bool first = true; + for( const item_comp &component_option : component_options ) { + std::pair component_option_range = + compute_nutrient_range( component_option.type, our_extra_flags ); + component_option_range.first *= component_option.count; + component_option_range.second *= component_option.count; + + if( first ) { + std::tie( this_min, this_max ) = component_option_range; + first = false; + } else { + this_min.min_in_place( component_option_range.first ); + this_max.max_in_place( component_option_range.second ); + } + } + tally_min += this_min; + tally_max += this_max; + } + + for( const std::pair &byproduct : rec.byproducts ) { + item byproduct_it( byproduct.first, calendar::turn, byproduct.second ); + nutrients byproduct_nutr = compute_default_effective_nutrients( byproduct_it, *this ); + tally_min -= byproduct_nutr; + tally_max -= byproduct_nutr; + } + + int charges = comest.count(); + return { tally_min / charges, tally_max / charges }; +} + +// Calculate the range of nturients possible for a given item across all +// possible recipes +std::pair player::compute_nutrient_range( + const itype_id &comest_id, const cata::flat_set &extra_flags ) const +{ + const itype *comest = item::find_type( comest_id ); + if( !comest->comestible ) { + return {}; + } + + item comest_it( comest, calendar::turn, 1 ); + // The default nutrients are always a possibility + nutrients min_nutr = compute_default_effective_nutrients( comest_it, *this, extra_flags ); + + if( comest->item_tags.count( "NUTRIENT_OVERRIDE" ) || + recipe_dict.is_item_on_loop( comest->get_id() ) ) { + return { min_nutr, min_nutr }; + } + + nutrients max_nutr = min_nutr; + + for( const recipe_id &rec : comest->recipes ) { + nutrients this_min; + nutrients this_max; + + item result_it = rec->create_result(); + if( result_it.contents.size() == 1 ) { + const item alt_result = result_it.contents.front(); + if( alt_result.typeId() == comest_it.typeId() ) { + result_it = alt_result; + } + } + if( result_it.typeId() != comest_it.typeId() ) { + debugmsg( "When creating recipe result expected %s, got %s\n", + comest_it.typeId(), result_it.typeId() ); + } + std::tie( this_min, this_max ) = compute_nutrient_range( result_it, rec, extra_flags ); + min_nutr.min_in_place( this_min ); + max_nutr.max_in_place( this_max ); + } + + return { min_nutr, max_nutr }; +} + int player::nutrition_for( const item &comest ) const { return compute_effective_nutrients( comest ).kcal / islot_comestible::kcal_per_nutr; diff --git a/src/craft_command.cpp b/src/craft_command.cpp index 8e43f6aebc60d..73018b9fdae28 100644 --- a/src/craft_command.cpp +++ b/src/craft_command.cpp @@ -1,6 +1,6 @@ #include "craft_command.h" -#include +#include #include #include #include diff --git a/src/crafting.cpp b/src/crafting.cpp index 755c32d465ba0..65e81f1b2aff0 100644 --- a/src/crafting.cpp +++ b/src/crafting.cpp @@ -29,6 +29,7 @@ #include "map.h" #include "map_iterator.h" #include "messages.h" +#include "mutation.h" #include "npc.h" #include "options.h" #include "output.h" @@ -73,8 +74,6 @@ static const efftype_id effect_contacts( "contacts" ); void drop_or_handle( const item &newit, player &p ); static const trait_id trait_DEBUG_HS( "DEBUG_HS" ); -static const trait_id trait_PAWS_LARGE( "PAWS_LARGE" ); -static const trait_id trait_PAWS( "PAWS" ); static const trait_id trait_BURROW( "BURROW" ); static bool crafting_allowed( const player &p, const recipe &rec ) @@ -923,17 +922,12 @@ double player::crafting_success_roll( const recipe &making ) const // It's tough to craft with paws. Fortunately it's just a matter of grip and fine-motor, // not inability to see what you're doing - if( has_trait( trait_PAWS ) || has_trait( trait_PAWS_LARGE ) ) { - int paws_rank_penalty = 0; - if( has_trait( trait_PAWS_LARGE ) ) { - paws_rank_penalty += 1; - } - if( making.skill_used == skill_id( "electronics" ) - || making.skill_used == skill_id( "tailor" ) - || making.skill_used == skill_id( "mechanics" ) ) { - paws_rank_penalty += 1; + for( const std::pair< trait_id, trait_data > &mut : my_mutations ) { + for( const std::pair &skib : mut.first->craft_skill_bonus ) { + if( making.skill_used == skib.first ) { + skill_dice += skib.second; + } } - skill_dice -= paws_rank_penalty * 4; } // Sides on dice is 16 plus your current intelligence @@ -1211,10 +1205,10 @@ void player::complete_craft( item &craft, const tripoint &loc ) if( newit.made_of( LIQUID ) ) { liquid_handler::handle_all_liquid( newit, PICKUP_RANGE ); - } else if( loc == tripoint_zero ) { + } else if( loc == tripoint_zero && can_wield( newit ).success() ) { wield_craft( *this, newit ); } else { - set_item_map_or_vehicle( *this, loc, newit ); + set_item_map_or_vehicle( *this, pos(), newit ); } } diff --git a/src/crafting_gui.cpp b/src/crafting_gui.cpp index c68a233dd21bd..41c7f84b3ee10 100644 --- a/src/crafting_gui.cpp +++ b/src/crafting_gui.cpp @@ -82,10 +82,8 @@ void load_recipe_category( const JsonObject &jsobj ) const std::string cat_name = get_cat_unprefixed( category ); - craft_subcat_list[category] = std::vector(); - JsonArray subcats = jsobj.get_array( "recipe_subcategories" ); - while( subcats.has_more() ) { - const std::string subcat_id = subcats.next_string(); + craft_subcat_list[category].clear(); + for( const std::string &subcat_id : jsobj.get_array( "recipe_subcategories" ) ) { if( subcat_id.find( "CSC_" + cat_name + "_" ) != 0 && subcat_id != "CSC_ALL" ) { jsobj.throw_error( "Crafting sub-category id has to be prefixed with CSC__" ); } @@ -425,15 +423,16 @@ const recipe *select_crafting_recipe( int &batch_size ) _( "Press to attempt to craft object." ) ); } // Draw borders - for( int i = 1; i < width - 1; ++i ) { // _ + for( int i = 1; i < width - 1; ++i ) { // - mvwputch( w_data, point( i, dataHeight - 1 ), BORDER_COLOR, LINE_OXOX ); } for( int i = 0; i < dataHeight - 1; ++i ) { // | mvwputch( w_data, point( 0, i ), BORDER_COLOR, LINE_XOXO ); mvwputch( w_data, point( width - 1, i ), BORDER_COLOR, LINE_XOXO ); } - mvwputch( w_data, point( 0, dataHeight - 1 ), BORDER_COLOR, LINE_XXOO ); // _| - mvwputch( w_data, point( width - 1, dataHeight - 1 ), BORDER_COLOR, LINE_XOOX ); // |_ + mvwvline( w_iteminfo, point( getmaxx( w_iteminfo ) - 1, 0 ), LINE_XOXO, getmaxy( w_iteminfo ) ); + mvwputch( w_data, point( 0, dataHeight - 1 ), BORDER_COLOR, LINE_XXOO ); // |_ + mvwputch( w_data, point( width - 1, dataHeight - 1 ), BORDER_COLOR, LINE_XOOX ); // _| int recmin = 0, recmax = current.size(); if( recmax > dataLines ) { @@ -608,17 +607,10 @@ const recipe *select_crafting_recipe( int &batch_size ) if( last_recipe != current[line] ) { last_recipe = current[line]; tmp = current[line]->create_result(); + tmp.set_var( "recipe_exemplar", last_recipe->ident().str() ); } tmp.info( true, thisItem, count ); - // If it's food that can have variable nutrition, add disclaimer. - // Hidden if the user is attempting to page through components. - if( ( tmp.is_food_container() || tmp.is_food() ) && !tmp.has_flag( "NUTRIENT_OVERRIDE" ) && - display_mode == 0 ) { - ypos += fold_and_print( w_data, point( xpos + 2, ypos ), pane - 2, c_light_gray, - _( "Shown nutrition is estimated, varying with chosen ingredients." ) ); - } - //color needs to be preserved in case part of the previous page was cut off nc_color stored_color = col; if( display_mode > 1 ) { @@ -1007,9 +999,15 @@ static void draw_recipe_tabs( const catacurses::window &w, const std::string &ta break; } case FILTERED: + mvwhline( w, point( 0, getmaxy( w ) - 1 ), LINE_OXOX, getmaxx( w ) - 1 ); + mvwputch( w, point( 0, getmaxy( w ) - 1 ), BORDER_COLOR, LINE_OXXO ); // |^ + mvwputch( w, point( getmaxx( w ) - 1, getmaxy( w ) - 1 ), BORDER_COLOR, LINE_OOXX ); // ^| draw_tab( w, 2, _( "Searched" ), true ); break; case BATCH: + mvwhline( w, point( 0, getmaxy( w ) - 1 ), LINE_OXOX, getmaxx( w ) - 1 ); + mvwputch( w, point( 0, getmaxy( w ) - 1 ), BORDER_COLOR, LINE_OXXO ); // |^ + mvwputch( w, point( getmaxx( w ) - 1, getmaxy( w ) - 1 ), BORDER_COLOR, LINE_OOXX ); // ^| draw_tab( w, 2, _( "Batch" ), true ); break; } @@ -1025,17 +1023,17 @@ static void draw_recipe_subtabs( const catacurses::window &w, const std::string int width = getmaxx( w ); for( int i = 0; i < width; i++ ) { if( i == 0 ) { - mvwputch( w, point( i, 2 ), BORDER_COLOR, LINE_XXXO ); + mvwputch( w, point( i, 2 ), BORDER_COLOR, LINE_XXXO ); // |- } else if( i == width ) { // TODO: that is always false! - mvwputch( w, point( i, 2 ), BORDER_COLOR, LINE_XOXX ); + mvwputch( w, point( i, 2 ), BORDER_COLOR, LINE_XOXX ); // -| } else { - mvwputch( w, point( i, 2 ), BORDER_COLOR, LINE_OXOX ); + mvwputch( w, point( i, 2 ), BORDER_COLOR, LINE_OXOX ); // - } } for( int i = 0; i < 3; i++ ) { - mvwputch( w, point( 0, i ), BORDER_COLOR, LINE_XOXO ); // |^ - mvwputch( w, point( width - 1, i ), BORDER_COLOR, LINE_XOXO ); // ^| + mvwputch( w, point( 0, i ), BORDER_COLOR, LINE_XOXO ); // | + mvwputch( w, point( width - 1, i ), BORDER_COLOR, LINE_XOXO ); // | } switch( mode ) { @@ -1055,8 +1053,8 @@ static void draw_recipe_subtabs( const catacurses::window &w, const std::string case BATCH: werase( w ); for( int i = 0; i < 3; i++ ) { - mvwputch( w, point( 0, i ), BORDER_COLOR, LINE_XOXO ); // |^ - mvwputch( w, point( width - 1, i ), BORDER_COLOR, LINE_XOXO ); // ^| + mvwputch( w, point( 0, i ), BORDER_COLOR, LINE_XOXO ); // | + mvwputch( w, point( width - 1, i ), BORDER_COLOR, LINE_XOXO ); // | } break; } diff --git a/src/creature.cpp b/src/creature.cpp index 27e5b43504156..c3f49a6c13aad 100644 --- a/src/creature.cpp +++ b/src/creature.cpp @@ -1338,6 +1338,10 @@ int Creature::get_num_dodges_bonus() const { return num_dodges_bonus; } +int Creature::get_num_dodges_base() const +{ + return num_dodges; +} // currently this is expected to be overridden to actually have use int Creature::get_env_resist( body_part ) const @@ -1461,9 +1465,9 @@ void Creature::set_num_blocks_bonus( int nblocks ) { num_blocks_bonus = nblocks; } -void Creature::set_num_dodges_bonus( int ndodges ) +void Creature::mod_num_dodges_bonus( int ndodges ) { - num_dodges_bonus = ndodges; + num_dodges_bonus += ndodges; } void Creature::set_armor_bash_bonus( int nbasharm ) diff --git a/src/creature.h b/src/creature.h index 4179d9b8be2f2..3e09417665f10 100644 --- a/src/creature.h +++ b/src/creature.h @@ -402,6 +402,7 @@ class Creature virtual int get_num_dodges() const; virtual int get_num_blocks_bonus() const; virtual int get_num_dodges_bonus() const; + virtual int get_num_dodges_base() const; virtual int get_env_resist( body_part bp ) const; @@ -474,7 +475,7 @@ class Creature virtual void mod_stat( const std::string &stat, float modifier ); virtual void set_num_blocks_bonus( int nblocks ); - virtual void set_num_dodges_bonus( int ndodges ); + virtual void mod_num_dodges_bonus( int ndodges ); virtual void set_armor_bash_bonus( int nbasharm ); virtual void set_armor_cut_bonus( int ncutarm ); diff --git a/src/damage.cpp b/src/damage.cpp index d871128c9a897..1e3dd442ef0a0 100644 --- a/src/damage.cpp +++ b/src/damage.cpp @@ -146,8 +146,7 @@ void damage_instance::deserialize( JsonIn &jsin ) JsonObject jo = jsin.get_object(); damage_units = load_damage_instance( jo ).damage_units; } else if( jsin.test_array() ) { - JsonArray ja = jsin.get_array(); - damage_units = load_damage_instance( ja ).damage_units; + damage_units = load_damage_instance( jsin.get_array() ).damage_units; } else { jsin.error( "Expected object or array for damage_instance" ); } @@ -304,9 +303,7 @@ damage_instance load_damage_instance( const JsonObject &jo ) { damage_instance di; if( jo.has_array( "values" ) ) { - JsonArray jarr = jo.get_array( "values" ); - while( jarr.has_more() ) { - JsonObject curr = jarr.next_object(); + for( const JsonObject &curr : jo.get_array( "values" ) ) { di.damage_units.push_back( load_damage_unit( curr ) ); } } else if( jo.has_string( "damage_type" ) ) { @@ -316,11 +313,10 @@ damage_instance load_damage_instance( const JsonObject &jo ) return di; } -damage_instance load_damage_instance( JsonArray &jarr ) +damage_instance load_damage_instance( const JsonArray &jarr ) { damage_instance di; - while( jarr.has_more() ) { - JsonObject curr = jarr.next_object(); + for( const JsonObject &curr : jarr ) { di.damage_units.push_back( load_damage_unit( curr ) ); } diff --git a/src/damage.h b/src/damage.h index e4ebf3f94bde4..2c63574bb02fa 100644 --- a/src/damage.h +++ b/src/damage.h @@ -111,7 +111,7 @@ std::string name_by_dt( const damage_type &dt ); const skill_id &skill_by_dt( damage_type dt ); damage_instance load_damage_instance( const JsonObject &jo ); -damage_instance load_damage_instance( JsonArray &jarr ); +damage_instance load_damage_instance( const JsonArray &jarr ); resistances load_resistances_instance( const JsonObject &jo ); diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp index bb5b3c1974238..e61b1222e809f 100644 --- a/src/debug_menu.cpp +++ b/src/debug_menu.cpp @@ -1,8 +1,8 @@ #include "debug_menu.h" // IWYU pragma: no_include -#include -#include +#include +#include #include #include #include @@ -27,6 +27,7 @@ #include "faction.h" #include "filesystem.h" #include "game.h" +#include "game_inventory.h" #include "map_extras.h" #include "messages.h" #include "mission.h" @@ -66,7 +67,7 @@ #include "artifact.h" #include "vpart_position.h" #include "rng.h" -#include "signal.h" +#include #include "magic.h" #include "bodypart.h" #include "calendar.h" @@ -149,7 +150,8 @@ enum debug_menu_index { DEBUG_DISPLAY_LIGHTING, DEBUG_DISPLAY_RADIATION, DEBUG_LEARN_SPELLS, - DEBUG_LEVEL_SPELLS + DEBUG_LEVEL_SPELLS, + DEBUG_TEST_MAP_EXTRA_DISTRIBUTION }; class mission_debug @@ -218,6 +220,7 @@ static int info_uilist( bool display_all_entries = true ) { uilist_entry( DEBUG_PRINT_FACTION_INFO, true, 'f', _( "Print faction info to console" ) ) }, { uilist_entry( DEBUG_PRINT_NPC_MAGIC, true, 'M', _( "Print NPC magic info to console" ) ) }, { uilist_entry( DEBUG_TEST_WEATHER, true, 'W', _( "Test weather" ) ) }, + { uilist_entry( DEBUG_TEST_MAP_EXTRA_DISTRIBUTION, true, 'e', _( "Test map extra list" ) ) }, }; uilist_initializer.insert( uilist_initializer.begin(), debug_only_options.begin(), debug_only_options.end() ); @@ -518,8 +521,11 @@ void character_edit_menu() p.weapon = item(); break; case D_ITEM_WORN: { - int item_pos = g->inv_for_all( _( "Make target equip" ) ); - item &to_wear = g->u.i_at( item_pos ); + item_location loc = game_menus::inv::titled_menu( g->u, _( "Make target equip" ) ); + if( !loc ) { + break; + } + item &to_wear = *loc; if( to_wear.is_armor() ) { p.on_item_wear( to_wear ); p.worn.push_back( to_wear ); @@ -727,7 +733,7 @@ void character_edit_menu() uilist smenu; smenu.addentry( 0, true, 'h', "%s: %d", _( "Health" ), p.get_healthy() ); smenu.addentry( 1, true, 'm', "%s: %d", _( "Health modifier" ), p.get_healthy_mod() ); - smenu.addentry( 2, true, 'r', "%s: %d", _( "Radiation" ), p.radiation ); + smenu.addentry( 2, true, 'r', "%s: %d", _( "Radiation" ), p.get_rad() ); smenu.query(); int value; switch( smenu.ret ) { @@ -742,8 +748,8 @@ void character_edit_menu() } break; case 2: - if( query_int( value, _( "Set the value to? Currently: %d" ), p.radiation ) ) { - p.radiation = value; + if( query_int( value, _( "Set the value to? Currently: %d" ), p.get_rad() ) ) { + p.set_rad( value ); } break; default: @@ -1308,7 +1314,9 @@ void debug() for( monster &critter : g->all_monsters() ) { // Use the normal death functions, useful for testing death // and for getting a corpse. - critter.die( nullptr ); + if( critter.type->id != mtype_id( "mon_generator" ) ) { + critter.die( nullptr ); + } } g->cleanup_dead(); } @@ -1693,6 +1701,9 @@ void debug() add_msg( m_good, _( "%s is now level %d!" ), spells[action]->name(), spells[action]->get_level() ); break; } + case DEBUG_TEST_MAP_EXTRA_DISTRIBUTION: + MapExtras::debug_spawn_test(); + break; } catacurses::erase(); m.invalidate_map_cache( g->get_levz() ); diff --git a/src/editmap.cpp b/src/editmap.cpp index 36b36675dc0be..e347c780c9563 100644 --- a/src/editmap.cpp +++ b/src/editmap.cpp @@ -1949,8 +1949,9 @@ void editmap::edit_mapgen() */ void editmap::cleartmpmap( tinymap &tmpmap ) { - for( auto &smap : tmpmap.grid ) { + for( submap *&smap : tmpmap.grid ) { delete smap; + smap = nullptr; } auto &ch = tmpmap.get_cache( target.z ); diff --git a/src/effect.cpp b/src/effect.cpp index f07f10c47b290..813fb2b8bf96b 100644 --- a/src/effect.cpp +++ b/src/effect.cpp @@ -1,7 +1,6 @@ #include "effect.h" #include -#include #include #include #include @@ -452,9 +451,7 @@ bool effect_type::is_show_in_info() const bool effect_type::load_miss_msgs( const JsonObject &jo, const std::string &member ) { if( jo.has_array( member ) ) { - JsonArray outer = jo.get_array( member ); - while( outer.has_more() ) { - JsonArray inner = outer.next_array(); + for( JsonArray inner : jo.get_array( member ) ) { miss_msgs.push_back( std::make_pair( inner.get_string( 0 ), inner.get_int( 1 ) ) ); } return true; @@ -464,9 +461,7 @@ bool effect_type::load_miss_msgs( const JsonObject &jo, const std::string &membe bool effect_type::load_decay_msgs( const JsonObject &jo, const std::string &member ) { if( jo.has_array( member ) ) { - JsonArray outer = jo.get_array( member ); - while( outer.has_more() ) { - JsonArray inner = outer.next_array(); + for( JsonArray inner : jo.get_array( member ) ) { std::string msg = inner.get_string( 0 ); std::string r = inner.get_string( 1 ); game_message_type rate = m_neutral; @@ -503,32 +498,32 @@ std::string effect::disp_name() const } // End result should look like "name (l. arm)" or "name [intensity] (l. arm)" - std::ostringstream ret; + std::string ret; if( eff_type->use_name_ints() ) { const translation &d_name = eff_type->name[ std::min( intensity, eff_type->name.size() ) - 1 ]; if( d_name.empty() ) { return std::string(); } - ret << d_name; + ret += d_name.translated(); } else { if( eff_type->name[0].empty() ) { return std::string(); } - ret << eff_type->name[0]; + ret += eff_type->name[0].translated(); if( intensity > 1 ) { if( eff_type->id == "bandaged" || eff_type->id == "disinfected" ) { - ret << " [" << texitify_healing_power( intensity ) << "]"; + ret += string_format( " [%s]", texitify_healing_power( intensity ) ); } else { - ret << " [" << intensity << "]"; + ret += string_format( " [%d]", intensity ); } } } if( bp != num_bp ) { - ret << " (" << body_part_name( bp ) << ")"; + ret += string_format( " (%s)", body_part_name( bp ) ); } - return ret.str(); + return ret; } // Used in disp_desc() @@ -544,41 +539,41 @@ struct desc_freq { std::string effect::disp_desc( bool reduced ) const { - std::ostringstream ret; + std::string ret; // First print stat changes, adding + if value is positive int tmp = get_avg_mod( "STR", reduced ); if( tmp > 0 ) { - ret << string_format( _( "Strength +%d; " ), tmp ); + ret += string_format( _( "Strength +%d; " ), tmp ); } else if( tmp < 0 ) { - ret << string_format( _( "Strength %d; " ), tmp ); + ret += string_format( _( "Strength %d; " ), tmp ); } tmp = get_avg_mod( "DEX", reduced ); if( tmp > 0 ) { - ret << string_format( _( "Dexterity +%d; " ), tmp ); + ret += string_format( _( "Dexterity +%d; " ), tmp ); } else if( tmp < 0 ) { - ret << string_format( _( "Dexterity %d; " ), tmp ); + ret += string_format( _( "Dexterity %d; " ), tmp ); } tmp = get_avg_mod( "PER", reduced ); if( tmp > 0 ) { - ret << string_format( _( "Perception +%d; " ), tmp ); + ret += string_format( _( "Perception +%d; " ), tmp ); } else if( tmp < 0 ) { - ret << string_format( _( "Perception %d; " ), tmp ); + ret += string_format( _( "Perception %d; " ), tmp ); } tmp = get_avg_mod( "INT", reduced ); if( tmp > 0 ) { - ret << string_format( _( "Intelligence +%d; " ), tmp ); + ret += string_format( _( "Intelligence +%d; " ), tmp ); } else if( tmp < 0 ) { - ret << string_format( _( "Intelligence %d; " ), tmp ); + ret += string_format( _( "Intelligence %d; " ), tmp ); } tmp = get_avg_mod( "SPEED", reduced ); if( tmp > 0 ) { - ret << string_format( _( "Speed +%d; " ), tmp ); + ret += string_format( _( "Speed +%d; " ), tmp ); } else if( tmp < 0 ) { - ret << string_format( _( "Speed %d; " ), tmp ); + ret += string_format( _( "Speed %d; " ), tmp ); } // Newline if necessary - if( !ret.str().empty() && ret.str().back() != '\n' ) { - ret << "\n"; + if( !ret.empty() && ret.back() != '\n' ) { + ret += "\n"; } // Then print pain/damage/coughing/vomiting, we don't display pkill, health, or radiation @@ -650,21 +645,21 @@ std::string effect::disp_desc( bool reduced ) const } } if( !constant.empty() ) { - ret << _( "Const: " ) << enumerate_as_string( constant ) << " "; + ret += _( "Const: " ) + enumerate_as_string( constant ) + " "; } if( !frequent.empty() ) { - ret << _( "Freq: " ) << enumerate_as_string( frequent ) << " "; + ret += _( "Freq: " ) + enumerate_as_string( frequent ) + " "; } if( !uncommon.empty() ) { - ret << _( "Unfreq: " ) << enumerate_as_string( uncommon ) << " "; + ret += _( "Unfreq: " ) + enumerate_as_string( uncommon ) + " "; } if( !rare.empty() ) { - ret << _( "Rare: " ) << enumerate_as_string( rare ); // No space needed at the end + ret += _( "Rare: " ) + enumerate_as_string( rare ); // No space needed at the end } // Newline if necessary - if( !ret.str().empty() && ret.str().back() != '\n' ) { - ret << "\n"; + if( !ret.empty() && ret.back() != '\n' ) { + ret += "\n"; } std::string tmp_str; @@ -683,14 +678,14 @@ std::string effect::disp_desc( bool reduced ) const } // Then print the effect description if( use_part_descs() ) { - ret << string_format( _( tmp_str ), body_part_name( bp ) ); + ret += string_format( _( tmp_str ), body_part_name( bp ) ); } else { if( !tmp_str.empty() ) { - ret << _( tmp_str ); + ret += _( tmp_str ); } } - return ret.str(); + return ret; } std::string effect::disp_short_desc( bool reduced ) const @@ -1213,11 +1208,10 @@ void load_effect_type( const JsonObject &jo ) new_etype.id = efftype_id( jo.get_string( "id" ) ); if( jo.has_member( "name" ) ) { - JsonArray jsarr = jo.get_array( "name" ); - while( jsarr.has_more() ) { + for( const JsonValue &entry : jo.get_array( "name" ) ) { translation name; - if( !jsarr.read_next( name ) ) { - jsarr.throw_error( "Error reading effect names" ); + if( !entry.read( name ) ) { + entry.throw_error( "Error reading effect names" ); } new_etype.name.emplace_back( name ); } @@ -1227,17 +1221,15 @@ void load_effect_type( const JsonObject &jo ) new_etype.speed_mod_name = jo.get_string( "speed_name", "" ); if( jo.has_member( "desc" ) ) { - JsonArray jsarr = jo.get_array( "desc" ); - while( jsarr.has_more() ) { - new_etype.desc.push_back( jsarr.next_string() ); + for( const std::string &line : jo.get_array( "desc" ) ) { + new_etype.desc.push_back( line ); } } else { new_etype.desc.push_back( "" ); } if( jo.has_member( "reduced_desc" ) ) { - JsonArray jsarr = jo.get_array( "reduced_desc" ); - while( jsarr.has_more() ) { - new_etype.reduced_desc.push_back( jsarr.next_string() ); + for( const std::string &line : jo.get_array( "reduced_desc" ) ) { + new_etype.reduced_desc.push_back( line ); } } else { new_etype.reduced_desc = new_etype.desc; diff --git a/src/event.cpp b/src/event.cpp index a026dc7ade4a8..c0daa07ac241d 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -54,7 +54,6 @@ std::string enum_to_string( event_type data ) case event_type::game_start: return "game_start"; case event_type::installs_cbm: return "installs_cbm"; case event_type::installs_faulty_cbm: return "installs_faulty_cbm"; - case event_type::launches_nuke: return "launches_nuke"; case event_type::learns_martial_art: return "learns_martial_art"; case event_type::loses_addiction: return "loses_addiction"; case event_type::npc_becomes_hostile: return "npc_becomes_hostile"; @@ -92,7 +91,7 @@ constexpr std::array, constexpr std::array, event_spec_character::fields.size()> event_spec_character::fields; -static_assert( static_cast( event_type::num_event_types ) == 62, +static_assert( static_cast( event_type::num_event_types ) == 61, "This static_assert is a reminder to add a definition below when you add a new " "event_type. If your event_spec specialization inherits from another struct for " "its fields definition then you probably don't need a definition here." ); @@ -129,7 +128,6 @@ DEFINE_EVENT_FIELDS( game_over ) DEFINE_EVENT_FIELDS( game_start ) DEFINE_EVENT_FIELDS( installs_cbm ) DEFINE_EVENT_FIELDS( installs_faulty_cbm ) -DEFINE_EVENT_FIELDS( launches_nuke ) DEFINE_EVENT_FIELDS( learns_martial_art ) DEFINE_EVENT_FIELDS( loses_addiction ) DEFINE_EVENT_FIELDS( npc_becomes_hostile ) diff --git a/src/event.h b/src/event.h index 661089d71ae2d..9720143303469 100644 --- a/src/event.h +++ b/src/event.h @@ -64,7 +64,6 @@ enum class event_type { game_start, installs_cbm, installs_faulty_cbm, - launches_nuke, learns_martial_art, loses_addiction, npc_becomes_hostile, @@ -134,7 +133,7 @@ struct event_spec_character { }; }; -static_assert( static_cast( event_type::num_event_types ) == 62, +static_assert( static_cast( event_type::num_event_types ) == 61, "This static_assert is to remind you to add a specialization for your new " "event_type below" ); @@ -433,14 +432,6 @@ struct event_spec { }; }; -template<> -struct event_spec { - static constexpr std::array, 1> fields = {{ - { "target_terrain", cata_variant_type::oter_id }, - } - }; -}; - template<> struct event_spec { static constexpr std::array, 2> fields = {{ diff --git a/src/explosion.cpp b/src/explosion.cpp index d40de90657602..f723f10d31bd8 100644 --- a/src/explosion.cpp +++ b/src/explosion.cpp @@ -825,35 +825,6 @@ void resonance_cascade( const tripoint &p ) } } -void nuke( const tripoint &p ) -{ - // TODO: nukes hit above surface, not critter = 0 - // TODO: Z - tripoint p_surface( p.xy(), 0 ); - tinymap tmpmap; - tmpmap.load( omt_to_sm_copy( p_surface ), false ); - tripoint dest( 0, 0, p.z ); - int &i = dest.x; - int &j = dest.y; - for( i = 0; i < SEEX * 2; i++ ) { - for( j = 0; j < SEEY * 2; j++ ) { - if( !one_in( 10 ) ) { - tmpmap.make_rubble( dest, f_rubble_rock, true, t_dirt, true ); - } - if( one_in( 3 ) ) { - tmpmap.add_field( dest, fd_nuke_gas, 3 ); - } - tmpmap.adjust_radiation( dest, rng( 20, 80 ) ); - } - } - tmpmap.save(); - overmap_buffer.ter_set( p_surface, oter_id( "crater" ) ); - // Kill any npcs on that omap location. - for( const auto &npc : overmap_buffer.get_npcs_near_omt( p_surface, 0 ) ) { - npc->marked_for_death = true; - } -} - } // namespace explosion_handler // This is only ever used to zero the cloud values, which is what makes it work. diff --git a/src/explosion.h b/src/explosion.h index 8a70066dfb3cd..18897b2024d6d 100644 --- a/src/explosion.h +++ b/src/explosion.h @@ -54,8 +54,6 @@ void resonance_cascade( const tripoint &p ); void scrambler_blast( const tripoint &p ); /** Triggers an EMP blast at p. */ void emp_blast( const tripoint &p ); -/** Nuke the area at p - global overmap terrain coordinates! */ -void nuke( const tripoint &p ); // shockwave applies knockback to all targets within radius of p // parameters force, stun, and dam_mult are passed to knockback() // ignore_player determines if player is affected, useful for bionic, etc. diff --git a/src/faction.cpp b/src/faction.cpp index 20c45c6040206..428a7afe4f463 100644 --- a/src/faction.cpp +++ b/src/faction.cpp @@ -1,6 +1,6 @@ #include "faction.h" -#include +#include #include #include #include diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp index 5c0dddfe399eb..f991eb5a8de6b 100644 --- a/src/faction_camp.cpp +++ b/src/faction_camp.cpp @@ -555,7 +555,8 @@ void talk_function::start_camp( npc &p ) } const recipe &making = camp_type.obj(); if( !run_mapgen_update_func( making.get_blueprint(), omt_pos ) ) { - popup( _( "%s failed to start the %s basecamp." ), p.disp_name(), making.get_blueprint() ); + popup( _( "%s failed to start the %s basecamp, perhaps there is a vehicle in the way." ), + p.disp_name(), making.get_blueprint() ); return; } get_basecamp( p, camp_type.str() ); @@ -1669,9 +1670,7 @@ void basecamp::start_menial_labor() } validate_sort_points(); - comp->set_attitude( NPCATT_ACTIVITY ); comp->assign_activity( activity_id( "ACT_MOVE_LOOT" ) ); - comp->set_mission( NPC_MISSION_ACTIVITY ); popup( _( "%s goes off to clean toilets and sort loot." ), comp->disp_name() ); } @@ -2383,7 +2382,8 @@ bool basecamp::upgrade_return( const point &dir, const std::string &miss, return false; } if( !run_mapgen_update_func( making.get_blueprint(), upos ) ) { - popup( _( "%s failed to build the %s upgrade." ), comp->disp_name(), + popup( _( "%s failed to build the %s upgrade, perhaps there is a vehicle in the way." ), + comp->disp_name(), making.get_blueprint() ); return false; } @@ -2720,7 +2720,8 @@ bool basecamp::survey_return() _( "Select an expansion:" ) ); if( !run_mapgen_update_func( expansion_type.str(), where ) ) { - popup( _( "%s failed to add the %s expansion" ), comp->disp_name(), + popup( _( "%s failed to add the %s expansion, perhaps there is a vehicle in the way." ), + comp->disp_name(), expansion_type->blueprint_name() ); return false; } diff --git a/src/fault.cpp b/src/fault.cpp index 0991520cab024..5ee6719394b79 100644 --- a/src/fault.cpp +++ b/src/fault.cpp @@ -39,9 +39,7 @@ void fault::load_fault( const JsonObject &jo ) mandatory( jo, false, "name", f.name_ ); mandatory( jo, false, "description", f.description_ ); - JsonArray ja_methods = jo.get_array( "mending_methods" ); - while( ja_methods.has_more() ) { - JsonObject jo_method = ja_methods.next_object(); + for( const JsonObject &jo_method : jo.get_array( "mending_methods" ) ) { mending_method m; mandatory( jo_method, false, "id", m.id ); @@ -50,9 +48,7 @@ void fault::load_fault( const JsonObject &jo ) mandatory( jo_method, false, "success_msg", m.success_msg ); mandatory( jo_method, false, "time", m.time ); - JsonArray jo_skills = jo_method.get_array( "skills" ); - while( jo_skills.has_more() ) { - JsonObject jo_skill = jo_skills.next_object(); + for( const JsonObject &jo_skill : jo_method.get_array( "skills" ) ) { skill_id sk_id; mandatory( jo_skill, false, "id", sk_id ); m.skills.emplace( sk_id, jo_skill.get_int( "level" ) ); diff --git a/src/field_type.cpp b/src/field_type.cpp index 3de5c96d72a39..cde0d93f26d4f 100644 --- a/src/field_type.cpp +++ b/src/field_type.cpp @@ -121,14 +121,10 @@ const field_intensity_level &field_type::get_intensity_level( int level ) const void field_type::load( const JsonObject &jo, const std::string & ) { optional( jo, was_loaded, "legacy_enum_id", legacy_enum_id, -1 ); - JsonArray ja = jo.get_array( "intensity_levels" ); - if( !jo.has_array( "intensity_levels" ) || ja.empty() ) { - jo.throw_error( "No intensity levels defined for field type", "id" ); - } - for( size_t i = 0; i < ja.size(); ++i ) { + for( const JsonObject &jao : jo.get_array( "intensity_levels" ) ) { field_intensity_level intensity_level; - field_intensity_level fallback_intensity_level = i > 0 ? intensity_levels[i - 1] : intensity_level; - JsonObject jao = ja.get_object( i ); + field_intensity_level fallback_intensity_level = !intensity_levels.empty() ? intensity_levels.back() + : intensity_level; optional( jao, was_loaded, "name", intensity_level.name, fallback_intensity_level.name ); optional( jao, was_loaded, "sym", intensity_level.symbol, unicode_codepoint_from_symbol_reader, fallback_intensity_level.symbol ); @@ -169,9 +165,7 @@ void field_type::load( const JsonObject &jo, const std::string & ) optional( jao, was_loaded, "convection_temperature_mod", intensity_level.convection_temperature_mod, fallback_intensity_level.convection_temperature_mod ); if( jao.has_array( "effects" ) ) { - JsonArray jae = jao.get_array( "effects" ); - for( size_t j = 0; j < jae.size(); ++j ) { - JsonObject joe = jae.next_object(); + for( const JsonObject &joe : jao.get_array( "effects" ) ) { field_effect fe; mandatory( joe, was_loaded, "effect_id", fe.id ); optional( joe, was_loaded, "min_duration", fe.min_duration ); @@ -199,6 +193,9 @@ void field_type::load( const JsonObject &jo, const std::string & ) fallback_intensity_level.scent_neutralization ); intensity_levels.emplace_back( intensity_level ); } + if( intensity_levels.empty() ) { + jo.throw_error( "No intensity levels defined for field type", "id" ); + } if( jo.has_object( "npc_complain" ) ) { JsonObject joc = jo.get_object( "npc_complain" ); @@ -214,13 +211,10 @@ void field_type::load( const JsonObject &jo, const std::string & ) } JsonObject jid = jo.get_object( "immunity_data" ); - JsonArray jidt = jid.get_array( "traits" ); - while( jidt.has_more() ) { - immunity_data_traits.emplace_back( trait_id( jidt.next_string() ) ); + for( const std::string &id : jid.get_array( "traits" ) ) { + immunity_data_traits.emplace_back( id ); } - JsonArray jidr = jid.get_array( "body_part_env_resistance" ); - while( jidr.has_more() ) { - JsonArray jao = jidr.next_array(); + for( JsonArray jao : jid.get_array( "body_part_env_resistance" ) ) { immunity_data_body_part_env_resistance.emplace_back( std::make_pair( get_body_part_token( jao.get_string( 0 ) ), jao.get_int( 1 ) ) ); } diff --git a/src/field_type.h b/src/field_type.h index 38ebeaf7dac30..bc11a7d4e9e40 100644 --- a/src/field_type.h +++ b/src/field_type.h @@ -2,8 +2,8 @@ #ifndef FIELD_TYPE_H #define FIELD_TYPE_H -#include -#include +#include +#include #include #include #include diff --git a/src/flag.cpp b/src/flag.cpp index a39b617ad5e21..611ccb45aac55 100644 --- a/src/flag.cpp +++ b/src/flag.cpp @@ -28,7 +28,7 @@ void json_flag::load( const JsonObject &jo ) // FIXME: most flags have a "context" field that isn't used for anything // Test for it here to avoid errors about unvisited members - jo.has_member( "context" ); + jo.get_member( "context" ); } void json_flag::check_consistency() diff --git a/src/font_loader.h b/src/font_loader.h index 67c85da1df525..662c297e9b308 100644 --- a/src/font_loader.h +++ b/src/font_loader.h @@ -5,6 +5,7 @@ #include #include #include +#include #include "debug.h" #include "filesystem.h" @@ -16,7 +17,7 @@ class font_loader { public: bool fontblending = false; - std::string typeface; + std::vector typeface; std::string map_typeface; std::string overmap_typeface; int fontwidth = 8; @@ -35,7 +36,11 @@ class font_loader std::ifstream stream( path.c_str(), std::ifstream::binary ); JsonIn json( stream ); JsonObject config = json.get_object(); - config.read( "typeface", typeface ); + if( config.has_string( "typeface" ) ) { + typeface.emplace_back( config.get_string( "typeface" ) ); + } else { + config.read( "typeface", typeface ); + } config.read( "map_typeface", map_typeface ); config.read( "overmap_typeface", overmap_typeface ); } catch( const std::exception &err ) { diff --git a/src/game.cpp b/src/game.cpp index d3fc2f2f9cde9..a3e546ebfc4e6 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1,7 +1,7 @@ #include "game.h" -#include -#include +#include +#include #include #include #include @@ -1173,22 +1173,35 @@ bool game::cleanup_at_end() bool queryReset = false; if( get_option( "WORLD_END" ) == "query" ) { - uilist smenu; - smenu.allow_cancel = false; - smenu.addentry( 0, true, 'k', "%s", _( "Keep world" ) ); - smenu.addentry( 1, true, 'r', "%s", _( "Reset world" ) ); - smenu.addentry( 2, true, 'd', "%s", _( "Delete world" ) ); - smenu.query(); - - switch( smenu.ret ) { - case 0: - break; - case 1: - queryReset = true; - break; - case 2: - queryDelete = true; - break; + bool decided = false; + std::string buffer = _( "Warning: NPC interactions and some other global flags " + "will not all reset when starting a new character in an " + "already-played world. This can lead to some strange " + "behavior.\n\n" + "Are you sure you wish to keep this world?" + ); + + while( !decided ) { + uilist smenu; + smenu.allow_cancel = false; + smenu.addentry( 0, true, 'r', "%s", _( "Reset world" ) ); + smenu.addentry( 1, true, 'd', "%s", _( "Delete world" ) ); + smenu.addentry( 2, true, 'k', "%s", _( "Keep world" ) ); + smenu.query(); + + switch( smenu.ret ) { + case 0: + queryReset = true; + decided = true; + break; + case 1: + queryDelete = true; + decided = true; + break; + case 2: + decided = query_yn( buffer ); + break; + } } } @@ -1540,6 +1553,7 @@ bool game::do_turn() } } update_stair_monsters(); + mon_info_update(); u.process_turn(); if( u.moves < 0 && get_option( "FORCE_REDRAW" ) ) { draw(); @@ -1942,18 +1956,17 @@ void game::handle_key_blocking_activity() /* item submenu for 'i' and '/' * It use draw_item_info to draw item info and action menu * -* @param pos position of item in inventory +* @param locThisItem the item * @param iStartX Left coordinate of the item info window * @param iWidth width of the item info window (height = height of terminal) * @return getch */ -int game::inventory_item_menu( int pos, int iStartX, int iWidth, +int game::inventory_item_menu( item_location locThisItem, int iStartX, int iWidth, const inventory_item_menu_positon position ) { int cMenu = static_cast( '+' ); - item &oThisItem = u.i_at( pos ); - item_location locThisItem( u, &oThisItem ); + item &oThisItem = *locThisItem; if( u.has_item( oThisItem ) ) { #if defined(__ANDROID__) if( get_option( "ANDROID_INVENTORY_AUTOADD" ) ) { @@ -2086,16 +2099,16 @@ int game::inventory_item_menu( int pos, int iStartX, int iWidth, wield( locThisItem ); break; case 't': - avatar_action::plthrow( u, pos ); + avatar_action::plthrow( u, locThisItem ); break; case 'c': - change_side( pos ); + u.change_side( locThisItem ); break; case 'T': u.takeoff( oThisItem ); break; case 'd': - u.drop( pos, u.pos() ); + u.drop( locThisItem, u.pos() ); break; case 'U': unload( oThisItem ); @@ -2107,7 +2120,7 @@ int game::inventory_item_menu( int pos, int iStartX, int iWidth, reload( locThisItem, true ); break; case 'm': - mend( pos ); + avatar_action::mend( u, locThisItem ); break; case 'R': u.read( oThisItem ); @@ -3805,26 +3818,161 @@ std::vector game::get_fishable_monsters( std::unordered_set // Print monster info to the given window void game::mon_info( const catacurses::window &w, int hor_padding ) { + const monster_visible_info &mon_visible = u.get_mon_visible(); + const auto &unique_types = mon_visible.unique_types; + const auto &unique_mons = mon_visible.unique_mons; + const auto &dangerous = mon_visible.dangerous; + const int width = getmaxx( w ) - 2 * hor_padding; const int maxheight = getmaxy( w ); const int startrow = 0; + // Print the direction headings + // Reminder: + // 7 0 1 unique_types uses these indices; + // 6 8 2 0-7 are provide by direction_from() + // 5 4 3 8 is used for local monsters (for when we explain them below) + + const std::array dir_labels = {{ + _( "North:" ), _( "NE:" ), _( "East:" ), _( "SE:" ), + _( "South:" ), _( "SW:" ), _( "West:" ), _( "NW:" ) + } + }; + std::array widths; + for( int i = 0; i < 8; i++ ) { + widths[i] = utf8_width( dir_labels[i] ); + } + std::array xcoords; + const std::array ycoords = {{ 0, 0, 1, 2, 2, 2, 1, 0 }}; + xcoords[0] = xcoords[4] = width / 3; + xcoords[1] = xcoords[3] = xcoords[2] = ( width / 3 ) * 2; + xcoords[5] = xcoords[6] = xcoords[7] = 0; + //for the alignment of the 1,2,3 rows on the right edge + xcoords[2] -= utf8_width( _( "East:" ) ) - utf8_width( _( "NE:" ) ); + for( int i = 0; i < 8; i++ ) { + nc_color c = unique_types[i].empty() && unique_mons[i].empty() ? c_dark_gray + : ( dangerous[i] ? c_light_red : c_light_gray ); + mvwprintz( w, point( xcoords[i] + hor_padding, ycoords[i] + startrow ), c, dir_labels[i] ); + } + + // Print the symbols of all monsters in all directions. + for( int i = 0; i < 8; i++ ) { + point pr( xcoords[i] + widths[i] + 1, ycoords[i] + startrow ); + + // The list of symbols needs a space on each end. + int symroom = ( width / 3 ) - widths[i] - 2; + const int typeshere_npc = unique_types[i].size(); + const int typeshere_mon = unique_mons[i].size(); + const int typeshere = typeshere_mon + typeshere_npc; + for( int j = 0; j < typeshere && j < symroom; j++ ) { + nc_color c; + std::string sym; + if( symroom < typeshere && j == symroom - 1 ) { + // We've run out of room! + c = c_white; + sym = "+"; + } else if( j < typeshere_npc ) { + switch( unique_types[i][j]->get_attitude() ) { + case NPCATT_KILL: + c = c_red; + break; + case NPCATT_FOLLOW: + c = c_light_green; + break; + default: + c = c_pink; + break; + } + sym = "@"; + } else { + const mtype &mt = *unique_mons[i][j - typeshere_npc]; + c = mt.color; + sym = mt.sym; + } + mvwprintz( w, pr, c, sym ); + + pr.x++; + } + } + + // Now we print their full names! + + std::set listed_mons; + + // Start printing monster names on row 4. Rows 0-2 are for labels, and row 3 + // is blank. + point pr( hor_padding, 4 + startrow ); + + // Print monster names, starting with those at location 8 (nearby). + for( int j = 8; j >= 0 && pr.y < maxheight; j-- ) { + // Separate names by some number of spaces (more for local monsters). + int namesep = ( j == 8 ? 2 : 1 ); + for( const mtype *type : unique_mons[j] ) { + if( pr.y >= maxheight ) { + // no space to print to anyway + break; + } + if( listed_mons.count( type ) > 0 ) { + // this type is already printed. + continue; + } + listed_mons.insert( type ); + + const mtype &mt = *type; + const std::string name = mt.nname(); + + // Move to the next row if necessary. (The +2 is for the "Z "). + if( pr.x + 2 + utf8_width( name ) >= width ) { + pr.y++; + pr.x = hor_padding; + } + + if( pr.y < maxheight ) { // Don't print if we've overflowed + mvwprintz( w, pr, mt.color, mt.sym ); + pr.x += 2; // symbol and space + nc_color danger = c_dark_gray; + if( mt.difficulty >= 30 ) { + danger = c_red; + } else if( mt.difficulty >= 16 ) { + danger = c_light_red; + } else if( mt.difficulty >= 8 ) { + danger = c_white; + } else if( mt.agro > 0 ) { + danger = c_light_gray; + } + mvwprintz( w, pr, danger, name ); + pr.x += utf8_width( name ) + namesep; + } + } + } +} + +void game::mon_info_update( ) +{ int newseen = 0; - const int iProxyDist = ( get_option( "SAFEMODEPROXIMITY" ) <= 0 ) ? MAX_VIEW_DISTANCE : - get_option( "SAFEMODEPROXIMITY" ); + const int safe_proxy_dist = get_option( "SAFEMODEPROXIMITY" ); + const int iProxyDist = ( safe_proxy_dist <= 0 ) ? MAX_VIEW_DISTANCE : + safe_proxy_dist; + + monster_visible_info &mon_visible = u.get_mon_visible(); + auto &new_seen_mon = mon_visible.new_seen_mon; + auto &unique_types = mon_visible.unique_types; + auto &unique_mons = mon_visible.unique_mons; + auto &dangerous = mon_visible.dangerous; + // 7 0 1 unique_types uses these indices; // 6 8 2 0-7 are provide by direction_from() // 5 4 3 8 is used for local monsters (for when we explain them below) - std::vector unique_types[9]; - std::vector unique_mons[9]; - // dangerous_types tracks whether we should print in red to warn the player - bool dangerous[8]; - for( auto &dangerou : dangerous ) { - dangerou = false; + for( auto &t : unique_types ) { + t.clear(); } + for( auto &m : unique_mons ) { + m.clear(); + } + std::fill( dangerous, dangerous + sizeof( dangerous ), false ); - tripoint view = u.pos() + u.view_offset; + const tripoint view = u.pos() + u.view_offset; new_seen_mon.clear(); static int previous_turn = 0; @@ -3832,10 +3980,10 @@ void game::mon_info( const catacurses::window &w, int hor_padding ) const int current_turn = to_turns( calendar::turn - calendar::turn_zero ); const int sm_ignored_turns = get_option( "SAFEMODEIGNORETURNS" ); - for( auto &c : u.get_visible_creatures( MAPSIZE_X ) ) { - const auto m = dynamic_cast( c ); - const auto p = dynamic_cast( c ); - const auto dir_to_mon = direction_from( view.xy(), point( c->posx(), c->posy() ) ); + for( Creature *c : u.get_visible_creatures( MAPSIZE_X ) ) { + monster *m = dynamic_cast( c ); + npc *p = dynamic_cast( c ); + const direction dir_to_mon = direction_from( view.xy(), point( c->posx(), c->posy() ) ); const int mx = POSX + ( c->posx() - view.x ); const int my = POSY + ( c->posy() - view.y ); int index = 8; @@ -3896,7 +4044,7 @@ void game::mon_info( const catacurses::window &w, int hor_padding ) if( m != nullptr ) { //Safemode monster check - auto &critter = *m; + monster &critter = *m; const monster_attitude matt = critter.attitude( &u ); const int mon_dist = rl_dist( u.pos(), critter.pos() ); @@ -3928,7 +4076,7 @@ void game::mon_info( const catacurses::window &w, int hor_padding ) } } - auto &vec = unique_mons[index]; + std::vector &vec = unique_mons[index]; if( std::find( vec.begin(), vec.end(), critter.type ) == vec.end() ) { vec.push_back( critter.type ); } @@ -3993,127 +4141,9 @@ void game::mon_info( const catacurses::window &w, int hor_padding ) previous_turn = current_turn; mostseen = newseen; - - // Print the direction headings - // Reminder: - // 7 0 1 unique_types uses these indices; - // 6 8 2 0-7 are provide by direction_from() - // 5 4 3 8 is used for local monsters (for when we explain them below) - - const std::array dir_labels = {{ - _( "North:" ), _( "NE:" ), _( "East:" ), _( "SE:" ), - _( "South:" ), _( "SW:" ), _( "West:" ), _( "NW:" ) - } - }; - std::array widths; - for( int i = 0; i < 8; i++ ) { - widths[i] = utf8_width( dir_labels[i] ); - } - std::array xcoords; - const std::array ycoords = {{ 0, 0, 1, 2, 2, 2, 1, 0 }}; - xcoords[0] = xcoords[4] = width / 3; - xcoords[1] = xcoords[3] = xcoords[2] = ( width / 3 ) * 2; - xcoords[5] = xcoords[6] = xcoords[7] = 0; - //for the alignment of the 1,2,3 rows on the right edge - xcoords[2] -= utf8_width( _( "East:" ) ) - utf8_width( _( "NE:" ) ); - for( int i = 0; i < 8; i++ ) { - nc_color c = unique_types[i].empty() && unique_mons[i].empty() ? c_dark_gray - : ( dangerous[i] ? c_light_red : c_light_gray ); - mvwprintz( w, point( xcoords[i] + hor_padding, ycoords[i] + startrow ), c, dir_labels[i] ); - } - - // Print the symbols of all monsters in all directions. - for( int i = 0; i < 8; i++ ) { - point pr( xcoords[i] + widths[i] + 1, ycoords[i] + startrow ); - - // The list of symbols needs a space on each end. - int symroom = ( width / 3 ) - widths[i] - 2; - const int typeshere_npc = unique_types[i].size(); - const int typeshere_mon = unique_mons[i].size(); - const int typeshere = typeshere_mon + typeshere_npc; - for( int j = 0; j < typeshere && j < symroom; j++ ) { - nc_color c; - std::string sym; - if( symroom < typeshere && j == symroom - 1 ) { - // We've run out of room! - c = c_white; - sym = "+"; - } else if( j < typeshere_npc ) { - switch( unique_types[i][j]->get_attitude() ) { - case NPCATT_KILL: - c = c_red; - break; - case NPCATT_FOLLOW: - c = c_light_green; - break; - default: - c = c_pink; - break; - } - sym = "@"; - } else { - const mtype &mt = *unique_mons[i][j - typeshere_npc]; - c = mt.color; - sym = mt.sym; - } - mvwprintz( w, pr, c, sym ); - - pr.x++; - } - } - - // Now we print their full names! - - std::set listed_mons; - - // Start printing monster names on row 4. Rows 0-2 are for labels, and row 3 - // is blank. - point pr( hor_padding, 4 + startrow ); - - // Print monster names, starting with those at location 8 (nearby). - for( int j = 8; j >= 0 && pr.y < maxheight; j-- ) { - // Separate names by some number of spaces (more for local monsters). - int namesep = ( j == 8 ? 2 : 1 ); - for( const mtype *type : unique_mons[j] ) { - if( pr.y >= maxheight ) { - // no space to print to anyway - break; - } - if( listed_mons.count( type ) > 0 ) { - // this type is already printed. - continue; - } - listed_mons.insert( type ); - - const mtype &mt = *type; - const std::string name = mt.nname(); - - // Move to the next row if necessary. (The +2 is for the "Z "). - if( pr.x + 2 + utf8_width( name ) >= width ) { - pr.y++; - pr.x = hor_padding; - } - - if( pr.y < maxheight ) { // Don't print if we've overflowed - mvwprintz( w, pr, mt.color, mt.sym ); - pr.x += 2; // symbol and space - nc_color danger = c_dark_gray; - if( mt.difficulty >= 30 ) { - danger = c_red; - } else if( mt.difficulty >= 16 ) { - danger = c_light_red; - } else if( mt.difficulty >= 8 ) { - danger = c_white; - } else if( mt.agro > 0 ) { - danger = c_light_gray; - } - mvwprintz( w, pr, danger, name ); - pr.x += utf8_width( name ) + namesep; - } - } - } } + void game::cleanup_dead() { // Dead monsters need to stay in the tracker until everything else that needs to die does so @@ -5334,13 +5364,13 @@ bool game::npc_menu( npc &who ) actor->head_power >= 0 && actor->torso_power >= 0; }; - const int pos = inv_for_filter( _( "Use which item?" ), will_accept ); + item_location loc = game_menus::inv::titled_filter_menu( will_accept, u, _( "Use which item?" ) ); - if( pos == INT_MIN ) { + if( !loc ) { add_msg( _( "Never mind" ) ); return false; } - item &used = u.i_at( pos ); + item &used = *loc; bool did_use = u.invoke_item( &used, heal_string, who.pos() ); if( did_use ) { // Note: exiting a body part selection menu counts as use here @@ -5396,11 +5426,12 @@ static std::string get_fire_fuel_string( const tripoint &examp ) if( g->m.has_flag( TFLAG_FIRE_CONTAINER, examp ) ) { field_entry *fire = g->m.get_field( examp, fd_fire ); if( fire ) { - std::stringstream ss; - ss << _( "There is a fire here." ) << " "; + std::string ss; + ss += _( "There is a fire here." ); + ss += " "; if( fire->get_field_intensity() > 1 ) { - ss << _( "It's too big and unpredictable to evaluate how long it will last." ); - return ss.str(); + ss += _( "It's too big and unpredictable to evaluate how long it will last." ); + return ss; } time_duration fire_age = fire->get_field_age(); // half-life inclusion @@ -5408,47 +5439,47 @@ static std::string get_fire_fuel_string( const tripoint &examp ) mod = std::max( mod, 0 ); if( fire_age >= 0_turns ) { if( mod >= 4 ) { // = survival level 0-1 - ss << _( "It's going to go out soon without extra fuel." ); - return ss.str(); + ss += _( "It's going to go out soon without extra fuel." ); + return ss; } else { fire_age = 30_minutes - fire_age; if( to_string_approx( fire_age - fire_age * mod / 5 ) == to_string_approx( fire_age + fire_age * mod / 5 ) ) { - ss << string_format( - _( "Without extra fuel it might burn yet for maybe %s, but might also go out sooner." ), - to_string_approx( fire_age - fire_age * mod / 5 ) ); + ss += string_format( + _( "Without extra fuel it might burn yet for maybe %s, but might also go out sooner." ), + to_string_approx( fire_age - fire_age * mod / 5 ) ); } else { - ss << string_format( - _( "Without extra fuel it might burn yet for between %s to %s, but might also go out sooner." ), - to_string_approx( fire_age - fire_age * mod / 5 ), - to_string_approx( fire_age + fire_age * mod / 5 ) ); + ss += string_format( + _( "Without extra fuel it might burn yet for between %s to %s, but might also go out sooner." ), + to_string_approx( fire_age - fire_age * mod / 5 ), + to_string_approx( fire_age + fire_age * mod / 5 ) ); } - return ss.str(); + return ss; } } else { fire_age = fire_age * -1 + 30_minutes; if( mod >= 4 ) { // = survival level 0-1 if( fire_age <= 1_hours ) { - ss << _( "It's quite decent and looks like it'll burn for a bit without extra fuel." ); - return ss.str(); + ss += _( "It's quite decent and looks like it'll burn for a bit without extra fuel." ); + return ss; } else if( fire_age <= 3_hours ) { - ss << _( "It looks solid, and will burn for a few hours without extra fuel." ); - return ss.str(); + ss += _( "It looks solid, and will burn for a few hours without extra fuel." ); + return ss; } else { - ss << _( "It's very well supplied and even without extra fuel might burn for at least a part of a day." ); - return ss.str(); + ss += _( "It's very well supplied and even without extra fuel might burn for at least a part of a day." ); + return ss; } } else { if( to_string_approx( fire_age - fire_age * mod / 5 ) == to_string_approx( fire_age + fire_age * mod / 5 ) ) { - ss << string_format( _( "Without extra fuel it will burn for about %s." ), + ss += string_format( _( "Without extra fuel it will burn for about %s." ), to_string_approx( fire_age - fire_age * mod / 5 ) ); } else { - ss << string_format( _( "Without extra fuel it will burn for between %s to %s." ), + ss += string_format( _( "Without extra fuel it will burn for between %s to %s." ), to_string_approx( fire_age - fire_age * mod / 5 ), to_string_approx( fire_age + fire_age * mod / 5 ) ); } - return ss.str(); + return ss; } } } @@ -5671,7 +5702,8 @@ void game::peek( const tripoint &p ) u.setpos( prev ); if( result.peek_action && *result.peek_action == PA_BLIND_THROW ) { - avatar_action::plthrow( u, INT_MIN, p ); + item_location loc; + avatar_action::plthrow( u, loc, p ); } m.invalidate_map_cache( p.z ); @@ -6553,7 +6585,7 @@ look_around_result game::look_around( catacurses::window w_info, tripoint ¢e { bVMonsterLookFire = false; // TODO: Make this `true` - const bool allow_zlev_move = m.has_zlevels(); + const bool allow_zlev_move = m.has_zlevels() && get_option( "FOV_3D" ); temp_exit_fullscreen(); @@ -7443,13 +7475,13 @@ game::vmenu_ret game::list_items( const std::vector &item_list ) active_pos = iter->vIG[iThisPage].pos; activeItem = &( *iter ); } - std::stringstream sText; + std::string sText; if( iter->vIG.size() > 1 ) { - sText << "[" << iThisPage + 1 << "/" << iter->vIG.size() << "] (" << iter->totalcount << ") "; + sText += string_format( "[%d/%d] (%d) ", iThisPage + 1, iter->vIG.size(), iter->totalcount ); } - sText << iter->example->tname(); + sText += iter->example->tname(); if( iter->vIG[iThisPage].count > 1 ) { - sText << " [" << iter->vIG[iThisPage].count << "]"; + sText += string_format( "[%d]", iter->vIG[iThisPage].count ); } nc_color col = c_light_green; @@ -7462,7 +7494,7 @@ game::vmenu_ret game::list_items( const std::vector &item_list ) col = iter->example->color_in_inventory(); } } - trim_and_print( w_items, point( 1, iNum - iStartPos ), width - 9, col, sText.str() ); + trim_and_print( w_items, point( 1, iNum - iStartPos ), width - 9, col, sText ); const int numw = iItemNum > 9 ? 2 : 1; const int x = iter->vIG[iThisPage].pos.x; const int y = iter->vIG[iThisPage].pos.y; @@ -8336,20 +8368,6 @@ void game::butcher() } } -void game::change_side( int pos ) -{ - if( pos == INT_MIN ) { - pos = inv_for_filter( _( "Change side for item" ), [&]( const item & it ) { - return u.is_worn( it ) && it.is_sided(); - }, _( "You don't have sided items worn." ) ); - } - if( pos == INT_MIN ) { - add_msg( _( "Never mind." ) ); - return; - } - u.change_side( pos ); -} - void game::reload( item_location &loc, bool prompt, bool empty ) { item *it = loc.get_item(); @@ -8426,7 +8444,13 @@ void game::reload( item_location &loc, bool prompt, bool empty ) } if( opt ) { - u.assign_activity( activity_id( "ACT_RELOAD" ), opt.moves(), opt.qty() ); + int moves = opt.moves(); + if( it->get_var( "dirt", 0 ) > 7800 ) { + add_msg( m_warning, _( "You struggle to reload the fouled %s." ), it->tname() ); + moves += 2500; + } + + u.assign_activity( activity_id( "ACT_RELOAD" ), moves, opt.qty() ); if( use_loc ) { u.activity.targets.emplace_back( loc ); } else { @@ -8517,22 +8541,6 @@ void game::reload_weapon( bool try_everything ) reload_item(); } -void game::mend( int pos ) -{ - if( pos == INT_MIN ) { - if( u.is_armed() ) { - pos = -1; - } else { - add_msg( m_info, _( "You're not wielding anything." ) ); - } - } - - item &obj = g->u.i_at( pos ); - if( g->u.has_item( obj ) ) { - g->u.mend_item( item_location( g->u, &obj ) ); - } -} - bool game::unload( item &it ) { return u.unload( it ); @@ -8671,6 +8679,9 @@ bool game::check_safe_mode_allowed( bool repeat_safe_mode_warnings ) } // Monsters around and we don't want to run std::string spotted_creature_name; + const monster_visible_info &mon_visible = u.get_mon_visible(); + const auto &new_seen_mon = mon_visible.new_seen_mon; + if( new_seen_mon.empty() ) { // naming consistent with code in game::mon_info spotted_creature_name = _( "a survivor" ); @@ -8937,16 +8948,28 @@ bool game::walk_move( const tripoint &dest_loc ) u.set_underwater( false ); if( !shifting_furniture && !pushing && is_dangerous_tile( dest_loc ) ) { - if( !u.movement_mode_is( CMM_RUN ) ) { - std::vector harmful_stuff = get_dangerous_tile( dest_loc ); + std::vector harmful_stuff = get_dangerous_tile( dest_loc ); + if( get_option( "DANGEROUS_TERRAIN_WARNING_PROMPT" ) == "ALWAYS" && + !prompt_dangerous_tile( dest_loc ) ) { + return true; + } else if( get_option( "DANGEROUS_TERRAIN_WARNING_PROMPT" ) == "RUNNING" && + ( !u.movement_mode_is( CMM_RUN ) || !prompt_dangerous_tile( dest_loc ) ) ) { + add_msg( m_warning, + _( "Stepping into that %1$s looks risky. Run into it if you wish to enter anyway." ), + enumerate_as_string( harmful_stuff ) ); + return true; + } else if( get_option( "DANGEROUS_TERRAIN_WARNING_PROMPT" ) == "CROUCHING" && + ( !u.movement_mode_is( CMM_CROUCH ) || !prompt_dangerous_tile( dest_loc ) ) ) { + add_msg( m_warning, + _( "Stepping into that %1$s looks risky. Crouch and move into it if you wish to enter anyway." ), + enumerate_as_string( harmful_stuff ) ); + return true; + } else if( get_option( "DANGEROUS_TERRAIN_WARNING_PROMPT" ) == "NEVER" && + !u.movement_mode_is( CMM_RUN ) ) { add_msg( m_warning, _( "Stepping into that %1$s looks risky. Run into it if you wish to enter anyway." ), enumerate_as_string( harmful_stuff ) ); return true; - } else if( !get_option( "DANGEROUS_RUNNING" ) ) { - if( !prompt_dangerous_tile( dest_loc ) ) { - return true; - } } } // Used to decide whether to print a 'moving is slow message @@ -9332,7 +9355,7 @@ point game::place_player( const tripoint &dest_loc ) if( maybe_corpse.is_corpse() && maybe_corpse.can_revive() && !maybe_corpse.get_mtype()->bloodType().obj().has_acid ) { u.assign_activity( activity_id( "ACT_PULP" ), calendar::INDEFINITELY_LONG, 0 ); - u.activity.placement = pos; + u.activity.placement = g->m.getabs( pos ); u.activity.auto_resume = true; u.activity.str_values.push_back( "auto_pulp_no_acid" ); return; @@ -10578,6 +10601,10 @@ point game::update_map( int &x, int &y ) if( shift == point_zero ) { // adjust player position u.setpos( tripoint( x, y, get_levz() ) ); + // Update what parts of the world map we can see + // We need this call because even if the map hasn't shifted we may have changed z-level and can now see farther + // TODO: only make this call if we changed z-level + update_overmap_seen(); // Not actually shifting the submaps, all the stuff below would do nothing return point_zero; } @@ -10752,12 +10779,12 @@ void game::update_stair_monsters() critter.staircount -= 4; // Let the player know zombies are trying to come. if( u.sees( dest ) ) { - std::stringstream dump; + std::string dump; if( critter.staircount > 4 ) { - dump << string_format( _( "You see a %s on the stairs" ), critter.name() ); + dump += string_format( _( "You see a %s on the stairs" ), critter.name() ); } else { if( critter.staircount > 0 ) { - dump << ( from_below ? + dump += ( from_below ? //~ The is almost at the of the ! string_format( _( "The %1$s is almost at the top of the %2$s!" ), critter.name(), @@ -10768,7 +10795,7 @@ void game::update_stair_monsters() } } - add_msg( m_warning, dump.str() ); + add_msg( m_warning, dump ); } else { sounds::sound( dest, 5, sounds::sound_t::movement, _( "a sound nearby from the stairs!" ), true, "misc", "stairs_movement" ); @@ -11282,7 +11309,7 @@ void game::process_artifact( item &it, player &p ) if( calendar::once_every( 1_minutes ) ) { add_msg( m_bad, _( "You feel fatigue seeping into your body." ) ); u.mod_fatigue( 3 * rng( 1, 3 ) ); - u.mod_stat( "stamina", -90 * rng( 1, 3 ) * rng( 1, 3 ) * rng( 2, 3 ) ); + u.mod_stamina( -90 * rng( 1, 3 ) * rng( 1, 3 ) * rng( 2, 3 ) ); it.charges++; } break; @@ -11329,8 +11356,8 @@ void game::process_artifact( item &it, player &p ) break; case AEP_PBLUE: - if( p.radiation > 0 ) { - p.radiation--; + if( p.get_rad() > 0 ) { + p.mod_rad( -1 ); } break; @@ -11471,7 +11498,7 @@ bool check_art_charge_req( item &it ) reqsmet = p.has_effect( effect_sleep ); break; case( ACR_RAD ): - reqsmet = ( ( g->m.get_radiation( p.pos() ) > 0 ) || ( p.radiation > 0 ) ); + reqsmet = ( ( g->m.get_radiation( p.pos() ) > 0 ) || ( p.get_rad() > 0 ) ); break; case( ACR_WET ): reqsmet = std::any_of( p.body_wetness.begin(), p.body_wetness.end(), diff --git a/src/game.h b/src/game.h index 3a8177fa6500a..df64522ef294f 100644 --- a/src/game.h +++ b/src/game.h @@ -562,20 +562,13 @@ class game void draw_trail_to_square( const tripoint &t, bool bDrawX ); - // TODO: Move these functions to game_menus::inv and isolate them. - int inv_for_filter( const std::string &title, item_filter filter, - const std::string &none_message = "" ); - int inv_for_all( const std::string &title, const std::string &none_message = "" ); - int inv_for_flag( const std::string &flag, const std::string &title ); - int inv_for_id( const itype_id &id, const std::string &title ); - enum inventory_item_menu_positon { RIGHT_TERMINAL_EDGE, LEFT_OF_INFO, RIGHT_OF_INFO, LEFT_TERMINAL_EDGE, }; - int inventory_item_menu( int pos, int startx = 0, int width = 50, + int inventory_item_menu( item_location locThisItem, int startx = 0, int width = 50, inventory_item_menu_positon position = RIGHT_OF_INFO ); /** Custom-filtered menu for inventory and nearby items and those that within specified radius */ @@ -776,9 +769,7 @@ class game void butcher(); // Butcher a corpse 'B' - void change_side( int pos = INT_MIN ); // Change the side on which an item is worn 'c' void reload( item_location &loc, bool prompt = false, bool empty = true ); - void mend( int pos = INT_MIN ); public: void reload_item(); // Reload an item void reload_weapon( bool try_everything = true ); // Reload a wielded gun/tool 'r' @@ -796,6 +787,7 @@ class game void set_critter_died(); void mon_info( const catacurses::window &, int hor_padding = 0 ); // Prints a list of nearby monsters + void mon_info_update( ); //Update seen monsters information void cleanup_dead(); // Delete any dead NPCs/monsters bool is_dangerous_tile( const tripoint &dest_loc ) const; std::vector get_dangerous_tile( const tripoint &dest_loc ) const; @@ -1011,7 +1003,6 @@ class game std::string list_item_upvote; std::string list_item_downvote; - std::vector> new_seen_mon; bool safe_mode_warning_logged; bool bVMonsterLookFire; character_id next_npc_id; diff --git a/src/game_inventory.cpp b/src/game_inventory.cpp index 9be601842b8c3..c1f2b746152e4 100644 --- a/src/game_inventory.cpp +++ b/src/game_inventory.cpp @@ -1,6 +1,6 @@ #include "game_inventory.h" -#include +#include #include #include #include @@ -201,43 +201,30 @@ void game_menus::inv::common( avatar &you ) } g->refresh_all(); - res = g->inventory_item_menu( you.get_item_position( location.get_item() ) ); + res = g->inventory_item_menu( location ); g->refresh_all(); } while( loop_options.count( res ) != 0 ); } -int game::inv_for_filter( const std::string &title, item_filter filter, - const std::string &none_message ) +item_location game_menus::inv::titled_filter_menu( item_filter filter, avatar &you, + const std::string &title, const std::string &none_message ) { - return u.get_item_position( inv_map_splice( filter, title, -1, none_message ).get_item() ); + return inv_internal( you, inventory_filter_preset( convert_filter( filter ) ), + title, -1, none_message ); } -int game::inv_for_all( const std::string &title, const std::string &none_message ) +item_location game_menus::inv::titled_menu( avatar &you, const std::string &title, + const std::string &none_message ) { const std::string msg = none_message.empty() ? _( "Your inventory is empty." ) : none_message; - return u.get_item_position( inv_internal( u, inventory_selector_preset(), title, -1, - msg ).get_item() ); -} - -int game::inv_for_flag( const std::string &flag, const std::string &title ) -{ - return inv_for_filter( title, [ &flag ]( const item & it ) { - return it.has_flag( flag ); - } ); -} - -int game::inv_for_id( const itype_id &id, const std::string &title ) -{ - return inv_for_filter( title, [ &id ]( const item & it ) { - return it.typeId() == id; - }, string_format( _( "You don't have a %s." ), item::nname( id ) ) ); + return inv_internal( you, inventory_selector_preset(), title, -1, msg ); } class armor_inventory_preset: public inventory_selector_preset { public: - armor_inventory_preset( const player &pl, const std::string &color_in ) : + armor_inventory_preset( player &pl, const std::string &color_in ) : p( pl ), color( color_in ) { append_cell( [ this ]( const item_location & loc ) { return get_number_string( loc->get_encumber( p ) ); @@ -278,7 +265,7 @@ class armor_inventory_preset: public inventory_selector_preset } protected: - const player &p; + player &p; private: std::string get_number_string( int number ) const { return number ? string_format( "<%s>%d", color, number ) : std::string(); @@ -290,7 +277,7 @@ class armor_inventory_preset: public inventory_selector_preset class wear_inventory_preset: public armor_inventory_preset { public: - wear_inventory_preset( const player &p, const std::string &color ) : + wear_inventory_preset( player &p, const std::string &color ) : armor_inventory_preset( p, color ) {} @@ -318,7 +305,7 @@ item_location game_menus::inv::wear( player &p ) class take_off_inventory_preset: public armor_inventory_preset { public: - take_off_inventory_preset( const player &p, const std::string &color ) : + take_off_inventory_preset( player &p, const std::string &color ) : armor_inventory_preset( p, color ) {} @@ -327,7 +314,7 @@ class take_off_inventory_preset: public armor_inventory_preset } std::string get_denial( const item_location &loc ) const override { - const auto ret = p.can_takeoff( *loc ); + const ret_val ret = p.can_takeoff( *loc ); if( !ret.success() ) { return trim_punctuation_marks( ret.str() ); @@ -1337,7 +1324,7 @@ item_location game_menus::inv::saw_barrel( player &p, item &tool ) ); } -std::list> game_menus::inv::multidrop( player &p ) +drop_locations game_menus::inv::multidrop( player &p ) { p.inv.restack( p ); @@ -1353,7 +1340,7 @@ std::list> game_menus::inv::multidrop( player &p ) if( inv_s.empty() ) { popup( std::string( _( "You have nothing to drop." ) ), PF_GET_KEY ); - return std::list >(); + return drop_locations(); } return inv_s.execute(); diff --git a/src/game_inventory.h b/src/game_inventory.h index 5fc752b97975f..0d2c69c302e49 100644 --- a/src/game_inventory.h +++ b/src/game_inventory.h @@ -22,7 +22,10 @@ class player; class salvage_actor; class repair_item_actor; +using item_filter = std::function; using item_location_filter = std::function; +using drop_location = std::pair; +using drop_locations = std::list; class inventory_filter_preset : public inventory_selector_preset { @@ -39,6 +42,12 @@ namespace game_menus namespace inv { +// item selector for all items in @you's inventory. +item_location titled_menu( avatar &you, const std::string &title, + const std::string &none_message = "" ); +// item selector for items in @you's inventory with a filter +item_location titled_filter_menu( item_filter filter, avatar &you, + const std::string &title, const std::string &none_message = "" ); /** * @name Customized inventory menus @@ -58,9 +67,9 @@ void swap_letters( player &p ); /** * Select items to drop. - * @return A list of pairs of position, quantity. + * @return A list of pairs of item_location, quantity. */ -std::list> multidrop( player &p ); +drop_locations multidrop( player &p ); /** Consuming an item. */ item_location consume( player &p ); diff --git a/src/gamemode.cpp b/src/gamemode.cpp index bca76308b095a..23492dc510acc 100644 --- a/src/gamemode.cpp +++ b/src/gamemode.cpp @@ -1,6 +1,6 @@ #include "gamemode.h" - -#include +#include "gamemode_defense.h" +#include "gamemode_tutorial.h" #include "debug.h" #include "translations.h" diff --git a/src/gamemode.h b/src/gamemode.h index 8d34cdec23e6d..d5a44cf2bcfbd 100644 --- a/src/gamemode.h +++ b/src/gamemode.h @@ -3,19 +3,16 @@ #define GAMEMODE_H #include -#include #include -#include "calendar.h" #include "enums.h" -#include "type_id.h" enum action_id : int; -using itype_id = std::string; namespace catacurses { class window; } // namespace catacurses + struct special_game; std::string special_game_name( special_game_id id ); @@ -26,160 +23,20 @@ struct special_game { virtual special_game_id id() { return SGAME_NULL; } - // init is run when the game begins + // Run when the game begins virtual bool init() { return true; } - // per_turn is run every turn--before any player actions + // Run every turn--before any player actions virtual void per_turn() { } - // pre_action is run after a keypress, but before the game handles the action + // Run after a keypress, but before the game handles the action // It may modify the action, e.g. to cancel it virtual void pre_action( action_id & ) { } - // post_action is run after the game handles the action + // Run after the game handles the action virtual void post_action( action_id ) { } - // game_over is run when the player dies (or the game otherwise ends) + // Run when the player dies (or the game otherwise ends) virtual void game_over() { } }; -// TUTORIAL: - -enum tut_lesson { - LESSON_INTRO, - LESSON_MOVE, LESSON_LOOK, LESSON_OPEN, LESSON_CLOSE, LESSON_SMASH, - LESSON_WINDOW, LESSON_PICKUP, LESSON_EXAMINE, LESSON_INTERACT, - - LESSON_FULL_INV, LESSON_WIELD_NO_SPACE, LESSON_AUTOWIELD, LESSON_ITEM_INTO_INV, - LESSON_GOT_ARMOR, LESSON_GOT_WEAPON, LESSON_GOT_FOOD, LESSON_GOT_TOOL, - LESSON_GOT_GUN, LESSON_GOT_AMMO, LESSON_WORE_ARMOR, LESSON_WORE_STORAGE, - LESSON_WORE_MASK, - - LESSON_WEAPON_INFO, LESSON_HIT_MONSTER, LESSON_PAIN, LESSON_BUTCHER, - - LESSON_TOOK_PAINKILLER, LESSON_TOOK_CIG, LESSON_DRANK_WATER, - - LESSON_ACT_GRENADE, LESSON_ACT_BUBBLEWRAP, - - LESSON_OVERLOADED, - - LESSON_GUN_LOAD, LESSON_GUN_FIRE, LESSON_RECOIL, - - LESSON_STAIRS, LESSON_DARK_NO_FLASH, LESSON_DARK, LESSON_PICKUP_WATER, - - NUM_LESSONS -}; - -struct tutorial_game : public special_game { - special_game_id id() override { - return SGAME_TUTORIAL; - } - bool init() override; - void per_turn() override; - void pre_action( action_id &act ) override; - void post_action( action_id act ) override; - void game_over() override { } - - private: - void add_message( tut_lesson lesson ); - - bool tutorials_seen[NUM_LESSONS] = {}; -}; - -// DEFENSE - -enum defense_style { - DEFENSE_CUSTOM = 0, - DEFENSE_EASY, - DEFENSE_MEDIUM, - DEFENSE_HARD, - DEFENSE_SHAUN, - DEFENSE_DAWN, - DEFENSE_SPIDERS, - DEFENSE_TRIFFIDS, - DEFENSE_SKYNET, - DEFENSE_LOVECRAFT, - NUM_DEFENSE_STYLES -}; - -enum defense_location { - DEFLOC_NULL = 0, - DEFLOC_HOSPITAL, - DEFLOC_WORKS, - DEFLOC_MALL, - DEFLOC_BAR, - DEFLOC_MANSION, - NUM_DEFENSE_LOCATIONS -}; - -enum caravan_category { - CARAVAN_CART = 0, - CARAVAN_MELEE, - CARAVAN_RANGED, - CARAVAN_AMMUNITION, - CARAVAN_COMPONENTS, - CARAVAN_FOOD, - CARAVAN_CLOTHES, - CARAVAN_TOOLS, - NUM_CARAVAN_CATEGORIES -}; - -struct defense_game : public special_game { - defense_game(); - - special_game_id id() override { - return SGAME_DEFENSE; - } - bool init() override; - void per_turn() override; - void pre_action( action_id &act ) override; - void post_action( action_id act ) override; - void game_over() override; - - private: - void init_to_style( defense_style new_style ); - - void setup(); - void refresh_setup( const catacurses::window &w, int selection ); - void init_mtypes(); - void init_constructions(); - void init_map(); - - void spawn_wave(); - void caravan(); - std::vector pick_monster_wave(); - void spawn_wave_monster( const mtype_id &type ); - - std::string special_wave_message( std::string name ); - - // DATA - int current_wave; - - defense_style style; // What type of game is it? - defense_location location; // Where are we? - - int initial_difficulty; // Total "level" of monsters in first wave - int wave_difficulty; // Increased "level" of monsters per wave - - time_duration time_between_waves; // Cooldown / building / healing time - int waves_between_caravans; // How many waves until we get to trade? - - int initial_cash; // How much cash do we start with? - int cash_per_wave; // How much cash do we get per wave? - int cash_increase; // How much does the above increase per wave? - - bool zombies; - bool specials; - bool spiders; - bool triffids; - bool robots; - bool subspace; - - bool hunger; // Do we hunger? - bool thirst; // Do we thirst? - bool sleep; // Do we need to sleep? - - bool mercenaries; // Do caravans offer the option of hiring a mercenary? - -}; - -#endif +#endif // GAMEMODE_H diff --git a/src/defense.cpp b/src/gamemode_defense.cpp similarity index 87% rename from src/defense.cpp rename to src/gamemode_defense.cpp index 06651a913cd2e..8e994bebcb2a2 100644 --- a/src/defense.cpp +++ b/src/gamemode_defense.cpp @@ -1,4 +1,4 @@ -#include "gamemode.h" // IWYU pragma: associated +#include "gamemode_defense.h" // IWYU pragma: associated #include @@ -6,6 +6,7 @@ #include "avatar.h" #include "color.h" #include "construction.h" +#include "coordinate_conversions.h" #include "debug.h" #include "game.h" #include "input.h" @@ -109,11 +110,13 @@ bool defense_game::init() robots = false; subspace = false; mercenaries = false; + allow_save = false; init_to_style( DEFENSE_EASY ); setup(); g->u.cash = initial_cash; popup_nowait( _( "Please wait as the map generates [ 0%% ]" ) ); // TODO: support multiple defense games? clean up old defense game + defloc_pos = tripoint( 50, 50, 0 ); init_map(); caravan(); return true; @@ -142,42 +145,74 @@ void defense_game::per_turn() void defense_game::pre_action( action_id &act ) { - if( act == ACTION_SLEEP && !sleep ) { - add_msg( m_info, _( "You don't need to sleep!" ) ); - act = ACTION_NULL; + std::string action_error_message; + bool leaving_defloc = false; + switch( act ) { + case ACTION_SLEEP: + if( !sleep ) { + action_error_message = _( "You don't need to sleep!" ); + } + break; + case ACTION_SAVE: + case ACTION_QUICKSAVE: + if( !allow_save ) { + action_error_message = _( "You cannot save in defense mode!" ); + } + break; + case ACTION_MOVE_N: + if( g->u.posy() == HALF_MAPSIZE_X && g->get_levy() <= 9 ) { + leaving_defloc = true; + } + break; + case ACTION_MOVE_NE: + if( ( g->u.posy() == HALF_MAPSIZE_Y && g->get_levy() <= 93 ) || + ( g->u.posx() == HALF_MAPSIZE_X + SEEX - 1 && g->get_levx() >= 98 ) ) { + leaving_defloc = true; + } + break; + case ACTION_MOVE_E: + if( g->u.posx() == HALF_MAPSIZE_X + SEEX - 1 && g->get_levx() >= 98 ) { + leaving_defloc = true; + } + break; + case ACTION_MOVE_SE: + if( ( g->u.posy() == HALF_MAPSIZE_Y + SEEY - 1 && g->get_levy() >= 98 ) || + ( g->u.posx() == HALF_MAPSIZE_X + SEEX - 1 && g->get_levx() >= 98 ) ) { + leaving_defloc = true; + } + break; + case ACTION_MOVE_S: + if( g->u.posy() == HALF_MAPSIZE_Y + SEEY - 1 && g->get_levy() >= 98 ) { + leaving_defloc = true; + } + break; + case ACTION_MOVE_SW: + if( ( g->u.posy() == HALF_MAPSIZE_Y + SEEY - 1 && g->get_levy() >= 98 ) || + ( g->u.posx() == HALF_MAPSIZE_X && g->get_levx() <= 93 ) ) { + leaving_defloc = true; + } + break; + case ACTION_MOVE_W: + if( g->u.posx() == HALF_MAPSIZE_X && + g->get_levx() <= 93 ) { + leaving_defloc = true; + } + break; + case ACTION_MOVE_NW: + if( ( g->u.posy() == HALF_MAPSIZE_Y && g->get_levy() <= 93 ) || + ( g->u.posx() == HALF_MAPSIZE_X && g->get_levx() <= 93 ) ) { + leaving_defloc = true; + } + break; + default: + break; } - if( act == ACTION_SAVE || act == ACTION_QUICKSAVE ) { - add_msg( m_info, _( "You cannot save in defense mode!" ) ); - act = ACTION_NULL; + if( leaving_defloc ) { + action_error_message = string_format( _( "You cannot leave the %s behind!" ), + defense_location_name( location ) ); } - - // Big ugly block for movement - if( ( act == ACTION_MOVE_N && g->u.posy() == HALF_MAPSIZE_X && - g->get_levy() <= 93 ) || - ( act == ACTION_MOVE_NE && ( ( g->u.posy() == HALF_MAPSIZE_Y && - g->get_levy() <= 93 ) || - ( g->u.posx() == HALF_MAPSIZE_X + SEEX - 1 && - g->get_levx() >= 98 ) ) ) || - ( act == ACTION_MOVE_E && g->u.posx() == HALF_MAPSIZE_X + SEEX - 1 && - g->get_levx() >= 98 ) || - ( act == ACTION_MOVE_SE && ( ( g->u.posy() == HALF_MAPSIZE_Y + SEEY - 1 && - g->get_levy() >= 98 ) || - ( g->u.posx() == HALF_MAPSIZE_X + SEEX - 1 && - g->get_levx() >= 98 ) ) ) || - ( act == ACTION_MOVE_S && g->u.posy() == HALF_MAPSIZE_Y + SEEY - 1 && - g->get_levy() >= 98 ) || - ( act == ACTION_MOVE_SW && ( ( g->u.posy() == HALF_MAPSIZE_Y + SEEY - 1 && - g->get_levy() >= 98 ) || - ( g->u.posx() == HALF_MAPSIZE_X && - g->get_levx() <= 93 ) ) ) || - ( act == ACTION_MOVE_W && g->u.posx() == HALF_MAPSIZE_X && - g->get_levx() <= 93 ) || - ( act == ACTION_MOVE_NW && ( ( g->u.posy() == HALF_MAPSIZE_Y && - g->get_levy() <= 93 ) || - ( g->u.posx() == HALF_MAPSIZE_X && - g->get_levx() <= 93 ) ) ) ) { - add_msg( m_info, _( "You cannot leave the %s behind!" ), - defense_location_name( location ) ); + if( !action_error_message.empty() ) { + add_msg( m_info, action_error_message ); act = ACTION_NULL; } } @@ -224,73 +259,32 @@ void defense_game::init_map() switch( location ) { case DEFLOC_NULL: case NUM_DEFENSE_LOCATIONS: + defloc_special = overmap_special_id( "house_two_story_basement" ); DebugLog( D_ERROR, D_GAME ) << "defense location is invalid: " << location; break; case DEFLOC_HOSPITAL: - starting_om.ter_set( { 51, 49, 0 }, oter_id( "road_end_north" ) ); - starting_om.ter_set( { 50, 50, 0 }, oter_id( "hospital_3_north" ) ); - starting_om.ter_set( { 51, 50, 0 }, oter_id( "hospital_2_north" ) ); - starting_om.ter_set( { 52, 50, 0 }, oter_id( "hospital_1_north" ) ); - starting_om.ter_set( { 50, 51, 0 }, oter_id( "hospital_6_north" ) ); - starting_om.ter_set( { 51, 51, 0 }, oter_id( "hospital_5_north" ) ); - starting_om.ter_set( { 52, 51, 0 }, oter_id( "hospital_4_north" ) ); - starting_om.ter_set( { 50, 52, 0 }, oter_id( "hospital_9_north" ) ); - starting_om.ter_set( { 51, 52, 0 }, oter_id( "hospital_8_north" ) ); - starting_om.ter_set( { 52, 52, 0 }, oter_id( "hospital_7_north" ) ); + defloc_special = overmap_special_id( "hospital" ); break; case DEFLOC_WORKS: - starting_om.ter_set( { 50, 52, 0 }, oter_id( "road_end_north" ) ); - starting_om.ter_set( { 50, 50, 0 }, oter_id( "public_works_NW_north" ) ); - starting_om.ter_set( { 51, 50, 0 }, oter_id( "public_works_NE_north" ) ); - starting_om.ter_set( { 50, 51, 0 }, oter_id( "public_works_SW_north" ) ); - starting_om.ter_set( { 51, 51, 0 }, oter_id( "public_works_SE_north" ) ); + defloc_special = overmap_special_id( "public_works" ); break; case DEFLOC_MALL: - for( int x = 49; x <= 51; x++ ) { - for( int y = 49; y <= 51; y++ ) { - starting_om.ter_set( { x, y, 0 }, oter_id( "megastore" ) ); - } - } - starting_om.ter_set( { 50, 49, 0 }, oter_id( "megastore_entrance" ) ); + defloc_special = overmap_special_id( "megastore" ); break; case DEFLOC_BAR: - starting_om.ter_set( { 50, 50, 0 }, oter_id( "bar_north" ) ); + defloc_special = overmap_special_id( "bar" ); break; case DEFLOC_MANSION: - starting_om.ter_set( { 49, 49, 0 }, oter_id( "mansion_c3_north" ) ); - starting_om.ter_set( { 50, 49, 0 }, oter_id( "mansion_e1_north" ) ); - starting_om.ter_set( { 51, 49, 0 }, oter_id( "mansion_c1_east" ) ); - starting_om.ter_set( { 49, 50, 0 }, oter_id( "mansion_t4_east" ) ); - starting_om.ter_set( { 50, 50, 0 }, oter_id( "mansion_+4_north" ) ); - starting_om.ter_set( { 51, 50, 0 }, oter_id( "mansion_t2_west" ) ); - starting_om.ter_set( { 49, 51, 0 }, oter_id( "mansion_c2_west" ) ); - starting_om.ter_set( { 50, 51, 0 }, oter_id( "mansion_t2_north" ) ); - starting_om.ter_set( { 51, 51, 0 }, oter_id( "mansion_c4_south" ) ); - starting_om.ter_set( { 49, 49, 1 }, oter_id( "mansion_c3u_north" ) ); - starting_om.ter_set( { 50, 49, 1 }, oter_id( "mansion_e1u_north" ) ); - starting_om.ter_set( { 51, 49, 1 }, oter_id( "mansion_c1u_east" ) ); - starting_om.ter_set( { 49, 50, 1 }, oter_id( "mansion_t4u_east" ) ); - starting_om.ter_set( { 50, 50, 1 }, oter_id( "mansion_+4u_north" ) ); - starting_om.ter_set( { 51, 50, 1 }, oter_id( "mansion_t2u_west" ) ); - starting_om.ter_set( { 49, 51, 1 }, oter_id( "mansion_c2u_west" ) ); - starting_om.ter_set( { 50, 51, 1 }, oter_id( "mansion_t2u_north" ) ); - starting_om.ter_set( { 51, 51, 1 }, oter_id( "mansion_c4u_south" ) ); - starting_om.ter_set( { 49, 49, -1 }, oter_id( "mansion_c3d_north" ) ); - starting_om.ter_set( { 50, 49, -1 }, oter_id( "mansion_e1d_north" ) ); - starting_om.ter_set( { 51, 49, -1 }, oter_id( "mansion_c1d_east" ) ); - starting_om.ter_set( { 49, 50, -1 }, oter_id( "mansion_t4d_east" ) ); - starting_om.ter_set( { 50, 50, -1 }, oter_id( "mansion_+4d_north" ) ); - starting_om.ter_set( { 51, 50, -1 }, oter_id( "mansion_t2d_west" ) ); - starting_om.ter_set( { 49, 51, -1 }, oter_id( "mansion_c2d_west" ) ); - starting_om.ter_set( { 50, 51, -1 }, oter_id( "mansion_t2d_north" ) ); - starting_om.ter_set( { 51, 51, -1 }, oter_id( "mansion_c4d_south" ) ); + defloc_special = overmap_special_id( "Mansion_Wild" ); break; } + starting_om.place_special_forced( defloc_special, defloc_pos, om_direction::type::north ); + starting_om.save(); // Init the map @@ -316,7 +310,7 @@ void defense_game::init_map() } } - g->load_map( tripoint( 100, 100, 0 ) ); + g->load_map( omt_to_sm_copy( defloc_pos ) ); g->u.setx( SEEX ); g->u.sety( SEEY ); @@ -360,6 +354,7 @@ void defense_game::init_to_style( defense_style new_style ) triffids = true; mercenaries = true; break; + case DEFENSE_MEDIUM: location = DEFLOC_MALL; initial_difficulty = 30; @@ -478,6 +473,8 @@ void defense_game::init_to_style( defense_style new_style ) hunger = true; thirst = true; sleep = true; + break; + } } @@ -487,6 +484,7 @@ void defense_game::setup() point( TERMX > FULL_SCREEN_WIDTH ? ( TERMX - FULL_SCREEN_WIDTH ) / 2 : 0, TERMY > FULL_SCREEN_HEIGHT ? ( TERMY - FULL_SCREEN_HEIGHT ) / 2 : 0 ) ); int selection = 1; + int selection_max = 20; refresh_setup( w, selection ); input_context ctxt( "DEFENSE_SETUP" ); @@ -511,7 +509,7 @@ void defense_game::setup() return; } } else if( action == "DOWN" ) { - if( selection == 19 ) { + if( selection == selection_max ) { selection = 1; } else { selection++; @@ -519,7 +517,7 @@ void defense_game::setup() refresh_setup( w, selection ); } else if( action == "UP" ) { if( selection == 1 ) { - selection = 19; + selection = selection_max; } else { selection--; } @@ -710,14 +708,14 @@ void defense_game::setup() if( action == "CONFIRM" ) { thirst = !thirst; } - mvwprintz( w, point( 16, 21 ), ( thirst ? c_light_green : c_yellow ), _( "Water" ) ); + mvwprintz( w, point( 14, 21 ), ( thirst ? c_light_green : c_yellow ), _( "Water" ) ); break; case 18: if( action == "CONFIRM" ) { sleep = !sleep; } - mvwprintz( w, point( 31, 21 ), ( sleep ? c_light_green : c_yellow ), _( "Sleep" ) ); + mvwprintz( w, point( 34, 21 ), ( sleep ? c_light_green : c_yellow ), _( "Sleep" ) ); break; case 19: @@ -726,6 +724,13 @@ void defense_game::setup() } mvwprintz( w, point( 46, 21 ), ( mercenaries ? c_light_green : c_yellow ), _( "Mercenaries" ) ); break; + + case 20: + if( action == "CONFIRM" ) { + allow_save = !allow_save; + } + mvwprintz( w, point( 59, 21 ), ( allow_save ? c_light_green : c_yellow ), _( "Allow save" ) ); + break; } } refresh_setup( w, selection ); @@ -735,45 +740,43 @@ void defense_game::setup() void defense_game::refresh_setup( const catacurses::window &w, int selection ) { werase( w ); - // NOLINTNEXTLINE(cata-use-named-point-constants) - mvwprintz( w, point( 1, 0 ), c_light_red, _( "DEFENSE MODE" ) ); - mvwprintz( w, point( 28, 0 ), c_light_red, _( "Press direction keys to cycle, ENTER to toggle" ) ); - mvwprintz( w, point( 28, 1 ), c_light_red, _( "Press S to start" ) ); - mvwprintz( w, point( 2, 2 ), c_light_gray, _( "Scenario:" ) ); + draw_border( w, c_light_gray, _( "DEFENSE MODE" ), c_light_red ); + mvwprintz( w, point( 2, 1 ), c_light_red, + _( "Press direction keys to cycle, ENTER to toggle, S to start" ) ); + mvwprintz( w, point( 2, 2 ), c_white, _( "Scenario:" ) ); mvwprintz( w, point( 2, 3 ), SELCOL( 1 ), defense_style_name( style ) ); mvwprintz( w, point( 28, 3 ), c_light_gray, defense_style_description( style ) ); - mvwprintz( w, point( 2, 4 ), c_light_gray, _( "Location:" ) ); + mvwprintz( w, point( 2, 4 ), c_white, _( "Location:" ) ); mvwprintz( w, point( 2, 5 ), SELCOL( 2 ), defense_location_name( location ) ); mvwprintz( w, point( 28, 5 ), c_light_gray, defense_location_description( location ) ); - mvwprintz( w, point( 2, 7 ), c_light_gray, _( "Initial Difficulty:" ) ); - mvwprintz( w, point( NUMALIGN( initial_difficulty ), 7 ), SELCOL( 3 ), "%d", - initial_difficulty ); + mvwprintz( w, point( 2, 7 ), c_white, _( "Initial Difficulty:" ) ); + mvwprintz( w, point( NUMALIGN( initial_difficulty ), 7 ), SELCOL( 3 ), "%d", initial_difficulty ); mvwprintz( w, point( 28, 7 ), c_light_gray, _( "The difficulty of the first wave." ) ); - mvwprintz( w, point( 2, 8 ), c_light_gray, _( "Wave Difficulty:" ) ); + mvwprintz( w, point( 2, 8 ), c_white, _( "Wave Difficulty:" ) ); mvwprintz( w, point( NUMALIGN( wave_difficulty ), 8 ), SELCOL( 4 ), "%d", wave_difficulty ); mvwprintz( w, point( 28, 8 ), c_light_gray, _( "The increase of difficulty with each wave." ) ); - mvwprintz( w, point( 2, 10 ), c_light_gray, _( "Time b/w Waves:" ) ); + mvwprintz( w, point( 2, 10 ), c_white, _( "Time b/w Waves:" ) ); mvwprintz( w, point( NUMALIGN( to_minutes( time_between_waves ) ), 10 ), SELCOL( 5 ), "%d", to_minutes( time_between_waves ) ); mvwprintz( w, point( 28, 10 ), c_light_gray, _( "The time, in minutes, between waves." ) ); - mvwprintz( w, point( 2, 11 ), c_light_gray, _( "Waves b/w Caravans:" ) ); + mvwprintz( w, point( 2, 11 ), c_white, _( "Waves b/w Caravans:" ) ); mvwprintz( w, point( NUMALIGN( waves_between_caravans ), 11 ), SELCOL( 6 ), "%d", waves_between_caravans ); mvwprintz( w, point( 28, 11 ), c_light_gray, _( "The number of waves in between caravans." ) ); - mvwprintz( w, point( 2, 13 ), c_light_gray, _( "Initial Cash:" ) ); + mvwprintz( w, point( 2, 13 ), c_white, _( "Initial Cash:" ) ); mvwprintz( w, point( NUMALIGN( initial_cash ), 13 ), SELCOL( 7 ), "%d", initial_cash / 100 ); mvwprintz( w, point( 28, 13 ), c_light_gray, _( "The amount of money the player starts with." ) ); - mvwprintz( w, point( 2, 14 ), c_light_gray, _( "Cash for 1st Wave:" ) ); + mvwprintz( w, point( 2, 14 ), c_white, _( "Cash for 1st Wave:" ) ); mvwprintz( w, point( NUMALIGN( cash_per_wave ), 14 ), SELCOL( 8 ), "%d", cash_per_wave / 100 ); mvwprintz( w, point( 28, 14 ), c_light_gray, _( "The cash awarded for the first wave." ) ); - mvwprintz( w, point( 2, 15 ), c_light_gray, _( "Cash Increase:" ) ); + mvwprintz( w, point( 2, 15 ), c_white, _( "Cash Increase:" ) ); mvwprintz( w, point( NUMALIGN( cash_increase ), 15 ), SELCOL( 9 ), "%d", cash_increase / 100 ); mvwprintz( w, point( 28, 15 ), c_light_gray, _( "The increase in the award each wave." ) ); - mvwprintz( w, point( 2, 17 ), c_light_gray, _( "Enemy Selection:" ) ); + mvwprintz( w, point( 2, 17 ), c_white, _( "Enemy Selection:" ) ); mvwprintz( w, point( 2, 18 ), TOGCOL( 10, zombies ), _( "Zombies" ) ); mvwprintz( w, point( 14, 18 ), TOGCOL( 11, specials ), _( "Special Zombies" ) ); mvwprintz( w, point( 34, 18 ), TOGCOL( 12, spiders ), _( "Spiders" ) ); @@ -781,11 +784,12 @@ void defense_game::refresh_setup( const catacurses::window &w, int selection ) mvwprintz( w, point( 59, 18 ), TOGCOL( 14, robots ), _( "Robots" ) ); mvwprintz( w, point( 70, 18 ), TOGCOL( 15, subspace ), _( "Subspace" ) ); - mvwprintz( w, point( 2, 20 ), c_light_gray, _( "Needs:" ) ); + mvwprintz( w, point( 2, 20 ), c_white, _( "Needs:" ) ); mvwprintz( w, point( 2, 21 ), TOGCOL( 16, hunger ), _( "Food" ) ); - mvwprintz( w, point( 16, 21 ), TOGCOL( 17, thirst ), _( "Water" ) ); - mvwprintz( w, point( 31, 21 ), TOGCOL( 18, sleep ), _( "Sleep" ) ); + mvwprintz( w, point( 14, 21 ), TOGCOL( 17, thirst ), _( "Water" ) ); + mvwprintz( w, point( 34, 21 ), TOGCOL( 18, sleep ), _( "Sleep" ) ); mvwprintz( w, point( 46, 21 ), TOGCOL( 19, mercenaries ), _( "Mercenaries" ) ); + mvwprintz( w, point( 59, 21 ), TOGCOL( 20, allow_save ), _( "Allow save" ) ); wrefresh( w ); } diff --git a/src/gamemode_defense.h b/src/gamemode_defense.h new file mode 100644 index 0000000000000..0c787b346634c --- /dev/null +++ b/src/gamemode_defense.h @@ -0,0 +1,131 @@ +#pragma once +#ifndef GAMEMODE_DEFENSE_H +#define GAMEMODE_DEFENSE_H + +#include + +#include "gamemode.h" +#include "calendar.h" +#include "point.h" +#include "omdata.h" +#include "type_id.h" + +enum action_id : int; +using itype_id = std::string; + +enum defense_style { + DEFENSE_CUSTOM = 0, + DEFENSE_EASY, + DEFENSE_MEDIUM, + DEFENSE_HARD, + DEFENSE_SHAUN, + DEFENSE_DAWN, + DEFENSE_SPIDERS, + DEFENSE_TRIFFIDS, + DEFENSE_SKYNET, + DEFENSE_LOVECRAFT, + NUM_DEFENSE_STYLES +}; + +enum defense_location { + DEFLOC_NULL = 0, + DEFLOC_HOSPITAL, + DEFLOC_WORKS, + DEFLOC_MALL, + DEFLOC_BAR, + DEFLOC_MANSION, + NUM_DEFENSE_LOCATIONS +}; + +enum caravan_category { + CARAVAN_CART = 0, + CARAVAN_MELEE, + CARAVAN_RANGED, + CARAVAN_AMMUNITION, + CARAVAN_COMPONENTS, + CARAVAN_FOOD, + CARAVAN_CLOTHES, + CARAVAN_TOOLS, + NUM_CARAVAN_CATEGORIES +}; + +struct defense_game : public special_game { + defense_game(); + + special_game_id id() override { + return SGAME_DEFENSE; + } + bool init() override; + void per_turn() override; + void pre_action( action_id &act ) override; + void post_action( action_id act ) override; + void game_over() override; + + private: + void init_to_style( defense_style new_style ); + + void setup(); + void refresh_setup( const catacurses::window &w, int selection ); + void init_mtypes(); + void init_constructions(); + void init_map(); + + void spawn_wave(); + void caravan(); + std::vector pick_monster_wave(); + void spawn_wave_monster( const mtype_id &type ); + + std::string special_wave_message( std::string name ); + + int current_wave; + + // What type of game is it? + defense_style style; + // Where are we? + defense_location location; + + // Total "level" of monsters in first wave + int initial_difficulty; + // Increased "level" of monsters per wave + int wave_difficulty; + + // Cooldown / building / healing time + time_duration time_between_waves; + // How many waves until we get to trade? + int waves_between_caravans; + + // How much cash do we start with? + int initial_cash; + // How much cash do we get per wave? + int cash_per_wave; + // How much does the above increase per wave? + int cash_increase; + + bool zombies; + bool specials; + bool spiders; + bool triffids; + bool robots; + bool subspace; + + // Do we need to fulfill hunger? + bool hunger; + // Do we need to fulfill thirst? + bool thirst; + // Do we need to sleep? + bool sleep; + + // Do caravans offer the option of hiring a mercenary? + bool mercenaries; + + // Allow save + bool allow_save; + + // Start defence location position on overmap + tripoint defloc_pos; + + // Defense location special + overmap_special_id defloc_special; +}; + +#endif // GAMEMODE_DEFENSE_H diff --git a/src/tutorial.cpp b/src/gamemode_tutorial.cpp similarity index 98% rename from src/tutorial.cpp rename to src/gamemode_tutorial.cpp index 53e9ab123b9a0..b3e36b3dd3d7e 100644 --- a/src/tutorial.cpp +++ b/src/gamemode_tutorial.cpp @@ -1,15 +1,13 @@ -#include "tutorial.h" +#include "gamemode_tutorial.h" // IWYU pragma: associated #include -#include -#include #include #include "action.h" #include "avatar.h" #include "coordinate_conversions.h" #include "game.h" -#include "gamemode.h" +#include "gamemode_tutorial.h" #include "json.h" #include "map.h" #include "map_iterator.h" diff --git a/src/gamemode_tutorial.h b/src/gamemode_tutorial.h new file mode 100644 index 0000000000000..07d2543cc3a50 --- /dev/null +++ b/src/gamemode_tutorial.h @@ -0,0 +1,56 @@ +#pragma once +#ifndef GAMEMODE_TUTORIAL_H +#define GAMEMODE_TUTORIAL_H + +#include "gamemode.h" + +enum special_game_id : int; +enum action_id : int; + +enum tut_lesson { + LESSON_INTRO, + LESSON_MOVE, LESSON_LOOK, LESSON_OPEN, LESSON_CLOSE, LESSON_SMASH, + LESSON_WINDOW, LESSON_PICKUP, LESSON_EXAMINE, LESSON_INTERACT, + + LESSON_FULL_INV, LESSON_WIELD_NO_SPACE, LESSON_AUTOWIELD, LESSON_ITEM_INTO_INV, + LESSON_GOT_ARMOR, LESSON_GOT_WEAPON, LESSON_GOT_FOOD, LESSON_GOT_TOOL, + LESSON_GOT_GUN, LESSON_GOT_AMMO, LESSON_WORE_ARMOR, LESSON_WORE_STORAGE, + LESSON_WORE_MASK, + + LESSON_WEAPON_INFO, LESSON_HIT_MONSTER, LESSON_PAIN, LESSON_BUTCHER, + + LESSON_TOOK_PAINKILLER, LESSON_TOOK_CIG, LESSON_DRANK_WATER, + + LESSON_ACT_GRENADE, LESSON_ACT_BUBBLEWRAP, + + LESSON_OVERLOADED, + + LESSON_GUN_LOAD, LESSON_GUN_FIRE, LESSON_RECOIL, + + LESSON_STAIRS, LESSON_DARK_NO_FLASH, LESSON_DARK, LESSON_PICKUP_WATER, + + NUM_LESSONS +}; + +struct tutorial_game : public special_game { + special_game_id id() override { + return SGAME_TUTORIAL; + } + bool init() override; + void per_turn() override; + void pre_action( action_id &act ) override; + void post_action( action_id act ) override; + void game_over() override { } + + private: + void add_message( tut_lesson lesson ); + + bool tutorials_seen[NUM_LESSONS] = {}; +}; + +class JsonObject; + +void load_tutorial_messages( const JsonObject &jo ); +void clear_tutorial_messages(); + +#endif // GAMEMODE_TUTORIAL_H diff --git a/src/generic_factory.h b/src/generic_factory.h index 0ac1ca1f84141..20b080d997190 100644 --- a/src/generic_factory.h +++ b/src/generic_factory.h @@ -833,6 +833,38 @@ class auto_flags_reader : public generic_typed_reader; +class volume_reader : public generic_typed_reader +{ + public: + bool operator()( const JsonObject &jo, const std::string &member_name, + units::volume &member, bool /* was_loaded */ ) const { + if( !jo.has_member( member_name ) ) { + return false; + } + member = read_from_json_string( *jo.get_raw( member_name ), units::volume_units ); + return true; + } + units::volume get_next( JsonIn &jin ) const { + return read_from_json_string( jin, units::volume_units ); + } +}; + +class mass_reader : public generic_typed_reader +{ + public: + bool operator()( const JsonObject &jo, const std::string &member_name, + units::mass &member, bool /* was_loaded */ ) const { + if( !jo.has_member( member_name ) ) { + return false; + } + member = read_from_json_string( *jo.get_raw( member_name ), units::mass_units ); + return true; + } + units::mass get_next( JsonIn &jin ) const { + return read_from_json_string( jin, units::mass_units ); + } +}; + /** * Uses a map (unordered or standard) to convert strings from JSON to some other type * (the mapped type of the map: `C::mapped_type`). It works for all mapped types, not just enums. diff --git a/src/handle_action.cpp b/src/handle_action.cpp index b7cbb8c732645..99eddb35a34a9 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -574,7 +574,7 @@ static void grab() you.grab( OBJECT_VEHICLE, grabp - you.pos() ); add_msg( _( "You grab the %s." ), vp->vehicle().name ); } else if( m.has_furn( grabp ) ) { // If not, grab furniture if present - if( m.furn( grabp ).obj().move_str_req < 0 ) { + if( !m.furn( grabp ).obj().is_movable() ) { add_msg( _( "You can not grab the %s" ), m.furnname( grabp ) ); return; } @@ -675,7 +675,7 @@ static void smash() maybe_corpse.get_mtype()->has_flag( MF_REVIVES ) ) { // do activity forever. ACT_PULP stops itself u.assign_activity( activity_id( "ACT_PULP" ), calendar::INDEFINITELY_LONG, 0 ); - u.activity.placement = smashp; + u.activity.placement = g->m.getabs( smashp ); return; // don't smash terrain if we've smashed a corpse } } @@ -692,7 +692,7 @@ static void smash() u.handle_melee_wear( u.weapon ); const int mod_sta = ( ( u.weapon.weight() / 10_gram ) + 200 + static_cast ( get_option( "PLAYER_BASE_STAMINA_REGEN_RATE" ) ) ) * -1; - u.mod_stat( "stamina", mod_sta ); + u.mod_stamina( mod_sta ); if( u.get_skill_level( skill_melee ) == 0 ) { u.practice( skill_melee, rng( 0, 1 ) * rng( 0, 1 ) ); } @@ -976,9 +976,10 @@ static void sleep() as_m.reset(); as_m.text = can_hibernate ? - _( "You're engorged to hibernate. The alarm would only attract attention. Set an alarm anyway?" + - deaf_text ) : - _( "You have an alarm clock. Set an alarm?" + deaf_text ); + _( "You're engorged to hibernate. The alarm would only attract attention. " + "Set an alarm anyway?" ) : + _( "You have an alarm clock. Set an alarm?" ); + as_m.text += deaf_text; as_m.entries.emplace_back( 0, true, get_option( "FORCE_CAPITAL_YN" ) ? 'N' : 'n', @@ -1926,12 +1927,14 @@ bool game::handle_action() break; case ACTION_MEND: - mend(); + avatar_action::mend( g->u, item_location() ); break; - case ACTION_THROW: - avatar_action::plthrow( g->u ); + case ACTION_THROW: { + item_location loc; + avatar_action::plthrow( g->u, loc ); break; + } case ACTION_FIRE: fire(); @@ -2105,7 +2108,7 @@ bool game::handle_action() case ACTION_IGNORE_ENEMY: if( safe_mode == SAFE_MODE_STOP ) { add_msg( m_info, _( "Ignoring enemy!" ) ); - for( auto &elem : new_seen_mon ) { + for( auto &elem : u.get_mon_visible().new_seen_mon ) { monster &critter = *elem; critter.ignoring = rl_dist( u.pos(), critter.pos() ); } diff --git a/src/handle_liquid.cpp b/src/handle_liquid.cpp index 58d75755b5814..cfdad43df3832 100644 --- a/src/handle_liquid.cpp +++ b/src/handle_liquid.cpp @@ -1,7 +1,7 @@ #include "handle_liquid.h" -#include -#include +#include +#include #include #include #include diff --git a/src/harvest.cpp b/src/harvest.cpp index 4d1db71646bb7..cc29a1e18029f 100644 --- a/src/harvest.cpp +++ b/src/harvest.cpp @@ -85,9 +85,7 @@ const harvest_id &harvest_list::load( const JsonObject &jo, const std::string &s ret.message_ = jo.get_string( "message" ); } - JsonArray jo_entries = jo.get_array( "entries" ); - while( jo_entries.has_more() ) { - JsonObject current_entry = jo_entries.next_object(); + for( const JsonObject ¤t_entry : jo.get_array( "entries" ) ) { ret.entries_.push_back( harvest_entry::load( current_entry, src ) ); } diff --git a/src/iexamine.cpp b/src/iexamine.cpp index 083ad7a15bd00..204d4a4ed327b 100644 --- a/src/iexamine.cpp +++ b/src/iexamine.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -743,7 +742,51 @@ void iexamine::elevator( player &p, const tripoint &examp ) return; } int movez = ( examp.z < 0 ? 2 : -2 ); + + tripoint original_floor_omt = ms_to_omt_copy( g->m.getabs( examp ) ); + tripoint new_floor_omt = original_floor_omt + tripoint( point_zero, movez ); + + // first find critters in the destination elevator and move them out of the way + for( Creature &critter : g->all_creatures() ) { + if( critter.is_player() ) { + continue; + } else if( g->m.ter( critter.pos() ) == ter_id( "t_elevator" ) ) { + tripoint critter_omt = ms_to_omt_copy( g->m.getabs( critter.pos() ) ); + if( critter_omt == new_floor_omt ) { + for( const tripoint &candidate : closest_tripoints_first( 10, critter.pos() ) ) { + if( g->m.ter( candidate ) != ter_id( "t_elevator" ) && + g->m.passable( candidate ) && + !g->critter_at( candidate ) ) { + critter.setpos( candidate ); + break; + } + } + } + } + } + + // move the player g->vertical_move( movez, false ); + + // finally, bring along everyone who was in the elevator with the player + for( Creature &critter : g->all_creatures() ) { + if( critter.is_player() ) { + continue; + } else if( g->m.ter( critter.pos() ) == ter_id( "t_elevator" ) ) { + tripoint critter_omt = ms_to_omt_copy( g->m.getabs( critter.pos() ) ); + + if( critter_omt == original_floor_omt ) { + for( const tripoint &candidate : closest_tripoints_first( 10, p.pos() ) ) { + if( g->m.ter( candidate ) == ter_id( "t_elevator" ) && + candidate != p.pos() && + !g->critter_at( candidate ) ) { + critter.setpos( candidate ); + break; + } + } + } + } + } } /** @@ -1118,7 +1161,7 @@ void iexamine::slot_machine( player &p, const tripoint & ) add_msg( m_info, _( "You need $%d to play." ), price ); break; } - if( !query_yn( _( played ? "Play again for $%d?" : "Insert $%d?" ), price ) ) { + if( !query_yn( played ? _( "Play again for $%d?" ) : _( "Insert $%d?" ), price ) ) { break; } p.cash -= cents( price ); @@ -5160,7 +5203,6 @@ void iexamine::quern_examine( player &p, const tripoint &examp ) return; } - std::stringstream pop; time_duration time_left = 0_turns; int hours_left = 0; int minutes_left = 0; @@ -5215,39 +5257,37 @@ void iexamine::quern_examine( player &p, const tripoint &examp ) switch( smenu.ret ) { case 0: { //inspect mill + std::string pop; if( active ) { - pop << "" << _( "There's a mill here. It is turning and milling." ) << "" - << "\n"; + pop = colorize( _( "There's a mill here. It is turning and milling." ), c_green ) + "\n"; if( time_left > 0_turns ) { if( minutes_left > 60 ) { - pop << string_format( ngettext( "It will finish milling in about %d hour.", + pop += string_format( ngettext( "It will finish milling in about %d hour.", "It will finish milling in about %d hours.", - hours_left ), hours_left ) << "\n\n "; + hours_left ), hours_left ) + "\n\n"; } else if( minutes_left > 30 ) { - pop << _( "It will finish milling in less than an hour." ); + pop += _( "It will finish milling in less than an hour." ); } else { - pop << string_format( _( "It should take about %d minutes to finish milling." ), minutes_left ); + pop += string_format( _( "It should take about %d minutes to finish milling." ), minutes_left ); } } } else { - pop << "" << _( "There's a mill here." ) << "" << "\n"; + pop += colorize( _( "There's a mill here." ), c_green ) + "\n"; } - pop << "" << _( "You inspect its contents and find: " ) << "" << "\n\n "; + pop += colorize( _( "You inspect its contents and find: " ), c_green ) + "\n\n"; if( items_here.empty() ) { - pop << _( "…that it is empty." ); + pop += _( "…that it is empty." ); } else { for( const item &it : items_here ) { if( it.typeId() == "fake_milling_item" ) { - pop << "\n " << "" << _( "You see some grains that are not yet milled to fine flour." ) - << "" << - "\n "; + pop += "\n" + colorize( _( "You see some grains that are not yet milled to fine flour." ), + c_red ) + "\n"; continue; } - pop << "-> " << item::nname( it.typeId(), it.charges ); - pop << " (" << std::to_string( it.charges ) << ")\n "; + pop += "-> " + item::nname( it.typeId(), it.charges ) + " (" + std::to_string( it.charges ) + ")\n"; } } - popup( pop.str(), PF_NONE ); + popup( pop, PF_NONE ); break; } case 1: @@ -5330,7 +5370,6 @@ void iexamine::smoker_options( player &p, const tripoint &examp ) } bool rem_f_opt = false; - std::stringstream pop; time_duration time_left = 0_turns; int hours_left = 0; int minutes_left = 0; @@ -5422,39 +5461,37 @@ void iexamine::smoker_options( player &p, const tripoint &examp ) switch( smenu.ret ) { case 0: { //inspect smoking rack + std::string pop; if( active ) { - pop << "" << _( "There's a smoking rack here. It is lit and smoking." ) << "" - << "\n"; + pop += colorize( _( "There's a smoking rack here. It is lit and smoking." ), c_green ) + "\n"; if( time_left > 0_turns ) { if( minutes_left > 60 ) { - pop << string_format( ngettext( "It will finish smoking in about %d hour.", + pop += string_format( ngettext( "It will finish smoking in about %d hour.", "It will finish smoking in about %d hours.", - hours_left ), hours_left ) << "\n\n "; + hours_left ), hours_left ) + "\n\n"; } else if( minutes_left > 30 ) { - pop << _( "It will finish smoking in less than an hour." ) << "\n "; + pop += _( "It will finish smoking in less than an hour." ) + std::string( "\n" ); } else { - pop << string_format( _( "It should take about %d minutes to finish smoking." ), - minutes_left ) << "\n "; + pop += string_format( _( "It should take about %d minutes to finish smoking." ), + minutes_left ) + "\n "; } } } else { - pop << "" << _( "There's a smoking rack here." ) << "" << "\n"; + pop += colorize( _( "There's a smoking rack here." ), c_green ) + "\n"; } - pop << "" << _( "You inspect its contents and find: " ) << "" << "\n\n "; + pop += colorize( _( "You inspect its contents and find: " ), c_green ) + "\n"; if( items_here.empty() ) { - pop << _( "…that it is empty." ); + pop += _( "…that it is empty." ); } else { for( const item &it : items_here ) { if( it.typeId() == "fake_smoke_plume" ) { - pop << "\n " << "" << _( "You see some smoldering embers there." ) << "" << - "\n "; + pop += "\n" + colorize( _( "You see some smoldering embers there." ), c_red ) + "\n"; continue; } - pop << "-> " << item::nname( it.typeId(), it.charges ); - pop << " (" << std::to_string( it.charges ) << ")\n "; + pop += "-> " + item::nname( it.typeId(), it.charges ) + " (" + std::to_string( it.charges ) + ")\n"; } } - popup( pop.str(), PF_NONE ); + popup( pop, PF_NONE ); break; } case 1: diff --git a/src/init.cpp b/src/init.cpp index 70fa9ffed1cbf..9ac4d539ec4fb 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -71,7 +71,7 @@ #include "string_formatter.h" #include "text_snippets.h" #include "trap.h" -#include "tutorial.h" +#include "gamemode_tutorial.h" #include "veh_type.h" #include "vehicle_group.h" #include "vitamin.h" diff --git a/src/input.cpp b/src/input.cpp index 597c1ee9d6819..488752476348a 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -217,11 +217,8 @@ void input_manager::load( const std::string &file_name, bool is_user_preferences actions[action_id].name = action.get_string( "name" ); } - // Iterate over the bindings JSON array - JsonArray bindings = action.get_array( "bindings" ); t_input_event_list events; - while( bindings.has_more() ) { - JsonObject keybinding = bindings.next_object(); + for( const JsonObject &keybinding : action.get_array( "bindings" ) ) { std::string input_method = keybinding.get_string( "input_method" ); input_event new_event; if( input_method == "keyboard" ) { @@ -233,11 +230,8 @@ void input_manager::load( const std::string &file_name, bool is_user_preferences } if( keybinding.has_array( "key" ) ) { - JsonArray keys = keybinding.get_array( "key" ); - while( keys.has_more() ) { - new_event.sequence.push_back( - get_keycode( keys.next_string() ) - ); + for( const std::string &line : keybinding.get_array( "key" ) ) { + new_event.sequence.push_back( get_keycode( line ) ); } } else { // assume string if not array, and throw if not string new_event.sequence.push_back( diff --git a/src/inventory_ui.cpp b/src/inventory_ui.cpp index e078ceebe2e82..fbc8c9f4f17c9 100644 --- a/src/inventory_ui.cpp +++ b/src/inventory_ui.cpp @@ -1608,7 +1608,7 @@ void inventory_selector::draw_footer( const catacurses::window &w ) const } } -inventory_selector::inventory_selector( const player &u, const inventory_selector_preset &preset ) +inventory_selector::inventory_selector( player &u, const inventory_selector_preset &preset ) : u( u ) , preset( preset ) , ctxt( "INVENTORY" ) @@ -1838,7 +1838,7 @@ item_location inventory_pick_selector::execute() } } -inventory_multiselector::inventory_multiselector( const player &p, +inventory_multiselector::inventory_multiselector( player &p, const inventory_selector_preset &preset, const std::string &selection_column_title ) : inventory_selector( p, preset ), @@ -1867,7 +1867,7 @@ void inventory_multiselector::on_entry_add( const inventory_entry &entry ) } } -inventory_compare_selector::inventory_compare_selector( const player &p ) : +inventory_compare_selector::inventory_compare_selector( player &p ) : inventory_multiselector( p, default_preset, _( "ITEMS TO COMPARE" ) ) {} std::pair inventory_compare_selector::execute() @@ -1929,7 +1929,7 @@ void inventory_compare_selector::toggle_entry( inventory_entry *entry ) } inventory_iuse_selector::inventory_iuse_selector( - const player &p, + player &p, const std::string &selector_title, const inventory_selector_preset &preset, const GetStats &get_st @@ -1938,8 +1938,7 @@ inventory_iuse_selector::inventory_iuse_selector( get_stats( get_st ), max_chosen_count( std::numeric_limits::max() ) {} - -std::list> inventory_iuse_selector::execute() +drop_locations inventory_iuse_selector::execute() { int count = 0; while( true ) { @@ -1984,7 +1983,7 @@ std::list> inventory_iuse_selector::execute() } break; } else if( input.action == "QUIT" ) { - return std::list >(); + return drop_locations(); } else if( input.action == "INVENTORY_FILTER" ) { set_filter(); } else { @@ -1993,11 +1992,11 @@ std::list> inventory_iuse_selector::execute() } } - std::list> dropped_pos_and_qty; + drop_locations dropped_pos_and_qty; - for( auto use_pair : to_use ) { - dropped_pos_and_qty.push_back( std::make_pair( u.get_item_position( use_pair.first ), - use_pair.second ) ); + for( const std::pair &use_pair : to_use ) { + item_location loc( u, const_cast( use_pair.first ) ); + dropped_pos_and_qty.push_back( std::make_pair( loc, use_pair.second ) ); } return dropped_pos_and_qty; @@ -2029,7 +2028,7 @@ inventory_selector::stats inventory_iuse_selector::get_raw_stats() const return stats{{ stat{{ "", "", "", "" }}, stat{{ "", "", "", "" }} }}; } -inventory_drop_selector::inventory_drop_selector( const player &p, +inventory_drop_selector::inventory_drop_selector( player &p, const inventory_selector_preset &preset ) : inventory_multiselector( p, preset, _( "ITEMS TO DROP" ) ), max_chosen_count( std::numeric_limits::max() ) @@ -2060,7 +2059,7 @@ void inventory_drop_selector::process_selected( int &count, count = 0; } -std::list> inventory_drop_selector::execute() +drop_locations inventory_drop_selector::execute() { int count = 0; while( true ) { @@ -2132,7 +2131,7 @@ std::list> inventory_drop_selector::execute() } break; } else if( input.action == "QUIT" ) { - return std::list >(); + return drop_locations(); } else if( input.action == "INVENTORY_FILTER" ) { set_filter(); } else if( input.action == "TOGGLE_FAVORITE" ) { @@ -2143,11 +2142,11 @@ std::list> inventory_drop_selector::execute() } } - std::list> dropped_pos_and_qty; + drop_locations dropped_pos_and_qty; - for( auto drop_pair : dropping ) { - dropped_pos_and_qty.push_back( std::make_pair( u.get_item_position( drop_pair.first ), - drop_pair.second ) ); + for( const std::pair &drop_pair : dropping ) { + item_location loc( u, const_cast( drop_pair.first ) ); + dropped_pos_and_qty.push_back( std::make_pair( loc, drop_pair.second ) ); } return dropped_pos_and_qty; diff --git a/src/inventory_ui.h b/src/inventory_ui.h index 2faa88ef67bca..b2829064fded7 100644 --- a/src/inventory_ui.h +++ b/src/inventory_ui.h @@ -2,7 +2,7 @@ #ifndef INVENTORY_UI_H #define INVENTORY_UI_H -#include +#include #include #include #include @@ -41,6 +41,9 @@ enum class scroll_direction : int { struct navigation_mode_data; struct inventory_input; +using drop_location = std::pair; +using drop_locations = std::list; + class inventory_entry { public: @@ -420,7 +423,7 @@ class selection_column : public inventory_column class inventory_selector { public: - inventory_selector( const player &u, const inventory_selector_preset &preset = default_preset ); + inventory_selector( player &u, const inventory_selector_preset &preset = default_preset ); ~inventory_selector(); /** These functions add items from map / vehicles. */ void add_character_items( Character &character ); @@ -453,7 +456,7 @@ class inventory_selector bool keep_open = false; protected: - const player &u; + player &u; const inventory_selector_preset &preset; /** @@ -622,7 +625,7 @@ inventory_selector::stat display_stat( const std::string &caption, int cur_value class inventory_pick_selector : public inventory_selector { public: - inventory_pick_selector( const player &p, + inventory_pick_selector( player &p, const inventory_selector_preset &preset = default_preset ) : inventory_selector( p, preset ) {} @@ -632,7 +635,7 @@ class inventory_pick_selector : public inventory_selector class inventory_multiselector : public inventory_selector { public: - inventory_multiselector( const player &p, const inventory_selector_preset &preset = default_preset, + inventory_multiselector( player &p, const inventory_selector_preset &preset = default_preset, const std::string &selection_column_title = "" ); protected: void rearrange_columns( size_t client_width ) override; @@ -645,7 +648,7 @@ class inventory_multiselector : public inventory_selector class inventory_compare_selector : public inventory_multiselector { public: - inventory_compare_selector( const player &p ); + inventory_compare_selector( player &p ); std::pair execute(); protected: @@ -660,11 +663,11 @@ class inventory_iuse_selector : public inventory_multiselector { public: using GetStats = std::function & )>; - inventory_iuse_selector( const player &p, + inventory_iuse_selector( player &p, const std::string &selector_title, const inventory_selector_preset &preset = default_preset, const GetStats & = {} ); - std::list> execute(); + drop_locations execute(); protected: stats get_raw_stats() const override; @@ -679,9 +682,9 @@ class inventory_iuse_selector : public inventory_multiselector class inventory_drop_selector : public inventory_multiselector { public: - inventory_drop_selector( const player &p, + inventory_drop_selector( player &p, const inventory_selector_preset &preset = default_preset ); - std::list> execute(); + drop_locations execute(); protected: stats get_raw_stats() const override; diff --git a/src/item.cpp b/src/item.cpp index 59d36daa9025b..8a3e7a54bfd95 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -1241,10 +1241,7 @@ void item::basic_info( std::vector &info, const iteminfo_query *parts, active ) ); info.push_back( iteminfo( "BASE", _( "burn: " ), "", iteminfo::lower_is_better, burnt ) ); - std::ostringstream stream; - std::copy( item_tags.begin(), item_tags.end(), - std::ostream_iterator( stream, "," ) ); - std::string tags_listed = stream.str(); + const std::string tags_listed = enumerate_as_string( item_tags, enumeration_conjunction::none ); info.push_back( iteminfo( "BASE", string_format( _( "tags: %s" ), tags_listed ) ) ); for( auto const &imap : item_vars ) { info.push_back( iteminfo( "BASE", @@ -1325,12 +1322,38 @@ void item::med_info( const item *med_item, std::vector &info, const it void item::food_info( const item *food_item, std::vector &info, const iteminfo_query *parts, int batch, bool debug ) const { - const nutrients nutr = g->u.compute_effective_nutrients( *food_item ); + nutrients min_nutr; + nutrients max_nutr; + + std::string recipe_exemplar = get_var( "recipe_exemplar", "" ); + if( recipe_exemplar.empty() ) { + min_nutr = max_nutr = g->u.compute_effective_nutrients( *food_item ); + } else { + std::tie( min_nutr, max_nutr ) = + g->u.compute_nutrient_range( *food_item, recipe_id( recipe_exemplar ) ); + } + + bool show_nutr = parts->test( iteminfo_parts::FOOD_NUTRITION ) || + parts->test( iteminfo_parts::FOOD_VITAMINS ); + if( min_nutr != max_nutr && show_nutr ) { + info.emplace_back( + "FOOD", _( "Nutrition will vary with chosen ingredients." ) ); + if( recipe_dict.is_item_on_loop( food_item->typeId() ) ) { + info.emplace_back( + "FOOD", _( "Nutrition range cannot be calculated accurately due to " + "recipe loops." ) ); + } + } + const std::string space = " "; - if( nutr.kcal != 0 || food_item->get_comestible()->quench != 0 ) { + if( max_nutr.kcal != 0 || food_item->get_comestible()->quench != 0 ) { if( parts->test( iteminfo_parts::FOOD_NUTRITION ) ) { info.push_back( iteminfo( "FOOD", _( "Calories (kcal): " ), - "", iteminfo::no_newline, nutr.kcal ) ); + "", iteminfo::no_newline, min_nutr.kcal ) ); + if( max_nutr.kcal != min_nutr.kcal ) { + info.push_back( iteminfo( "FOOD", _( "-" ), + "", iteminfo::no_newline, max_nutr.kcal ) ); + } } if( parts->test( iteminfo_parts::FOOD_QUENCH ) ) { info.push_back( iteminfo( "FOOD", space + _( "Quench: " ), @@ -1354,21 +1377,44 @@ void item::food_info( const item *food_item, std::vector &info, info.push_back( iteminfo( "FOOD", _( "Smells like: " ) + food_item->corpse->nname() ) ); } - const std::string required_vits = enumerate_as_string( - nutr.vitamins.begin(), - nutr.vitamins.end(), - []( const std::pair &v ) { + auto format_vitamin = [&]( const std::pair &v, bool display_vitamins ) { + const bool is_vitamin = v.first->type() == vitamin_type::VITAMIN; // only display vitamins that we actually require - return ( g->u.vitamin_rate( v.first ) > 0_turns && v.second != 0 ) ? - string_format( "%s (%i%%)", v.first.obj().name(), - static_cast( v.second * g->u.vitamin_rate( v.first ) / - 1_days * 100 ) ) : - std::string(); + if( g->u.vitamin_rate( v.first ) == 0_turns || v.second == 0 || + display_vitamins != is_vitamin || v.first->has_flag( "NO_DISPLAY" ) ) { + return std::string(); + } + const double multiplier = g->u.vitamin_rate( v.first ) / 1_days * 100; + const int min_value = min_nutr.get_vitamin( v.first ); + const int max_value = v.second; + const int min_rda = lround( min_value * multiplier ); + const int max_rda = lround( max_value * multiplier ); + const std::string format = min_rda == max_rda ? "%s (%i%%)" : "%s (%i-%i%%)"; + return string_format( format, v.first->name(), min_value, max_value ); + }; + + const std::string required_vits = enumerate_as_string( + max_nutr.vitamins.begin(), + max_nutr.vitamins.end(), + [&]( const std::pair &v ) { + return format_vitamin( v, true ); } ); + + const std::string effect_vits = enumerate_as_string( + max_nutr.vitamins.begin(), + max_nutr.vitamins.end(), + [&]( const std::pair &v ) { + return format_vitamin( v, false ); + } ); + if( !required_vits.empty() && parts->test( iteminfo_parts::FOOD_VITAMINS ) ) { info.emplace_back( "FOOD", _( "Vitamins (RDA): " ), required_vits ); } + if( !effect_vits.empty() && parts->test( iteminfo_parts::FOOD_VIT_EFFECTS ) ) { + info.emplace_back( "FOOD", _( "Other contents: " ), effect_vits ); + } + if( g->u.allergy_type( *food_item ) != morale_type( "morale_null" ) ) { info.emplace_back( "DESCRIPTION", _( "* This food will cause an allergic reaction." ) ); @@ -3651,7 +3697,7 @@ void item::on_contents_changed() convert( type->container->unseals_into ); } - set_flag( "ENCUMBRANCE_UPDATE" ); + encumbrance_update_ = true; } void item::on_damage( int, damage_type ) @@ -3661,8 +3707,6 @@ void item::on_damage( int, damage_type ) std::string item::tname( unsigned int quantity, bool with_prefix, unsigned int truncate ) const { - std::stringstream ret; - int dirt_level = get_var( "dirt", 0 ) / 2000; std::string dirt_symbol; // TODO: MATERIALS put this in json @@ -3743,32 +3787,24 @@ std::string item::tname( unsigned int quantity, bool with_prefix, unsigned int t maintext = type_name( quantity ); } else if( is_gun() || is_tool() || is_magazine() ) { int amt = 0; - ret.str( "" ); - ret << label( quantity ); + maintext = label( quantity ); for( const item *mod : is_gun() ? gunmods() : toolmods() ) { if( !type->gun || !type->gun->built_in_mods.count( mod->typeId() ) ) { amt++; } } if( amt ) { - ret << string_format( "+%d", amt ); + maintext += string_format( "+%d", amt ); } - maintext = ret.str(); } else if( is_armor() && has_clothing_mod() ) { - ret.str( "" ); - ret << label( quantity ); - ret << "+1"; - maintext = ret.str(); + maintext = label( quantity ) + "+1"; } else if( is_craft() ) { - ret.str( "" ); - const std::string name = _( "in progress %s" ); - ret << string_format( name, making->result_name() ); + maintext = string_format( _( "in progress %s" ), making->result_name() ); if( charges > 1 ) { - ret << " (" << charges << ")"; + maintext += string_format( " (%d)", charges ); } const int percent_progress = item_counter / 100000; - ret << " (" << percent_progress << "%)"; - maintext = ret.str(); + maintext += string_format( " (%d%%)", percent_progress ); } else if( contents.size() == 1 ) { const item &contents_item = contents.front(); if( contents_item.made_of( LIQUID ) || contents_item.is_food() ) { @@ -3791,114 +3827,112 @@ std::string item::tname( unsigned int quantity, bool with_prefix, unsigned int t maintext = label( quantity ); } - ret.str( "" ); + std::string tagtext; if( is_food() ) { if( has_flag( "HIDDEN_POISON" ) && g->u.get_skill_level( skill_survival ) >= 3 ) { - ret << _( " (poisonous)" ); + tagtext += _( " (poisonous)" ); } else if( has_flag( "HIDDEN_HALLU" ) && g->u.get_skill_level( skill_survival ) >= 5 ) { - ret << _( " (hallucinogenic)" ); + tagtext += _( " (hallucinogenic)" ); } } if( has_flag( "ETHEREAL_ITEM" ) ) { - ret << string_format( _( " (%s turns)" ), get_var( "ethereal" ) ); + tagtext += string_format( _( " (%s turns)" ), get_var( "ethereal" ) ); } else if( goes_bad() || is_food() ) { if( item_tags.count( "DIRTY" ) ) { - ret << _( " (dirty)" ); + tagtext += _( " (dirty)" ); } else if( rotten() ) { - ret << _( " (rotten)" ); + tagtext += _( " (rotten)" ); } else if( has_flag( "MUSHY" ) ) { - ret << _( " (mushy)" ); + tagtext += _( " (mushy)" ); } else if( is_going_bad() ) { - ret << _( " (old)" ); + tagtext += _( " (old)" ); } else if( is_fresh() ) { - ret << _( " (fresh)" ); + tagtext += _( " (fresh)" ); } } if( has_temperature() ) { if( has_flag( "HOT" ) ) { - ret << _( " (hot)" ); + tagtext += _( " (hot)" ); } if( has_flag( "COLD" ) ) { - ret << _( " (cold)" ); + tagtext += _( " (cold)" ); } if( has_flag( "FROZEN" ) ) { - ret << _( " (frozen)" ); + tagtext += _( " (frozen)" ); } else if( has_flag( "MELTS" ) ) { - ret << _( " (melted)" ); // he melted + tagtext += _( " (melted)" ); // he melted } } const sizing sizing_level = get_sizing( g->u, get_encumber( g->u ) != 0 ); if( sizing_level == sizing::human_sized_small_char ) { - ret << _( " (too big)" ); + tagtext += _( " (too big)" ); } else if( sizing_level == sizing::big_sized_small_char ) { - ret << _( " (huge!)" ); + tagtext += _( " (huge!)" ); } else if( sizing_level == sizing::human_sized_big_char || sizing_level == sizing::small_sized_human_char ) { - ret << _( " (too small)" ); + tagtext += _( " (too small)" ); } else if( sizing_level == sizing::small_sized_big_char ) { - ret << _( " (tiny!)" ); + tagtext += _( " (tiny!)" ); } else if( !has_flag( "FIT" ) && has_flag( "VARSIZE" ) ) { - ret << _( " (poor fit)" ); + tagtext += _( " (poor fit)" ); } if( is_filthy() ) { - ret << _( " (filthy)" ); + tagtext += _( " (filthy)" ); } if( is_bionic() && !has_flag( "NO_PACKED" ) ) { if( !has_flag( "NO_STERILE" ) ) { - ret << _( " (sterile)" ); + tagtext += _( " (sterile)" ); } else { - ret << _( " (packed)" ); + tagtext += _( " (packed)" ); } } if( is_tool() && has_flag( "USE_UPS" ) ) { - ret << _( " (UPS)" ); + tagtext += _( " (UPS)" ); } if( has_var( "NANOFAB_ITEM_ID" ) ) { - ret << string_format( " (%s)", nname( get_var( "NANOFAB_ITEM_ID" ) ) ); + tagtext += string_format( " (%s)", nname( get_var( "NANOFAB_ITEM_ID" ) ) ); } if( has_flag( "RADIO_MOD" ) ) { - ret << _( " (radio:" ); + tagtext += _( " (radio:" ); if( has_flag( "RADIOSIGNAL_1" ) ) { - ret << pgettext( "The radio mod is associated with the [R]ed button.", "R)" ); + tagtext += pgettext( "The radio mod is associated with the [R]ed button.", "R)" ); } else if( has_flag( "RADIOSIGNAL_2" ) ) { - ret << pgettext( "The radio mod is associated with the [B]lue button.", "B)" ); + tagtext += pgettext( "The radio mod is associated with the [B]lue button.", "B)" ); } else if( has_flag( "RADIOSIGNAL_3" ) ) { - ret << pgettext( "The radio mod is associated with the [G]reen button.", "G)" ); + tagtext += pgettext( "The radio mod is associated with the [G]reen button.", "G)" ); } else { debugmsg( "Why is the radio neither red, blue, nor green?" ); - ret << "?)"; + tagtext += "?)"; } } if( has_flag( "WET" ) ) { - ret << _( " (wet)" ); + tagtext += _( " (wet)" ); } if( already_used_by_player( g->u ) ) { - ret << _( " (used)" ); + tagtext += _( " (used)" ); } if( active && ( has_flag( "WATER_EXTINGUISH" ) || has_flag( "LITCIG" ) ) ) { - ret << _( " (lit)" ); + tagtext += _( " (lit)" ); } else if( has_flag( "IS_UPS" ) && get_var( "cable" ) == "plugged_in" ) { - ret << _( " (plugged in)" ); + tagtext += _( " (plugged in)" ); } else if( active && !is_food() && !is_corpse() && ( typeId().length() < 3 || typeId().compare( typeId().length() - 3, 3, "_on" ) != 0 ) ) { // Usually the items whose ids end in "_on" have the "active" or "on" string already contained // in their name, also food is active while it rots. - ret << _( " (active)" ); + tagtext += _( " (active)" ); } if( is_favorite ) { - ret << _( " *" ); // Display asterisk for favorite items + tagtext += _( " *" ); // Display asterisk for favorite items } - const std::string tagtext = ret.str(); - std::string modtext; if( gunmod_find( "barrel_small" ) ) { modtext += _( "sawn-off " ); @@ -3907,21 +3941,19 @@ std::string item::tname( unsigned int quantity, bool with_prefix, unsigned int t modtext += std::string( pgettext( "Adjective, as in diamond katana", "diamond" ) ) + " "; } - ret.str( "" ); //~ This is a string to construct the item name as it is displayed. This format string has been added for maximum flexibility. The strings are: %1$s: Damage text (e.g. "bruised"). %2$s: burn adjectives (e.g. "burnt"). %3$s: tool modifier text (e.g. "atomic"). %4$s: vehicle part text (e.g. "3.8-Liter"). $5$s: main item text (e.g. "apple"). %6s: tags (e.g. "(wet) (poor fit)"). - ret << string_format( _( "%1$s%2$s%3$s%4$s%5$s%6$s" ), damtext, burntext, modtext, vehtext, - maintext, tagtext ); + std::string ret = string_format( _( "%1$s%2$s%3$s%4$s%5$s%6$s" ), damtext, burntext, modtext, + vehtext, maintext, tagtext ); - std::string r = ret.str(); if( truncate != 0 ) { - r = utf8_truncate( r, truncate + truncate_override ); + ret = utf8_truncate( ret, truncate + truncate_override ); } if( item_vars.find( "item_note" ) != item_vars.end() ) { //~ %s is an item name. This style is used to denote items with notes. - return string_format( _( "*%s*" ), r ); + return string_format( _( "*%s*" ), ret ); } else { - return r; + return ret; } } @@ -3992,16 +4024,31 @@ std::string item::display_name( unsigned int quantity ) const max_amount = to_joule( type->battery->max_capacity ); } + std::string ammotext; + if( ( ( is_gun() && ammo_required() ) || is_magazine() ) && get_option( "AMMO_IN_NAMES" ) ) { + if( ammo_current() != "null" ) { + ammotext = find_type( ammo_current() )->ammo->type->name(); + } else { + ammotext = ammotype( *ammo_types().begin() )->name(); + } + } + if( amount || show_amt ) { if( is_money() ) { amt = string_format( " $%.2f", amount / 100.0 ); } else { + if( !ammotext.empty() ) { + ammotext = " " + ammotext; + } + if( max_amount != 0 ) { - amt = string_format( " (%i/%i)", amount, max_amount ); + amt = string_format( " (%i/%i%s)", amount, max_amount, ammotext ); } else { - amt = string_format( " (%i)", amount ); + amt = string_format( " (%i%s)", amount, ammotext ); } } + } else if( !ammotext.empty() ) { + amt = " (" + ammotext + ")"; } // This is a hack to prevent possible crashing when displaying maps as items during character creation @@ -4095,6 +4142,13 @@ units::mass item::weight( bool include_contents, bool integral ) const ret *= 0.75; } + // if this is a gun apply all of its gunmods' weight multipliers + if( type->gun ) { + for( const item *mod : gunmods() ) { + ret *= mod->type->gunmod->weight_multiplier; + } + } + if( count_by_charges() ) { ret *= charges; diff --git a/src/item.h b/src/item.h index de21d9e66dddd..b1a5017b510bc 100644 --- a/src/item.h +++ b/src/item.h @@ -2,7 +2,7 @@ #ifndef ITEM_H #define ITEM_H -#include +#include #include #include #include @@ -274,7 +274,7 @@ class item : public visitable */ /*@{*/ static item make_corpse( const mtype_id &mt = string_id::NULL_ID(), - time_point turn = calendar::turn, const std::string &name = "", const int upgrade_time = -1 ); + time_point turn = calendar::turn, const std::string &name = "", int upgrade_time = -1 ); /*@}*/ /** * @return The monster type associated with this item (@ref corpse). It is usually the @@ -2138,6 +2138,11 @@ class item : public visitable int mission_id = -1; // Refers to a mission in game's master list int player_id = -1; // Only give a mission to the right player! + // Set when the item / its content changes. Used for worn item with + // encumbrance depending on their content. + // This not part serialized or compared on purpose! + bool encumbrance_update_ = false; + private: /** * Accumulated rot, expressed as time the item has been in standard temperature. diff --git a/src/item_action.cpp b/src/item_action.cpp index e8de73ee00d45..a9e7d94fa3e46 100644 --- a/src/item_action.cpp +++ b/src/item_action.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -259,15 +258,13 @@ void game::item_action_menu() // Add mapped actions to the menu vector. std::transform( iactions.begin(), iactions.end(), std::back_inserter( menu_items ), []( const std::pair &elem ) { - std::stringstream ss; - ss << elem.second->display_name(); + std::string ss = elem.second->display_name(); if( elem.second->ammo_required() ) { - ss << " (" << elem.second->ammo_required() << '/' - << elem.second->ammo_remaining() << ')'; + ss += string_format( " (%d/%d)", elem.second->ammo_required(), elem.second->ammo_remaining() ); } const auto method = elem.second->get_use( elem.first ); - return std::make_tuple( method->get_type(), method->get_name(), ss.str() ); + return std::make_tuple( method->get_type(), method->get_name(), ss ); } ); // Sort mapped actions. sort_menu( menu_items.begin(), menu_items.end() ); @@ -289,18 +286,18 @@ void game::item_action_menu() } // Fill the menu. for( const auto &elem : menu_items ) { - std::stringstream ss; - ss << std::get<1>( elem ) - << std::string( max_len.first - utf8_width( std::get<1>( elem ), true ), ' ' ) - << std::string( 4, ' ' ); + std::string ss; + ss += std::get<1>( elem ); + ss += std::string( max_len.first - utf8_width( std::get<1>( elem ), true ), ' ' ); + ss += std::string( 4, ' ' ); - ss << std::get<2>( elem ) - << std::string( max_len.second - utf8_width( std::get<2>( elem ), true ), ' ' ); + ss += std::get<2>( elem ); + ss += std::string( max_len.second - utf8_width( std::get<2>( elem ), true ), ' ' ); const char bind = key_bound_to( ctxt, std::get<0>( elem ) ); const bool enabled = assigned_action( std::get<0>( elem ) ); - kmenu.addentry( num, enabled, bind, ss.str() ); + kmenu.addentry( num, enabled, bind, ss ); num++; } diff --git a/src/item_category.h b/src/item_category.h index 11f0c339f6ebd..c318af6fc56dc 100644 --- a/src/item_category.h +++ b/src/item_category.h @@ -14,7 +14,7 @@ class JsonObject; // this is a helper struct with rules for picking a zone struct zone_priority_data { - bool was_loaded; + bool was_loaded = false; zone_type_id id; bool filthy = false; cata::flat_set flags; diff --git a/src/item_factory.cpp b/src/item_factory.cpp index ff70f34e29415..df038d0bab068 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -77,9 +76,7 @@ static void assign( const JsonObject &jo, const std::string &name, return; } mods.clear(); - JsonArray jarr = jo.get_array( name ); - while( jarr.has_more() ) { - JsonArray curr = jarr.next_array(); + for( JsonArray curr : jo.get_array( name ) ) { mods.emplace( gun_mode_id( curr.get_string( 0 ) ), gun_modifier_data( curr.get_string( 1 ), curr.get_int( 2 ), curr.size() >= 4 ? curr.get_tags( 3 ) : std::set() ) ); } @@ -109,9 +106,8 @@ static bool assign_coverage_from_json( const JsonObject &jo, const std::string & }; if( jo.has_array( key ) ) { - JsonArray arr = jo.get_array( key ); - while( arr.has_more() ) { - parse( arr.next_string() ); + for( const std::string &line : jo.get_array( key ) ) { + parse( line ); } return true; @@ -388,11 +384,6 @@ void Item_factory::register_cached_uses( const itype &obj ) if( e.first == "GUN_REPAIR" ) { gun_tools.insert( obj.id ); } - - // can this item be used to repair wood/paper/bone/chitin items? - if( e.first == "MISC_REPAIR" ) { - misc_tools.insert( obj.id ); - } } } @@ -404,16 +395,6 @@ void Item_factory::finalize_post( itype &obj ) return; } - // handle wood/paper/bone/chitin items as a special case - if( !obj.gun && !obj.count_by_charges() && std::any_of( obj.materials.begin(), obj.materials.end(), - []( const material_id & m ) { - return m == material_id( "wood" ) || m == material_id( "paper" ) || - m == material_id( "bone" ) || m == material_id( "chitin" ) || m == material_id( "acidchitin" ); - } ) ) { - std::copy( misc_tools.begin(), misc_tools.end(), std::inserter( obj.repair, obj.repair.begin() ) ); - return; - } - // for each item iterate through potential repair tools for( const auto &tool : repair_tools ) { @@ -459,6 +440,19 @@ void Item_factory::finalize() finalize_pre( *e.second ); finalize_post( *e.second ); } + + // for each item register all (non-obsolete) potential recipes + for( const std::pair &p : recipe_dict ) { + const recipe &rec = p.second; + if( rec.obsolete || rec.will_be_blacklisted() ) { + continue; + } + const itype_id &result = rec.result(); + auto it = m_templates.find( result ); + if( it != m_templates.end() ) { + it->second.recipes.push_back( p.first ); + } + } } void Item_factory::finalize_item_blacklist() @@ -602,6 +596,7 @@ void Item_factory::init() add_iuse( "AUTOCLAVE", &iuse::autoclave ); add_iuse( "BELL", &iuse::bell ); add_iuse( "BLECH", &iuse::blech ); + add_iuse( "BLECH_BECAUSE_UNCLEAN", &iuse::blech_because_unclean ); add_iuse( "BOLTCUTTERS", &iuse::boltcutters ); add_iuse( "C4", &iuse::c4 ); add_iuse( "CABLE_ATTACH", &iuse::cable_attach ); @@ -703,7 +698,6 @@ void Item_factory::init() add_iuse( "MEDITATE", &iuse::meditate ); add_iuse( "METH", &iuse::meth ); add_iuse( "MININUKE", &iuse::mininuke ); - add_iuse( "MISC_REPAIR", &iuse::misc_repair ); add_iuse( "MOLOTOV_LIT", &iuse::molotov_lit ); add_iuse( "MOP", &iuse::mop ); add_iuse( "MP3", &iuse::mp3 ); @@ -801,6 +795,7 @@ void Item_factory::init() add_actor( std::make_unique() ); add_actor( std::make_unique() ); add_actor( std::make_unique() ); + add_actor( std::make_unique() ); add_actor( std::make_unique() ); add_actor( std::make_unique() ); add_actor( std::make_unique() ); @@ -823,14 +818,14 @@ void Item_factory::init() 0 ); } -bool Item_factory::check_ammo_type( std::ostream &msg, const ammotype &ammo ) const +bool Item_factory::check_ammo_type( std::string &msg, const ammotype &ammo ) const { if( ammo.is_null() ) { return false; } if( !ammo.is_valid() ) { - msg << string_format( "ammo type %s is not known", ammo.c_str() ) << "\n"; + msg += string_format( "ammo type %s is not known\n", ammo.c_str() ); return false; } @@ -838,7 +833,7 @@ bool Item_factory::check_ammo_type( std::ostream &msg, const ammotype &ammo ) co m_templates.end(), [&ammo]( const decltype( m_templates )::value_type & e ) { return e.second.ammo && e.second.ammo->type == ammo; } ) ) { - msg << string_format( "there is no actual ammo of type %s defined", ammo.c_str() ) << "\n"; + msg += string_format( "there is no actual ammo of type %s defined\n", ammo.c_str() ); return false; } return true; @@ -847,76 +842,76 @@ bool Item_factory::check_ammo_type( std::ostream &msg, const ammotype &ammo ) co void Item_factory::check_definitions() const { for( const auto &elem : m_templates ) { - std::ostringstream msg; + std::string msg; const itype *type = &elem.second; if( !type->category_force.is_valid() ) { - msg << "undefined category " << type->category_force.c_str() << "\n"; + msg += "undefined category " + type->category_force.str() + "\n"; } if( type->weight < 0_gram ) { - msg << "negative weight" << "\n"; + msg += "negative weight\n"; } if( type->volume < 0_ml ) { - msg << "negative volume" << "\n"; + msg += "negative volume\n"; } if( type->count_by_charges() || type->phase == LIQUID ) { if( type->stack_size <= 0 ) { - msg << "invalid stack_size " << type->stack_size << " on type using charges\n"; + msg += string_format( "invalid stack_size %d on type using charges\n", type->stack_size ); } } if( type->price < 0_cent ) { - msg << "negative price" << "\n"; + msg += "negative price\n"; } if( type->damage_min() > 0 || type->damage_max() < 0 || type->damage_min() > type->damage_max() ) { - msg << "invalid damage range" << "\n"; + msg += "invalid damage range\n"; } if( type->description.empty() ) { - msg << "empty description" << "\n"; + msg += "empty description\n"; } for( const material_id &mat_id : type->materials ) { if( mat_id.str() == "null" || !mat_id.is_valid() ) { - msg << string_format( "invalid material %s", mat_id.c_str() ) << "\n"; + msg += string_format( "invalid material %s\n", mat_id.c_str() ); } } if( type->sym.empty() ) { - msg << "symbol not defined" << "\n"; + msg += "symbol not defined\n"; } else if( utf8_width( type->sym ) != 1 ) { - msg << "symbol must be exactly one console cell width" << "\n"; + msg += "symbol must be exactly one console cell width\n"; } for( const auto &_a : type->techniques ) { if( !_a.is_valid() ) { - msg << string_format( "unknown technique %s", _a.c_str() ) << "\n"; + msg += string_format( "unknown technique %s\n", _a.c_str() ); } } if( !type->snippet_category.empty() ) { if( !SNIPPET.has_category( type->snippet_category ) ) { - msg << string_format( "item %s: snippet category %s without any snippets", type->id.c_str(), - type->snippet_category.c_str() ) << "\n"; + msg += string_format( "item %s: snippet category %s without any snippets\n", type->id.c_str(), + type->snippet_category.c_str() ); } } for( auto &q : type->qualities ) { if( !q.first.is_valid() ) { - msg << string_format( "item %s has unknown quality %s", type->id.c_str(), q.first.c_str() ) << "\n"; + msg += string_format( "item %s has unknown quality %s\n", type->id.c_str(), q.first.c_str() ); } } if( type->default_container && ( !has_template( *type->default_container ) || *type->default_container == "null" ) ) { - msg << string_format( "invalid container property %s", type->default_container->c_str() ) << "\n"; + msg += string_format( "invalid container property %s\n", type->default_container->c_str() ); } for( const auto &e : type->emits ) { if( !e.is_valid() ) { - msg << string_format( "item %s has unknown emit source %s", type->id.c_str(), e.c_str() ) << "\n"; + msg += string_format( "item %s has unknown emit source %s\n", type->id.c_str(), e.c_str() ); } } for( const auto &f : type->faults ) { if( !f.is_valid() ) { - msg << string_format( "invalid item fault %s", f.c_str() ) << "\n"; + msg += string_format( "invalid item fault %s\n", f.c_str() ); } } @@ -924,69 +919,68 @@ void Item_factory::check_definitions() const if( type->comestible->tool != "null" ) { auto req_tool = find_template( type->comestible->tool ); if( !req_tool->tool ) { - msg << string_format( "invalid tool property %s", type->comestible->tool.c_str() ) << "\n"; + msg += string_format( "invalid tool property %s\n", type->comestible->tool.c_str() ); } } } if( type->brewable ) { if( type->brewable->time < 1_turns ) { - msg << "brewable time is less than 1 turn\n"; + msg += "brewable time is less than 1 turn\n"; } if( type->brewable->results.empty() ) { - msg << "empty product list" << "\n"; + msg += "empty product list\n"; } for( auto &b : type->brewable->results ) { if( !has_template( b ) ) { - msg << string_format( "invalid result id %s", b.c_str() ) << "\n"; + msg += string_format( "invalid result id %s\n", b.c_str() ); } } } if( type->seed ) { if( type->seed->grow < 1_turns ) { - msg << "seed growing time is less than 1 turn\n"; + msg += "seed growing time is less than 1 turn\n"; } if( !has_template( type->seed->fruit_id ) ) { - msg << string_format( "invalid fruit id %s", type->seed->fruit_id.c_str() ) << "\n"; + msg += string_format( "invalid fruit id %s\n", type->seed->fruit_id.c_str() ); } for( auto &b : type->seed->byproducts ) { if( !has_template( b ) ) { - msg << string_format( "invalid byproduct id %s", b.c_str() ) << "\n"; + msg += string_format( "invalid byproduct id %s\n", b.c_str() ); } } } if( type->book ) { if( type->book->skill && !type->book->skill.is_valid() ) { - msg << "uses invalid book skill." << "\n"; + msg += "uses invalid book skill.\n"; } if( type->book->martial_art && !type->book->martial_art.is_valid() ) { - msg << string_format( "trains invalid martial art '%s'.", - type->book->martial_art.str() ) << "\n"; + msg += string_format( "trains invalid martial art '%s'.\n", type->book->martial_art.str() ); } if( type->can_use( "MA_MANUAL" ) && !type->book->martial_art ) { - msg << "has use_action MA_MANUAL but does not specify a martial art\n"; + msg += "has use_action MA_MANUAL but does not specify a martial art\n"; } } if( type->can_use( "MA_MANUAL" ) && !type->book ) { - msg << "has use_action MA_MANUAL but is not a book\n"; + msg += "has use_action MA_MANUAL but is not a book\n"; } if( type->ammo ) { if( !type->ammo->type && type->ammo->type != ammotype( "NULL" ) ) { - msg << "must define at least one ammo type" << "\n"; + msg += "must define at least one ammo type\n"; } check_ammo_type( msg, type->ammo->type ); if( type->ammo->casing && ( !has_template( *type->ammo->casing ) || *type->ammo->casing == "null" ) ) { - msg << string_format( "invalid casing property %s", type->ammo->casing->c_str() ) << "\n"; + msg += string_format( "invalid casing property %s\n", type->ammo->casing->c_str() ); } if( type->ammo->drop != "null" && !has_template( type->ammo->drop ) ) { - msg << string_format( "invalid drop item %s", type->ammo->drop.c_str() ) << "\n"; + msg += string_format( "invalid drop item %s\n", type->ammo->drop.c_str() ); } } if( type->battery ) { if( type->battery->max_capacity < 0_mJ ) { - msg << "battery cannot have negative maximum charge\n"; + msg += "battery cannot have negative maximum charge\n"; } } if( type->gun ) { @@ -996,49 +990,49 @@ void Item_factory::check_definitions() const if( type->gun->ammo.empty() ) { // if gun doesn't use ammo forbid both integral or detachable magazines if( static_cast( type->gun->clip ) || !type->magazines.empty() ) { - msg << "cannot specify clip_size or magazine without ammo type" << "\n"; + msg += "cannot specify clip_size or magazine without ammo type\n"; } if( type->item_tags.count( "RELOAD_AND_SHOOT" ) ) { - msg << "RELOAD_AND_SHOOT requires an ammo type to be specified" << "\n"; + msg += "RELOAD_AND_SHOOT requires an ammo type to be specified\n"; } } else { if( type->item_tags.count( "RELOAD_AND_SHOOT" ) && !type->magazines.empty() ) { - msg << "RELOAD_AND_SHOOT cannot be used with magazines" << "\n"; + msg += "RELOAD_AND_SHOOT cannot be used with magazines\n"; } for( const ammotype &at : type->gun->ammo ) { if( !type->gun->clip && !type->magazines.empty() && !type->magazine_default.count( at ) ) { - msg << "specified magazine but none provided for ammo type " << at.str() << "\n"; + msg += string_format( "specified magazine but none provided for ammo type %s\n", at.str() ); } } } if( type->gun->barrel_length < 0_ml ) { - msg << "gun barrel length cannot be negative" << "\n"; + msg += "gun barrel length cannot be negative\n"; } if( !type->gun->skill_used ) { - msg << "uses no skill" << "\n"; + msg += "uses no skill\n"; } else if( !type->gun->skill_used.is_valid() ) { - msg << "uses an invalid skill " << type->gun->skill_used.str() << "\n"; + msg += string_format( "uses an invalid skill %s\n", type->gun->skill_used.str() ); } for( auto &gm : type->gun->default_mods ) { if( !has_template( gm ) ) { - msg << "invalid default mod." << "\n"; + msg += "invalid default mod.\n"; } } for( auto &gm : type->gun->built_in_mods ) { if( !has_template( gm ) ) { - msg << "invalid built-in mod." << "\n"; + msg += "invalid built-in mod.\n"; } } } if( type->gunmod ) { if( type->gunmod->location.str().empty() ) { - msg << "gunmod does not specify location" << "\n"; + msg += "gunmod does not specify location\n"; } if( ( type->gunmod->sight_dispersion < 0 ) != ( type->gunmod->aim_speed < 0 ) ) { - msg << "gunmod must have both sight_dispersion and aim_speed set or neither of them set" << "\n"; + msg += "gunmod must have both sight_dispersion and aim_speed set or neither of them set\n"; } } if( type->mod ) { @@ -1053,12 +1047,12 @@ void Item_factory::check_definitions() const for( const auto &e : type->mod->magazine_adaptor ) { check_ammo_type( msg, e.first ); if( e.second.empty() ) { - msg << "No magazines specified for ammo type " << e.first.str() << "\n"; + msg += string_format( "no magazines specified for ammo type %s\n", e.first.str() ); } for( const itype_id &opt : e.second ) { const itype *mag = find_template( opt ); if( !mag->magazine || !mag->magazine->type.count( e.first ) ) { - msg << "invalid magazine " << opt << " in magazine adapter\n"; + msg += string_format( "invalid magazine %s in magazine adapter\n", opt ); } } } @@ -1068,50 +1062,49 @@ void Item_factory::check_definitions() const check_ammo_type( msg, at ); } if( type->magazine->type.empty() ) { - msg << "magazine did not specify ammo type" << "\n"; + msg += "magazine did not specify ammo type\n"; } if( type->magazine->capacity < 0 ) { - msg << string_format( "invalid capacity %i", type->magazine->capacity ) << "\n"; + msg += string_format( "invalid capacity %i\n", type->magazine->capacity ); } if( type->magazine->count < 0 || type->magazine->count > type->magazine->capacity ) { - msg << string_format( "invalid count %i", type->magazine->count ) << "\n"; + msg += string_format( "invalid count %i\n", type->magazine->count ); } const itype *da = find_template( type->magazine->default_ammo ); if( !( da->ammo && type->magazine->type.count( da->ammo->type ) ) ) { - msg << string_format( "invalid default_ammo %s", type->magazine->default_ammo.c_str() ) << "\n"; + msg += string_format( "invalid default_ammo %s\n", type->magazine->default_ammo.c_str() ); } if( type->magazine->reliability < 0 || type->magazine->reliability > 100 ) { - msg << string_format( "invalid reliability %i", type->magazine->reliability ) << "\n"; + msg += string_format( "invalid reliability %i\n", type->magazine->reliability ); } if( type->magazine->reload_time < 0 ) { - msg << string_format( "invalid reload_time %i", type->magazine->reload_time ) << "\n"; + msg += string_format( "invalid reload_time %i\n", type->magazine->reload_time ); } if( type->magazine->linkage && ( !has_template( *type->magazine->linkage ) || *type->magazine->linkage == "null" ) ) { - msg << string_format( "invalid linkage property %s", type->magazine->linkage->c_str() ) << "\n"; + msg += string_format( "invalid linkage property %s\n", type->magazine->linkage->c_str() ); } } for( const std::pair, std::set> &ammo_variety : type->magazines ) { if( ammo_variety.second.empty() ) { - msg << "No magazine specified for " << ammo_variety.first.str() << "\n"; + msg += string_format( "no magazine specified for %s\n", ammo_variety.first.str() ); } for( const std::string &magazine : ammo_variety.second ) { const itype *mag_ptr = find_template( magazine ); if( mag_ptr == nullptr ) { - msg << "Magazine \"" << magazine << "\" specified for \"" - << ammo_variety.first.str() << "\" does not exist\n"; + msg += string_format( "magazine \"%s\" specified for \"%s\" does not exist\n", magazine, + ammo_variety.first.str() ); } else if( !mag_ptr->magazine ) { - msg << "Magazine \"" << magazine << "\" specified for \"" - << ammo_variety.first.str() << "\" is not a magazine\n"; + msg += string_format( "magazine \"%s\" specified for \"%s\" is not a magazine\n", magazine, + ammo_variety.first.str() ); } else if( !mag_ptr->magazine->type.count( ammo_variety.first ) ) { - msg << "magazine \"" << magazine << "\" does not take compatible ammo\n"; + msg += string_format( "magazine \"%s\" does not take compatible ammo\n", magazine ); } else if( mag_ptr->item_tags.count( "SPEEDLOADER" ) && mag_ptr->magazine->capacity != type->gun->clip ) { - msg << "Speedloader " << magazine << " capacity (" - << mag_ptr->magazine->capacity << ") does not match gun capacity (" - << type->gun->clip << ").\n"; + msg += string_format( "speedloader %s capacity (%d) does not match gun capacity (%d).\n", magazine, + mag_ptr->magazine->capacity, type->gun->clip ); } } } @@ -1122,31 +1115,31 @@ void Item_factory::check_definitions() const } if( type->tool->revert_to && ( !has_template( *type->tool->revert_to ) || *type->tool->revert_to == "null" ) ) { - msg << string_format( "invalid revert_to property %s", type->tool->revert_to->c_str() ) << "\n"; + msg += string_format( "invalid revert_to property %s\n", type->tool->revert_to->c_str() ); } if( !type->tool->revert_msg.empty() && !type->tool->revert_to ) { - msg << _( "cannot specify revert_msg without revert_to" ) << "\n"; + msg += "cannot specify revert_msg without revert_to\n"; } if( !type->tool->subtype.empty() && !has_template( type->tool->subtype ) ) { - msg << _( "Invalid tool subtype" ) << type->tool->subtype << "\n"; + msg += string_format( "invalid tool subtype %s\n", type->tool->subtype ); } } if( type->bionic ) { if( !type->bionic->id.is_valid() ) { - msg << string_format( "there is no bionic with id %s", type->bionic->id.c_str() ) << "\n"; + msg += string_format( "there is no bionic with id %s\n", type->bionic->id.c_str() ); } } if( type->container ) { if( type->container->seals && type->container->unseals_into != "null" ) { - msg << string_format( "Resealable container unseals_into %s", - type->container->unseals_into.c_str() ) << "\n"; + msg += string_format( "resealable container unseals_into %s\n", + type->container->unseals_into.c_str() ); } if( type->container->contains <= 0_ml ) { - msg << string_format( "\"contains\" (%d) must be >0", type->container->contains.value() ) << "\n"; + msg += string_format( "\"contains\" (%d) must be >0\n", type->container->contains.value() ); } if( !has_template( type->container->unseals_into ) ) { - msg << string_format( "unseals_into invalid id %s", type->container->unseals_into.c_str() ) << "\n"; + msg += string_format( "unseals_into invalid id %s\n", type->container->unseals_into.c_str() ); } } @@ -1155,18 +1148,18 @@ void Item_factory::check_definitions() const assert( actor ); if( !actor->is_valid() ) { - msg << string_format( "item action \"%s\" was not described.", actor->type.c_str() ) << "\n"; + msg += string_format( "item action \"%s\" was not described.\n", actor->type.c_str() ); } } if( type->fuel && !type->count_by_charges() ) { - msg << "fuel value set, but item isn't count_by_charges.\n"; + msg += "fuel value set, but item isn't count_by_charges.\n"; } - if( msg.str().empty() ) { + if( msg.empty() ) { continue; } - debugmsg( "warnings for type %s:\n%s", type->id.c_str(), msg.str() ); + debugmsg( "warnings for type %s:\n%s", type->id.c_str(), msg ); } for( const auto &e : migrations ) { if( !m_templates.count( e.second.replace ) ) { @@ -1425,9 +1418,8 @@ void Item_factory::load( islot_gun &slot, const JsonObject &jo, const std::strin assign( jo, "skill", slot.skill_used, strict ); if( jo.has_array( "ammo" ) ) { slot.ammo.clear(); - JsonArray atypes = jo.get_array( "ammo" ); - for( size_t i = 0; i < atypes.size(); ++i ) { - slot.ammo.insert( ammotype( atypes.get_string( i ) ) ); + for( const std::string &id : jo.get_array( "ammo" ) ) { + slot.ammo.insert( ammotype( id ) ); } } else if( jo.has_string( "ammo" ) ) { slot.ammo.clear(); @@ -1462,9 +1454,7 @@ void Item_factory::load( islot_gun &slot, const JsonObject &jo, const std::strin if( jo.has_array( "valid_mod_locations" ) ) { slot.valid_mod_locations.clear(); - JsonArray jarr = jo.get_array( "valid_mod_locations" ); - while( jarr.has_more() ) { - JsonArray curr = jarr.next_array(); + for( JsonArray curr : jo.get_array( "valid_mod_locations" ) ) { slot.valid_mod_locations.emplace( curr.get_string( 0 ), curr.get_int( 1 ) ); } } @@ -1538,9 +1528,8 @@ void Item_factory::load( islot_tool &slot, const JsonObject &jo, const std::stri bool strict = src == "dda"; if( jo.has_array( "ammo" ) ) { - JsonArray atypes = jo.get_array( "ammo" ); - for( size_t i = 0; i < atypes.size(); ++i ) { - slot.ammo_id.insert( ammotype( atypes.get_string( i ) ) ); + for( const std::string &id : jo.get_array( "ammo" ) ) { + slot.ammo_id.insert( ammotype( id ) ); } } else if( jo.has_string( "ammo" ) ) { slot.ammo_id.insert( ammotype( jo.get_string( "ammo" ) ) ); @@ -1556,16 +1545,17 @@ void Item_factory::load( islot_tool &slot, const JsonObject &jo, const std::stri assign( jo, "sub", slot.subtype, strict ); if( jo.has_array( "rand_charges" ) ) { - JsonArray jarr = jo.get_array( "rand_charges" ); if( jo.has_member( "initial_charges" ) ) { - jarr.throw_error( "You can have a fixed initial amount of charges, or randomized. Not both." ); + jo.throw_error( "You can have a fixed initial amount of charges, or randomized. Not both.", + "rand_charges" ); } - while( jarr.has_more() ) { - slot.rand_charges.push_back( jarr.next_int() ); + for( const int charge : jo.get_array( "rand_charges" ) ) { + slot.rand_charges.push_back( charge ); } if( slot.rand_charges.size() == 1 ) { // see item::item(...) for the use of this array - jarr.throw_error( "a rand_charges array with only one entry will be ignored, it needs at least 2 entries!" ); + jo.throw_error( "a rand_charges array with only one entry will be ignored, it needs at least 2 entries!", + "rand_charges" ); } } } @@ -1589,9 +1579,8 @@ void Item_factory::load( islot_mod &slot, const JsonObject &jo, const std::strin bool strict = src == "dda"; if( jo.has_array( "ammo_modifier" ) ) { - JsonArray atypes = jo.get_array( "ammo_modifier" ); - for( size_t i = 0; i < atypes.size(); ++i ) { - slot.ammo_modifier.insert( ammotype( atypes.get_string( i ) ) ); + for( const std::string &id : jo.get_array( "ammo_modifier" ) ) { + slot.ammo_modifier.insert( ammotype( id ) ); } } else if( jo.has_string( "ammo_modifier" ) ) { slot.ammo_modifier.insert( ammotype( jo.get_string( "ammo_modifier" ) ) ); @@ -1609,14 +1598,11 @@ void Item_factory::load( islot_mod &slot, const JsonObject &jo, const std::strin if( !mags.empty() ) { slot.magazine_adaptor.clear(); } - while( mags.has_more() ) { - JsonArray arr = mags.next_array(); - + for( JsonArray arr : mags ) { ammotype ammo( arr.get_string( 0 ) ); // an ammo type (e.g. 9mm) - JsonArray compat = arr.get_array( 1 ); // compatible magazines for this ammo type - - while( compat.has_more() ) { - slot.magazine_adaptor[ ammo ].insert( compat.next_string() ); + // compatible magazines for this ammo type + for( const std::string &line : arr.get_array( 1 ) ) { + slot.magazine_adaptor[ ammo ].insert( line ); } } } @@ -1728,19 +1714,19 @@ void Item_factory::load( islot_comestible &slot, const JsonObject &jo, const std bool got_calories = false; - if( jo.has_int( "calories" ) ) { + if( jo.has_member( "calories" ) ) { slot.default_nutrition.kcal = jo.get_int( "calories" ); got_calories = true; - } else if( relative.has_int( "calories" ) ) { + } else if( relative.has_member( "calories" ) ) { slot.default_nutrition.kcal += relative.get_int( "calories" ); got_calories = true; - } else if( proportional.has_float( "calories" ) ) { + } else if( proportional.has_member( "calories" ) ) { slot.default_nutrition.kcal *= proportional.get_float( "calories" ); got_calories = true; - } else if( jo.has_int( "nutrition" ) ) { + } else if( jo.has_member( "nutrition" ) ) { slot.default_nutrition.kcal = jo.get_int( "nutrition" ) * islot_comestible::kcal_per_nutr; } @@ -1750,9 +1736,7 @@ void Item_factory::load( islot_comestible &slot, const JsonObject &jo, const std // any specification of vitamins suppresses use of material defaults @see Item_factory::finalize if( jo.has_array( "vitamins" ) ) { - auto vits = jo.get_array( "vitamins" ); - while( vits.has_more() ) { - auto pair = vits.next_array(); + for( JsonArray pair : jo.get_array( "vitamins" ) ) { vitamin_id vit( pair.get_string( 0 ) ); slot.default_nutrition.vitamins[ vit ] = pair.get_int( 1 ); } @@ -1764,9 +1748,7 @@ void Item_factory::load( islot_comestible &slot, const JsonObject &jo, const std slot.default_nutrition.vitamins[ v.first ] += relative.get_int( "vitamins" ); } } else if( relative.has_array( "vitamins" ) ) { - auto vits = relative.get_array( "vitamins" ); - while( vits.has_more() ) { - auto pair = vits.next_array(); + for( JsonArray pair : relative.get_array( "vitamins" ) ) { vitamin_id vit( pair.get_string( 0 ) ); slot.default_nutrition.vitamins[ vit ] += pair.get_int( 1 ); } @@ -1844,6 +1826,7 @@ void Item_factory::load( islot_gunmod &slot, const JsonObject &jo, const std::st assign( jo, "consume_divisor", slot.consume_divisor ); assign( jo, "ammo_effects", slot.ammo_effects, strict ); assign( jo, "ups_charges_multiplier", slot.ups_charges_multiplier ); + assign( jo, "weight_multiplier", slot.weight_multiplier ); if( jo.has_int( "time" ) ) { slot.install_time = jo.get_int( "time" ); } else if( jo.has_string( "time" ) ) { @@ -1863,9 +1846,7 @@ void Item_factory::load( islot_gunmod &slot, const JsonObject &jo, const std::st assign( jo, "min_str_required_mod", slot.min_str_required_mod ); if( jo.has_array( "add_mod" ) ) { slot.add_mod.clear(); - JsonArray jarr = jo.get_array( "add_mod" ); - while( jarr.has_more() ) { - JsonArray curr = jarr.next_array(); + for( JsonArray curr : jo.get_array( "add_mod" ) ) { slot.add_mod.emplace( curr.get_string( 0 ), curr.get_int( 1 ) ); } } @@ -1886,9 +1867,8 @@ void Item_factory::load( islot_magazine &slot, const JsonObject &jo, const std:: { bool strict = src == "dda"; if( jo.has_array( "ammo_type" ) ) { - JsonArray atypes = jo.get_array( "ammo_type" ); - for( size_t i = 0; i < atypes.size(); ++i ) { - slot.type.insert( ammotype( atypes.get_string( i ) ) ); + for( const std::string &id : jo.get_array( "ammo_type" ) ) { + slot.type.insert( ammotype( id ) ); } } else if( jo.has_string( "ammo_type" ) ) { slot.type.insert( ammotype( jo.get_string( "ammo_type" ) ) ); @@ -2070,8 +2050,7 @@ void Item_factory::load_basic_info( const JsonObject &jo, itype &def, const std: assign( jo, "insulation", def.insulation_factor ); if( jo.has_member( "thrown_damage" ) ) { - JsonArray jarr = jo.get_array( "thrown_damage" ); - def.thrown_damage = load_damage_instance( jarr ); + def.thrown_damage = load_damage_instance( jo.get_array( "thrown_damage" ) ); } else { // TODO: Move to finalization def.thrown_damage.clear(); @@ -2122,10 +2101,7 @@ void Item_factory::load_basic_info( const JsonObject &jo, itype &def, const std: def.magazine_default.clear(); def.magazines.clear(); - JsonArray mags = jo.get_array( "magazines" ); - while( mags.has_more() ) { - JsonArray arr = mags.next_array(); - + for( JsonArray arr : jo.get_array( "magazines" ) ) { ammotype ammo( arr.get_string( 0 ) ); // an ammo type (e.g. 9mm) JsonArray compat = arr.get_array( 1 ); // compatible magazines for this ammo type @@ -2142,8 +2118,7 @@ void Item_factory::load_basic_info( const JsonObject &jo, itype &def, const std: if( !jarr.empty() ) { def.min_skills.clear(); } - while( jarr.has_more() ) { - JsonArray cur = jarr.next_array(); + for( JsonArray cur : jarr ) { const auto sk = skill_id( cur.get_string( 0 ) ); if( !sk.is_valid() ) { jo.throw_error( string_format( "invalid skill: %s", sk.c_str() ), "min_skills" ); @@ -2192,15 +2167,11 @@ void Item_factory::load_basic_info( const JsonObject &jo, itype &def, const std: def.drop_action = usage_from_object( tmp ).second; } - if( jo.has_string( "looks_like" ) ) { - def.looks_like = jo.get_string( "looks_like" ); - } + jo.read( "looks_like", def.looks_like ); if( jo.has_member( "conditional_names" ) ) { def.conditional_names.clear(); - JsonArray jarr = jo.get_array( "conditional_names" ); - while( jarr.has_more() ) { - JsonObject curr = jarr.next_object(); + for( const JsonObject &curr : jo.get_array( "conditional_names" ) ) { conditional_name cname; cname.type = curr.get_enum_value( "type" ); cname.condition = curr.get_string( "condition" ); @@ -2245,8 +2216,7 @@ void Item_factory::load_basic_info( const JsonObject &jo, itype &def, const std: // auto-create a category that is unlikely to already be used and put the // snippets in it. def.snippet_category = std::string( "auto:" ) + def.id; - JsonArray jarr = jo.get_array( "snippet_category" ); - SNIPPET.add_snippets_from_json( def.snippet_category, jarr ); + SNIPPET.add_snippets_from_json( def.snippet_category, jo.get_array( "snippet_category" ) ); } else { def.snippet_category = jo.get_string( "snippet_category", "" ); } @@ -2270,9 +2240,8 @@ void Item_factory::load_migration( const JsonObject &jo ) m.id = jo.get_string( "id" ); migrations[ m.id ] = m; } else if( jo.has_array( "id" ) ) { - JsonArray ja = jo.get_array( "id" ); - while( ja.has_more() ) { - m.id = ja.next_string(); + for( const std::string &line : jo.get_array( "id" ) ) { + m.id = line; migrations[ m.id ] = m; } } else { @@ -2317,9 +2286,7 @@ void Item_factory::set_qualities_from_json( const JsonObject &jo, const std::str itype &def ) { if( jo.has_array( member ) ) { - JsonArray jarr = jo.get_array( member ); - while( jarr.has_more() ) { - JsonArray curr = jarr.next_array(); + for( JsonArray curr : jo.get_array( member ) ) { const auto quali = std::pair( quality_id( curr.get_string( 0 ) ), curr.get_int( 1 ) ); if( def.qualities.count( quali.first ) > 0 ) { @@ -2336,9 +2303,7 @@ void Item_factory::set_properties_from_json( const JsonObject &jo, const std::st itype &def ) { if( jo.has_array( member ) ) { - JsonArray jarr = jo.get_array( member ); - while( jarr.has_more() ) { - JsonArray curr = jarr.next_array(); + for( JsonArray curr : jo.get_array( member ) ) { const auto prop = std::pair( curr.get_string( 0 ), curr.get_string( 1 ) ); if( def.properties.count( prop.first ) > 0 ) { curr.throw_error( "Duplicated property", 0 ); @@ -2371,7 +2336,6 @@ void Item_factory::clear() repair_tools.clear(); gun_tools.clear(); - misc_tools.clear(); repair_actions.clear(); frozen = false; @@ -2437,9 +2401,8 @@ bool Item_factory::load_sub_ref( std::unique_ptr &ptr, const Js } else if( name != "contents" ) { obj.throw_error( string_format( "You can't use an array for '%s'", arr_name ) ); } - JsonArray arr = obj.get_array( arr_name ); - while( arr.has_more() ) { - entries.push_back( std::make_pair( arr.next_string(), isgroup ) ); + for( const std::string &line : obj.get_array( arr_name ) ) { + entries.emplace_back( line, isgroup ); } }; get_array( iname, false ); @@ -2491,10 +2454,9 @@ bool Item_factory::load_string( std::vector &vec, const JsonObject std::string temp; if( obj.has_array( name ) ) { - JsonArray arr = obj.get_array( name ); - while( arr.has_more() ) { - result |= arr.read_next( temp ); - vec.push_back( temp ); + for( const std::string &line : obj.get_array( name ) ) { + result |= true; + vec.push_back( line ); } } else if( obj.has_member( name ) ) { result |= obj.read( name, temp ); @@ -2519,8 +2481,7 @@ void Item_factory::add_entry( Item_group &ig, const JsonObject &obj ) jarr = obj.get_array( "distribution" ); } if( gptr ) { - while( jarr.has_more() ) { - JsonObject job2 = jarr.next_object(); + for( const JsonObject &job2 : jarr ) { add_entry( *gptr, job2 ); } ig.add_entry( std::move( gptr ) ); @@ -2565,16 +2526,14 @@ void Item_factory::load_item_group( const JsonObject &jsobj ) load_item_group( jsobj, group_id, subtype ); } -void Item_factory::load_item_group( JsonArray &entries, const Group_tag &group_id, - const bool is_collection, int ammo_chance, - int magazine_chance ) +void Item_factory::load_item_group( const JsonArray &entries, const Group_tag &group_id, + const bool is_collection, const int ammo_chance, const int magazine_chance ) { const auto type = is_collection ? Item_group::G_COLLECTION : Item_group::G_DISTRIBUTION; std::unique_ptr &isd = m_template_groups[group_id]; Item_group *const ig = make_group_or_throw( group_id, isd, type, ammo_chance, magazine_chance ); - while( entries.has_more() ) { - JsonObject subobj = entries.next_object(); + for( const JsonObject &subobj : entries ) { add_entry( *ig, subobj ); } } @@ -2594,13 +2553,12 @@ void Item_factory::load_item_group( const JsonObject &jsobj, const Group_tag &gr jsobj.get_int( "magazine", 0 ) ); if( subtype == "old" ) { - JsonArray items = jsobj.get_array( "items" ); - while( items.has_more() ) { - if( items.test_object() ) { - JsonObject subobj = items.next_object(); + for( const JsonValue &entry : jsobj.get_array( "items" ) ) { + if( entry.test_object() ) { + JsonObject subobj = entry.get_object(); add_entry( *ig, subobj ); } else { - JsonArray pair = items.next_array(); + JsonArray pair = entry.get_array(); ig->add_item_entry( pair.get_string( 0 ), pair.get_int( 1 ) ); } } @@ -2608,36 +2566,32 @@ void Item_factory::load_item_group( const JsonObject &jsobj, const Group_tag &gr } if( jsobj.has_member( "entries" ) ) { - JsonArray items = jsobj.get_array( "entries" ); - while( items.has_more() ) { - JsonObject subobj = items.next_object(); + for( const JsonObject &subobj : jsobj.get_array( "entries" ) ) { add_entry( *ig, subobj ); } } if( jsobj.has_member( "items" ) ) { - JsonArray items = jsobj.get_array( "items" ); - while( items.has_more() ) { - if( items.test_string() ) { - ig->add_item_entry( items.next_string(), 100 ); - } else if( items.test_array() ) { - JsonArray subitem = items.next_array(); + for( const JsonValue &entry : jsobj.get_array( "items" ) ) { + if( entry.test_string() ) { + ig->add_item_entry( entry.get_string(), 100 ); + } else if( entry.test_array() ) { + JsonArray subitem = entry.get_array(); ig->add_item_entry( subitem.get_string( 0 ), subitem.get_int( 1 ) ); } else { - JsonObject subobj = items.next_object(); + JsonObject subobj = entry.get_object(); add_entry( *ig, subobj ); } } } if( jsobj.has_member( "groups" ) ) { - JsonArray items = jsobj.get_array( "groups" ); - while( items.has_more() ) { - if( items.test_string() ) { - ig->add_group_entry( items.next_string(), 100 ); - } else if( items.test_array() ) { - JsonArray subitem = items.next_array(); + for( const JsonValue &entry : jsobj.get_array( "groups" ) ) { + if( entry.test_string() ) { + ig->add_group_entry( entry.get_string(), 100 ); + } else if( entry.test_array() ) { + JsonArray subitem = entry.get_array(); ig->add_group_entry( subitem.get_string( 0 ), subitem.get_int( 1 ) ); } else { - JsonObject subobj = items.next_object(); + JsonObject subobj = entry.get_object(); add_entry( *ig, subobj ); } } @@ -2653,16 +2607,15 @@ void Item_factory::set_use_methods_from_json( const JsonObject &jo, const std::s use_methods.clear(); if( jo.has_array( member ) ) { - JsonArray jarr = jo.get_array( member ); - while( jarr.has_more() ) { - if( jarr.test_string() ) { - std::string type = jarr.next_string(); + for( const JsonValue &entry : jo.get_array( member ) ) { + if( entry.test_string() ) { + std::string type = entry.get_string(); use_methods.emplace( type, usage_from_string( type ) ); - } else if( jarr.test_object() ) { - auto obj = jarr.next_object(); + } else if( entry.test_object() ) { + auto obj = entry.get_object(); use_methods.insert( usage_from_object( obj ) ); } else { - jarr.throw_error( "array element is neither string nor object." ); + entry.throw_error( "array element is neither string nor object." ); } } @@ -2835,9 +2788,8 @@ void item_group::debug_spawn() uilist menu2; menu2.text = _( "Result of 100 spawns:" ); for( const auto &e : itemnames2 ) { - std::ostringstream buffer; - buffer << e.first << " x " << e.second << "\n"; - menu2.entries.emplace_back( static_cast( menu2.entries.size() ), true, -2, buffer.str() ); + menu2.entries.emplace_back( static_cast( menu2.entries.size() ), true, -2, + string_format( _( "%d x %s" ), e.first, e.second ) ); } menu2.query(); } diff --git a/src/item_factory.h b/src/item_factory.h index 4b87814d9d1a5..8209532d301e0 100644 --- a/src/item_factory.h +++ b/src/item_factory.h @@ -86,7 +86,7 @@ class Item_factory /** * Callback for the init system (@ref DynamicDataLoader), loads an item group definitions. * @param jsobj The json object to load from. - * @throw std::string if the json object contains invalid data. + * @throw JsonError if the json object contains invalid data. */ void load_item_group( const JsonObject &jsobj ); /** @@ -99,7 +99,7 @@ class Item_factory * @param group_id The ident of the item that is to be loaded. * @param subtype The type of the item group, either "collection", "distribution" or "old" * ("old" is a distribution, too). - * @throw std::string if the json object contains invalid data. + * @throw JsonError if the json object contains invalid data. */ void load_item_group( const JsonObject &jsobj, const Group_tag &group_id, const std::string &subtype ); @@ -121,7 +121,7 @@ class Item_factory * Note that each entry in the array has to be a JSON object. The other function above * can also load data from arrays of strings, where the strings are item or group ids. */ - void load_item_group( JsonArray &entries, const Group_tag &group_id, bool is_collection, + void load_item_group( const JsonArray &entries, const Group_tag &group_id, bool is_collection, int ammo_chance, int magazine_chance ); /** * Get the item group object. Returns null if the item group does not exists. @@ -148,7 +148,7 @@ class Item_factory * These function load different instances of itype objects from json. * The loaded item types are stored and can be accessed through @ref find_template. * @param jo The json object to load data from. - * @throw std::string if the json object contains invalid data. + * @throw JsonError if the json object contains invalid data. */ /*@{*/ void load_ammo( const JsonObject &jo, const std::string &src ); @@ -254,7 +254,7 @@ class Item_factory * @param msg Stream in which all error messages are printed. * @param ammo Ammo type to check. */ - bool check_ammo_type( std::ostream &msg, const ammotype &ammo ) const; + bool check_ammo_type( std::string &msg, const ammotype &ammo ) const; /** * Called before creating a new template and handles inheritance via copy-from @@ -363,9 +363,6 @@ class Item_factory // tools that can be used to repair complex firearms std::set gun_tools; - // tools that can be used to repair wood/paper/bone/chitin items - std::set misc_tools; - std::set repair_actions; }; diff --git a/src/item_group.cpp b/src/item_group.cpp index 9dbb4421086f5..c71e5ec2b42ad 100644 --- a/src/item_group.cpp +++ b/src/item_group.cpp @@ -195,7 +195,9 @@ void Single_item_creator::inherit_ammo_mag_chances( const int ammo, const int ma Item_modifier::Item_modifier() : damage( 0, 0 ) , count( 1, 1 ) - , dirt( 0, 9999 ) // min and max should follow max_dirt in ranged.cpp + // Dirt in guns is capped unless overwritten in the itemgroup + // most guns should not be very dirty or dirty at all + , dirt( 0, 500 ) , charges( -1, -1 ) , with_ammo( 0 ) , with_magazine( 0 ) @@ -588,22 +590,22 @@ static Group_tag get_unique_group_id() } } -Group_tag item_group::load_item_group( JsonIn &stream, const std::string &default_subtype ) +Group_tag item_group::load_item_group( const JsonValue &value, const std::string &default_subtype ) { - if( stream.test_string() ) { - return stream.get_string(); - } else if( stream.test_object() ) { + if( value.test_string() ) { + return value.get_string(); + } else if( value.test_object() ) { const Group_tag group = get_unique_group_id(); - JsonObject jo = stream.get_object(); + JsonObject jo = value.get_object(); const std::string subtype = jo.get_string( "subtype", default_subtype ); item_controller->load_item_group( jo, group, subtype ); return group; - } else if( stream.test_array() ) { + } else if( value.test_array() ) { const Group_tag group = get_unique_group_id(); - JsonArray jarr = stream.get_array(); + JsonArray jarr = value.get_array(); // load_item_group needs a bool, invalid subtypes are unexpected and most likely errors // from the caller of this function. if( default_subtype != "collection" && default_subtype != "distribution" ) { @@ -613,7 +615,7 @@ Group_tag item_group::load_item_group( JsonIn &stream, const std::string &defaul return group; } else { - stream.error( "invalid item group, must be string (group id) or object/array (the group data)" ); + value.throw_error( "invalid item group, must be string (group id) or object/array (the group data)" ); // stream.error always throws, this is here to prevent a warning return Group_tag{}; } diff --git a/src/item_group.h b/src/item_group.h index f38f38cdf7cba..7e1c72f74f94e 100644 --- a/src/item_group.h +++ b/src/item_group.h @@ -16,7 +16,7 @@ struct itype; using Item_tag = std::string; using Group_tag = std::string; class JsonObject; -class JsonIn; +class JsonValue; class time_point; namespace item_group @@ -79,23 +79,23 @@ void load_item_group( const JsonObject &jsobj, const Group_tag &group_id, /** * Get an item group id and (optionally) load an inlined item group. * - * If the next value in the JSON stream is string, it's assumed to be an item group id and it's + * If the value is string, it's assumed to be an item group id and it's * returned directly. * - * If the next value is a JSON object, it is loaded as item group. The group will be given a + * If the value is a JSON object, it is loaded as item group. The group will be given a * unique id (if the JSON object contains an id, it is ignored) and that id will be returned. * If the JSON object does not contain a subtype, the given default is used. * - * If the next value is a JSON array, it is loaded as item group: the default_subtype will be + * If the value is a JSON array, it is loaded as item group: the default_subtype will be * used as subtype of the new item group and the array is loaded like the "entries" array of * a item group definition (see format of item groups). * * @param stream Stream to load from * @param default_subtype If an inlined item group is loaded this is used as the default * subtype. It must be either "distribution" or "collection". See @ref Item_group. - * @throw std::string as usual for JSON errors, including invalid input values. + * @throw JsonError as usual for JSON errors, including invalid input values. */ -Group_tag load_item_group( JsonIn &stream, const std::string &default_subtype ); +Group_tag load_item_group( const JsonValue &value, const std::string &default_subtype ); } // namespace item_group /** diff --git a/src/iteminfo_query.h b/src/iteminfo_query.h index 57b528f8bec5f..29c27d3d2c987 100644 --- a/src/iteminfo_query.h +++ b/src/iteminfo_query.h @@ -34,6 +34,7 @@ enum class iteminfo_parts : size_t { FOOD_PORTIONS, FOOD_SMELL, FOOD_VITAMINS, + FOOD_VIT_EFFECTS, FOOD_CANNIBALISM, FOOD_TAINT, FOOD_POISON, diff --git a/src/itype.h b/src/itype.h index 2dc035a840237..7679669a24035 100644 --- a/src/itype.h +++ b/src/itype.h @@ -590,6 +590,8 @@ struct islot_gunmod : common_ranged_data { /** Increases base gun UPS consumption by this many times per shot */ float ups_charges_multiplier = 1.0f; + /** Increases gun weight by this many times */ + float weight_multiplier = 1.0f; /** Firing modes added to or replacing those of the base gun */ std::map mode_modifier; @@ -965,6 +967,9 @@ struct itype { /** What items can be used to repair this item? @see Item_factory::finalize */ std::set repair; + /** What recipes can make this item */ + std::vector recipes; + /** What faults (if any) can occur */ std::set faults; diff --git a/src/iuse.cpp b/src/iuse.cpp index de96a28766167..aeb1593c3b92f 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -395,10 +395,10 @@ static int alcohol( player &p, const item &it, const int strength ) { // Weaker characters are cheap drunks /** @EFFECT_STR_MAX reduces drunkenness duration */ - time_duration duration = alc_strength( strength, 34_minutes, 68_minutes, - 90_minutes ) - ( alc_strength( strength, 36_seconds, 1_minutes, 72_seconds ) * p.str_max ); + time_duration duration = alc_strength( strength, 22_minutes, 34_minutes, + 45_minutes ) - ( alc_strength( strength, 36_seconds, 1_minutes, 72_seconds ) * p.str_max ); if( p.has_trait( trait_ALCMET ) ) { - duration = alc_strength( strength, 9_minutes, 18_minutes, 25_minutes ) - ( alc_strength( strength, + duration = alc_strength( strength, 6_minutes, 14_minutes, 18_minutes ) - ( alc_strength( strength, 36_seconds, 1_minutes, 1_minutes ) * p.str_max ); // Metabolizing the booze improves the nutritional value; // might not be healthy, and still causes Thirst problems, though @@ -406,9 +406,9 @@ static int alcohol( player &p, const item &it, const int strength ) // Metabolizing it cancels out the depressant p.mod_stim( abs( it.get_comestible() ? it.get_comestible()->stim : 0 ) ); } else if( p.has_trait( trait_TOLERANCE ) ) { - duration -= alc_strength( strength, 12_minutes, 30_minutes, 45_minutes ); + duration -= alc_strength( strength, 9_minutes, 16_minutes, 24_minutes ); } else if( p.has_trait( trait_LIGHTWEIGHT ) ) { - duration += alc_strength( strength, 12_minutes, 30_minutes, 45_minutes ); + duration += alc_strength( strength, 9_minutes, 16_minutes, 24_minutes ); } p.add_effect( effect_drunk, duration ); return it.type->charges_to_use(); @@ -998,6 +998,22 @@ int iuse::blech( player *p, item *it, bool, const tripoint & ) return it->type->charges_to_use(); } +int iuse::blech_because_unclean( player *p, item *it, bool, const tripoint & ) +{ + if( !p->is_npc() ) { + if( it->made_of( LIQUID ) ) { + if( !p->query_yn( _( "This looks unclean, sure you want to drink it?" ) ) ) { + return 0; + } + } else { //Assume that if a blech consumable isn't a drink, it will be eaten. + if( !p->query_yn( _( "This looks unclean, sure you want to eat it?" ) ) ) { + return 0; + } + } + } + return it->type->charges_to_use(); +} + int iuse::plantblech( player *p, item *it, bool, const tripoint &pos ) { if( p->has_trait( trait_THRESH_PLANT ) ) { @@ -1236,7 +1252,7 @@ static void marloss_common( player &p, item &it, const trait_id ¤t_color ) iuse dummy; dummy.purifier( &p, &it, false, p.pos() ); if( effect == 6 ) { - p.radiation = 0; + p.set_rad( 0 ); } } else if( effect == 7 ) { @@ -1381,7 +1397,7 @@ int iuse::mycus( player *p, item *it, bool t, const tripoint &pos ) p->add_msg_if_player( m_good, _( "You feel better all over." ) ); p->mod_painkiller( 30 ); this->purifier( p, it, t, pos ); // Clear out some of that goo you may have floating around - p->radiation = 0; + p->set_rad( 0 ); p->healall( 4 ); // Can't make you a whole new person, but not for lack of trying p->add_msg_if_player( m_good, _( "As it settles in, you feel ecstasy radiating through every part of your body…" ) ); @@ -1589,15 +1605,19 @@ int iuse::radio_mod( player *p, item *, bool, const tripoint & ) return 0; } - int inventory_index = g->inv_for_filter( _( "Modify what?" ), []( const item & itm ) { + auto filter = []( const item & itm ) { return itm.has_flag( "RADIO_MODABLE" ); - } ); - item &modded = p->i_at( inventory_index ); + }; + + // note: if !p->is_npc() then p is avatar + item_location loc = game_menus::inv::titled_filter_menu( + filter, *p->as_avatar(), _( "Modify what?" ) ); - if( modded.is_null() ) { + if( !loc ) { p->add_msg_if_player( _( "You do not have that item!" ) ); return 0; } + item &modded = *loc; int choice = uilist( _( "Which signal should activate the item?" ), { _( "\"Red\"" ), _( "\"Blue\"" ), _( "\"Green\"" ) @@ -3407,14 +3427,14 @@ int iuse::geiger( player *p, item *it, bool t, const tripoint &pos ) } const tripoint &pnt = *pnt_; if( pnt == g->u.pos() ) { - p->add_msg_if_player( m_info, _( "Your radiation level: %d mSv (%d mSv from items)" ), p->radiation, + p->add_msg_if_player( m_info, _( "Your radiation level: %d mSv (%d mSv from items)" ), p->get_rad(), p->leak_level( "RADIOACTIVE" ) ); break; } if( npc *const person_ = g->critter_at( pnt ) ) { npc &person = *person_; p->add_msg_if_player( m_info, _( "%s's radiation level: %d mSv (%d mSv from items)" ), - person.name, person.radiation, + person.name, person.get_rad(), person.leak_level( "RADIOACTIVE" ) ); } break; @@ -4352,6 +4372,7 @@ int iuse::portable_game( player *p, item *it, bool, const tripoint & ) as_m.entries.emplace_back( 3, true, '3', _( "Sokoban" ) ); as_m.entries.emplace_back( 4, true, '4', _( "Minesweeper" ) ); as_m.entries.emplace_back( 5, true, '5', _( "Lights on!" ) ); + as_m.entries.emplace_back( 6, true, '6', _( "Play anything for a while" ) ); as_m.query(); switch( as_m.ret ) { @@ -4370,6 +4391,9 @@ int iuse::portable_game( player *p, item *it, bool, const tripoint & ) case 5: loaded_software = "lightson_game"; break; + case 6: + loaded_software = "null"; + break; default: //Cancel return 0; @@ -4379,8 +4403,12 @@ int iuse::portable_game( player *p, item *it, bool, const tripoint & ) const int moves = to_moves( 15_minutes ); p->add_msg_if_player( _( "You play on your %s for a while." ), it->tname() ); + if( loaded_software == "null" ) { + p->assign_activity( activity_id( "ACT_GENERIC_GAME" ), to_moves( 1_hours ), -1, + p->get_item_position( it ), "gaming" ); + return it->type->charges_to_use(); + } p->assign_activity( activity_id( "ACT_GAME" ), moves, -1, p->get_item_position( it ), "gaming" ); - std::map game_data; game_data.clear(); int game_score = 0; @@ -4621,12 +4649,20 @@ int iuse::mind_splicer( player *p, item *it, bool, const tripoint & ) if( map_it.typeId() == "rmi2_corpse" && query_yn( _( "Use the mind splicer kit on the %s?" ), colorize( map_it.tname(), map_it.color_in_inventory() ) ) ) { - int pos = g->inv_for_id( itype_id( "data_card" ), _( "Select storage media" ) ); - item &data_card = p->i_at( pos ); - if( data_card.is_null() ) { + + auto filter = []( const item & it ) { + return it.typeId() == "data_card"; + }; + avatar *you = p->as_avatar(); + item_location loc; + if( you != nullptr ) { + loc = game_menus::inv::titled_filter_menu( filter, *you, _( "Select storage media" ) ); + } + if( !loc ) { add_msg( m_info, _( "Nevermind." ) ); return 0; } + item &data_card = *loc; ///\EFFECT_DEX makes using the mind splicer faster ///\EFFECT_FIRSTAID makes using the mind splicer faster const time_duration time = std::max( 150_minutes - 20_minutes * ( p->get_skill_level( @@ -4674,15 +4710,20 @@ int iuse::lumber( player *p, item *it, bool t, const tripoint & ) } // If the player is not standing on a log, check inventory - int pos = g->inv_for_id( itype_id( "log" ), _( "Cut up what?" ) ); - - item &cut = p->i_at( pos ); + avatar *you = p->as_avatar(); + item_location loc; + auto filter = []( const item & it ) { + return it.typeId() == "log"; + }; + if( you != nullptr ) { + loc = game_menus::inv::titled_filter_menu( filter, *you, _( "Cut up what?" ) ); + } - if( cut.is_null() ) { + if( !loc ) { p->add_msg_if_player( m_info, _( "You do not have that item!" ) ); return 0; } - p->i_rem( &cut ); + p->i_rem( &*loc ); cut_log_into_planks( *p ); return it->type->charges_to_use(); } @@ -5496,7 +5537,7 @@ static bool heat_item( player &p ) { auto loc = g->inv_map_splice( []( const item & itm ) { const item *food = itm.get_food(); - return food && food->item_tags.count( "HOT" ); + return food && !food->item_tags.count( "HOT" ); }, _( "Heat up what?" ), 1, _( "You don't have appropriate food to heat up." ) ); item *heat = loc.get_item(); @@ -5778,12 +5819,12 @@ int iuse::radglove( player *p, item *it, bool, const tripoint & ) return 0; } else { p->add_msg_if_player( _( "You activate your radiation biomonitor." ) ); - if( p->radiation >= 1 ) { + if( p->get_rad() >= 1 ) { p->add_msg_if_player( m_warning, _( "You are currently irradiated." ) ); p->add_msg_player_or_say( m_info, _( "Your radiation level: %d mSv." ), _( "It says here that my radiation level is %d mSv." ), - p->radiation ); + p->get_rad() ); } else { p->add_msg_player_or_say( m_info, _( "You are not currently irradiated." ), @@ -5863,12 +5904,12 @@ int iuse::gun_repair( player *p, item *it, bool, const tripoint & ) p->add_msg_if_player( m_info, _( "You need a mechanics skill of 2 to use this repair kit." ) ); return 0; } - int inventory_index = g->inv_for_all( _( "Select the firearm to repair" ) ); - item &fix = p->i_at( inventory_index ); - if( fix.is_null() ) { + item_location loc = game_menus::inv::titled_menu( g->u, ( "Select the firearm to repair" ) ); + if( !loc ) { p->add_msg_if_player( m_info, _( "You do not have that item!" ) ); return 0; } + item &fix = *loc; if( !fix.is_firearm() ) { p->add_msg_if_player( m_info, _( "That isn't a firearm!" ) ); return 0; @@ -5987,80 +6028,6 @@ int iuse::toolmod_attach( player *p, item *it, bool, const tripoint & ) return 0; } -int iuse::misc_repair( player *p, item *it, bool, const tripoint & ) -{ - if( !it->ammo_sufficient() ) { - return 0; - } - if( p->is_underwater() ) { - p->add_msg_if_player( m_info, _( "You can't do that while underwater." ) ); - return 0; - } - if( p->is_mounted() ) { - p->add_msg_if_player( m_info, _( "You cannot do that while mounted." ) ); - return 0; - } - if( p->fine_detail_vision_mod() > 4 ) { - p->add_msg_if_player( m_info, _( "You can't see to repair!" ) ); - return 0; - } - /** @EFFECT_FABRICATION >0 allows use of repair kit */ - if( p->get_skill_level( skill_fabrication ) < 1 ) { - p->add_msg_if_player( m_info, _( "You need a fabrication skill of 1 to use this repair kit." ) ); - return 0; - } - static const std::set repairable { - material_id( "wood" ), - material_id( "paper" ), - material_id( "bone" ), - material_id( "chitin" ), - material_id( "acidchitin" ) - }; - int inventory_index = g->inv_for_filter( _( "Select the item to repair" ), []( const item & itm ) { - return !itm.is_firearm() && itm.made_of_any( repairable ) && !itm.count_by_charges(); - } ); - item &fix = p->i_at( inventory_index ); - if( fix.is_null() ) { - p->add_msg_if_player( m_info, _( "You do not have that item!" ) ); - return 0; - } - if( fix.damage() <= fix.min_damage() ) { - p->add_msg_if_player( m_info, _( "You cannot improve your %s any more this way." ), - fix.tname() ); - return 0; - } - if( fix.damage() <= 0 && fix.has_flag( "PRIMITIVE_RANGED_WEAPON" ) ) { - p->add_msg_if_player( m_info, _( "You cannot improve your %s any more this way." ), - fix.tname() ); - return 0; - } - const std::string startdurability = fix.durability_indicator( true ); - std::string resultdurability; - if( fix.damage() <= 0 ) { - p->moves -= to_moves( 10_seconds * p->fine_detail_vision_mod() ); - p->practice( skill_fabrication, 10 ); - fix.mod_damage( -itype::damage_scale ); - p->add_msg_if_player( m_good, _( "You reinforce your %s." ), fix.tname() ); - - } else if( fix.damage() > itype::damage_scale ) { - p->moves -= to_moves( 5_seconds * p->fine_detail_vision_mod() ); - p->practice( skill_fabrication, 10 ); - fix.mod_damage( -itype::damage_scale ); - resultdurability = fix.durability_indicator( true ); - p->add_msg_if_player( m_good, _( "You repair your %s! ( %s-> %s)" ), fix.tname( 1, false ), - startdurability, resultdurability ); - - } else { - p->moves -= to_moves( 3_seconds * p->fine_detail_vision_mod() ); - p->practice( skill_fabrication, 10 ); - fix.set_damage( 0 ); - resultdurability = fix.durability_indicator( true ); - p->add_msg_if_player( m_good, _( "You repair your %s completely! ( %s-> %s)" ), - fix.tname( 1, false ), startdurability, resultdurability ); - } - return it->type->charges_to_use(); -} - int iuse::bell( player *p, item *it, bool, const tripoint & ) { if( it->typeId() == "cow_bell" ) { @@ -6323,7 +6290,9 @@ static bool einkpc_download_memory_card( player &p, item &eink, item &mc ) for( const auto &e : recipe_dict ) { const auto &r = e.second; - + if( r.never_learn ) { + continue; + } if( science ) { if( r.difficulty >= 3 && one_in( r.difficulty + 1 ) ) { candidates.push_back( &r ); @@ -6686,17 +6655,26 @@ int iuse::einktabletpc( player *p, item *it, bool t, const tripoint &pos ) return it->type->charges_to_use(); } + avatar *you = p->as_avatar(); + item_location loc; + auto filter = []( const item & it ) { + return it.has_flag( "MC_MOBILE" ); + }; + const std::string title = _( "Insert memory card" ); + if( ei_download == choice ) { p->moves -= to_moves( 2_seconds ); - const int inventory_index = g->inv_for_flag( "MC_MOBILE", _( "Insert memory card" ) ); - item &mc = p->i_at( inventory_index ); - - if( mc.is_null() ) { + if( you != nullptr ) { + loc = game_menus::inv::titled_filter_menu( filter, *you, title ); + } + if( !loc ) { p->add_msg_if_player( m_info, _( "You do not have that item!" ) ); return it->type->charges_to_use(); } + item &mc = *loc; + if( !mc.has_flag( "MC_MOBILE" ) ) { p->add_msg_if_player( m_info, _( "This is not a compatible memory card." ) ); return it->type->charges_to_use(); @@ -6720,13 +6698,15 @@ int iuse::einktabletpc( player *p, item *it, bool t, const tripoint &pos ) if( ei_decrypt == choice ) { p->moves -= to_moves( 2_seconds ); - const int inventory_index = g->inv_for_flag( "MC_MOBILE", _( "Insert memory card" ) ); - item &mc = p->i_at( inventory_index ); - - if( mc.is_null() ) { + if( you != nullptr ) { + loc = game_menus::inv::titled_filter_menu( filter, *you, title ); + } + if( !loc ) { p->add_msg_if_player( m_info, _( "You do not have that item!" ) ); return it->type->charges_to_use(); } + item &mc = *loc; + if( !mc.has_flag( "MC_MOBILE" ) ) { p->add_msg_if_player( m_info, _( "This is not a compatible memory card." ) ); return it->type->charges_to_use(); @@ -7796,13 +7776,19 @@ int iuse::camera( player *p, item *it, bool, const tripoint & ) p->moves -= to_moves( 2_seconds ); - const int inventory_index = g->inv_for_flag( "MC_MOBILE", _( "Insert memory card" ) ); - item &mc = p->i_at( inventory_index ); - - if( mc.is_null() ) { + avatar *you = p->as_avatar(); + item_location loc; + if( you != nullptr ) { + loc = game_menus::inv::titled_filter_menu( []( const item & it ) { + return it.has_flag( "MC_MOBILE" ); + }, *you, _( "Insert memory card" ) ); + } + if( !loc ) { p->add_msg_if_player( m_info, _( "You do not have that item!" ) ); return it->type->charges_to_use(); } + item &mc = *loc; + if( !mc.has_flag( "MC_MOBILE" ) ) { p->add_msg_if_player( m_info, _( "This is not a compatible memory card." ) ); return it->type->charges_to_use(); @@ -7989,19 +7975,26 @@ int iuse::radiocar( player *p, item *it, bool, const tripoint & ) if( choice == 1 ) { if( bomb_it == it->contents.end() ) { //arming car with bomb - int inventory_index = g->inv_for_flag( "RADIOCARITEM", _( "Arm what?" ) ); - item &put = p->i_at( inventory_index ); - if( put.is_null() ) { + + avatar *you = p->as_avatar(); + item_location loc; + if( you != nullptr ) { + loc = game_menus::inv::titled_filter_menu( []( const item & it ) { + return it.has_flag( "RADIOCARITEM" ); + }, *you, _( "Arm what?" ) ); + } + if( !loc ) { p->add_msg_if_player( m_info, _( "You do not have that item!" ) ); return 0; } + item &put = *loc; if( put.has_flag( "RADIOCARITEM" ) && ( put.volume() <= 1250_ml || ( put.weight() <= 2_kilogram ) ) ) { p->moves -= to_moves( 3_seconds ); p->add_msg_if_player( _( "You armed your RC car with %s." ), put.tname() ); - it->put_in( p->i_rem( inventory_index ) ); + it->put_in( p->i_rem( &put ) ); } else if( !put.has_flag( "RADIOCARITEM" ) ) { p->add_msg_if_player( _( "RC car with %s? How?" ), put.tname() ); @@ -8826,6 +8819,16 @@ int iuse::cable_attach( player *p, item *it, bool, const tripoint & ) const bool wearing_solar_pack = has_solar_pack || has_solar_pack_on; const bool has_ups = p->has_charges( "UPS_off", 1 ) || p->has_charges( "adv_UPS_off", 1 ); + item_location loc; + avatar *you = p->as_avatar(); + + auto filter = [&]( const item & itm ) { + return itm.has_flag( "IS_UPS" ); + }; + + const std::string choose_ups = _( "Choose UPS:" ); + const std::string dont_have_ups = _( "You don't have any UPS." ); + const auto set_cable_active = []( player * p, item * it, const std::string & state ) { it->set_var( "state", state ); it->active = true; @@ -8858,14 +8861,14 @@ int iuse::cable_attach( player *p, item *it, bool, const tripoint & ) p->add_msg_if_player( m_info, _( "You attach the cable to the solar pack." ) ); return 0; } else if( choice == 3 ) { - int pos = g->inv_for_filter( _( "Choose UPS:" ), [&]( const item & itm ) { - return itm.has_flag( "IS_UPS" ); - }, _( "You don't have any UPS." ) ); - if( pos == INT_MIN ) { + if( you != nullptr ) { + loc = game_menus::inv::titled_filter_menu( filter, *you, choose_ups, dont_have_ups ); + } + if( !loc ) { add_msg( _( "Never mind" ) ); return 0; } - item &chosen = p->i_at( pos ); + item &chosen = *loc; chosen.set_var( "cable", "plugged_in" ); chosen.activate(); set_cable_active( p, it, "UPS" ); @@ -8963,15 +8966,13 @@ int iuse::cable_attach( player *p, item *it, bool, const tripoint & ) p->add_msg_if_player( m_good, _( "You are now plugged to the solar backpack." ) ); return 0; } else if( choice == 4 ) { + loc = game_menus::inv::titled_filter_menu( filter, *you, choose_ups, dont_have_ups ); // connecting self to UPS - int pos = g->inv_for_filter( _( "Choose UPS:" ), [&]( const item & itm ) { - return itm.has_flag( "IS_UPS" ); - }, _( "You don't have any UPS." ) ); - if( pos == INT_MIN ) { + if( !loc ) { add_msg( _( "Never mind" ) ); return 0; } - item &chosen = p->i_at( pos ); + item &chosen = *loc; chosen.set_var( "cable", "plugged_in" ); chosen.activate(); set_cable_active( p, it, "UPS_link" ); @@ -9449,19 +9450,19 @@ int iuse::wash_items( player *p, bool soft_items, bool hard_items ) popup( std::string( _( "You have nothing to clean." ) ), PF_GET_KEY ); return 0; } - const std::list> to_clean = inv_s.execute(); + const drop_locations to_clean = inv_s.execute(); if( to_clean.empty() ) { return 0; } // Determine if we have enough water and cleanser for all the items. units::volume total_volume = 0_ml; - for( std::pair pair : to_clean ) { - item i = p->i_at( pair.first ); - if( pair.first == INT_MIN ) { + for( drop_location pair : to_clean ) { + if( !pair.first ) { p->add_msg_if_player( m_info, _( "Never mind." ) ); return 0; } + item &i = *pair.first; total_volume += i.volume() * pair.second / ( i.count_by_charges() ? i.charges : 1 ); } @@ -9488,8 +9489,8 @@ int iuse::wash_items( player *p, bool soft_items, bool hard_items ) // Assign the activity values. p->assign_activity( activity_id( "ACT_WASH" ), required.time ); - for( std::pair pair : to_clean ) { - p->activity.values.push_back( pair.first ); + for( drop_location pair : to_clean ) { + p->activity.targets.push_back( pair.first ); p->activity.values.push_back( pair.second ); } @@ -9499,7 +9500,7 @@ int iuse::wash_items( player *p, bool soft_items, bool hard_items ) int iuse::break_stick( player *p, item *it, bool, const tripoint & ) { p->moves -= to_moves( 2_seconds ); - p->mod_stat( "stamina", static_cast( 0.05f * get_option( "PLAYER_MAX_STAMINA" ) ) ); + p->mod_stamina( static_cast( 0.05f * get_option( "PLAYER_MAX_STAMINA" ) ) ); if( p->get_str() < 5 ) { p->add_msg_if_player( _( "You are too weak to even try." ) ); diff --git a/src/iuse.h b/src/iuse.h index 51ed23457e19e..c2088be163e91 100644 --- a/src/iuse.h +++ b/src/iuse.h @@ -57,6 +57,7 @@ class iuse int flusleep( player *, item *, bool, const tripoint & ); int inhaler( player *, item *, bool, const tripoint & ); int blech( player *, item *, bool, const tripoint & ); + int blech_because_unclean( player *, item *, bool, const tripoint & ); int plantblech( player *, item *, bool, const tripoint & ); int chew( player *, item *, bool, const tripoint & ); int purifier( player *, item *, bool, const tripoint & ); @@ -174,7 +175,6 @@ class iuse int gun_repair( player *, item *, bool, const tripoint & ); int gunmod_attach( player *, item *, bool, const tripoint & ); int toolmod_attach( player *, item *, bool, const tripoint & ); - int misc_repair( player *, item *, bool, const tripoint & ); int rm13armor_off( player *, item *, bool, const tripoint & ); int rm13armor_on( player *, item *, bool, const tripoint & ); int unpack_item( player *, item *, bool, const tripoint & ); diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp index cdf501003d3f9..ced80ef91af46 100644 --- a/src/iuse_actor.cpp +++ b/src/iuse_actor.cpp @@ -137,9 +137,8 @@ void iuse_transform::load( const JsonObject &obj ) } obj.read( "target_charges", ammo_qty ); if( obj.has_array( "rand_target_charges" ) ) { - JsonArray jarr = obj.get_array( "rand_target_charges" ); - while( jarr.has_more() ) { - random_ammo_qty.push_back( jarr.next_int() ); + for( const int charge : obj.get_array( "rand_target_charges" ) ) { + random_ammo_qty.push_back( charge ); } if( random_ammo_qty.size() < 2 ) { obj.throw_error( "You must specify two or more values to choose between", "rand_target_charges" ); @@ -616,9 +615,7 @@ void consume_drug_iuse::load( const JsonObject &obj ) obj.read( "tools_needed", tools_needed ); if( obj.has_array( "effects" ) ) { - JsonArray jsarr = obj.get_array( "effects" ); - while( jsarr.has_more() ) { - JsonObject e = jsarr.next_object(); + for( const JsonObject &e : obj.get_array( "effects" ) ) { effects.push_back( load_effect_data( e ) ); } } @@ -626,9 +623,7 @@ void consume_drug_iuse::load( const JsonObject &obj ) obj.read( "fields_produced", fields_produced ); obj.read( "moves", moves ); - auto arr = obj.get_array( "vitamins" ); - while( arr.has_more() ) { - auto vit = arr.next_array(); + for( JsonArray vit : obj.get_array( "vitamins" ) ) { auto lo = vit.get_int( 1 ); auto hi = vit.size() >= 3 ? vit.get_int( 2 ) : lo; vitamins.emplace( vitamin_id( vit.get_string( 0 ) ), std::make_pair( lo, hi ) ); @@ -864,6 +859,45 @@ std::unique_ptr ups_based_armor_actor::clone() const return std::make_unique( *this ); } +std::unique_ptr place_npc_iuse::clone() const +{ + return std::make_unique( *this ); +} + +void place_npc_iuse::load( const JsonObject &obj ) +{ + npc_class_id = string_id( obj.get_string( "npc_class_id" ) ); + obj.read( "summon_msg", summon_msg ); + obj.read( "moves", moves ); + obj.read( "place_randomly", place_randomly ); +} + +int place_npc_iuse::use( player &p, item &, bool, const tripoint & ) const +{ + cata::optional target_pos; + if( place_randomly ) { + const tripoint_range target_range = points_in_radius( p.pos(), 1 ); + target_pos = random_point( target_range, []( const tripoint & t ) { + return !g->m.passable( t ); + } ); + } else { + const std::string query = _( "Place npc where?" ); + target_pos = choose_adjacent( _( "Place npc where?" ) ); + } + if( !target_pos ) { + return 0; + } + if( !g->m.passable( target_pos.value() ) ) { + p.add_msg_if_player( m_info, _( "There is no square to spawn npc in!" ) ); + return 0; + } + + g->m.place_npc( target_pos.value().xy(), npc_class_id ); + p.mod_moves( -moves ); + p.add_msg_if_player( m_info, "%s", _( summon_msg ) ); + return 1; +} + void ups_based_armor_actor::load( const JsonObject &obj ) { obj.read( "activate_msg", activate_msg ); @@ -1152,15 +1186,14 @@ void reveal_map_actor::load( const JsonObject &obj ) { radius = obj.get_int( "radius" ); message = obj.get_string( "message" ); - JsonArray jarr = obj.get_array( "terrain" ); std::string ter; ot_match_type ter_match_type; - while( jarr.has_more() ) { - if( jarr.test_string() ) { - ter = jarr.next_string(); + for( const JsonValue &entry : obj.get_array( "terrain" ) ) { + if( entry.test_string() ) { + ter = entry.get_string(); ter_match_type = ot_match_type::contains; } else { - JsonObject jo = jarr.next_object(); + JsonObject jo = entry.get_object(); ter = jo.get_string( "om_terrain" ); ter_match_type = jo.get_enum_value( jo.get_string( "om_terrain_match_type", "CONTAINS" ), ot_match_type::contains ); @@ -1700,12 +1733,12 @@ int inscribe_actor::use( player &p, item &it, bool t, const tripoint & ) const return iuse::handle_ground_graffiti( p, &it, string_format( _( "%s what?" ), verb ), p.pos() ); } - int pos = g->inv_for_all( _( "Inscribe which item?" ) ); - item &cut = p.i_at( pos ); - if( cut.is_null() ) { + item_location loc = game_menus::inv::titled_menu( g->u, _( "Inscribe which item?" ) ); + if( !loc ) { p.add_msg_if_player( m_info, _( "Never mind." ) ); return 0; } + item &cut = *loc; if( &cut == &it ) { p.add_msg_if_player( _( "You try to bend your %s, but fail." ), it.tname() ); return 0; @@ -2572,13 +2605,21 @@ int holster_actor::use( player &p, item &it, bool, const tripoint & ) const return string_format( _( "Draw %s" ), elem.display_name() ); } ); + item *internal_item = nullptr; if( opts.size() > 1 ) { - const int ret = uilist( string_format( _( "Use %s" ), it.tname() ), opts ); + int ret = uilist( string_format( _( "Use %s" ), it.tname() ), opts ); if( ret < 0 ) { pos = -2; } else { pos += ret; + if( opts.size() != it.contents.size() ) { + ret--; + } + auto iter = std::next( it.contents.begin(), ret ); + internal_item = &*iter; } + } else { + internal_item = &it.contents.front(); } if( pos < -1 ) { @@ -2589,13 +2630,13 @@ int holster_actor::use( player &p, item &it, bool, const tripoint & ) const if( pos >= 0 ) { // worn holsters ignore penalty effects (e.g. GRABBED) when determining number of moves to consume if( p.is_worn( it ) ) { - p.wield_contents( it, pos, false, draw_cost ); + p.wield_contents( it, internal_item, false, draw_cost ); } else { - p.wield_contents( it, pos ); + p.wield_contents( it, internal_item ); } } else { - auto loc = game_menus::inv::holster( p, it ); + item_location loc = game_menus::inv::holster( p, it ); if( !loc ) { p.add_msg_if_player( _( "Never mind." ) ); @@ -2835,9 +2876,8 @@ int ammobelt_actor::use( player &p, item &, bool, const tripoint & ) const void repair_item_actor::load( const JsonObject &obj ) { // Mandatory: - JsonArray jarr = obj.get_array( "materials" ); - while( jarr.has_more() ) { - materials.emplace( jarr.next_string() ); + for( const std::string &line : obj.get_array( "materials" ) ) { + materials.emplace( line ); } // TODO: Make skill non-mandatory while still erroring on invalid skill @@ -3408,7 +3448,7 @@ void heal_actor::load( const JsonObject &obj ) torso_power = obj.get_float( "torso_power", 1.5f * limb_power ); limb_scaling = obj.get_float( "limb_scaling", 0.25f * limb_power ); - float scaling_ratio = limb_scaling / limb_power; + float scaling_ratio = limb_power < 0.0001f ? 0.0f : limb_scaling / limb_power; head_scaling = obj.get_float( "head_scaling", scaling_ratio * head_power ); torso_scaling = obj.get_float( "torso_scaling", scaling_ratio * torso_power ); @@ -3419,9 +3459,7 @@ void heal_actor::load( const JsonObject &obj ) long_action = obj.get_bool( "long_action", false ); if( obj.has_array( "effects" ) ) { - JsonArray jsarr = obj.get_array( "effects" ); - while( jsarr.has_more() ) { - JsonObject e = jsarr.next_object(); + for( const JsonObject &e : obj.get_array( "effects" ) ) { effects.push_back( load_effect_data( e ) ); } } @@ -4475,13 +4513,11 @@ std::unique_ptr weigh_self_actor::clone() const void sew_advanced_actor::load( const JsonObject &obj ) { // Mandatory: - JsonArray jarr = obj.get_array( "materials" ); - while( jarr.has_more() ) { - materials.emplace( jarr.next_string() ); + for( const std::string &line : obj.get_array( "materials" ) ) { + materials.emplace( line ); } - jarr = obj.get_array( "clothing_mods" ); - while( jarr.has_more() ) { - clothing_mods.push_back( clothing_mod_id( jarr.next_string() ) ); + for( const std::string &line : obj.get_array( "clothing_mods" ) ) { + clothing_mods.push_back( clothing_mod_id( line ) ); } // TODO: Make skill non-mandatory while still erroring on invalid skill @@ -4511,15 +4547,18 @@ int sew_advanced_actor::use( player &p, item &it, bool, const tripoint & ) const return 0; } - int pos = g->inv_for_filter( _( "Enhance which clothing?" ), [ this ]( const item & itm ) { + auto filter = [this]( const item & itm ) { return itm.is_armor() && !itm.is_firearm() && !itm.is_power_armor() && itm.made_of_any( materials ); - } ); - item &mod = p.i_at( pos ); - if( mod.is_null() ) { + }; + // note: if !p.is_npc() then p is avatar. + item_location loc = game_menus::inv::titled_filter_menu( + filter, *p.as_avatar(), _( "Enhance which clothing?" ) ); + if( !loc ) { p.add_msg_if_player( m_info, _( "You do not have that item!" ) ); return 0; } + item &mod = *loc; if( &mod == &it ) { p.add_msg_if_player( m_info, _( "This can be used to repair or modify other items, not itself." ) ); @@ -4681,7 +4720,7 @@ int sew_advanced_actor::use( player &p, item &it, bool, const tripoint & ) const mod.tname( 1, false ), startdurability, resultdurability ); if( destroyed ) { p.add_msg_if_player( m_bad, _( "You destroy it!" ) ); - p.i_rem_keep_contents( pos ); + p.i_rem_keep_contents( p.get_item_position( &mod ) ); } return thread_needed / 2; } else if( rn <= 10 ) { diff --git a/src/iuse_actor.h b/src/iuse_actor.h index 914830a8682fc..4b72ccb685c58 100644 --- a/src/iuse_actor.h +++ b/src/iuse_actor.h @@ -15,6 +15,7 @@ #include "explosion.h" #include "game_constants.h" #include "iuse.h" +class npc_template; #include "ret_val.h" #include "string_id.h" #include "translations.h" @@ -310,6 +311,24 @@ class place_monster_iuse : public iuse_actor std::unique_ptr clone() const override; }; +/** + * This iuse contains the logic to summon an npc on the map. + */ +class place_npc_iuse : public iuse_actor +{ + public: + string_id npc_class_id; + bool place_randomly = false; + int moves = 100; + std::string summon_msg; + + place_npc_iuse() : iuse_actor( "place_npc" ) { } + ~place_npc_iuse() override = default; + void load( const JsonObject &obj ) override; + int use( player &, item &, bool, const tripoint & ) const override; + std::unique_ptr clone() const override; +}; + /** * Items that can be worn and can be activated to consume energy from UPS. * Note that the energy consumption is done in @ref player::process_active_items, it is diff --git a/src/json.cpp b/src/json.cpp index c53fc7276fc5b..2badf08acfaa7 100644 --- a/src/json.cpp +++ b/src/json.cpp @@ -109,8 +109,11 @@ void JsonObject::finish() const std::string &name = p.first; if( !visited_members.count( name ) && !string_starts_with( name, "//" ) && name != "blueprint" ) { - dbg( D_ERROR ) << "Failed to visit member '" << name << "' in JsonObject at " - << jsin->line_number( start ) << ":\n" << str() << std::endl; + try { + throw_error( string_format( "Failed to visit member %s in JsonObject", name ), name ); + } catch( const JsonError &e ) { + debugmsg( "\n%s", e.what() ); + } } } } @@ -156,13 +159,11 @@ int JsonObject::verify_position( const std::string &name, // so it will never indicate a valid member position return 0; } - visited_members.insert( name ); return iter->second; } bool JsonObject::has_member( const std::string &name ) const { - visited_members.insert( name ); return positions.count( name ) > 0; } @@ -233,6 +234,7 @@ void JsonObject::throw_error( std::string err ) const JsonIn *JsonObject::get_raw( const std::string &name ) const { int pos = verify_position( name ); + visited_members.insert( name ); jsin->seek( pos ); return jsin; } @@ -241,9 +243,7 @@ JsonIn *JsonObject::get_raw( const std::string &name ) const bool JsonObject::get_bool( const std::string &name ) const { - int pos = verify_position( name ); - jsin->seek( pos ); - return jsin->get_bool(); + return get_member( name ).get_bool(); } bool JsonObject::get_bool( const std::string &name, const bool fallback ) const @@ -252,15 +252,14 @@ bool JsonObject::get_bool( const std::string &name, const bool fallback ) const if( !pos ) { return fallback; } + visited_members.insert( name ); jsin->seek( pos ); return jsin->get_bool(); } int JsonObject::get_int( const std::string &name ) const { - int pos = verify_position( name ); - jsin->seek( pos ); - return jsin->get_int(); + return get_member( name ).get_int(); } int JsonObject::get_int( const std::string &name, const int fallback ) const @@ -269,15 +268,14 @@ int JsonObject::get_int( const std::string &name, const int fallback ) const if( !pos ) { return fallback; } + visited_members.insert( name ); jsin->seek( pos ); return jsin->get_int(); } double JsonObject::get_float( const std::string &name ) const { - int pos = verify_position( name ); - jsin->seek( pos ); - return jsin->get_float(); + return get_member( name ).get_float(); } double JsonObject::get_float( const std::string &name, const double fallback ) const @@ -286,15 +284,14 @@ double JsonObject::get_float( const std::string &name, const double fallback ) c if( !pos ) { return fallback; } + visited_members.insert( name ); jsin->seek( pos ); return jsin->get_float(); } std::string JsonObject::get_string( const std::string &name ) const { - int pos = verify_position( name ); - jsin->seek( pos ); - return jsin->get_string(); + return get_member( name ).get_string(); } std::string JsonObject::get_string( const std::string &name, const std::string &fallback ) const @@ -303,6 +300,7 @@ std::string JsonObject::get_string( const std::string &name, const std::string & if( !pos ) { return fallback; } + visited_members.insert( name ); jsin->seek( pos ); return jsin->get_string(); } @@ -315,26 +313,25 @@ JsonArray JsonObject::get_array( const std::string &name ) const if( !pos ) { return JsonArray(); } + visited_members.insert( name ); jsin->seek( pos ); return JsonArray( *jsin ); } std::vector JsonObject::get_int_array( const std::string &name ) const { - JsonArray ja = get_array( name ); std::vector ret; - while( ja.has_more() ) { - ret.push_back( ja.next_int() ); + for( const int entry : get_array( name ) ) { + ret.push_back( entry ); } return ret; } std::vector JsonObject::get_string_array( const std::string &name ) const { - JsonArray ja = get_array( name ); std::vector ret; - while( ja.has_more() ) { - ret.push_back( ja.next_string() ); + for( const std::string &entry : get_array( name ) ) { + ret.push_back( entry ); } return ret; } @@ -345,6 +342,7 @@ JsonObject JsonObject::get_object( const std::string &name ) const if( !pos ) { return JsonObject(); } + visited_members.insert( name ); jsin->seek( pos ); return jsin->get_object(); } @@ -357,6 +355,7 @@ bool JsonObject::has_null( const std::string &name ) const if( !pos ) { return false; } + visited_members.insert( name ); jsin->seek( pos ); return jsin->test_null(); } @@ -699,9 +698,8 @@ bool JsonArray::has_object( const size_t i ) const void add_array_to_set( std::set &s, const JsonObject &json, const std::string &name ) { - JsonArray jarr = json.get_array( name ); - while( jarr.has_more() ) { - s.insert( jarr.next_string() ); + for( const std::string &line : json.get_array( name ) ) { + s.insert( line ); } } @@ -1888,3 +1886,13 @@ JsonIn &JsonValue::seek() const jsin_.seek( pos_ ); return jsin_; } + +JsonValue JsonObject::get_member( const std::string &name ) const +{ + const auto iter = positions.find( name ); + if( !jsin || iter == positions.end() ) { + throw_error( "requested non-existing member \"" + name + "\"" ); + } + visited_members.insert( name ); + return JsonValue( *jsin, iter->second ); +} diff --git a/src/json.h b/src/json.h index 43b3170287768..5fc6f9d64fb0e 100644 --- a/src/json.h +++ b/src/json.h @@ -35,6 +35,7 @@ class JsonObject; class JsonArray; class JsonSerializer; class JsonDeserializer; +class JsonValue; template class string_id; @@ -836,6 +837,7 @@ class JsonObject [[noreturn]] void throw_error( std::string err, const std::string &name ) const; // seek to a value and return a pointer to the JsonIn (member must exist) JsonIn *get_raw( const std::string &name ) const; + JsonValue get_member( const std::string &name ) const; // values by name // variants with no fallback throw an error if the name is not found. @@ -854,11 +856,13 @@ class JsonObject if( !has_member( name ) ) { return fallback; } + visited_members.insert( name ); jsin->seek( verify_position( name ) ); return jsin->get_enum_value(); } template::value>::type> E get_enum_value( const std::string &name ) const { + visited_members.insert( name ); jsin->seek( verify_position( name ) ); return jsin->get_enum_value(); } @@ -902,6 +906,7 @@ class JsonObject if( !pos ) { return false; } + visited_members.insert( name ); jsin->seek( pos ); return jsin->read( t, throw_on_error ); } @@ -910,8 +915,6 @@ class JsonObject std::string line_number() const; // for occasional use only }; -class JsonValue; - /* JsonArray * ========= * @@ -996,7 +999,7 @@ class JsonArray public: JsonArray( JsonIn &jsin ); JsonArray( const JsonArray &ja ); - JsonArray() : start( 0 ), index( 0 ), end_( 0 ), jsin( nullptr ) {} + JsonArray() : start( 0 ), index( 0 ), end_( 0 ), final_separator( false ), jsin( nullptr ) {} ~JsonArray() { finish(); } @@ -1114,6 +1117,25 @@ class JsonValue return seek().read( t ); } + bool test_string() const { + return seek().test_string(); + } + bool test_int() const { + return seek().test_int(); + } + bool test_bool() const { + return seek().test_bool(); + } + bool test_float() const { + return seek().test_float(); + } + bool test_object() const { + return seek().test_object(); + } + bool test_array() const { + return seek().test_array(); + } + void throw_error( const std::string &err ) const { seek().error( err ); } @@ -1271,6 +1293,7 @@ std::set JsonObject::get_tags( const std::string &name ) const if( !pos ) { return res; } + visited_members.insert( name ); jsin->seek( pos ); // allow single string as tag diff --git a/src/magic.cpp b/src/magic.cpp index 19d0a5ace96dc..ad0641717a34c 100644 --- a/src/magic.cpp +++ b/src/magic.cpp @@ -1,6 +1,6 @@ #include "magic.h" -#include +#include #include #include #include @@ -103,6 +103,7 @@ std::string enum_to_string( spell_flag data ) case spell_flag::RANDOM_DURATION: return "RANDOM_DURATION"; case spell_flag::RANDOM_TARGET: return "RANDOM_TARGET"; case spell_flag::MUTATE_TRAIT: return "MUTATE_TRAIT"; + case spell_flag::PAIN_NORESIST: return "PAIN_NORESIST"; case spell_flag::WONDER: return "WONDER"; case spell_flag::LAST: break; } @@ -1091,10 +1092,9 @@ void spell::cast_all_effects( Creature &source, const tripoint &target ) const source.add_msg_if_player( sp.message() ); if( sp.has_flag( RANDOM_TARGET ) ) { - if( _self ) { - sp.cast_all_effects( source, sp.random_valid_target( source, source.pos() ) ); - } else { - sp.cast_all_effects( source, sp.random_valid_target( source, target ) ); + if( const cata::optional new_target = sp.random_valid_target( source, + _self ? source.pos() : target ) ) { + sp.cast_all_effects( source, *new_target ); } } else { if( _self ) { @@ -1110,10 +1110,9 @@ void spell::cast_all_effects( Creature &source, const tripoint &target ) const for( const fake_spell &extra_spell : type->additional_spells ) { spell sp = extra_spell.get_spell( get_level() ); if( sp.has_flag( RANDOM_TARGET ) ) { - if( extra_spell.self ) { - sp.cast_all_effects( source, sp.random_valid_target( source, source.pos() ) ); - } else { - sp.cast_all_effects( source, sp.random_valid_target( source, target ) ); + if( const cata::optional new_target = sp.random_valid_target( source, + extra_spell.self ? source.pos() : target ) ) { + sp.cast_all_effects( source, *new_target ); } } else { if( extra_spell.self ) { @@ -1126,20 +1125,20 @@ void spell::cast_all_effects( Creature &source, const tripoint &target ) const } } -tripoint spell::random_valid_target( const Creature &caster, const tripoint &caster_pos ) const +cata::optional spell::random_valid_target( const Creature &caster, + const tripoint &caster_pos ) const { - const std::set area = spell_effect::spell_effect_blast( *this, caster_pos, caster_pos, - range(), false ); std::set valid_area; - for( const tripoint &target : area ) { + for( const tripoint &target : spell_effect::spell_effect_blast( *this, caster_pos, caster_pos, + range(), false ) ) { if( is_valid_target( caster, target ) ) { valid_area.emplace( target ); } } - size_t rand_i = rng( 0, valid_area.size() - 1 ); - auto iter = valid_area.begin(); - std::advance( iter, rand_i ); - return *iter; + if( valid_area.empty() ) { + return cata::nullopt; + } + return random_entry( valid_area ); } // player diff --git a/src/magic.h b/src/magic.h index 35d28d6e08526..32dc8d1e86328 100644 --- a/src/magic.h +++ b/src/magic.h @@ -2,7 +2,7 @@ #ifndef MAGIC_H #define MAGIC_H -#include +#include #include #include #include @@ -51,6 +51,7 @@ enum spell_flag { RANDOM_TARGET, // picks a random valid target within your range instead of normal behavior. MUTATE_TRAIT, // overrides the mutate spell_effect to use a specific trait_id instead of a category WONDER, // instead of casting each of the extra_spells, it picks N of them and casts them (where N is std::min( damage(), number_of_spells )) + PAIN_NORESIST, // pain altering spells can't be resisted (like with the deadened trait) LAST }; @@ -401,7 +402,8 @@ class spell bool is_valid_effect_target( valid_target t ) const; // picks a random valid tripoint from @area - tripoint random_valid_target( const Creature &caster, const tripoint &caster_pos ) const; + cata::optional random_valid_target( const Creature &caster, + const tripoint &caster_pos ) const; }; class known_magic diff --git a/src/magic_enchantment.cpp b/src/magic_enchantment.cpp index 107dcb6489422..efd7c246167ce 100644 --- a/src/magic_enchantment.cpp +++ b/src/magic_enchantment.cpp @@ -200,16 +200,12 @@ void enchantment::load( const JsonObject &jo, const std::string & ) if( jo.has_object( "intermittent_activation" ) ) { JsonObject jobj = jo.get_object( "intermittent_activation" ); - JsonArray jarray = jo.get_array( "effects" ); - while( jarray.has_more() ) { - JsonObject effect_obj; + for( const JsonObject &effect_obj : jo.get_array( "effects" ) ) { time_duration dur = read_from_json_string( *effect_obj.get_raw( "frequency" ), time_duration::units ); if( effect_obj.has_array( "spell_effects" ) ) { - JsonArray jarray = effect_obj.get_array( "spell_effects" ); - while( jarray.has_more() ) { + for( const JsonObject &fake_spell_obj : effect_obj.get_array( "spell_effects" ) ) { fake_spell fake; - JsonObject fake_spell_obj = jarray.next_object(); fake.load( fake_spell_obj ); add_activation( dur, fake ); } @@ -227,9 +223,7 @@ void enchantment::load( const JsonObject &jo, const std::string & ) "ALWAYS" ) ); if( jo.has_array( "values" ) ) { - JsonArray jarray = jo.get_array( "values" ); - while( jarray.has_more() ) { - JsonObject value_obj = jarray.next_object(); + for( const JsonObject &value_obj : jo.get_array( "values" ) ) { const enchantment::mod value = io::string_to_enum( value_obj.get_string( "value" ) ); const int add = value_obj.get_int( "add", 0 ); const double mult = value_obj.get_float( "multiply", 0.0 ); @@ -370,6 +364,9 @@ void enchantment::activate_passive( Character &guy ) const guy.mod_speed_bonus( get_value_add( mod::SPEED ) ); guy.mod_speed_bonus( mult_bonus( mod::SPEED, guy.get_speed_base() ) ); + + guy.mod_num_dodges_bonus( get_value_add( mod::BONUS_DODGE ) ); + guy.mod_num_dodges_bonus( mult_bonus( mod::BONUS_DODGE, guy.get_num_dodges_base() ) ); } void enchantment::cast_hit_you( Character &caster, const tripoint &target ) const diff --git a/src/magic_enchantment.h b/src/magic_enchantment.h index e27a2d93038b2..9fce4e38b0b8f 100644 --- a/src/magic_enchantment.h +++ b/src/magic_enchantment.h @@ -129,7 +129,7 @@ class enchantment enchantment_id id; - bool was_loaded; + bool was_loaded = false; void serialize( JsonOut &jsout ) const; diff --git a/src/magic_spell_effect.cpp b/src/magic_spell_effect.cpp index 23168b0037f72..c6fac1357fcf4 100644 --- a/src/magic_spell_effect.cpp +++ b/src/magic_spell_effect.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include #include @@ -686,7 +686,7 @@ void spell_effect::recover_energy( const spell &sp, Creature &caster, const trip if( energy_source == "MANA" ) { p->magic.mod_mana( *p, healing ); } else if( energy_source == "STAMINA" ) { - p->mod_stat( "stamina", healing ); + p->mod_stamina( healing ); } else if( energy_source == "FATIGUE" ) { // fatigue is backwards p->mod_fatigue( -healing ); @@ -694,11 +694,15 @@ void spell_effect::recover_energy( const spell &sp, Creature &caster, const trip if( healing > 0 ) { p->mod_power_level( units::from_kilojoule( healing ) ); } else { - p->mod_stat( "stamina", healing ); + p->mod_stamina( healing ); } } else if( energy_source == "PAIN" ) { // pain is backwards - p->mod_pain_noresist( -healing ); + if( sp.has_flag( PAIN_NORESIST ) ) { + p->mod_pain_noresist( -healing ); + } else { + p->mod_pain( -healing ); + } } else if( energy_source == "HEALTH" ) { p->mod_healthy( healing ); } else { diff --git a/src/magic_teleporter_list.cpp b/src/magic_teleporter_list.cpp index b93f72c870cf2..d6f2a3df7aa4c 100644 --- a/src/magic_teleporter_list.cpp +++ b/src/magic_teleporter_list.cpp @@ -1,6 +1,6 @@ #include "magic_teleporter_list.h" -#include +#include #include #include #include diff --git a/src/magic_ter_fur_transform.cpp b/src/magic_ter_fur_transform.cpp index 0dc1adc256b8d..5099e95bdddae 100644 --- a/src/magic_ter_fur_transform.cpp +++ b/src/magic_ter_fur_transform.cpp @@ -55,13 +55,12 @@ static void load_transform_results( const JsonObject &jsi, const std::string &js list.add( T( jsi.get_string( json_key ) ), 1 ); return; } - JsonArray jarr = jsi.get_array( json_key ); - while( jarr.has_more() ) { - if( jarr.test_array() ) { - JsonArray inner = jarr.next_array(); + for( const JsonValue &entry : jsi.get_array( json_key ) ) { + if( entry.test_array() ) { + JsonArray inner = entry.get_array(); list.add( T( inner.get_string( 0 ) ), inner.get_int( 1 ) ); } else { - list.add( T( jarr.next_string() ), 1 ); + list.add( T( entry.get_string() ), 1 ); } } } diff --git a/src/main.cpp b/src/main.cpp index 21536165ad805..8da3f3577441b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,7 @@ #if defined(_WIN32) #include "platform_win.h" #else -#include +#include #endif #include "color.h" #include "crash.h" diff --git a/src/main_menu.cpp b/src/main_menu.cpp index 0eb408b35fa3b..f398b07f228bd 100644 --- a/src/main_menu.cpp +++ b/src/main_menu.cpp @@ -41,7 +41,7 @@ #define dbg(x) DebugLog((DebugLevel)(x),D_GAME) << __FILE__ << ":" << __LINE__ << ": " -static const holiday current_holiday = holiday::christmas; +static const holiday current_holiday = holiday::new_year; void main_menu::on_move() const { @@ -302,7 +302,7 @@ void main_menu::init_strings() std::string line; while( std::getline( stream, line ) ) { if( line[0] != '#' ) { - mmenu_credits + ( line.empty() ? " " : line ) + "\n"; + mmenu_credits += ( line.empty() ? " " : line ) + "\n"; } } } ); diff --git a/src/map.cpp b/src/map.cpp index de451d9f403d1..1653f0ad162a7 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1247,7 +1247,7 @@ void map::furn_set( const tripoint &p, const furn_id &new_furniture ) const furn_t &new_t = new_furniture.obj(); // If player has grabbed this furniture and it's no longer grabbable, release the grab. - if( g->u.get_grab_type() == OBJECT_FURNITURE && g->u.grab_point == p && new_t.move_str_req < 0 ) { + if( g->u.get_grab_type() == OBJECT_FURNITURE && g->u.grab_point == p && !new_t.is_movable() ) { add_msg( _( "The %s you were grabbing is destroyed!" ), old_t.name() ); g->u.grab( OBJECT_NONE ); } @@ -1960,7 +1960,7 @@ void map::drop_furniture( const tripoint &p ) if( frn_obj.has_flag( "TINY" ) || frn_obj.has_flag( "NOCOLLIDE" ) ) { weight = 5; } else { - weight = frn_obj.move_str_req >= 0 ? frn_obj.move_str_req : 20; + weight = frn_obj.is_movable() ? frn_obj.move_str_req : 20; } if( frn_obj.has_flag( "ROUGH" ) || frn_obj.has_flag( "SHARP" ) ) { @@ -4380,7 +4380,9 @@ void map::process_items( const bool active, map::map_process_func processor, process_items_in_vehicles( *current_submap, pos.z, processor, signal ); } } - for( const tripoint &abs_pos : submaps_with_active_items ) { + // Making a copy, in case the original variable gets modified during `process_items_in_submap` + const std::set submaps_with_active_items_copy = submaps_with_active_items; + for( const tripoint &abs_pos : submaps_with_active_items_copy ) { const tripoint local_pos = abs_pos - abs_sub.xy(); submap *const current_submap = get_submap_at_grid( local_pos ); if( !active || !current_submap->active_items.empty() ) { @@ -5728,7 +5730,7 @@ bool map::draw_maptile( const catacurses::window &w, const player &u, const trip } } - if( !check_and_set_seen_cache( p ) ) { + if( check_and_set_seen_cache( p ) ) { g->u.memorize_symbol( getabs( p ), memory_sym ); } @@ -6676,7 +6678,7 @@ void map::rotten_item_spawn( const item &item, const tripoint &pnt ) const int chance = ( comest->rot_spawn_chance * get_option( "CARRION_SPAWNRATE" ) ) / 100; if( rng( 0, 100 ) < chance ) { MonsterGroupResult spawn_details = MonsterGroupManager::GetResultFromGroup( mgroup ); - add_spawn( spawn_details.name, 1, pnt.xy(), false ); + add_spawn( spawn_details.name, 1, pnt, false ); if( g->u.sees( pnt ) ) { if( item.is_seed() ) { add_msg( m_warning, _( "Something has crawled out of the %s plants!" ), item.get_plant_name() ); @@ -7330,44 +7332,29 @@ bool tinymap::inbounds( const tripoint &p ) const // set up a map just long enough scribble on it // this tinymap should never, ever get saved -bool tinymap::fake_load( const furn_id &fur_type, const ter_id &ter_type, const trap_id &trap_type, - int fake_map_z ) +fake_map::fake_map( const furn_id &fur_type, const ter_id &ter_type, const trap_id &trap_type, + const int fake_map_z ) { const tripoint tripoint_below_zero( 0, 0, fake_map_z ); - bool do_terset = true; set_abs_sub( tripoint_below_zero ); for( int gridx = 0; gridx < my_MAPSIZE; gridx++ ) { for( int gridy = 0; gridy < my_MAPSIZE; gridy++ ) { - const tripoint gridp( gridx, gridy, fake_map_z ); - submap *tmpsub = MAPBUFFER.lookup_submap( gridp ); - if( tmpsub == nullptr ) { - generate_uniform( gridp, ter_type ); - do_terset = false; - tmpsub = MAPBUFFER.lookup_submap( gridp ); - if( tmpsub == nullptr ) { - dbg( D_ERROR ) << "failed to generate a fake submap at 0,0,-9 "; - debugmsg( "failed to generate a fake submap at 0,0,-9" ); - return false; - } - } - const size_t gridn = get_nonant( gridp ); + std::unique_ptr sm = std::make_unique(); - setsubmap( gridn, tmpsub ); - } - } + std::uninitialized_fill_n( &sm->ter[0][0], SEEX * SEEY, ter_type ); + std::uninitialized_fill_n( &sm->frn[0][0], SEEX * SEEY, fur_type ); + std::uninitialized_fill_n( &sm->trp[0][0], SEEX * SEEY, trap_type ); + + setsubmap( get_nonant( { gridx, gridy, fake_map_z } ), sm.get() ); - for( const tripoint &pos : points_in_rectangle( tripoint_below_zero, - tripoint( MAPSIZE * SEEX, MAPSIZE * SEEY, fake_map_z ) ) ) { - if( do_terset ) { - ter_set( pos, ter_type ); + temp_submaps_.emplace_back( std::move( sm ) ); } - furn_set( pos, fur_type ); - trap_set( pos, trap_type ); } - return true; } +fake_map::~fake_map() = default; + void map::set_graffiti( const tripoint &p, const std::string &contents ) { if( !inbounds( p ) ) { diff --git a/src/map.h b/src/map.h index c2a1ff55baef2..904abbd913b51 100644 --- a/src/map.h +++ b/src/map.h @@ -265,6 +265,11 @@ class map } } + bool check_seen_cache( const tripoint &p ) const { + std::bitset &memory_seen_cache = + get_cache( p.z ).map_memory_seen_cache; + return !memory_seen_cache[ static_cast( p.x + p.y * MAPSIZE_Y ) ]; + } bool check_and_set_seen_cache( const tripoint &p ) const { std::bitset &memory_seen_cache = get_cache( p.z ).map_memory_seen_cache; @@ -1325,9 +1330,8 @@ class map character_id place_npc( const point &p, const string_id &type, bool force = false ); void apply_faction_ownership( const point &p1, const point &p2, faction_id id ); - void add_spawn( const mtype_id &type, int count, const point &p, - bool friendly = false, - int faction_id = -1, int mission_id = -1, + void add_spawn( const mtype_id &type, int count, const tripoint &p, + bool friendly = false, int faction_id = -1, int mission_id = -1, const std::string &name = "NONE" ) const; void do_vehicle_caching( int z ); // Note: in 3D mode, will actually build caches on ALL z-levels @@ -1534,7 +1538,6 @@ class map void draw_temple( mapgendata &dat ); void draw_mine( mapgendata &dat ); void draw_spiral( mapgendata &dat ); - void draw_sarcophagus( mapgendata &dat ); void draw_fema( mapgendata &dat ); void draw_anthill( mapgendata &dat ); void draw_slimepit( mapgendata &dat ); @@ -1830,8 +1833,15 @@ class tinymap : public map public: tinymap( int mapsize = 2, bool zlevels = false ); bool inbounds( const tripoint &p ) const override; - bool fake_load( const furn_id &fur_type, const ter_id &ter_type, const trap_id &trap_type, - int fake_map_z ); }; +class fake_map : public tinymap +{ + private: + std::vector> temp_submaps_; + public: + fake_map( const furn_id &fur_type, const ter_id &ter_type, const trap_id &trap_type, + int fake_map_z ); + ~fake_map() override; +}; #endif diff --git a/src/map_extras.cpp b/src/map_extras.cpp index a72fd0f2340ff..38e9ea12278c2 100644 --- a/src/map_extras.cpp +++ b/src/map_extras.cpp @@ -103,11 +103,10 @@ static const mtype_id mon_marloss_zealot_f( "mon_marloss_zealot_f" ); static const mtype_id mon_marloss_zealot_m( "mon_marloss_zealot_m" ); static const mtype_id mon_zombie_smoker( "mon_zombie_smoker" ); static const mtype_id mon_zombie_scientist( "mon_zombie_scientist" ); -static const mtype_id mon_chickenbot( "mon_chickenbot" ); static const mtype_id mon_dispatch( "mon_dispatch" ); -static const mtype_id mon_tankbot( "mon_tankbot" ); static const mtype_id mon_turret_bmg( "mon_turret_bmg" ); static const mtype_id mon_turret_rifle( "mon_turret_rifle" ); +static const mtype_id mon_turret_riot( "mon_turret_riot" ); static const mtype_id mon_zombie_spitter( "mon_zombie_spitter" ); static const mtype_id mon_zombie_soldier( "mon_zombie_soldier" ); static const mtype_id mon_zombie_military_pilot( "mon_zombie_military_pilot" ); @@ -182,7 +181,7 @@ static void dead_vegetation_parser( map &m, const tripoint &loc ) } } -static void mx_house_wasp( map &m, const tripoint & ) +static void mx_house_wasp( map &m, const tripoint &loc ) { for( int i = 0; i < SEEX * 2; i++ ) { for( int j = 0; j < SEEY * 2; j++ ) { @@ -214,13 +213,13 @@ static void mx_house_wasp( map &m, const tripoint & ) } } } - m.add_spawn( mon_wasp, 1, point( podx, pody ) ); + m.add_spawn( mon_wasp, 1, tripoint( podx, pody, loc.z ) ); } m.place_items( "rare", 70, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), false, calendar::start_of_cataclysm ); } -static void mx_house_spider( map &m, const tripoint & ) +static void mx_house_spider( map &m, const tripoint &loc ) { auto spider_type = mon_spider_widow_giant; auto egg_type = f_egg_sackbw; @@ -232,7 +231,7 @@ static void mx_house_spider( map &m, const tripoint & ) for( int j = 0; j < SEEY * 2; j++ ) { if( m.ter( point( i, j ) ) == t_floor ) { if( one_in( 15 ) ) { - m.add_spawn( spider_type, rng( 1, 2 ), point( i, j ) ); + m.add_spawn( spider_type, rng( 1, 2 ), tripoint( i, j, loc.z ) ); for( int x = i - 1; x <= i + 1; x++ ) { for( int y = j - 1; y <= j + 1; y++ ) { if( m.ter( point( x, y ) ) == t_floor ) { @@ -348,14 +347,14 @@ static void mx_helicopter( map &m, const tripoint &abs_sub ) const tripoint pos = vp.pos(); // Spawn pilots in seats with controls.CTRL_ELECTRONIC if( controls_at( wreckage, pos ) ) { - m.add_spawn( mon_zombie_military_pilot, 1, pos.xy() ); + m.add_spawn( mon_zombie_military_pilot, 1, pos ); } else { if( one_in( 5 ) ) { - m.add_spawn( mon_zombie_bio_op, 1, pos.xy() ); + m.add_spawn( mon_zombie_bio_op, 1, pos ); } else if( one_in( 5 ) ) { - m.add_spawn( mon_zombie_scientist, 1, pos.xy() ); + m.add_spawn( mon_zombie_scientist, 1, pos ); } else { - m.add_spawn( mon_zombie_soldier, 1, pos.xy() ); + m.add_spawn( mon_zombie_soldier, 1, pos ); } } @@ -376,10 +375,10 @@ static void mx_helicopter( map &m, const tripoint &abs_sub ) const tripoint pos = vp.pos(); // Spawn pilots in seats with controls. if( controls_at( wreckage, pos ) ) { - m.add_spawn( mon_zombie_military_pilot, 1, pos.xy() ); + m.add_spawn( mon_zombie_military_pilot, 1, pos ); } else { if( !one_in( 3 ) ) { - m.add_spawn( mon_zombie_soldier, 1, pos.xy() ); + m.add_spawn( mon_zombie_soldier, 1, pos ); } } @@ -397,7 +396,7 @@ static void mx_helicopter( map &m, const tripoint &abs_sub ) // Just pilots for( const vpart_reference &vp : wreckage->get_any_parts( VPFLAG_CONTROLS ) ) { const tripoint pos = vp.pos(); - m.add_spawn( mon_zombie_military_pilot, 1, pos.xy() ); + m.add_spawn( mon_zombie_military_pilot, 1, pos ); // Delete the items that would have spawned here from a "corpse" for( auto sp : wreckage->parts_at_relative( vp.mount(), true ) ) { @@ -434,12 +433,12 @@ static void mx_military( map &m, const tripoint & ) return m.passable( n ); } ) ) { if( one_in( 10 ) ) { - m.add_spawn( mon_zombie_soldier, 1, p->xy() ); + m.add_spawn( mon_zombie_soldier, 1, *p ); } else if( one_in( 25 ) ) { if( one_in( 2 ) ) { - m.add_spawn( mon_zombie_bio_op, 1, p->xy() ); + m.add_spawn( mon_zombie_bio_op, 1, *p ); } else { - m.add_spawn( mon_dispatch, 1, p->xy() ); + m.add_spawn( mon_dispatch, 1, *p ); } } else { m.place_items( "map_extra_military", 100, *p, *p, true, calendar::start_of_cataclysm ); @@ -466,7 +465,7 @@ static void mx_science( map &m, const tripoint & ) return m.passable( n ); } ) ) { if( one_in( 10 ) ) { - m.add_spawn( mon_zombie_scientist, 1, p->xy() ); + m.add_spawn( mon_zombie_scientist, 1, *p ); } else { m.place_items( "map_extra_science", 100, *p, *p, true, calendar::start_of_cataclysm ); } @@ -492,7 +491,7 @@ static void mx_collegekids( map &m, const tripoint & ) return m.passable( n ); } ) ) { if( one_in( 10 ) ) { - m.add_spawn( mon_zombie_tough, 1, p->xy() ); + m.add_spawn( mon_zombie_tough, 1, *p ); } else { if( type < 6 ) { // kids going to a cabin in the woods m.place_items( "map_extra_college_camping", 100, *p, *p, true, calendar::start_of_cataclysm ); @@ -525,14 +524,16 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) const bool road_at_east = is_ot_match( "road", east, ot_match_type::type ); const auto spawn_turret = [&]( int x, int y ) { - if( one_in( 2 ) ) { - m.add_spawn( mon_turret_bmg, 1, point( x, y ) ); + if( one_in( 3 ) ) { + m.add_spawn( mon_turret_bmg, 1, { x, y, abs_sub.z } ); + } else if( one_in( 2 ) ) { + m.add_spawn( mon_turret_rifle, 1, { x, y, abs_sub.z } ); } else { - m.add_spawn( mon_turret_rifle, 1, point( x, y ) ); + m.add_spawn( mon_turret_riot, 1, { x, y, abs_sub.z } ); } }; bool mil = false; - if( one_in( 3 ) ) { + if( one_in( 6 ) ) { mil = true; } if( mil ) { //Military doesn't joke around with their barricades! @@ -573,14 +574,21 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) } } - if( one_in( 3 ) ) { // Chicken delivery - m.add_vehicle( vgroup_id( "military_vehicles" ), tripoint( 12, SEEY * 2 - 7, abs_sub.z ), 0, 70, - -1 ); - m.add_spawn( mon_chickenbot, 1, point( 12, 12 ) ); - } else if( one_in( 2 ) ) { // TAAANK + if( one_in( 2 ) ) { // The truck's wrecked...with fuel. Explosive barrel? - m.add_vehicle( vproto_id( "military_cargo_truck" ), point( 12, SEEY * 2 - 8 ), 0, 70, -1 ); - m.add_spawn( mon_tankbot, 1, point( 12, 12 ) ); + m.add_vehicle( vproto_id( "military_cargo_truck" ), point( 12, SEEY * 2 - 12 ), 0, 70, -1 ); + if( road_at_north ) { + spawn_turret( 12, 6 ); + } + if( road_at_east ) { + spawn_turret( 18, 12 ); + } + if( road_at_south ) { + spawn_turret( 12, 18 ); + } + if( road_at_west ) { + spawn_turret( 6, 12 ); + } } else { // Vehicle & turrets m.add_vehicle( vgroup_id( "military_vehicles" ), tripoint( 12, SEEY * 2 - 10, abs_sub.z ), 0, 70, -1 ); @@ -616,22 +624,22 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) if( road_at_north ) { line_furn( &m, f_barricade_road, 4, 3, 10, 3 ); line_furn( &m, f_barricade_road, 13, 3, 19, 3 ); - m.add_spawn( mon_turret_rifle, 1, point( 12, 1 ) ); + m.add_spawn( mon_turret_riot, 1, { 12, 1, abs_sub.z } ); } if( road_at_east ) { line_furn( &m, f_barricade_road, SEEX * 2 - 3, 4, SEEX * 2 - 3, 10 ); line_furn( &m, f_barricade_road, SEEX * 2 - 3, 13, SEEX * 2 - 3, 19 ); - m.add_spawn( mon_turret_rifle, 1, point( SEEX * 2 - 1, 12 ) ); + m.add_spawn( mon_turret_riot, 1, { SEEX * 2 - 1, 12, abs_sub.z } ); } if( road_at_south ) { line_furn( &m, f_barricade_road, 4, SEEY * 2 - 3, 10, SEEY * 2 - 3 ); line_furn( &m, f_barricade_road, 13, SEEY * 2 - 3, 19, SEEY * 2 - 3 ); - m.add_spawn( mon_turret_rifle, 1, point( 12, SEEY * 2 - 1 ) ); + m.add_spawn( mon_turret_riot, 1, { 12, SEEY * 2 - 1, abs_sub.z } ); } if( road_at_west ) { line_furn( &m, f_barricade_road, 3, 4, 3, 10 ); line_furn( &m, f_barricade_road, 3, 13, 3, 19 ); - m.add_spawn( mon_turret_rifle, 1, point( 1, 12 ) ); + m.add_spawn( mon_turret_riot, 1, { 1, 12, abs_sub.z } ); } m.add_vehicle( vproto_id( "policecar" ), point( 8, 6 ), 20 ); @@ -664,8 +672,8 @@ static void mx_marloss_pilgrimage( map &m, const tripoint &abs_sub ) tripoint where = random_entry( spawnzone ); /// @todo wrong: this access the main game map, not m. Also accesses creatures currently loaded. if( g->is_empty( where ) ) { - one_in( 2 ) ? m.add_spawn( mon_marloss_zealot_f, 1, - where.xy() ) : m.add_spawn( mon_marloss_zealot_m, 1, where.xy() ); + one_in( 2 ) ? m.add_spawn( mon_marloss_zealot_f, 1, where ) : + m.add_spawn( mon_marloss_zealot_m, 1, where ); } } } @@ -785,7 +793,7 @@ static void mx_drugdeal( map &m, const tripoint &abs_sub ) m.spawn_item( point( x, y ), drugtype, 0, drugs_placed ); } if( one_in( 10 ) ) { - m.add_spawn( mon_zombie_spitter, 1, point( x, y ) ); + m.add_spawn( mon_zombie_spitter, 1, { x, y, abs_sub.z } ); } else { m.place_items( "map_extra_drugdeal", 100, point( x, y ), point( x, y ), true, calendar::start_of_cataclysm ); @@ -819,7 +827,7 @@ static void mx_drugdeal( map &m, const tripoint &abs_sub ) if( tries < 10 ) { // We found a valid spot! if( one_in( 20 ) ) { - m.add_spawn( mon_zombie_smoker, 1, point( x, y ) ); + m.add_spawn( mon_zombie_smoker, 1, { x, y, abs_sub.z } ); } else { m.place_items( "map_extra_drugdeal", 100, point( x, y ), point( x, y ), true, calendar::start_of_cataclysm ); @@ -1668,14 +1676,14 @@ static void mx_anomaly( map &m, const tripoint &abs_sub ) m.spawn_natural_artifact( center, prop ); } -static void mx_shia( map &m, const tripoint & ) +static void mx_shia( map &m, const tripoint &loc ) { // A rare chance to spawn Shia. This was extracted from the hardcoded forest mapgen // and moved into a map extra, but it still has a one_in chance of spawning because // otherwise the extreme rarity of this event wildly skewed the values for all of the // other extras. if( one_in( 5000 ) ) { - m.add_spawn( mon_shia, 1, point( SEEX, SEEY ) ); + m.add_spawn( mon_shia, 1, { SEEX, SEEY, loc.z } ); } } @@ -1701,10 +1709,10 @@ static void mx_spider( map &m, const tripoint &abs_sub ) m.ter_set( point( 12, 12 ), t_dirt ); m.furn_set( point( 12, 12 ), f_egg_sackws ); m.remove_field( { 12, 12, m.get_abs_sub().z }, fd_web ); - m.add_spawn( mon_spider_web, rng( 1, 2 ), point( SEEX, SEEY ) ); + m.add_spawn( mon_spider_web, rng( 1, 2 ), { SEEX, SEEY, abs_sub.z } ); } -static void mx_jabberwock( map &m, const tripoint & ) +static void mx_jabberwock( map &m, const tripoint &loc ) { // A rare chance to spawn a jabberwock. This was extracted from the harcoded forest mapgen // and moved into a map extra. It still has a one_in chance of spawning because otherwise @@ -1712,7 +1720,7 @@ static void mx_jabberwock( map &m, const tripoint & ) // into the monster group, but again the hardcoded rarity it had in the forest mapgen was // not easily replicated there. if( one_in( 50 ) ) { - m.add_spawn( mon_jabberwock, 1, point( SEEX, SEEY ) ); + m.add_spawn( mon_jabberwock, 1, { SEEX, SEEY, loc.z } ); } } @@ -2740,14 +2748,13 @@ void apply_function( const string_id &id, map &m, const tripoint &abs break; } case map_extra_method::mapgen: { - tripoint over( abs_sub ); - sm_to_omt( over ); - mapgendata dat( over, m, 0.0f, calendar::turn, nullptr ); + mapgendata dat( sm_to_omt_copy( abs_sub ), m, 0.0f, calendar::turn, nullptr ); run_mapgen_func( extra.generator_id, dat ); break; } case map_extra_method::update_mapgen: { - run_mapgen_update_func( extra.generator_id, sm_to_omt_copy( abs_sub ) ); + mapgendata dat( sm_to_omt_copy( abs_sub ), m, 0.0f, calendar::start_of_cataclysm, nullptr ); + run_mapgen_update_func( extra.generator_id, dat ); break; } case map_extra_method::null: @@ -2796,6 +2803,53 @@ void check_consistency() extras.check(); } +void debug_spawn_test() +{ + uilist mx_menu; + std::vector mx_names; + for( std::pair ®ion_extra : + region_settings_map["default"].region_extras ) { + mx_menu.addentry( -1, true, -1, region_extra.first ); + mx_names.push_back( region_extra.first ); + } + + mx_menu.text = _( "Test which map extra list?" ); + while( true ) { + mx_menu.query(); + const int index = mx_menu.ret; + if( index >= static_cast( mx_names.size() ) || index < 0 ) { + break; + } + + std::map results; + for( size_t a = 0; a < 32400; a++ ) { + map_extras ex = region_settings_map["default"].region_extras[mx_names[index]]; + if( ex.chance > 0 && one_in( ex.chance ) ) { + std::string *extra = ex.values.pick(); + if( extra == nullptr ) { + results[_( "none" )]++; + } else { + results[*( ex.values.pick() )]++; + } + } else { + results[_( "none" )]++; + } + } + + std::multimap sorted_results; + for( std::pair &e : results ) { + sorted_results.insert( std::pair( e.second, e.first ) ); + } + uilist results_menu; + results_menu.text = _( "Result of 32400 selections:" ); + for( std::pair &r : sorted_results ) { + results_menu.entries.emplace_back( static_cast( results_menu.entries.size() ), true, -2, + string_format( "%d x %s", r.first, r.second ) ); + } + results_menu.query(); + } +} + } // namespace MapExtras void map_extra::load( const JsonObject &jo, const std::string & ) diff --git a/src/map_extras.h b/src/map_extras.h index ab05be3b13d9c..fe92449cce025 100644 --- a/src/map_extras.h +++ b/src/map_extras.h @@ -2,7 +2,7 @@ #ifndef MAP_EXTRAS_H #define MAP_EXTRAS_H -#include +#include #include #include @@ -66,6 +66,8 @@ void apply_function( const std::string &id, map &m, const tripoint &abs_sub ); void load( const JsonObject &jo, const std::string &src ); void check_consistency(); +void debug_spawn_test(); + /// This function provides access to all loaded map extras. const generic_factory &mapExtraFactory(); diff --git a/src/map_field.cpp b/src/map_field.cpp index 253306c4de5c1..15981304877e3 100644 --- a/src/map_field.cpp +++ b/src/map_field.cpp @@ -1084,11 +1084,12 @@ bool map::process_fields_in_submap( submap *const current_submap, if( !spawn_details.name ) { continue; } - if( const auto spawn_point = random_point( points_in_radius( p, - cur.monster_spawn_radius() ), [this]( const tripoint & n ) { + if( const cata::optional spawn_point = random_point( + points_in_radius( p, cur.monster_spawn_radius() ), + [this]( const tripoint & n ) { return passable( n ); } ) ) { - add_spawn( spawn_details.name, spawn_details.pack_size, spawn_point->xy() ); + add_spawn( spawn_details.name, spawn_details.pack_size, *spawn_point ); } } } diff --git a/src/mapbuffer.cpp b/src/mapbuffer.cpp index 6c32db50189be..40fdb4eefea03 100644 --- a/src/mapbuffer.cpp +++ b/src/mapbuffer.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include diff --git a/src/mapdata.cpp b/src/mapdata.cpp index c91d0d7a68101..6ac4e396e74cb 100644 --- a/src/mapdata.cpp +++ b/src/mapdata.cpp @@ -239,8 +239,7 @@ bool map_bash_info::load( const JsonObject &jsobj, const std::string &member, bo } if( j.has_member( "items" ) ) { - JsonIn &stream = *j.get_raw( "items" ); - drop_group = item_group::load_item_group( stream, "collection" ); + drop_group = item_group::load_item_group( j.get_member( "items" ), "collection" ); } else { drop_group = "EMPTY_GROUP"; } @@ -270,8 +269,7 @@ bool map_deconstruct_info::load( const JsonObject &jsobj, const std::string &mem can_do = true; deconstruct_above = j.get_bool( "deconstruct_above", false ); - JsonIn &stream = *j.get_raw( "items" ); - drop_group = item_group::load_item_group( stream, "collection" ); + drop_group = item_group::load_item_group( j.get_member( "items" ), "collection" ); return true; } @@ -378,9 +376,7 @@ void map_data_common_t::load_symbol( const JsonObject &jo ) if( jo.has_member( "copy-from" ) && looks_like.empty() ) { looks_like = jo.get_string( "copy-from" ); } - if( jo.has_member( "looks_like" ) ) { - looks_like = jo.get_string( "looks_like" ); - } + jo.read( "looks_like", looks_like ); load_season_array( jo, "symbol", symbol_, [&jo]( const std::string & str ) { if( str == "LINE_XOXO" ) { @@ -1240,6 +1236,11 @@ size_t furn_t::count() return furniture_data.size(); } +bool furn_t::is_movable() const +{ + return move_str_req >= 0; +} + void furn_t::load( const JsonObject &jo, const std::string &src ) { map_data_common_t::load( jo, src ); @@ -1252,7 +1253,7 @@ void furn_t::load( const JsonObject &jo, const std::string &src ) optional( jo, was_loaded, "bonus_fire_warmth_feet", bonus_fire_warmth_feet, 300 ); optional( jo, was_loaded, "keg_capacity", keg_capacity, legacy_volume_reader, 0_ml ); mandatory( jo, was_loaded, "required_str", move_str_req ); - assign( jo, "max_volume", max_volume, src == "dda" ); + optional( jo, was_loaded, "max_volume", max_volume, volume_reader(), DEFAULT_MAX_VOLUME_IN_SQUARE ); optional( jo, was_loaded, "crafting_pseudo_item", crafting_pseudo_item, "" ); optional( jo, was_loaded, "deployed_item", deployed_item ); load_symbol( jo ); diff --git a/src/mapdata.h b/src/mapdata.h index 15c71f75f7698..2862e3ce9c1c5 100644 --- a/src/mapdata.h +++ b/src/mapdata.h @@ -371,6 +371,8 @@ struct furn_t : map_data_common_t { static size_t count(); + bool is_movable() const; + void load( const JsonObject &jo, const std::string &src ) override; void check() const override; }; diff --git a/src/mapgen.cpp b/src/mapgen.cpp index fc4d6580e5e5e..1a1879cc23c67 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -1,6 +1,6 @@ #include "mapgen.h" -#include +#include #include #include #include @@ -179,10 +179,11 @@ void map::generate( const tripoint &p, const time_point &when ) if( !spawn_details.name ) { continue; } - if( const auto p = random_point( *this, [this]( const tripoint & n ) { + if( const cata::optional p = + random_point( *this, [this]( const tripoint & n ) { return passable( n ); } ) ) { - add_spawn( spawn_details.name, spawn_details.pack_size, p->xy() ); + add_spawn( spawn_details.name, spawn_details.pack_size, *p ); } } } @@ -577,7 +578,7 @@ int jmapgen_int::get() const * Turn json gobbldigook into machine friendly gobbldigook, for applying * basic map 'set' functions, optionally based on one_in(chance) or repeat value */ -void mapgen_function_json_base::setup_setmap( JsonArray &parray ) +void mapgen_function_json_base::setup_setmap( const JsonArray &parray ) { std::string tmpval; std::map setmap_opmap; @@ -590,8 +591,7 @@ void mapgen_function_json_base::setup_setmap( JsonArray &parray ) jmapgen_setmap_op tmpop; int setmap_optype = 0; - while( parray.has_more() ) { - JsonObject pjo = parray.next_object(); + for( const JsonObject &pjo : parray ) { if( pjo.read( "point", tmpval ) ) { setmap_optype = JMAPGEN_SETMAP_OPTYPE_POINT; } else if( pjo.read( "set", tmpval ) ) { @@ -629,6 +629,7 @@ void mapgen_function_json_base::setup_setmap( JsonArray &parray ) tmp_x2 = jmapgen_int( pjo, "x2" ); tmp_y2 = jmapgen_int( pjo, "y2" ); if( !check_inbounds( tmp_x2, tmp_y2, pjo ) ) { + pjo.allow_omitted_members(); continue; } } @@ -725,6 +726,9 @@ class jmapgen_alternativly : public jmapgen_piece chosen->get().apply( dat, x, y ); } } + bool has_vehicle_collision( mapgendata &dat, int x, int y ) const override { + return dat.m.veh_at( tripoint( x, y, dat.zlevel() ) ).has_value(); + } }; /** @@ -1038,14 +1042,11 @@ class jmapgen_liquid_item : public jmapgen_piece class jmapgen_item_group : public jmapgen_piece { public: - std::string group_id; + Group_tag group_id; jmapgen_int chance; - jmapgen_item_group( const JsonObject &jsi ) : - group_id( jsi.get_string( "item" ) ) - , chance( jsi, "chance", 1, 1 ) { - if( !item_group::group_is_defined( group_id ) ) { - set_mapgen_defer( jsi, "item", "no such item group '" + group_id + "'" ); - } + jmapgen_item_group( const JsonObject &jsi ) : chance( jsi, "chance", 1, 1 ) { + JsonValue group = jsi.get_member( "item" ); + group_id = item_group::load_item_group( group, "collection" ); repeat = jmapgen_int( jsi, "repeat", 1, 1 ); } void apply( mapgendata &dat, const jmapgen_int &x, const jmapgen_int &y ) const override { @@ -1125,8 +1126,8 @@ class jmapgen_monster_group : public jmapgen_piece } }; /** - * Place spawn points for a specific monster (not a group). - * "monster": id of the monster. + * Place spawn points for a specific monster. + * "monster": id of the monster. or "group": id of the monster group. * "friendly": whether the new monster is friendly to the player character. * "name": the name of the monster (if it has one). * "chance": the percentage chance of a monster, affected by spawn density @@ -1162,16 +1163,15 @@ class jmapgen_monster : public jmapgen_piece return; } } else if( jsi.has_array( "monster" ) ) { - JsonArray jarr = jsi.get_array( "monster" ); - while( jarr.has_more() ) { + for( const JsonValue &entry : jsi.get_array( "monster" ) ) { mtype_id id; int weight = 100; - if( jarr.test_array() ) { - JsonArray inner = jarr.next_array(); + if( entry.test_array() ) { + JsonArray inner = entry.get_array(); id = mtype_id( inner.get_string( 0 ) ); weight = inner.get_int( 1 ); } else { - id = mtype_id( jarr.next_string() ); + id = mtype_id( entry.get_string() ); } if( !id.is_valid() ) { set_mapgen_defer( jsi, "monster", "no such monster" ); @@ -1196,39 +1196,40 @@ class jmapgen_monster : public jmapgen_piece // Instead, apply a multipler to the number of monsters for really high densities. // For example, a 50% chance at spawn density 4 becomes a 75% chance of ~2.7 monsters. int odds_after_density = raw_odds * get_option( "SPAWN_DENSITY" ) ; - int max_odds = 100 - ( 100 - raw_odds ) / 2; + int max_odds = ( 100 + raw_odds ) / 2; float density_multiplier = 1; if( odds_after_density > max_odds ) { density_multiplier = 1.0f * odds_after_density / max_odds; odds_after_density = max_odds; } - if( !x_in_y( odds_after_density, 100 ) ) { - return; - } - int mission_id = -1; if( dat.mission() && target ) { mission_id = dat.mission()->get_id(); } - if( m_id != mongroup_id::NULL_ID() ) { - // Spawn single monster from a group - dat.m.place_spawns( m_id, 1, point( x.get(), y.get() ), point( x.get(), y.get() ), 1.0f, true, - false, - name, mission_id ); - } else { - int spawn_count = roll_remainder( density_multiplier ); + int spawn_count = roll_remainder( density_multiplier ); - if( one_or_none ) { // don't let high spawn density alone cause more than 1 to spawn. - spawn_count = std::min( spawn_count, 1 ); - } - if( raw_odds == 100 ) { // don't spawn less than 1 if odds were 100%, even with low spawn density. - spawn_count = std::max( spawn_count, 1 ); + if( one_or_none ) { // don't let high spawn density alone cause more than 1 to spawn. + spawn_count = std::min( spawn_count, 1 ); + } + if( raw_odds == 100 ) { // don't spawn less than 1 if odds were 100%, even with low spawn density. + spawn_count = std::max( spawn_count, 1 ); + } else { + if( !x_in_y( odds_after_density, 100 ) ) { + return; } + } - dat.m.add_spawn( *( ids.pick() ), spawn_count * pack_size.get(), point( x.get(), y.get() ), - friendly, -1, mission_id, name ); + if( m_id != mongroup_id::NULL_ID() ) { + MonsterGroupResult spawn_details = MonsterGroupManager::GetResultFromGroup( m_id ); + dat.m.add_spawn( spawn_details.name, spawn_count * pack_size.get(), + { x.get(), y.get(), dat.m.get_abs_sub().z }, + friendly, -1, mission_id, name ); + } else { + dat.m.add_spawn( *( ids.pick() ), spawn_count * pack_size.get(), + { x.get(), y.get(), dat.m.get_abs_sub().z }, + friendly, -1, mission_id, name ); } } }; @@ -1638,13 +1639,12 @@ class jmapgen_zone : public jmapgen_piece static void load_weighted_entries( const JsonObject &jsi, const std::string &json_key, weighted_int_list &list ) { - JsonArray jarr = jsi.get_array( json_key ); - while( jarr.has_more() ) { - if( jarr.test_array() ) { - JsonArray inner = jarr.next_array(); + for( const JsonValue &entry : jsi.get_array( json_key ) ) { + if( entry.test_array() ) { + JsonArray inner = entry.get_array(); list.add( inner.get_string( 0 ), inner.get_int( 1 ) ); } else { - list.add( jarr.next_string(), 100 ); + list.add( entry.get_string(), 100 ); } } } @@ -1739,6 +1739,30 @@ class jmapgen_nested : public jmapgen_piece ptr->nest( dat, point( x.get(), y.get() ) ); } + bool has_vehicle_collision( mapgendata &dat, int x, int y ) const override { + const weighted_int_list &selected_entries = neighbors.test( + dat ) ? entries : else_entries; + if( selected_entries.empty() ) { + return false; + } + + for( auto &entry : selected_entries ) { + if( entry.obj == "null" ) { + continue; + } + const auto iter = nested_mapgen.find( entry.obj ); + if( iter == nested_mapgen.end() ) { + return false; + } + for( auto &nest : iter->second ) { + if( nest->has_vehicle_collision( dat, {x, y} ) ) { + return true; + } + } + } + + return false; + } }; jmapgen_objects::jmapgen_objects( const point &offset, const point &mapsize ) @@ -1856,17 +1880,16 @@ void load_place_mapings_string( const JsonObject &pjo, const std::string &key, } else if( pjo.has_object( key ) ) { load_place_mapings( pjo.get_object( key ), vect ); } else { - JsonArray jarr = pjo.get_array( key ); - while( jarr.has_more() ) { - if( jarr.test_string() ) { + for( const JsonValue &entry : pjo.get_array( key ) ) { + if( entry.test_string() ) { try { - vect.push_back( make_shared_fast( jarr.next_string() ) ); + vect.push_back( make_shared_fast( entry.get_string() ) ); } catch( const std::runtime_error &err ) { // Using the json object here adds nice formatting and context information - jarr.throw_error( err.what() ); + entry.throw_error( err.what() ); } } else { - load_place_mapings( jarr.next_object(), vect ); + load_place_mapings( entry.get_object(), vect ); } } } @@ -1884,21 +1907,20 @@ void load_place_mapings_alternatively( const JsonObject &pjo, const std::string load_place_mapings_string( pjo, key, vect ); } else { auto alter = make_shared_fast< jmapgen_alternativly >(); - JsonArray jarr = pjo.get_array( key ); - while( jarr.has_more() ) { - if( jarr.test_string() ) { + for( const JsonValue &entry : pjo.get_array( key ) ) { + if( entry.test_string() ) { try { - alter->alternatives.emplace_back( jarr.next_string() ); + alter->alternatives.emplace_back( entry.get_string() ); } catch( const std::runtime_error &err ) { // Using the json object here adds nice formatting and context information - jarr.throw_error( err.what() ); + entry.throw_error( err.what() ); } - } else if( jarr.test_object() ) { - JsonObject jsi = jarr.next_object(); + } else if( entry.test_object() ) { + JsonObject jsi = entry.get_object(); alter->alternatives.emplace_back( jsi ); - } else if( jarr.test_array() ) { + } else if( entry.test_array() ) { // If this is an array, it means it is an entry followed by a desired total count of instances. - JsonArray piece_and_count_jarr = jarr.next_array(); + JsonArray piece_and_count_jarr = entry.get_array(); if( piece_and_count_jarr.size() != 2 ) { piece_and_count_jarr.throw_error( "Array must have exactly two entries: the object, then the count." ); } @@ -2063,7 +2085,7 @@ mapgen_palette mapgen_palette::load_internal( const JsonObject &jo, const std::s // mandatory: every character in rows must have matching entry, unless fill_ter is set // "terrain": { "a": "t_grass", "b": "t_lava" } - if( jo.has_object( "terrain" ) ) { + if( jo.has_member( "terrain" ) ) { JsonObject pjo = jo.get_object( "terrain" ); for( const auto &key : pjo.get_member_names() ) { if( key.size() != 1 ) { @@ -2281,8 +2303,7 @@ bool mapgen_function_json_base::setup_common( const JsonObject &jo ) } if( jo.has_array( "set" ) ) { - parray = jo.get_array( "set" ); - setup_setmap( parray ); + setup_setmap( jo.get_array( "set" ) ); } // "add" is deprecated in favor of "place_item", but kept to support mods @@ -2552,6 +2573,31 @@ void mapgen_function_json_base::formatted_set_incredibly_simple( map &m, const p } } +bool mapgen_function_json_base::has_vehicle_collision( mapgendata &dat, const point &offset ) const +{ + if( do_format ) { + for( int y = 0; y < mapgensize.y; y++ ) { + for( int x = 0; x < mapgensize.x; x++ ) { + const point p( x, y ); + const ter_furn_id &tdata = format[calc_index( p )]; + const point map_pos = p + offset; + if( ( tdata.furn != f_null || tdata.ter != t_null ) && + dat.m.veh_at( tripoint( map_pos, dat.zlevel() ) ).has_value() ) { + return true; + } + } + } + } + + for( auto &elem : setmap_points ) { + if( elem.has_vehicle_collision( dat, offset ) ) { + return true; + } + } + + return objects.has_vehicle_collision( dat, offset ); +} + /* * Apply mapgen as per a derived-from-json recipe; in theory fast, but not very versatile */ @@ -2682,8 +2728,6 @@ void map::draw_map( mapgendata &dat ) if( is_ot_match( "slimepit", terrain_type, ot_match_type::prefix ) || is_ot_match( "slime_pit", terrain_type, ot_match_type::prefix ) ) { draw_slimepit( dat ); - } else if( is_ot_match( "haz_sar", terrain_type, ot_match_type::prefix ) ) { - draw_sarcophagus( dat ); } else if( is_ot_match( "triffid", terrain_type, ot_match_type::prefix ) ) { draw_triffid( dat ); } else if( is_ot_match( "office", terrain_type, ot_match_type::prefix ) ) { @@ -5090,582 +5134,6 @@ void map::draw_spiral( mapgendata &dat ) } } -void map::draw_sarcophagus( mapgendata &dat ) -{ - const oter_id &terrain_type = dat.terrain_type(); - computer *tmpcomp = nullptr; - - const auto ter_key = mapf::ter_bind( "R 1 & V C G 5 % Q E , _ r X f F V H 6 x $ ^ . - | " - "# t + = D w T S e o h c d l s !", t_elevator_control_off, - t_sewage_pipe, t_sewage_pump, t_vat, t_floor, t_grate, - t_wall_glass, t_wall_glass, t_sewage, t_elevator, - t_pavement_y, t_pavement, t_floor, t_door_metal_locked, - t_chainfence, t_chainfence, t_wall_glass, t_wall_glass, - t_console, t_console_broken, t_shrub, t_floor, t_floor, - t_wall, t_wall, t_rock, t_floor, t_door_c, - t_door_locked_alarm, t_door_locked, t_window, t_floor, - t_floor, t_floor, t_floor, t_floor, t_floor, t_floor, - t_floor, t_sidewalk, t_thconc_floor ); - const auto fur_key = mapf::furn_bind( "R 1 & V C G 5 % Q E , _ r X f F V H 6 x $ ^ . - | " - "# t + = D w T S e o h c d l s !", f_null, f_null, - f_null, f_null, f_crate_c, f_null, f_null, f_null, - f_null, f_null, f_null, f_null, f_rack, f_null, f_null, - f_null, f_null, f_null, f_null, f_null, f_null, - f_indoor_plant, f_null, f_null, f_null, f_null, f_table, - f_null, f_null, f_null, f_null, f_toilet, f_sink, - f_fridge, f_bookcase, f_chair, f_counter, f_desk, - f_locker, f_null, f_null ); - const auto b_ter_key = mapf::ter_bind( "= + E & 6 H V c h d r M _ $ | - # . , l S T", - t_door_metal_c, t_door_metal_o, t_elevator, - t_elevator_control_off, t_console, t_reinforced_glass, - t_reinforced_glass, t_floor, t_floor, t_floor, t_floor, - t_gates_control_concrete, t_sewage, t_door_metal_locked, - t_concrete_wall, t_concrete_wall, t_rock, t_rock_floor, - t_metal_floor, t_floor, t_floor, t_floor ); - const auto b_fur_key = mapf::furn_bind( "= + E & 6 H V c h d r M _ $ | - # . , l S T", f_null, - f_null, f_null, f_null, f_null, f_null, f_null, - f_counter, f_chair, f_desk, f_rack, f_null, f_null, - f_null, f_null, f_null, f_null, f_null, f_null, - f_locker, f_sink, f_toilet ); - - // Convenience function because this big block of hardcoded mapgen does a LOT of overmap terrain - // comparisons and it gets very verbose. What would be better is to convert all this to JSON mapgen. - const auto match = []( const oter_id & oterid, const std::string & oterstr ) { - return is_ot_match( oterstr, oterid, ot_match_type::type ); - }; - - if( match( terrain_type, "haz_sar_entrance" ) ) { - // Init to grass & dirt; - dat.fill_groundcover(); - mapf::formatted_set_simple( this, 0, 0, - " f |_________%..S| |.\n" - " f |!!!!!!!!!|..r| |.\n" - " f |!!!!!!!!!|..r| |.\n" - " f |l!!!!!!!!=..r| |c\n" - " f |l!!!!!!!!|..S| |w\n" - " f |l!!!!!!!!%..r|sss\n" - " f |!!!!!!!!!%..r|sss\n" - " f |!!!!!!!!!%..r|ss_\n" - " f |!!!!!!!!!|x..|ss_\n" - " f |-XXXXXXX-|-D-|ss_\n" - " f s_______ssssssss_\n" - " f s_______ssssssss_\n" - " f s________________\n" - " f s________________\n" - " f s________________\n" - " f ssss________________\n" - " f ssss_______ssssssss_\n" - " fF|-D-|XXXXXXX- s_\n" - " wxh.D_______f s_\n" - " wcdcw_______f ss\n" - " |www|_______fFFFFFFFF\n" - " _______ \n" - " _______ \n" - " _______ \n", ter_key, fur_key ); - spawn_item( point( 19, 3 ), "cleansuit" ); - place_items( "office", 80, point( 4, 19 ), point( 6, 19 ), false, calendar::start_of_cataclysm ); - place_items( "cleaning", 90, point( 7, 3 ), point( 7, 5 ), false, calendar::start_of_cataclysm ); - place_items( "toxic_dump_equipment", 85, point( 19, 1 ), point( 19, 3 ), false, - calendar::start_of_cataclysm ); - place_items( "toxic_dump_equipment", 85, point( 19, 5 ), point( 19, 7 ), false, - calendar::start_of_cataclysm ); - place_spawns( GROUP_HAZMATBOT, 2, point( 10, 5 ), point( 10, 5 ), 1, true ); - //lazy radiation mapping - for( int x = 0; x < SEEX * 2; x++ ) { - for( int y = 0; y < SEEY * 2; y++ ) { - adjust_radiation( point( x, y ), rng( 10, 30 ) ); - } - } - if( match( dat.north(), "haz_sar" ) && match( dat.west(), "haz_sar" ) ) { - rotate( 3 ); - } else if( match( dat.north(), "haz_sar" ) && match( dat.east(), "haz_sar" ) ) { - rotate( 0 ); - } else if( match( dat.south(), "haz_sar" ) && match( dat.east(), "haz_sar" ) ) { - rotate( 1 ); - } else if( match( dat.west(), "haz_sar" ) && match( dat.south(), "haz_sar" ) ) { - rotate( 2 ); - } - } else if( match( terrain_type, "haz_sar" ) ) { - dat.fill_groundcover(); - if( ( match( dat.south(), "haz_sar_entrance" ) && match( dat.east(), "haz_sar" ) ) || - ( match( dat.north(), "haz_sar" ) && match( dat.east(), "haz_sar_entrance" ) ) || - ( match( dat.west(), "haz_sar" ) && match( dat.north(), "haz_sar_entrance" ) ) || - ( match( dat.south(), "haz_sar" ) && match( dat.west(), "haz_sar_entrance" ) ) ) { - mapf::formatted_set_simple( this, 0, 0, - " \n" - " fFFFFFFFFFFFFFFFFFFFFFF\n" - " f \n" - " f \n" - " f #################\n" - " f ##################\n" - " f ##...llrr..........\n" - " f ##..!!!!!!!!!.......\n" - " f ##..!!!!!!!!!&&&1111\n" - " f ##..!!!!!!!!x&&&....\n" - " f ##..!!!!!!!!!!!!....\n" - " f ##r.!!!!!!!!!!!!....\n" - " f ##r.!!!!!!!!!!!!....\n" - " f ##r.!!!!!!!!!!!!....\n" - " f ##r.!!!!!!!!!!!!..CC\n" - " f ##..!!!!!!!!!!!...CC\n" - " f ##..!!!!!!!!!!....C.\n" - " f ##..!!!!!!!!!.......\n" - " f ##..!!!!!!!!........\n" - " f ###.!!!!!!!x##.#####\n" - " f ####XXXXXXX###+#####\n" - " f ##!!!!!!!!x|x.r| \n" - " f |!!!!!!!!!%..r| |-\n" - " f |!!!!!!!!!%..r| |^\n", ter_key, fur_key ); - spawn_item( point( 19, 22 ), "cleansuit" ); - place_items( "cleaning", 85, point( 6, 11 ), point( 6, 14 ), false, calendar::start_of_cataclysm ); - place_items( "tools_common", 85, point( 10, 6 ), point( 13, 6 ), false, - calendar::start_of_cataclysm ); - place_items( "toxic_dump_equipment", 85, point( 22, 14 ), point( 23, 15 ), false, - calendar::start_of_cataclysm ); - place_spawns( GROUP_HAZMATBOT, 2, point( 22, 12 ), point( 22, 12 ), 1, true ); - place_spawns( GROUP_HAZMATBOT, 2, point( 23, 18 ), point( 23, 18 ), 1, true ); - //lazy radiation mapping - for( int x = 0; x < SEEX * 2; x++ ) { - for( int y = 0; y < SEEY * 2; y++ ) { - adjust_radiation( point( x, y ), rng( 10, 30 ) ); - } - } - if( match( dat.west(), "haz_sar_entrance" ) ) { - rotate( 1 ); - if( x_in_y( 1, 4 ) ) { - add_vehicle( vproto_id( "military_cargo_truck" ), point( 10, 11 ), 0 ); - } - } else if( match( dat.north(), "haz_sar_entrance" ) ) { - rotate( 2 ); - if( x_in_y( 1, 4 ) ) { - add_vehicle( vproto_id( "military_cargo_truck" ), point( 12, 10 ), 90 ); - } - } else if( match( dat.east(), "haz_sar_entrance" ) ) { - rotate( 3 ); - if( x_in_y( 1, 4 ) ) { - add_vehicle( vproto_id( "military_cargo_truck" ), point( 13, 12 ), 180 ); - } - } else if( x_in_y( 1, 4 ) ) { - add_vehicle( vproto_id( "military_cargo_truck" ), point( 11, 13 ), 270 ); - } - - } else if( ( match( dat.west(), "haz_sar_entrance" ) && match( dat.north(), "haz_sar" ) ) || - ( match( dat.north(), "haz_sar_entrance" ) && match( dat.east(), "haz_sar" ) ) || - ( match( dat.west(), "haz_sar" ) && match( dat.south(), "haz_sar_entrance" ) ) || - ( match( dat.south(), "haz_sar" ) && match( dat.east(), "haz_sar_entrance" ) ) ) { - mapf::formatted_set_simple( this, 0, 0, - "......|-+-|-+|...h..w f \n" - ".c....|.............w f \n" - "hd....+....ch.....hdw f \n" - "cc....|....cdd...ddd| f \n" - "ww-www|w+w-www--www-| f \n" - "ssssssssssssssssssss f \n" - "ssssssssssssssssssss f \n" - "___,____,____,____ss f \n" - "___,____,____,____ss f \n" - "___,____,____,____ss f \n" - "___,____,____,____ss f \n" - "___,____,____,____ss f \n" - "__________________ss f \n" - "__________________ss f \n" - "__________________ss f \n" - "__________________ss f \n" - "________,_________ss f \n" - "________,_________ss f \n" - "________,_________ss f \n" - "ssssssssssssssssssss f \n" - "FFFFFFFFFFFFFFFFFFFFFFf \n" - " \n" - " \n" - " \n", ter_key, fur_key ); - spawn_item( point( 1, 2 ), "id_military" ); - place_items( "office", 85, point_south_east, point( 1, 3 ), false, calendar::start_of_cataclysm ); - place_items( "office", 85, point( 11, 3 ), point( 13, 3 ), false, calendar::start_of_cataclysm ); - place_items( "office", 85, point( 17, 3 ), point( 19, 3 ), false, calendar::start_of_cataclysm ); - //lazy radiation mapping - for( int x = 0; x < SEEX * 2; x++ ) { - for( int y = 0; y < SEEY * 2; y++ ) { - adjust_radiation( point( x, y ), rng( 10, 30 ) ); - } - } - if( match( dat.north(), "haz_sar_entrance" ) ) { - rotate( 1 ); - } - if( match( dat.east(), "haz_sar_entrance" ) ) { - rotate( 2 ); - } - if( match( dat.south(), "haz_sar_entrance" ) ) { - rotate( 3 ); - } - } else { - mapf::formatted_set_simple( this, 0, 0, - " \n" - "FFFFFFFFFFFFFFFFFFFFFFf \n" - " f \n" - " f \n" - "################ f \n" - "################# f \n" - ".V.V.V..........## f \n" - ".......|G|.......## f \n" - "11111111111111...## f \n" - ".......|G|.%515%.## f \n" - "...........%QQQ%.## f \n" - "..CC......x%QQQ%.## f \n" - ".CCC.......%QQQ%.## f \n" - "...........%QQQ%.## f \n" - ".....|.R|..%515%.## f \n" - "......EE|....1...## f \n" - "......EE|....&...## f \n" - ".....---|.......## f \n" - "...............## f \n" - "################ f \n" - "############### f \n" - " f \n" - "------|---|--|---www| f \n" - ".x6x..|S.T|l.|^.ddd.| f \n", ter_key, fur_key ); - place_items( "office", 85, point( 16, 23 ), point( 18, 23 ), false, calendar::start_of_cataclysm ); - place_items( "cleaning", 85, point( 11, 23 ), point( 12, 23 ), false, - calendar::start_of_cataclysm ); - place_items( "robots", 90, point( 2, 11 ), point( 3, 11 ), false, calendar::start_of_cataclysm ); - // TODO: change to monster group - place_spawns( GROUP_HAZMATBOT, 2, point( 7, 10 ), point( 7, 10 ), 1, true ); - place_spawns( GROUP_HAZMATBOT, 2, point( 11, 16 ), point( 11, 16 ), 1, true ); - //lazy radiation mapping - for( int x = 0; x < SEEX * 2; x++ ) { - for( int y = 0; y < SEEY * 2; y++ ) { - adjust_radiation( point( x, y ), rng( 10, 30 ) ); - } - } - tmpcomp = add_computer( tripoint( 2, 23, abs_sub.z ), _( "SRCF Security Terminal" ), 0 ); - tmpcomp->add_option( _( "Security Reminder [1055]" ), COMPACT_SR1_MESS, 0 ); - tmpcomp->add_option( _( "Security Reminder [1056]" ), COMPACT_SR2_MESS, 0 ); - tmpcomp->add_option( _( "Security Reminder [1057]" ), COMPACT_SR3_MESS, 0 ); - //tmpcomp->add_option(_("Security Reminder [1058]"), COMPACT_SR4_MESS, 0); limited to 9 computer options - tmpcomp->add_option( _( "EPA: Report All Potential Containment Breaches [3873643]" ), - COMPACT_SRCF_1_MESS, 2 ); - tmpcomp->add_option( _( "SRCF: Internal Memo, EPA [2918024]" ), COMPACT_SRCF_2_MESS, 2 ); - tmpcomp->add_option( _( "CDC: Internal Memo, Standby [2918115]" ), COMPACT_SRCF_3_MESS, 2 ); - tmpcomp->add_option( _( "USARMY: SEAL SRCF [987167]" ), COMPACT_SRCF_SEAL_ORDER, 4 ); - tmpcomp->add_option( _( "COMMAND: REACTIVATE ELEVATOR" ), COMPACT_SRCF_ELEVATOR, 0 ); - tmpcomp->add_option( _( "COMMAND: SEAL SRCF [4423]" ), COMPACT_SRCF_SEAL, 5 ); - tmpcomp->add_failure( COMPFAIL_ALARM ); - if( match( dat.west(), "haz_sar" ) && match( dat.north(), "haz_sar" ) ) { - rotate( 1 ); - } - if( match( dat.east(), "haz_sar" ) && match( dat.north(), "haz_sar" ) ) { - rotate( 2 ); - } - if( match( dat.east(), "haz_sar" ) && match( dat.south(), "haz_sar" ) ) { - rotate( 3 ); - } - } - } else if( match( terrain_type, "haz_sar_entrance_b1" ) ) { - // Init to grass & dirt; - dat.fill_groundcover(); - mapf::formatted_set_simple( this, 0, 0, - "#############...........\n" - "#############...........\n" - "|---------|#............\n" - "|_________|M............\n" - "|_________$.............\n" - "|_________$.............\n" - "|_________$.............\n" - "|_________$.............\n" - "|_________$.............\n" - "|_________|.............\n" - "|---------|#............\n" - "############............\n" - "###########.............\n" - "###########M......####..\n" - "#########|--$$$$$--|####\n" - "####|----|_________|----\n" - "####|___________________\n" - "####|___________________\n" - "####|___________________\n" - "####|___________________\n" - "####|___________________\n" - "####|___________________\n" - "####|___________________\n" - "####|-------------------\n", b_ter_key, b_fur_key ); - for( int i = 0; i < SEEX * 2; i++ ) { - for( int j = 0; j < SEEY * 2; j++ ) { - if( this->ter( point( i, j ) ) == t_rock_floor ) { - if( one_in( 250 ) ) { - add_item( point( i, j ), item::make_corpse() ); - place_items( "science", 70, point( i, j ), point( i, j ), true, calendar::start_of_cataclysm ); - } - place_spawns( GROUP_PLAIN, 80, point( i, j ), point( i, j ), 1, true ); - } - if( this->ter( point( i, j ) ) != t_metal_floor ) { - adjust_radiation( point( i, j ), rng( 10, 70 ) ); - } - if( this->ter( point( i, j ) ) == t_sewage ) { - if( one_in( 2 ) ) { - ter_set( point( i, j ), t_dirtfloor ); - } - if( one_in( 4 ) ) { - ter_set( point( i, j ), t_dirtmound ); - } - if( one_in( 2 ) ) { - make_rubble( tripoint( i, j, abs_sub.z ), f_wreckage, true ); - } - place_items( "trash", 50, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - place_items( "sewer", 50, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - if( one_in( 40 ) ) { - spawn_item( point( i, j ), "nanomaterial", 1, 5 ); - } - place_spawns( GROUP_VANILLA, 5, point( i, j ), point( i, j ), 1, true ); - } - } - } - if( match( dat.north(), "haz_sar_b1" ) && match( dat.west(), "haz_sar_b1" ) ) { - rotate( 3 ); - } else if( match( dat.north(), "haz_sar_b1" ) && match( dat.east(), "haz_sar_b1" ) ) { - rotate( 0 ); - } else if( match( dat.south(), "haz_sar_b1" ) && match( dat.east(), "haz_sar_b1" ) ) { - rotate( 1 ); - } else if( match( dat.west(), "haz_sar_b1" ) && match( dat.south(), "haz_sar_b1" ) ) { - rotate( 2 ); - } - } else if( match( terrain_type, "haz_sar_b1" ) ) { - dat.fill_groundcover(); - if( ( match( dat.south(), "haz_sar_entrance_b1" ) && match( dat.east(), "haz_sar_b1" ) ) || - ( match( dat.north(), "haz_sar_b1" ) && match( dat.east(), "haz_sar_entrance_b1" ) ) || - ( match( dat.west(), "haz_sar_b1" ) && match( dat.north(), "haz_sar_entrance_b1" ) ) || - ( match( dat.south(), "haz_sar_b1" ) && match( dat.west(), "haz_sar_entrance_b1" ) ) ) { - mapf::formatted_set_simple( this, 0, 0, - "########################\n" - "####################.##.\n" - "####|----------|###.....\n" - "####|__________|M.......\n" - "####|__________$........\n" - "####|__________$........\n" - "####|__________$........\n" - "####|__________$........\n" - "####|__________$........\n" - "####|__________|........\n" - "####|----------|........\n" - "###############.........\n" - "##############..........\n" - "#############...........\n" - "############...........#\n" - "|---------|#.........###\n" - "|_________|M.........###\n" - "|_________$..........|--\n" - "|_________$..........|r,\n" - "|_________$..........|r,\n" - "|_________$..........|r,\n" - "|_________$..........|,,\n" - "|_________|..........|,,\n" - "|---------|#.........|-$\n", b_ter_key, b_fur_key ); - for( int i = 0; i < SEEX * 2; i++ ) { - for( int j = 0; j < SEEY * 2; j++ ) { - if( this->furn( point( i, j ) ) == f_rack ) { - place_items( "mechanics", 60, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - } - if( this->ter( point( i, j ) ) == t_rock_floor ) { - if( one_in( 250 ) ) { - add_item( point( i, j ), item::make_corpse() ); - place_items( "science", 70, point( i, j ), point( i, j ), true, calendar::start_of_cataclysm ); - } else { - place_spawns( GROUP_PLAIN, 1, point( i, j ), point( i, j ), 1, true ); - } - } - if( this->ter( point( i, j ) ) != t_metal_floor ) { - adjust_radiation( point( i, j ), rng( 10, 70 ) ); - } - if( this->ter( point( i, j ) ) == t_sewage ) { - if( one_in( 2 ) ) { - ter_set( point( i, j ), t_dirtfloor ); - } - if( one_in( 4 ) ) { - ter_set( point( i, j ), t_dirtmound ); - } - if( one_in( 2 ) ) { - make_rubble( tripoint( i, j, abs_sub.z ), f_wreckage, true ); - } - place_items( "trash", 50, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - place_items( "sewer", 50, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - if( one_in( 40 ) ) { - spawn_item( point( i, j ), "nanomaterial", 1, 5 ); - } - place_spawns( GROUP_VANILLA, 5, point( i, j ), point( i, j ), 1, true ); - } - } - } - if( match( dat.west(), "haz_sar_entrance_b1" ) ) { - rotate( 1 ); - } else if( match( dat.north(), "haz_sar_entrance_b1" ) ) { - rotate( 2 ); - } else if( match( dat.east(), "haz_sar_entrance_b1" ) ) { - rotate( 3 ); - } - } else if( ( match( dat.west(), "haz_sar_entrance_b1" ) && match( dat.north(), "haz_sar_b1" ) ) || - ( match( dat.north(), "haz_sar_entrance_b1" ) && match( dat.east(), "haz_sar_b1" ) ) || - ( match( dat.west(), "haz_sar_b1" ) && match( dat.south(), "haz_sar_entrance_b1" ) ) || - ( match( dat.south(), "haz_sar_b1" ) && match( dat.east(), "haz_sar_entrance_b1" ) ) ) { - mapf::formatted_set_simple( this, 0, 0, - "....M..|,,,,|........###\n" - ".......|-HH=|.........##\n" - ".....................###\n" - "......................##\n" - ".......................#\n" - "......................##\n" - ".......................#\n" - "......................##\n" - "......................##\n" - ".......................#\n" - ".....................###\n" - "....................####\n" - "..................######\n" - "###....M.........#######\n" - "#####|--$$$$$--|########\n" - "|----|_________|----|###\n" - "|___________________|###\n" - "|___________________|###\n" - "|___________________|###\n" - "|___________________|###\n" - "|___________________|###\n" - "|___________________|###\n" - "|___________________|###\n" - "|-------------------|###\n", b_ter_key, b_fur_key ); - for( int i = 0; i < SEEX * 2; i++ ) { - for( int j = 0; j < SEEY * 2; j++ ) { - if( this->ter( point( i, j ) ) == t_rock_floor ) { - if( one_in( 250 ) ) { - add_item( point( i, j ), item::make_corpse() ); - place_items( "science", 70, point( i, j ), point( i, j ), true, calendar::start_of_cataclysm ); - } - place_spawns( GROUP_PLAIN, 80, point( i, j ), point( i, j ), 1, true ); - } - if( this->ter( point( i, j ) ) != t_metal_floor ) { - adjust_radiation( point( i, j ), rng( 10, 70 ) ); - } - if( this->ter( point( i, j ) ) == t_sewage ) { - if( one_in( 2 ) ) { - ter_set( point( i, j ), t_dirtfloor ); - } - if( one_in( 4 ) ) { - ter_set( point( i, j ), t_dirtmound ); - } - if( one_in( 2 ) ) { - make_rubble( tripoint( i, j, abs_sub.z ), f_wreckage, true ); - } - place_items( "trash", 50, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - place_items( "sewer", 50, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - if( one_in( 20 ) ) { - spawn_item( point( i, j ), "nanomaterial", 1, 5 ); - } - place_spawns( GROUP_VANILLA, 5, point( i, j ), point( i, j ), 1, true ); - } - } - } - if( match( dat.north(), "haz_sar_entrance_b1" ) ) { - rotate( 1 ); - } - if( match( dat.east(), "haz_sar_entrance_b1" ) ) { - rotate( 2 ); - } - if( match( dat.south(), "haz_sar_entrance_b1" ) ) { - rotate( 3 ); - } - } else { - mapf::formatted_set_simple( this, 0, 0, - "########################\n" - ".#######################\n" - "...#..#|----------|#####\n" - ".......|__________|#####\n" - ".......$__________|#####\n" - ".......$__________|#####\n" - ".......$__________|#####\n" - ".......$__________|#####\n" - ".......$__________|#####\n" - "......M|__________|#####\n" - "......#|----------|#####\n" - ".....###################\n" - "....####|---|----|######\n" - "###.##|-|,,,|,S,T|######\n" - "#|-=-||&|,,,+,,,,|######\n" - "#|,,l|EE+,,,|----|-|####\n" - "#|,,l|EE+,,,|ddd,,l|####\n" - "-|-$-|--|,,,V,h,,,l|####\n" - ",,,,,|,,=,,,V,,,,,,|####\n" - ",,,,,|rr|,,,V,,,,c,|####\n" - ",,,,,|--|,,,|,,,hc,|####\n" - ",,,,,+,,,,,,+,,c6c,|####\n" - ",,,,M|,,,,,,|r,,,,,|####\n" - "$$$$-|-|=HH-|-HHHH-|####\n", b_ter_key, b_fur_key ); - spawn_item( point( 3, 16 ), "sarcophagus_access_code" ); - for( int i = 0; i < SEEX * 2; i++ ) { - for( int j = 0; j < SEEY * 2; j++ ) { - if( this->furn( point( i, j ) ) == f_locker ) { - place_items( "cleaning", 60, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - } - if( this->furn( point( i, j ) ) == f_desk ) { - place_items( "cubical_office", 60, point( i, j ), point( i, j ), false, - calendar::start_of_cataclysm ); - } - if( this->furn( point( i, j ) ) == f_rack ) { - place_items( "sewage_plant", 60, point( i, j ), point( i, j ), false, - calendar::start_of_cataclysm ); - } - if( this->ter( point( i, j ) ) == t_rock_floor ) { - if( one_in( 250 ) ) { - add_item( point( i, j ), item::make_corpse() ); - place_items( "science", 70, point( i, j ), point( i, j ), true, calendar::start_of_cataclysm ); - } - place_spawns( GROUP_PLAIN, 80, point( i, j ), point( i, j ), 1, true ); - } - if( this->ter( point( i, j ) ) != t_metal_floor ) { - adjust_radiation( point( i, j ), rng( 10, 70 ) ); - } - if( this->ter( point( i, j ) ) == t_sewage ) { - if( one_in( 2 ) ) { - ter_set( point( i, j ), t_dirtfloor ); - } - if( one_in( 4 ) ) { - ter_set( point( i, j ), t_dirtmound ); - } - if( one_in( 2 ) ) { - make_rubble( tripoint( i, j, abs_sub.z ), f_wreckage, true ); - } - place_items( "trash", 50, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - place_items( "sewer", 50, point( i, j ), point( i, j ), false, calendar::start_of_cataclysm ); - if( one_in( 40 ) ) { - spawn_item( point( i, j ), "nanomaterial", 1, 5 ); - } - place_spawns( GROUP_VANILLA, 5, point( i, j ), point( i, j ), 1, true ); - } - } - } - tmpcomp = add_computer( tripoint( 16, 21, abs_sub.z ), - _( "SRCF Security Terminal" ), 0 ); - tmpcomp->add_option( _( "Security Reminder [1055]" ), COMPACT_SR1_MESS, 0 ); - tmpcomp->add_option( _( "Security Reminder [1056]" ), COMPACT_SR2_MESS, 0 ); - tmpcomp->add_option( _( "Security Reminder [1057]" ), COMPACT_SR3_MESS, 0 ); - //tmpcomp->add_option(_("Security Reminder [1058]"), COMPACT_SR4_MESS, 0); limited to 9 computer options - tmpcomp->add_option( _( "EPA: Report All Potential Containment Breaches [3873643]" ), - COMPACT_SRCF_1_MESS, 2 ); - tmpcomp->add_option( _( "SRCF: Internal Memo, EPA [2918024]" ), - COMPACT_SRCF_2_MESS, 2 ); - tmpcomp->add_option( _( "CDC: Internal Memo, Standby [2918115]" ), - COMPACT_SRCF_3_MESS, 2 ); - tmpcomp->add_option( _( "USARMY: SEAL SRCF [987167]" ), COMPACT_SRCF_SEAL_ORDER, 4 ); - tmpcomp->add_option( _( "COMMAND: REACTIVATE ELEVATOR" ), COMPACT_SRCF_ELEVATOR, 0 ); - tmpcomp->add_failure( COMPFAIL_ALARM ); - if( match( dat.west(), "haz_sar_b1" ) && match( dat.north(), "haz_sar_b1" ) ) { - rotate( 1 ); - } - if( match( dat.east(), "haz_sar_b1" ) && match( dat.north(), "haz_sar_b1" ) ) { - rotate( 2 ); - } - if( match( dat.east(), "haz_sar_b1" ) && match( dat.south(), "haz_sar_b1" ) ) { - rotate( 3 ); - } - } - } -} - void map::draw_fema( mapgendata &dat ) { const oter_id &terrain_type = dat.terrain_type(); @@ -6318,8 +5786,8 @@ void map::place_spawns( const mongroup_id &group, const int chance, // Pick a monster type MonsterGroupResult spawn_details = MonsterGroupManager::GetResultFromGroup( group, &num ); - add_spawn( spawn_details.name, spawn_details.pack_size, point( x, y ), friendly, -1, mission_id, - name ); + add_spawn( spawn_details.name, spawn_details.pack_size, { x, y, abs_sub.z }, + friendly, -1, mission_id, name ); } } @@ -6454,7 +5922,7 @@ std::vector map::put_items_from_loc( const items_location &loc, const tr return spawn_items( p, items ); } -void map::add_spawn( const mtype_id &type, int count, const point &p, bool friendly, +void map::add_spawn( const mtype_id &type, int count, const tripoint &p, bool friendly, int faction_id, int mission_id, const std::string &name ) const { if( p.x < 0 || p.x >= SEEX * my_MAPSIZE || p.y < 0 || p.y >= SEEY * my_MAPSIZE ) { @@ -6465,8 +5933,8 @@ void map::add_spawn( const mtype_id &type, int count, const point &p, bool frien submap *place_on_submap = get_submap_at( p, offset ); if( !place_on_submap ) { - debugmsg( "centadodecamonant doesn't exist in grid; within add_spawn(%s, %d, %d, %d)", - type.c_str(), count, p.x, p.y ); + debugmsg( "centadodecamonant doesn't exist in grid; within add_spawn(%s, %d, %d, %d, %d)", + type.c_str(), count, p.x, p.y, p.z ); return; } if( MonsterGroupManager::monster_is_blacklisted( type ) ) { @@ -7702,35 +7170,41 @@ bool update_mapgen_function_json::update_map( const tripoint &omt_pos, const poi { tinymap update_tmap; const tripoint sm_pos = omt_to_sm_copy( omt_pos ); - update_tmap.load( sm_pos, false ); + update_tmap.load( sm_pos, true ); mapgendata md( omt_pos, update_tmap, 0.0f, calendar::start_of_cataclysm, miss ); - // If the existing map is rotated, we need to rotate it back to the north - // orientation before applying our updates. - const int rotation = oter_get_rotation( overmap_buffer.ter( omt_pos ) ); - if( rotation > 0 ) { - md.m.rotate( rotation, true ); - } - - const bool applied = update_map( md, offset, verify ); - - // If we rotated the map before applying updates, we now need to rotate - // it back to where we found it. - if( rotation ) { - md.m.rotate( 4 - rotation, true ); - } - - if( applied ) { - md.m.save(); - } - - return applied; + return update_map( md, offset, verify ); } bool update_mapgen_function_json::update_map( mapgendata &md, const point &offset, const bool verify ) const { + class rotation_guard + { + public: + rotation_guard( const mapgendata &md ) + : md( md ), rotation( oter_get_rotation( md.terrain_type() ) ) { + // If the existing map is rotated, we need to rotate it back to the north + // orientation before applying our updates. + if( rotation != 0 ) { + md.m.rotate( rotation, true ); + } + } + + ~rotation_guard() { + // If we rotated the map before applying updates, we now need to rotate + // it back to where we found it. + if( rotation != 0 ) { + md.m.rotate( 4 - rotation, true ); + } + } + private: + const mapgendata &md; + const int rotation; + }; + rotation_guard rot( md ); + for( auto &elem : setmap_points ) { if( verify && elem.has_vehicle_collision( md, offset ) ) { return false; @@ -7785,12 +7259,20 @@ bool run_mapgen_update_func( const std::string &update_mapgen_id, const tripoint return update_function->second[0]->update_map( omt_pos, point_zero, miss, cancel_on_collision ); } +bool run_mapgen_update_func( const std::string &update_mapgen_id, mapgendata &dat, + const bool cancel_on_collision ) +{ + const auto update_function = update_mapgen.find( update_mapgen_id ); + if( update_function == update_mapgen.end() || update_function->second.empty() ) { + return false; + } + return update_function->second[0]->update_map( dat, point_zero, cancel_on_collision ); +} + std::pair, std::map> get_changed_ids_from_update( const std::string &update_mapgen_id ) { const int fake_map_z = -9; - const tripoint tripoint_below_zero( 0, 0, fake_map_z ); - const tripoint tripoint_fake_map_edge( 23, 23, fake_map_z ); std::map terrains; std::map furnitures; @@ -7801,10 +7283,8 @@ std::pair, std::map> get_changed_ids_from_up return std::make_pair( terrains, furnitures ); } - tinymap fake_map; - if( !fake_map.fake_load( f_null, t_dirt, tr_null, fake_map_z ) ) { - return std::make_pair( terrains, furnitures ); - } + ::fake_map fake_map( f_null, t_dirt, tr_null, fake_map_z ); + oter_id any = oter_id( "field" ); // just need a variable here, it doesn't need to be valid const regional_settings dummy_settings; @@ -7813,20 +7293,13 @@ std::pair, std::map> get_changed_ids_from_up any, any, 0, dummy_settings, fake_map, any, 0.0f, calendar::turn, nullptr ); if( update_function->second[0]->update_map( fake_md ) ) { - for( const tripoint &pos : fake_map.points_in_rectangle( tripoint_below_zero, - tripoint_fake_map_edge ) ) { + for( const tripoint &pos : fake_map.points_on_zlevel( fake_map_z ) ) { ter_id ter_at_pos = fake_map.ter( pos ); if( ter_at_pos != t_dirt ) { - if( terrains.find( ter_at_pos ) == terrains.end() ) { - terrains[ter_at_pos] = 0; - } terrains[ter_at_pos] += 1; } if( fake_map.has_furn( pos ) ) { furn_id furn_at_pos = fake_map.furn( pos ); - if( furnitures.find( furn_at_pos ) == furnitures.end() ) { - furnitures[furn_at_pos] = 0; - } furnitures[furn_at_pos] += 1; } } diff --git a/src/mapgen.h b/src/mapgen.h index 4816d0c48f4e1..d76980a3cef42 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -279,6 +279,7 @@ class mapgen_function_json_base public: bool check_inbounds( const jmapgen_int &x, const jmapgen_int &y, const JsonObject &jso ) const; size_t calc_index( const point &p ) const; + bool has_vehicle_collision( mapgendata &dat, const point &offset ) const; private: std::string jdata; @@ -289,7 +290,7 @@ class mapgen_function_json_base void setup_common(); bool setup_common( const JsonObject &jo ); - void setup_setmap( JsonArray &parray ); + void setup_setmap( const JsonArray &parray ); // Returns true if the mapgen qualifies at this point already virtual bool setup_internal( const JsonObject &jo ) = 0; virtual void setup_setmap_internal() { } diff --git a/src/mapgen_functions.cpp b/src/mapgen_functions.cpp index 7a59435eca528..d861fc1f44aeb 100644 --- a/src/mapgen_functions.cpp +++ b/src/mapgen_functions.cpp @@ -118,13 +118,7 @@ building_gen_pointer get_mapgen_cfunction( const std::string &ident ) { "river_straight", &mapgen_river_straight }, { "river_curved", &mapgen_river_curved }, { "parking_lot", &mapgen_parking_lot }, - { "house_generic_boxy", &mapgen_generic_house_boxy }, - { "house_generic_big_livingroom", &mapgen_generic_house_big_livingroom }, - { "house_generic_center_hallway", &mapgen_generic_house_center_hallway }, { "spider_pit", mapgen_spider_pit }, - { "basement_generic_layout", &mapgen_basement_generic_layout }, // empty, not bound - { "basement_junk", &mapgen_basement_junk }, - { "basement_spiders", &mapgen_basement_spiders }, { "cave", &mapgen_cave }, { "cave_rat", &mapgen_cave_rat }, { "cavern", &mapgen_cavern }, @@ -313,8 +307,8 @@ void mapgen_hive( mapgendata &dat ) m->ter_set( point( i + k, j + l ), t_floor_wax ); } } - m->add_spawn( mon_bee, 2, point( i, j ) ); - m->add_spawn( mon_beekeeper, 1, point( i, j ) ); + m->add_spawn( mon_bee, 2, { i, j, m->get_abs_sub().z } ); + m->add_spawn( mon_beekeeper, 1, { i, j, m->get_abs_sub().z } ); m->ter_set( point( i, j - 3 ), t_floor_wax ); m->ter_set( point( i, j + 3 ), t_floor_wax ); m->ter_set( point( i - 1, j - 2 ), t_floor_wax ); @@ -893,7 +887,7 @@ void mapgen_road( mapgendata &dat ) dat.monster_density() ); // 1 per 10 overmaps if( one_in( 10000 ) ) { - m->add_spawn( mon_zombie_jackson, 1, point( SEEX, SEEY ) ); + m->add_spawn( mon_zombie_jackson, 1, { SEEX, SEEY, m->get_abs_sub().z } ); } } @@ -1911,950 +1905,6 @@ void mapgen_parking_lot( mapgendata &dat ) } } -void house_room( room_type type, int x1, int y1, int x2, int y2, mapgendata &dat ) -{ - map *const m = &dat.m; - int pos_x1 = 0; - int pos_y1 = 0; - - if( type == room_backyard ) { //processing it separately - m->furn_set( point( x1 + 2, y1 ), f_chair ); - m->furn_set( point( x1 + 2, y1 + 1 ), f_table ); - for( int i = x1; i <= x2; i++ ) { - for( int j = y1; j <= y2; j++ ) { - if( ( i == x1 ) || ( i == x2 || ( j == y2 ) ) ) { - m->ter_set( point( i, j ), t_fence ); - } else { - m->ter_set( point( i, j ), t_grass ); - if( one_in( 35 ) && !m->has_furn( point( i, j ) ) ) { - m->ter_set( point( i, j ), t_tree_young ); - } else if( one_in( 35 ) && !m->has_furn( point( i, j ) ) ) { - m->ter_set( point( i, j ), t_tree ); - } else if( one_in( 25 ) ) { - m->ter_set( point( i, j ), t_dirt ); - } - } - } - } - m->ter_set( point( ( x1 + x2 ) / 2, y2 ), t_fencegate_c ); - return; - } - - for( int i = x1; i <= x2; i++ ) { - for( int j = y1; j <= y2; j++ ) { - if( dat.is_groundcover( m->ter( point( i, j ) ) ) || - //m->ter(i, j) == t_grass || m->ter(i, j) == t_dirt || - m->ter( point( i, j ) ) == t_floor ) { - if( j == y1 || j == y2 ) { - m->ter_set( point( i, j ), t_wall ); - } else if( i == x1 || i == x2 ) { - m->ter_set( point( i, j ), t_wall ); - } else { - m->ter_set( point( i, j ), t_floor ); - } - } - } - } - for( int i = y1 + 1; i <= y2 - 1; i++ ) { - m->ter_set( point( x1, i ), t_wall ); - m->ter_set( point( x2, i ), t_wall ); - } - - items_location placed = "none"; - int chance = 0; - int rn = 0; - switch( type ) { - case room_study: - placed = "livingroom"; - chance = 40; - break; - case room_living: - placed = "livingroom"; - chance = 83; - //choose random wall - switch( rng( 1, 4 ) ) { //some bookshelves - case 1: - pos_x1 = x1 + 2; - pos_y1 = y1 + 1; - m->furn_set( point( x1 + 2, y2 - 1 ), f_desk ); - while( pos_x1 < x2 ) { - pos_x1 += 1; - if( m->ter( point( pos_x1, pos_y1 ) ) == t_wall ) { - break; - } - m->furn_set( point( pos_x1, pos_y1 ), f_bookcase ); - pos_x1 += 1; - if( m->ter( point( pos_x1, pos_y1 ) ) == t_wall ) { - break; - } - m->furn_set( point( pos_x1, pos_y1 ), f_bookcase ); - pos_x1 += 2; - } - break; - case 2: - pos_x1 = x2 - 2; - pos_y1 = y1 + 1; - m->furn_set( point( x1 + 2, y2 - 1 ), f_desk ); - while( pos_x1 > x1 ) { - pos_x1 -= 1; - if( m->ter( point( pos_x1, pos_y1 ) ) == t_wall ) { - break; - } - m->furn_set( point( pos_x1, pos_y1 ), f_bookcase ); - pos_x1 -= 1; - if( m->ter( point( pos_x1, pos_y1 ) ) == t_wall ) { - break; - } - m->furn_set( point( pos_x1, pos_y1 ), f_bookcase ); - pos_x1 -= 2; - } - break; - case 3: - pos_x1 = x1 + 2; - pos_y1 = y2 - 1; - m->furn_set( point( x1 + 2, y2 - 1 ), f_desk ); - while( pos_x1 < x2 ) { - pos_x1 += 1; - if( m->ter( point( pos_x1, pos_y1 ) ) == t_wall ) { - break; - } - m->furn_set( point( pos_x1, pos_y1 ), f_bookcase ); - pos_x1 += 1; - if( m->ter( point( pos_x1, pos_y1 ) ) == t_wall ) { - break; - } - m->furn_set( point( pos_x1, pos_y1 ), f_bookcase ); - pos_x1 += 2; - } - break; - case 4: - pos_x1 = x2 - 2; - pos_y1 = y2 - 1; - m->furn_set( point( x1 + 2, y2 - 1 ), f_desk ); - while( pos_x1 > x1 ) { - pos_x1 -= 1; - if( m->ter( point( pos_x1, pos_y1 ) ) == t_wall ) { - break; - } - m->furn_set( point( pos_x1, pos_y1 ), f_bookcase ); - pos_x1 -= 1; - if( m->ter( point( pos_x1, pos_y1 ) ) == t_wall ) { - break; - } - m->furn_set( point( pos_x1, pos_y1 ), f_bookcase ); - pos_x1 -= 2; - } - break; - } - - break; - case room_kitchen: { - placed = "kitchen"; - chance = 75; - m->place_items( "cleaning", 58, point( x1 + 1, y1 + 1 ), point( x2 - 1, y2 - 2 ), false, - dat.when() ); - m->place_items( "home_hw", 40, point( x1 + 1, y1 + 1 ), point( x2 - 1, y2 - 2 ), false, - dat.when() ); - int oven_x = -1; - int oven_y = -1; - int cupboard_x = -1; - int cupboard_y = -1; - - switch( rng( 1, 4 ) ) { //fridge, sink, oven and some cupboards near them - case 1: - m->furn_set( point( x1 + 2, y1 + 1 ), f_fridge ); - m->place_items( "fridge", 82, point( x1 + 2, y1 + 1 ), point( x1 + 2, y1 + 1 ), false, dat.when() ); - m->furn_set( point( x1 + 1, y1 + 1 ), f_sink ); - if( x1 + 4 < x2 ) { - oven_x = x1 + 3; - cupboard_x = x1 + 4; - oven_y = cupboard_y = y1 + 1; - } - - break; - case 2: - m->furn_set( point( x2 - 2, y1 + 1 ), f_fridge ); - m->place_items( "fridge", 82, point( x2 - 2, y1 + 1 ), point( x2 - 2, y1 + 1 ), false, dat.when() ); - m->furn_set( point( x2 - 1, y1 + 1 ), f_sink ); - if( x2 - 4 > x1 ) { - oven_x = x2 - 3; - cupboard_x = x2 - 4; - oven_y = cupboard_y = y1 + 1; - } - break; - case 3: - m->furn_set( point( x1 + 2, y2 - 1 ), f_fridge ); - m->place_items( "fridge", 82, point( x1 + 2, y2 - 1 ), point( x1 + 2, y2 - 1 ), false, dat.when() ); - m->furn_set( point( x1 + 1, y2 - 1 ), f_sink ); - if( x1 + 4 < x2 ) { - oven_x = x1 + 3; - cupboard_x = x1 + 4; - oven_y = cupboard_y = y2 - 1; - } - break; - case 4: - m->furn_set( point( x2 - 2, y2 - 1 ), f_fridge ); - m->place_items( "fridge", 82, point( x2 - 2, y2 - 1 ), point( x2 - 2, y2 - 1 ), false, dat.when() ); - m->furn_set( point( x2 - 1, y2 - 1 ), f_sink ); - if( x2 - 4 > x1 ) { - oven_x = x2 - 3; - cupboard_x = x2 - 4; - oven_y = cupboard_y = y2 - 1; - } - break; - } - - // oven and it's contents - if( oven_x != -1 && oven_y != -1 ) { - m->furn_set( point( oven_x, oven_y ), f_oven ); - m->place_items( "oven", 70, point( oven_x, oven_y ), point( oven_x, oven_y ), false, - dat.when() ); - } - - // cupboard and it's contents - if( cupboard_x != -1 && cupboard_y != -1 ) { - m->furn_set( point( cupboard_x, cupboard_y ), f_cupboard ); - m->place_items( "cleaning", 30, point( cupboard_x, cupboard_y ), point( cupboard_x, cupboard_y ), - false, dat.when() ); - m->place_items( "home_hw", 30, point( cupboard_x, cupboard_y ), point( cupboard_x, cupboard_y ), - false, dat.when() ); - m->place_items( "cannedfood", 30, point( cupboard_x, cupboard_y ), point( cupboard_x, cupboard_y ), - false, dat.when() ); - m->place_items( "pasta", 30, point( cupboard_x, cupboard_y ), point( cupboard_x, cupboard_y ), - false, dat.when() ); - } - - if( one_in( 2 ) ) { //dining table in the kitchen - square_furn( m, f_table, static_cast( ( x1 + x2 ) / 2 ) - 1, - static_cast( ( y1 + y2 ) / 2 ) - 1, - static_cast( ( x1 + x2 ) / 2 ), - static_cast( ( y1 + y2 ) / 2 ) ); - m->place_items( "dining", 20, point( static_cast( ( x1 + x2 ) / 2 ) - 1, - static_cast( ( y1 + y2 ) / 2 ) - 1 ), - point( ( x1 + x2 ) / 2, static_cast( ( y1 + y2 ) / 2 ) ), false, dat.when() ); - } - if( one_in( 2 ) ) { - for( int i = 0; i <= 2; i++ ) { - pos_x1 = rng( x1 + 2, x2 - 2 ); - pos_y1 = rng( y1 + 1, y2 - 1 ); - if( m->ter( point( pos_x1, pos_y1 ) ) == t_floor && - !( m->furn( point( pos_x1, pos_y1 ) ) == f_cupboard || - m->furn( point( pos_x1, pos_y1 ) ) == f_oven || m->furn( point( pos_x1, pos_y1 ) ) == f_sink || - m->furn( point( pos_x1, pos_y1 ) ) == f_fridge ) ) { - m->furn_set( point( pos_x1, pos_y1 ), f_chair ); - } - } - } - - } - break; - case room_bedroom: - placed = "bedroom"; - chance = 78; - if( one_in( 14 ) ) { - m->place_items( "homeguns", 58, point( x1 + 1, y1 + 1 ), point( x2 - 1, y2 - 1 ), false, - dat.when() ); - } - if( one_in( 10 ) ) { - m->place_items( "home_hw", 40, point( x1 + 1, y1 + 1 ), point( x2 - 1, y2 - 1 ), false, - dat.when() ); - } - switch( rng( 1, 5 ) ) { - case 1: - m->furn_set( point( x1 + 1, y1 + 2 ), f_bed ); - m->furn_set( point( x1 + 1, y1 + 3 ), f_bed ); - m->place_items( "bed", 60, point( x1 + 1, y1 + 2 ), point( x1 + 1, y1 + 2 ), false, dat.when() ); - m->place_items( "bed", 60, point( x1 + 1, y1 + 3 ), point( x1 + 1, y1 + 3 ), false, dat.when() ); - break; - case 2: - m->furn_set( point( x1 + 2, y2 - 1 ), f_bed ); - m->furn_set( point( x1 + 3, y2 - 1 ), f_bed ); - m->place_items( "bed", 60, point( x1 + 2, y2 - 1 ), point( x1 + 2, y2 - 1 ), false, dat.when() ); - m->place_items( "bed", 60, point( x1 + 2, y2 - 1 ), point( x1 + 2, y2 - 1 ), false, dat.when() ); - break; - case 3: - m->furn_set( point( x2 - 1, y2 - 3 ), f_bed ); - m->furn_set( point( x2 - 1, y2 - 2 ), f_bed ); - m->place_items( "bed", 60, point( x2 - 1, y2 - 3 ), point( x2 - 1, y2 - 3 ), false, dat.when() ); - m->place_items( "bed", 60, point( x2 - 1, y2 - 2 ), point( x2 - 1, y2 - 2 ), false, dat.when() ); - break; - case 4: - m->furn_set( point( x2 - 3, y1 + 1 ), f_bed ); - m->furn_set( point( x2 - 2, y1 + 1 ), f_bed ); - m->place_items( "bed", 60, point( x2 - 3, y1 + 1 ), point( x2 - 3, y1 + 1 ), false, dat.when() ); - m->place_items( "bed", 60, point( x2 - 2, y1 + 1 ), point( x2 - 2, y1 + 1 ), false, dat.when() ); - break; - case 5: - m->furn_set( point( ( x1 + x2 ) / 2, y2 - 1 ), f_bed ); - m->furn_set( point( static_cast( ( x1 + x2 ) / 2 ) + 1, y2 - 1 ), f_bed ); - m->furn_set( point( ( x1 + x2 ) / 2, y2 - 2 ), f_bed ); - m->furn_set( point( static_cast( ( x1 + x2 ) / 2 ) + 1, y2 - 2 ), f_bed ); - m->place_items( "bed", 60, point( ( x1 + x2 ) / 2, y2 - 1 ), - point( ( x1 + x2 ) / 2, y2 - 1 ), false, - dat.when() ); - m->place_items( "bed", 60, point( static_cast( ( x1 + x2 ) / 2 ) + 1, y2 - 1 ), - point( static_cast( ( x1 + x2 ) / 2 ) + 1, y2 - 1 ), - false, dat.when() ); - m->place_items( "bed", 60, point( ( x1 + x2 ) / 2, y2 - 2 ), - point( ( x1 + x2 ) / 2, y2 - 2 ), false, - dat.when() ); - m->place_items( "bed", 60, point( static_cast( ( x1 + x2 ) / 2 ) + 1, y2 - 2 ), - point( static_cast( ( x1 + x2 ) / 2 ) + 1, y2 - 2 ), - false, dat.when() ); - break; - } - switch( rng( 1, 4 ) ) { - case 1: - m->furn_set( point( x1 + 2, y1 + 1 ), f_dresser ); - m->place_items( "dresser", 80, point( x1 + 2, y1 + 1 ), point( x1 + 2, y1 + 1 ), false, - dat.when() ); - break; - case 2: - m->furn_set( point( x2 - 2, y2 - 1 ), f_dresser ); - m->place_items( "dresser", 80, point( x2 - 2, y2 - 1 ), point( x2 - 2, y2 - 1 ), false, - dat.when() ); - break; - case 3: - rn = static_cast( ( x1 + x2 ) / 2 ); - m->furn_set( point( rn, y1 + 1 ), f_dresser ); - m->place_items( "dresser", 80, point( rn, y1 + 1 ), point( rn, y1 + 1 ), false, dat.when() ); - break; - case 4: - rn = static_cast( ( y1 + y2 ) / 2 ); - m->furn_set( point( x1 + 1, rn ), f_dresser ); - m->place_items( "dresser", 80, point( x1 + 1, rn ), point( x1 + 1, rn ), false, dat.when() ); - break; - } - break; - case room_bathroom: - m->place_toilet( point( x2 - 1, y2 - 1 ) ); - m->place_items( "harddrugs", 18, point( x1 + 1, y1 + 1 ), point( x2 - 1, y2 - 2 ), false, - dat.when() ); - m->place_items( "cleaning", 48, point( x1 + 1, y1 + 1 ), point( x2 - 1, y2 - 2 ), false, - dat.when() ); - placed = "softdrugs"; - chance = 72; - m->furn_set( point( x2 - 1, y2 - 2 ), f_bathtub ); - if( one_in( 3 ) && !( m->ter( point( x2 - 1, y2 - 3 ) ) == t_wall ) ) { - m->furn_set( point( x2 - 1, y2 - 3 ), f_bathtub ); - } - if( !( ( m->furn( point( x1 + 1, y2 - 2 ) ) == f_toilet ) || - ( m->furn( point( x1 + 1, y2 - 2 ) ) == f_bathtub ) ) ) { - m->furn_set( point( x1 + 1, y2 - 2 ), f_sink ); - } - if( one_in( 4 ) ) { - for( int x = x1 + 1; x <= x2 - 1; x++ ) { - for( int y = y1 + 1; y <= y2 - 1; y++ ) { - m->ter_set( point( x, y ), t_linoleum_white ); - } - } - } else if( one_in( 4 ) ) { - for( int x = x1 + 1; x <= x2 - 1; x++ ) { - for( int y = y1 + 1; y <= y2 - 1; y++ ) { - m->ter_set( point( x, y ), t_linoleum_gray ); - } - } - } - break; - default: - break; - } - m->place_items( placed, chance, point( x1 + 1, y1 + 1 ), point( x2 - 1, y2 - 1 ), false, - dat.when() ); -} - -void mapgen_generic_house_boxy( mapgendata &dat ) -{ - mapgen_generic_house( dat, 1 ); -} - -void mapgen_generic_house_big_livingroom( mapgendata &dat ) -{ - mapgen_generic_house( dat, 2 ); -} - -void mapgen_generic_house_center_hallway( mapgendata &dat ) -{ - mapgen_generic_house( dat, 3 ); -} - -void mapgen_generic_house( mapgendata &dat, int variant ) -{ - map *const m = &dat.m; - int rn = 0; - int lw = 0; - int rw = 0; - int mw = 0; - int tw = 0; - int bw = 0; - int cw = 0; - int actual_house_height = 0; - int bw_old = 0; - - // West external wall - lw = rng( 0, 4 ); - // Middle wall between bedroom & kitchen/bath - // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores) - mw = lw + rng( 7, 10 ); - // East external wall - rw = SEEX * 2 - rng( 1, 5 ); - // North external wall - tw = rng( 1, 6 ); - // South external wall - bw = SEEX * 2 - rng( 2, 5 ); - // Middle wall between living room & kitchen/bed - // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores) - cw = tw + rng( 4, 7 ); - //reserving some space for backyard. Actual south external wall. - actual_house_height = bw - rng( 4, 6 ); - bw_old = bw; - - for( int i = 0; i < SEEX * 2; i++ ) { - for( int j = 0; j < SEEY * 2; j++ ) { - if( i > lw && i < rw && j > tw && j < bw ) { - m->ter_set( point( i, j ), t_floor ); - } else { - m->ter_set( point( i, j ), dat.groundcover() ); - } - //placing north and south walls - if( i >= lw && i <= rw && ( j == tw || j == bw ) ) { - m->ter_set( point( i, j ), t_wall ); - } - //placing west (lw) and east walls - if( ( i == lw || i == rw ) && j > tw && j < bw /*actual_house_height*/ ) { - m->ter_set( point( i, j ), t_wall ); - } - } - } - switch( variant ) { - case 1: - // Quadrants, essentially - mw = rng( lw + 5, rw - 5 ); - cw = tw + rng( 4, 7 ); - house_room( room_living, mw, tw, rw, cw, dat ); - house_room( room_kitchen, lw, tw, mw, cw, dat ); - m->ter_set( point( mw, rng( tw + 2, cw - 2 ) ), ( one_in( 3 ) ? t_door_c : t_floor ) ); - rn = rng( lw + 1, mw - 2 ); - m->ter_set( point( rn, tw ), t_window_domestic ); - m->ter_set( point( rn + 1, tw ), t_window_domestic ); - rn = rng( mw + 1, rw - 2 ); - m->ter_set( point( rn, tw ), t_window_domestic ); - m->ter_set( point( rn + 1, tw ), t_window_domestic ); - // Bottom part mw - rn = rng( lw + 3, rw - 3 ); - if( rn <= lw + 5 ) { - // Bedroom on right, bathroom on left - house_room( room_bedroom, rn, cw, rw, bw, dat ); - - // Put door between bedroom and living - m->ter_set( point( rng( rw - 1, rn > mw ? rn + 1 : mw + 1 ), cw ), t_door_c ); - - if( bw - cw >= 10 && rn - lw >= 6 ) { - // All fits, placing bathroom and 2nd bedroom - house_room( room_bathroom, lw, bw - 5, rn, bw, dat ); - house_room( room_bedroom, lw, cw, rn, bw - 5, dat ); - - // Put door between bathroom and bedroom - m->ter_set( point( rn, rng( bw - 4, bw - 1 ) ), t_door_c ); - - if( one_in( 3 ) ) { - // Put door between 2nd bedroom and 1st bedroom - m->ter_set( point( rn, rng( cw + 1, bw - 6 ) ), t_door_c ); - } else { - // ...Otherwise, between 2nd bedroom and kitchen - m->ter_set( point( rng( lw + 1, rn > mw ? mw - 1 : rn - 1 ), cw ), t_door_c ); - } - } else if( bw - cw > 4 ) { - // Too big for a bathroom, not big enough for 2nd bedroom - // Make it a bathroom anyway, but give the excess space back to - // the kitchen. - house_room( room_bathroom, lw, bw - 4, rn, bw, dat ); - for( int i = lw + 1; i < mw && i < rn; i++ ) { - m->ter_set( point( i, cw ), t_floor ); - } - - // Put door between excess space and bathroom - m->ter_set( point( rng( lw + 1, rn - 1 ), bw - 4 ), t_door_c ); - - // Put door between excess space and bedroom - m->ter_set( point( rn, rng( cw + 1, bw - 5 ) ), t_door_c ); - } else { - // Small enough to be a bathroom; make it one. - house_room( room_bathroom, lw, cw, rn, bw, dat ); - - if( one_in( 5 ) ) { - // Put door between bathroom and kitchen with low chance - m->ter_set( point( rng( lw + 1, rn > mw ? mw - 1 : rn - 1 ), cw ), t_door_c ); - } else { - // ...Otherwise, between bathroom and bedroom - m->ter_set( point( rn, rng( cw + 1, bw - 1 ) ), t_door_c ); - } - } - // Point on bedroom wall, for window - rn = rng( rn + 2, rw - 2 ); - } else { - // Bedroom on left, bathroom on right - house_room( room_bedroom, lw, cw, rn, bw, dat ); - - // Put door between bedroom and kitchen - m->ter_set( point( rng( lw + 1, rn > mw ? mw - 1 : rn - 1 ), cw ), t_door_c ); - - if( bw - cw >= 10 && rw - rn >= 6 ) { - // All fits, placing bathroom and 2nd bedroom - house_room( room_bathroom, rn, bw - 5, rw, bw, dat ); - house_room( room_bedroom, rn, cw, rw, bw - 5, dat ); - - // Put door between bathroom and bedroom - m->ter_set( point( rn, rng( bw - 4, bw - 1 ) ), t_door_c ); - - if( one_in( 3 ) ) { - // Put door between 2nd bedroom and 1st bedroom - m->ter_set( point( rn, rng( cw + 1, bw - 6 ) ), t_door_c ); - } else { - // ...Otherwise, between 2nd bedroom and living - m->ter_set( point( rng( rw - 1, rn > mw ? rn + 1 : mw + 1 ), cw ), t_door_c ); - } - } else if( bw - cw > 4 ) { - // Too big for a bathroom, not big enough for 2nd bedroom - // Make it a bathroom anyway, but give the excess space back to - // the living. - house_room( room_bathroom, rn, bw - 4, rw, bw, dat ); - for( int i = rw - 1; i > rn && i > mw; i-- ) { - m->ter_set( point( i, cw ), t_floor ); - } - - // Put door between excess space and bathroom - m->ter_set( point( rng( rw - 1, rn + 1 ), bw - 4 ), t_door_c ); - - // Put door between excess space and bedroom - m->ter_set( point( rn, rng( cw + 1, bw - 5 ) ), t_door_c ); - } else { - // Small enough to be a bathroom; make it one. - house_room( room_bathroom, rn, cw, rw, bw, dat ); - - if( one_in( 5 ) ) { - // Put door between bathroom and living with low chance - m->ter_set( point( rng( rw - 1, rn > mw ? rn + 1 : mw + 1 ), cw ), t_door_c ); - } else { - // ...Otherwise, between bathroom and bedroom - m->ter_set( point( rn, rng( cw + 1, bw - 1 ) ), t_door_c ); - } - } - // Point on bedroom wall, for window - rn = rng( lw + 2, rn - 2 ); - } - m->ter_set( point( rn, bw ), t_window_domestic ); - m->ter_set( point( rn + 1, bw ), t_window_domestic ); - if( !one_in( 3 ) && rw < SEEX * 2 - 1 ) { // Potential side windows - rn = rng( tw + 2, bw - 6 ); - m->ter_set( point( rw, rn ), t_window_domestic ); - m->ter_set( point( rw, rn + 4 ), t_window_domestic ); - } - if( !one_in( 3 ) && lw > 0 ) { // Potential side windows - rn = rng( tw + 2, bw - 6 ); - m->ter_set( point( lw, rn ), t_window_domestic ); - m->ter_set( point( lw, rn + 4 ), t_window_domestic ); - } - if( one_in( 2 ) ) { // Placement of the main door - m->ter_set( point( rng( lw + 2, mw - 1 ), tw ), - ( one_in( 6 ) ? ( one_in( 6 ) ? t_door_c : t_door_c_peep ) : ( one_in( - 6 ) ? t_door_locked : t_door_locked_peep ) ) ); - if( one_in( 5 ) ) { // Placement of side door - m->ter_set( point( rw, rng( tw + 2, cw - 2 ) ), ( one_in( 6 ) ? t_door_c : t_door_locked ) ); - } - } else { - m->ter_set( point( rng( mw + 1, rw - 2 ), tw ), - ( one_in( 6 ) ? ( one_in( 6 ) ? t_door_c : t_door_c_peep ) : ( one_in( - 6 ) ? t_door_locked : t_door_locked_peep ) ) ); - if( one_in( 5 ) ) { - m->ter_set( point( lw, rng( tw + 2, cw - 2 ) ), ( one_in( 6 ) ? t_door_c : t_door_locked ) ); - } - } - break; - - case 2: - // Old-style; simple; - //Modified by Jovan in 28 Aug 2013 - //Long narrow living room in front, big kitchen and HUGE bedroom - bw = SEEX * 2 - 2; - cw = tw + rng( 3, 6 ); - mw = rng( lw + 7, rw - 4 ); - //int actual_house_height=bw-rng(4,6); - //in some rare cases some rooms (especially kitchen and living room) may get rather small - if( ( tw <= 3 ) && ( abs( ( actual_house_height - 3 ) - cw ) >= 3 ) ) { - //everything is fine - house_room( room_backyard, lw, actual_house_height + 1, rw, bw, dat ); - //door from bedroom to backyard - m->ter_set( point( ( lw + mw ) / 2, actual_house_height ), t_door_c ); - } else { //using old layout - actual_house_height = bw_old; - } - // Plop down the rooms - house_room( room_living, lw, tw, rw, cw, dat ); - house_room( room_kitchen, mw, cw, rw, actual_house_height - 3, dat ); - //making bedroom smaller - house_room( room_bedroom, lw, cw, mw, actual_house_height, dat ); - house_room( room_bathroom, mw, actual_house_height - 3, rw, actual_house_height, dat ); - - // Space between kitchen & living room: - rn = rng( mw + 1, rw - 3 ); - m->ter_set( point( rn, cw ), t_floor ); - m->ter_set( point( rn + 1, cw ), t_floor ); - // Front windows - rn = rng( 2, 5 ); - m->ter_set( point( lw + rn, tw ), t_window_domestic ); - m->ter_set( point( lw + rn + 1, tw ), t_window_domestic ); - m->ter_set( point( rw - rn, tw ), t_window_domestic ); - m->ter_set( point( rw - rn + 1, tw ), t_window_domestic ); - // Front door - m->ter_set( point( rng( lw + 4, rw - 4 ), tw ), ( one_in( 6 ) ? t_door_c : t_door_locked ) ); - if( one_in( 3 ) ) { // Kitchen windows - rn = rng( cw + 1, actual_house_height - 5 ); - m->ter_set( point( rw, rn ), t_window_domestic ); - m->ter_set( point( rw, rn + 1 ), t_window_domestic ); - } - if( one_in( 3 ) ) { // Bedroom windows - rn = rng( cw + 1, actual_house_height - 2 ); - m->ter_set( point( lw, rn ), t_window_domestic ); - m->ter_set( point( lw, rn + 1 ), t_window_domestic ); - } - // Door to bedroom - if( one_in( 4 ) ) { - m->ter_set( point( rng( lw + 1, mw - 1 ), cw ), t_door_c ); - } else { - m->ter_set( point( mw, rng( cw + 3, actual_house_height - 4 ) ), t_door_c ); - } - // Door to bathroom - if( one_in( 4 ) ) { - m->ter_set( point( mw, actual_house_height - 1 ), t_door_c ); - } else { - m->ter_set( point( rng( mw + 2, rw - 2 ), actual_house_height - 3 ), t_door_c ); - } - // Back windows - rn = rng( lw + 1, mw - 2 ); - m->ter_set( point( rn, actual_house_height ), t_window_domestic ); - m->ter_set( point( rn + 1, actual_house_height ), t_window_domestic ); - rn = rng( mw + 1, rw - 1 ); - m->ter_set( point( rn, actual_house_height ), t_window_domestic ); - break; - - case 3: - // Long center hallway, kitchen, living room and office - mw = static_cast( ( lw + rw ) / 2 ); - cw = bw - rng( 5, 7 ); - // Hallway doors and windows - m->ter_set( point( mw, tw ), ( one_in( 6 ) ? t_door_c : t_door_locked ) ); - if( one_in( 4 ) ) { - m->ter_set( point( mw - 1, tw ), t_window_domestic ); - m->ter_set( point( mw + 1, tw ), t_window_domestic ); - } - for( int i = tw + 1; i < cw; i++ ) { // Hallway walls - m->ter_set( point( mw - 2, i ), t_wall ); - m->ter_set( point( mw + 2, i ), t_wall ); - } - if( one_in( 2 ) ) { // Front rooms are kitchen or living room - house_room( room_living, lw, tw, mw - 2, cw, dat ); - house_room( room_kitchen, mw + 2, tw, rw, cw, dat ); - } else { - house_room( room_kitchen, lw, tw, mw - 2, cw, dat ); - house_room( room_living, mw + 2, tw, rw, cw, dat ); - } - // Front windows - rn = rng( lw + 1, mw - 4 ); - m->ter_set( point( rn, tw ), t_window_domestic ); - m->ter_set( point( rn + 1, tw ), t_window_domestic ); - rn = rng( mw + 3, rw - 2 ); - m->ter_set( point( rn, tw ), t_window_domestic ); - m->ter_set( point( rn + 1, tw ), t_window_domestic ); - if( one_in( 3 ) && lw > 0 ) { // Side windows? - rn = rng( tw + 1, cw - 2 ); - m->ter_set( point( lw, rn ), t_window_domestic ); - m->ter_set( point( lw, rn + 1 ), t_window_domestic ); - } - if( one_in( 3 ) && rw < SEEX * 2 - 1 ) { // Side windows? - rn = rng( tw + 1, cw - 2 ); - m->ter_set( point( rw, rn ), t_window_domestic ); - m->ter_set( point( rw, rn + 1 ), t_window_domestic ); - } - if( one_in( 2 ) ) { // Bottom rooms are bedroom or bathroom - //bathroom to the left (eastern wall), study to the right - //house_room(m, room_bedroom, lw, cw, rw - 3, bw, dat); - house_room( room_bedroom, mw - 2, cw, rw - 3, bw, dat ); - house_room( room_bathroom, rw - 3, cw, rw, bw, dat ); - house_room( room_study, lw, cw, mw - 2, bw, dat ); - //===Study Room Furniture== - m->ter_set( point( mw - 2, ( bw + cw ) / 2 ), t_door_o ); - m->furn_set( point( lw + 1, cw + 1 ), f_chair ); - m->furn_set( point( lw + 1, cw + 2 ), f_table ); - m->ter_set( point( lw + 1, cw + 3 ), t_console_broken ); - m->furn_set( point( lw + 3, bw - 1 ), f_bookcase ); - m->place_items( "magazines", 30, point( lw + 3, bw - 1 ), point( lw + 3, bw - 1 ), false, - dat.when() ); - m->place_items( "novels", 40, point( lw + 3, bw - 1 ), point( lw + 3, bw - 1 ), false, - dat.when() ); - m->place_items( "alcohol", 20, point( lw + 3, bw - 1 ), point( lw + 3, bw - 1 ), false, - dat.when() ); - m->place_items( "manuals", 30, point( lw + 3, bw - 1 ), point( lw + 3, bw - 1 ), false, - dat.when() ); - //========================= - m->ter_set( point( rng( lw + 2, mw - 3 ), cw ), t_door_c ); - if( one_in( 4 ) ) { - m->ter_set( point( rng( rw - 2, rw - 1 ), cw ), t_door_c ); - } else { - m->ter_set( point( rw - 3, rng( cw + 2, bw - 2 ) ), t_door_c ); - } - //bedroom windows - rn = rng( mw, rw - 5 ); - m->ter_set( point( rn, bw ), t_window_domestic ); - m->ter_set( point( rn + 1, bw ), t_window_domestic ); - //study window - m->ter_set( point( rng( lw + 2, mw - 3 ), bw ), t_window_domestic ); - - if( one_in( 4 ) ) { - m->ter_set( point( rng( rw - 2, rw - 1 ), bw ), t_window_domestic ); - } else { - m->ter( point( rw, rng( cw + 1, bw - 1 ) ) ); - } - } else { //bathroom to the right - house_room( room_bathroom, lw, cw, lw + 3, bw, dat ); - //house_room(m, room_bedroom, lw + 3, cw, rw, bw, dat); - house_room( room_bedroom, lw + 3, cw, mw + 2, bw, dat ); - house_room( room_study, mw + 2, cw, rw, bw, dat ); - //===Study Room Furniture== - m->ter_set( point( mw + 2, ( bw + cw ) / 2 ), t_door_c ); - m->furn_set( point( rw - 1, cw + 1 ), f_chair ); - m->furn_set( point( rw - 1, cw + 2 ), f_table ); - m->ter_set( point( rw - 1, cw + 3 ), t_console_broken ); - m->furn_set( point( rw - 3, bw - 1 ), f_bookcase ); - m->place_items( "magazines", 40, point( rw - 3, bw - 1 ), point( rw - 3, bw - 1 ), false, - dat.when() ); - m->place_items( "novels", 40, point( rw - 3, bw - 1 ), point( rw - 3, bw - 1 ), false, - dat.when() ); - m->place_items( "alcohol", 20, point( rw - 3, bw - 1 ), point( rw - 3, bw - 1 ), false, - dat.when() ); - m->place_items( "manuals", 20, point( rw - 3, bw - 1 ), point( rw - 3, bw - 1 ), false, - dat.when() ); - //========================= - - if( one_in( 4 ) ) { - m->ter_set( point( rng( lw + 1, lw + 2 ), cw ), t_door_c ); - } else { - m->ter_set( point( lw + 3, rng( cw + 2, bw - 2 ) ), t_door_c ); - } - //bedroom windows - rn = rng( lw + 4, mw ); - m->ter_set( point( rn, bw ), t_window_domestic ); - m->ter_set( point( rn + 1, bw ), t_window_domestic ); - //study window - m->ter_set( point( rng( mw + 3, rw - 1 ), bw ), t_window_domestic ); - if( one_in( 4 ) ) { - m->ter_set( point( rng( lw + 1, lw + 2 ), bw ), t_window_domestic ); - } else { - m->ter( point( lw, rng( cw + 1, bw - 1 ) ) ); - } - } - // Doors off the sides of the hallway - m->ter_set( point( mw - 2, rng( tw + 3, cw - 3 ) ), t_door_c ); - m->ter_set( point( mw + 2, rng( tw + 3, cw - 3 ) ), t_door_c ); - m->ter_set( point( mw, cw ), t_door_c ); - break; - } - // Done with the various house structures - - ////// - if( rng( 2, 7 ) < tw ) { - // Big front yard has a chance for a fence - for( int i = lw; i <= rw; i++ ) { - m->ter_set( point( i, 0 ), t_fence ); - } - for( int i = 1; i < tw; i++ ) { - m->ter_set( point( lw, i ), t_fence ); - } - int hole = rng( SEEX - 3, SEEX + 2 ); - m->ter_set( point( hole, 0 ), t_dirt ); - m->ter_set( point( hole + 1, 0 ), t_dirt ); - if( one_in( tw ) ) { - m->ter_set( point( hole - 1, 1 ), t_tree_young ); - m->ter_set( point( hole + 2, 1 ), t_tree_young ); - } - } - - place_stairs( dat ); - - // Just boring old zombies - m->place_spawns( mongroup_id( "GROUP_ZOMBIE" ), 2, point_zero, point( SEEX * 2 - 1, SEEX * 2 - 1 ), - dat.monster_density() ); - - m->rotate( static_cast( dat.terrain_type()->get_dir() ) ); -} - -/////////////////////////////////////////////////////////// -void mapgen_basement_generic_layout( mapgendata &dat ) -{ - map *const m = &dat.m; - const ter_id t_rock_smooth( "t_rock_smooth" ); - const int up = 0; - const int left = 0; - const int down = SEEY * 2 - 5; - const int right = SEEX * 2 - 1; - square( m, t_rock, left, down, right, SEEY * 2 - 1 ); - square( m, t_rock_floor, 1, 1, right - 1, down - 1 ); - line( m, t_rock_smooth, left, up, right, up ); - line( m, t_rock_smooth, left, down, right, down ); - line( m, t_rock_smooth, left, up, left, down ); - line( m, t_rock_smooth, right, up, right, down ); - m->ter_set( point( SEEX - 1, down - 1 ), t_stairs_up ); - m->ter_set( point( SEEX, down - 1 ), t_stairs_up ); - line( m, t_rock_smooth, SEEX - 2, down - 1, SEEX - 2, down - 3 ); - line( m, t_rock_smooth, SEEX + 1, down - 1, SEEX + 1, down - 3 ); - line( m, t_door_locked, SEEX - 1, down - 3, SEEX, down - 3 ); - - // Rotate randomly, now that other basements are more generic - m->rotate( rng( 0, 3 ) ); -} - -namespace furn_space -{ -static bool clear( const map &m, const tripoint &from, const tripoint &to ) -{ - for( const auto &p : m.points_in_rectangle( from, to ) ) { - if( m.ter( p ).obj().movecost == 0 ) { - return false; - } - } - - return true; -} - -static point best_expand( const map &m, const tripoint &from, int maxx, int maxy ) -{ - if( clear( m, from, from + point( maxx, maxy ) ) ) { - // Common case - return point( maxx, maxy ); - } - - // Brute force all the combinations for the one with biggest area - int best_area = 0; - point best; - for( int x = 0; x <= maxx; x++ ) { - for( int y = 0; y <= maxy; y++ ) { - int area = x * y; - if( area <= best_area ) { - continue; - } - - if( clear( m, from, from + point( x, y ) ) ) { - best_area = area; - best = point( x, y ); - } - } - } - - return best; -} -} // namespace furn_space - -void mapgen_basement_junk( mapgendata &dat ) -{ - map *const m = &dat.m; - // Junk! - mapgen_basement_generic_layout( dat ); - //makes a square of randomly thrown around furniture and places stuff. - const int z = m->get_abs_sub().z; - for( const auto &p : m->points_in_rectangle( tripoint( 1, 1, z ), tripoint( 22, 22, z ) ) ) { - if( m->ter( p ).obj().movecost == 0 ) { - // Wall, skip - continue; - } - - if( one_in( 1600 ) ) { - m->furn_set( p, furn_str_id( "f_gun_safe_el" ) ); - m->place_items( "basement_op_guns", 96, p.xy(), p.xy(), false, dat.when() ); - m->place_items( "ammo", 90, p.xy(), p.xy(), false, dat.when() ); - } - if( one_in( 20 ) ) { - int rn = rng( 1, 8 ); - if( rn == 1 ) { - m->furn_set( p, f_dresser ); - m->place_items( "dresser", 30, p.xy(), p.xy(), false, dat.when() ); - m->place_items( "trash_forest", 60, p.xy(), p.xy(), false, dat.when() ); - } else if( rn == 2 ) { - m->furn_set( p, f_chair ); - } else if( rn == 3 ) { - m->furn_set( p, f_cupboard ); - m->place_items( "trash", 60, p.xy(), p.xy(), false, dat.when() ); - m->place_items( "dining", 40, p.xy(), p.xy(), false, dat.when() ); - } else if( rn == 4 ) { - tripoint rs = p + furn_space::best_expand( *m, p, rng( 0, 4 ), 0 ); - square_furn( m, f_bookcase, p.x, p.y, rs.x, rs.y ); - m->place_items( "novels", 60, p.xy(), rs.xy(), false, dat.when() ); - m->place_items( "magazines", 20, p.xy(), rs.xy(), false, dat.when() ); - } else if( rn == 5 ) { - tripoint rs = p + furn_space::best_expand( *m, p, 0, rng( 0, 4 ) ); - square_furn( m, f_bookcase, p.x, p.y, rs.x, rs.y ); - m->place_items( "novels", 60, p.xy(), rs.xy(), false, dat.when() ); - m->place_items( "magazines", 20, p.xy(), rs.xy(), false, dat.when() ); - } else if( rn == 6 ) { - tripoint rs = p + furn_space::best_expand( *m, p, rng( 0, 2 ), 0 ); - square_furn( m, f_locker, p.x, p.y, rs.x, rs.y ); - m->place_items( "trash", 60, p.xy(), rs.xy(), false, dat.when() ); - m->place_items( "home_hw", 20, p.xy(), rs.xy(), false, dat.when() ); - } else if( rn == 7 ) { - tripoint rs = p + furn_space::best_expand( *m, p, 0, rng( 0, 2 ) ); - square_furn( m, f_locker, p.x, p.y, rs.x, rs.y ); - m->place_items( "trash", 60, p.xy(), rs.xy(), false, dat.when() ); - m->place_items( "home_hw", 20, p.xy(), rs.xy(), false, dat.when() ); - } else { - tripoint rs = p + furn_space::best_expand( *m, p, rng( 0, 2 ), rng( 0, 2 ) ); - square_furn( m, f_table, p.x, p.y, rs.x, rs.y ); - } - } - } - - m->place_items( "bedroom", 60, point_south_east, point( SEEX * 2 - 2, SEEY * 2 - 2 ), false, - dat.when() ); - m->place_items( "home_hw", 80, point_south_east, point( SEEX * 2 - 2, SEEY * 2 - 2 ), false, - dat.when() ); - m->place_items( "homeguns", 10, point_south_east, point( SEEX * 2 - 2, SEEY * 2 - 2 ), false, - dat.when() ); - // Chance of zombies in the basement - m->place_spawns( mongroup_id( "GROUP_ZOMBIE" ), 2, point_south_east, point( SEEX * 2 - 2, - SEEY * 2 - 2 ), dat.monster_density() ); -} - -void mapgen_basement_spiders( mapgendata &dat ) -{ - map *const m = &dat.m; - // Oh no! A spider nest! - mapgen_basement_junk( dat ); - auto spider_type = mon_spider_widow_giant; - auto egg_type = f_egg_sackbw; - if( one_in( 2 ) ) { - spider_type = mon_spider_cellar_giant; - egg_type = f_egg_sackcs; - } - for( int i = 1; i < 22; i++ ) { - for( int j = 1; j < 22; j++ ) { - if( m->ter( point( i, j ) ).obj().movecost == 0 ) { - // Wall, skip - continue; - } - - if( !one_in( 3 ) ) { - madd_field( m, i, j, fd_web, rng( 1, 3 ) ); - } - if( one_in( 30 ) && m->passable( point( i, j ) ) ) { - m->furn_set( point( i, j ), egg_type ); - //hope you like'em spiders - m->add_spawn( spider_type, rng( 1, 2 ), point( i, j ) ); - m->remove_field( { i, j, m->get_abs_sub().z }, fd_web ); - } - } - } - m->place_items( "rare", 70, point_south_east, point( SEEX * 2 - 1, SEEY * 2 - 5 ), false, - dat.when() ); -} - void mapgen_cave( mapgendata &dat ) { map *const m = &dat.m; @@ -2975,11 +2025,11 @@ void mapgen_cave_rat( mapgendata &dat ) for( int i = SEEX - 4; i <= SEEX + 4; i++ ) { for( int j = SEEY - 4; j <= SEEY + 4; j++ ) { if( ( i <= SEEX - 2 || i >= SEEX + 2 ) && ( j <= SEEY - 2 || j >= SEEY + 2 ) ) { - m->add_spawn( mon_sewer_rat, 1, point( i, j ) ); + m->add_spawn( mon_sewer_rat, 1, { i, j, m->get_abs_sub().z } ); } } } - m->add_spawn( mon_rat_king, 1, point( SEEX, SEEY ) ); + m->add_spawn( mon_rat_king, 1, { SEEX, SEEY, m->get_abs_sub().z } ); m->place_items( "rare", 75, point( SEEX - 4, SEEY - 4 ), point( SEEX + 4, SEEY + 4 ), true, dat.when() ); } else { @@ -2999,7 +2049,7 @@ void mapgen_cave_rat( mapgendata &dat ) madd_field( m, cx, cy, fd_blood, rng( 1, 3 ) ); } if( one_in( 20 ) ) { - m->add_spawn( mon_sewer_rat, 1, point( cx, cy ) ); + m->add_spawn( mon_sewer_rat, 1, { cx, cy, m->get_abs_sub().z } ); } } } @@ -3019,7 +2069,7 @@ void mapgen_cave_rat( mapgendata &dat ) madd_field( m, cx, cy, fd_blood, rng( 1, 3 ) ); } if( one_in( 20 ) ) { - m->add_spawn( mon_sewer_rat, 1, point( cx, cy ) ); + m->add_spawn( mon_sewer_rat, 1, { cx, cy, m->get_abs_sub().z } ); } } } @@ -3563,9 +2613,9 @@ static void mapgen_ants_generic( mapgendata &dat ) m->place_items( "ant_egg", 98, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, dat.when() ); } if( dat.terrain_type() == "ants_queen" ) { - m->add_spawn( mon_ant_queen, 1, point( SEEX, SEEY ) ); + m->add_spawn( mon_ant_queen, 1, { SEEX, SEEY, m->get_abs_sub().z } ); } else if( dat.terrain_type() == "ants_larvae" ) { - m->add_spawn( mon_ant_larva, 10, point( SEEX, SEEY ) ); + m->add_spawn( mon_ant_larva, 10, { SEEX, SEEY, m->get_abs_sub().z } ); } } @@ -3582,7 +2632,7 @@ void mapgen_ants_larvae( mapgendata &dat ) mapgen_ants_generic( dat ); dat.m.place_items( "ant_egg", 98, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, dat.when() ); - dat.m.add_spawn( mon_ant_larva, 10, point( SEEX, SEEY ) ); + dat.m.add_spawn( mon_ant_larva, 10, { SEEX, SEEY, dat.m.get_abs_sub().z } ); } void mapgen_ants_queen( mapgendata &dat ) @@ -3590,7 +2640,7 @@ void mapgen_ants_queen( mapgendata &dat ) mapgen_ants_generic( dat ); dat.m.place_items( "ant_egg", 98, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, dat.when() ); - dat.m.add_spawn( mon_ant_queen, 1, point( SEEX, SEEY ) ); + dat.m.add_spawn( mon_ant_queen, 1, { SEEX, SEEY, dat.m.get_abs_sub().z } ); } void mapgen_tutorial( mapgendata &dat ) diff --git a/src/mapgen_functions.h b/src/mapgen_functions.h index 20d526c73476a..9d23b552bca77 100644 --- a/src/mapgen_functions.h +++ b/src/mapgen_functions.h @@ -43,9 +43,6 @@ void mapgen_forest_trail_tee( mapgendata &dat ); void mapgen_forest_trail_four_way( mapgendata &dat ); void mapgen_hive( mapgendata &dat ); void mapgen_spider_pit( mapgendata &dat ); -void mapgen_fungal_bloom( mapgendata &dat ); -void mapgen_fungal_tower( mapgendata &dat ); -void mapgen_fungal_flowers( mapgendata &dat ); void mapgen_river_center( mapgendata &dat ); void mapgen_road( mapgendata &dat ); void mapgen_bridge( mapgendata &dat ); @@ -56,13 +53,6 @@ void mapgen_river_curved_not( mapgendata &dat ); void mapgen_river_straight( mapgendata &dat ); void mapgen_river_curved( mapgendata &dat ); void mapgen_parking_lot( mapgendata &dat ); -void mapgen_generic_house( mapgendata &dat, int variant ); // not mapped -void mapgen_generic_house_boxy( mapgendata &dat ); -void mapgen_generic_house_big_livingroom( mapgendata &dat ); -void mapgen_generic_house_center_hallway( mapgendata &dat ); -void mapgen_basement_generic_layout( mapgendata &dat ); -void mapgen_basement_junk( mapgendata &dat ); -void mapgen_basement_spiders( mapgendata &dat ); void mapgen_cave( mapgendata &dat ); void mapgen_cave_rat( mapgendata &dat ); void mapgen_cavern( mapgendata &dat ); @@ -96,6 +86,8 @@ void place_stairs( mapgendata &dat ); mapgen_update_func add_mapgen_update_func( const JsonObject &jo, bool &defer ); bool run_mapgen_update_func( const std::string &update_mapgen_id, const tripoint &omt_pos, mission *miss = nullptr, bool cancel_on_collision = true ); +bool run_mapgen_update_func( const std::string &update_mapgen_id, mapgendata &dat, + bool cancel_on_collision = true ); bool run_mapgen_func( const std::string &mapgen_id, mapgendata &dat ); std::pair, std::map> get_changed_ids_from_update( const std::string &update_mapgen_id ); diff --git a/src/martialarts.cpp b/src/martialarts.cpp index 3f44e216075b9..b786d6b362a3b 100644 --- a/src/martialarts.cpp +++ b/src/martialarts.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include @@ -487,68 +486,68 @@ bool ma_requirements::is_valid_weapon( const item &i ) const std::string ma_requirements::get_description( bool buff ) const { - std::stringstream dump; + std::string dump; if( std::any_of( min_skill.begin(), min_skill.end(), []( const std::pair &pr ) { return pr.second > 0; } ) ) { - dump << string_format( _( "%s required: " ), + dump += string_format( _( "%s required: " ), ngettext( "Skill", "Skills", min_skill.size() ) ); - dump << enumerate_as_string( min_skill.begin(), + dump += enumerate_as_string( min_skill.begin(), min_skill.end(), []( const std::pair &pr ) { return string_format( "%s: %d", pr.first->name(), pr.second ); - }, enumeration_conjunction::none ) << std::endl; + }, enumeration_conjunction::none ) + "\n"; } if( std::any_of( min_damage.begin(), min_damage.end(), []( const std::pair &pr ) { return pr.second > 0; } ) ) { - dump << ngettext( "Damage type required: ", + dump += ngettext( "Damage type required: ", "Damage types required: ", min_damage.size() ); - dump << enumerate_as_string( min_damage.begin(), + dump += enumerate_as_string( min_damage.begin(), min_damage.end(), []( const std::pair &pr ) { return string_format( _( "%s: %d" ), name_by_dt( pr.first ), pr.second ); - }, enumeration_conjunction::none ) << std::endl; + }, enumeration_conjunction::none ) + "\n"; } if( !req_buffs.empty() ) { - dump << _( "Requires: " ); + dump += _( "Requires: " ); - dump << enumerate_as_string( req_buffs.begin(), req_buffs.end(), []( const mabuff_id & bid ) { + dump += enumerate_as_string( req_buffs.begin(), req_buffs.end(), []( const mabuff_id & bid ) { return _( bid->name ); - }, enumeration_conjunction::none ) << std::endl; + }, enumeration_conjunction::none ) + "\n"; } const std::string type = buff ? _( "activate" ) : _( "be used" ); if( unarmed_allowed && melee_allowed ) { - dump << string_format( _( "* Can %s while armed or unarmed" ), - type ) << std::endl; + dump += string_format( _( "* Can %s while armed or unarmed" ), + type ) + "\n"; if( unarmed_weapons_allowed ) { - dump << string_format( _( "* Can %s while using any unarmed weapon" ), - type ) << std::endl; + dump += string_format( _( "* Can %s while using any unarmed weapon" ), + type ) + "\n"; } } else if( unarmed_allowed ) { - dump << string_format( _( "* Can only %s while unarmed" ), - type ) << std::endl; + dump += string_format( _( "* Can only %s while unarmed" ), + type ) + "\n"; if( unarmed_weapons_allowed ) { - dump << string_format( _( "* Can %s while using any unarmed weapon" ), - type ) << std::endl; + dump += string_format( _( "* Can %s while using any unarmed weapon" ), + type ) + "\n"; } } else if( melee_allowed ) { - dump << string_format( _( "* Can only %s while armed" ), - type ) << std::endl; + dump += string_format( _( "* Can only %s while armed" ), + type ) + "\n"; } if( wall_adjacent ) { - dump << string_format( _( "* Can %s while near to a wall" ), - type ) << std::endl; + dump += string_format( _( "* Can %s while near to a wall" ), + type ) + "\n"; } - return dump.str(); + return dump; } ma_technique::ma_technique() @@ -626,7 +625,7 @@ bool ma_buff::is_valid_character( const Character &u ) const void ma_buff::apply_character( Character &u ) const { - u.set_num_dodges_bonus( u.get_num_dodges_bonus() + dodges_bonus ); + u.mod_num_dodges_bonus( dodges_bonus ); u.set_num_blocks_bonus( u.get_num_blocks_bonus() + blocks_bonus ); } @@ -678,53 +677,53 @@ bool ma_buff::can_melee() const std::string ma_buff::get_description( bool passive ) const { - std::stringstream dump; - dump << string_format( _( "Buff technique: %s" ), _( name ) ) << std::endl; + std::string dump; + dump += string_format( _( "Buff technique: %s" ), _( name ) ) + "\n"; std::string temp = bonuses.get_description(); if( !temp.empty() ) { - dump << string_format( _( "%s: " ), - ngettext( "Bonus", "Bonus/stack", max_stacks ) ) << std::endl << temp; + dump += string_format( _( "%s: " ), + ngettext( "Bonus", "Bonus/stack", max_stacks ) ) + "\n" + temp; } - dump << reqs.get_description( true ); + dump += reqs.get_description( true ); if( max_stacks > 1 ) { - dump << string_format( _( "* Will stack up to %d times" ), - max_stacks ) << std::endl; + dump += string_format( _( "* Will stack up to %d times" ), + max_stacks ) + "\n"; } const int turns = to_turns( buff_duration ); if( !passive && turns ) { - dump << string_format( _( "* Will last for %d %s" ), - turns, ngettext( "turn", "turns", turns ) ) << std::endl; + dump += string_format( _( "* Will last for %d %s" ), + turns, ngettext( "turn", "turns", turns ) ) + "\n"; } if( dodges_bonus > 0 ) { - dump << string_format( _( "* Will give a +%s bonus to dodge%s" ), - dodges_bonus, ngettext( " for the stack", " per stack", max_stacks ) ) << std::endl; + dump += string_format( _( "* Will give a +%s bonus to dodge%s" ), + dodges_bonus, ngettext( " for the stack", " per stack", max_stacks ) ) + "\n"; } else if( dodges_bonus < 0 ) { - dump << string_format( _( "* Will give a %s penalty to dodge%s" ), - dodges_bonus, ngettext( " for the stack", " per stack", max_stacks ) ) << std::endl; + dump += string_format( _( "* Will give a %s penalty to dodge%s" ), + dodges_bonus, ngettext( " for the stack", " per stack", max_stacks ) ) + "\n"; } if( blocks_bonus > 0 ) { - dump << string_format( _( "* Will give a +%s bonus to block%s" ), - blocks_bonus, ngettext( " for the stack", " per stack", max_stacks ) ) << std::endl; + dump += string_format( _( "* Will give a +%s bonus to block%s" ), + blocks_bonus, ngettext( " for the stack", " per stack", max_stacks ) ) + "\n"; } else if( blocks_bonus < 0 ) { - dump << string_format( _( "* Will give a %s penalty to block%s" ), - blocks_bonus, ngettext( " for the stack", " per stack", max_stacks ) ) << std::endl; + dump += string_format( _( "* Will give a %s penalty to block%s" ), + blocks_bonus, ngettext( " for the stack", " per stack", max_stacks ) ) + "\n"; } if( quiet ) { - dump << _( "* Attacks will be completely silent" ) << std::endl; + dump += _( "* Attacks will be completely silent" ) + std::string( "\n" ); } if( stealthy ) { - dump << _( "* Movement will make less noise" ) << std::endl; + dump += _( "* Movement will make less noise" ) + std::string( "\n" ); } - return dump.str(); + return dump; } martialart::martialart() @@ -1240,7 +1239,7 @@ float ma_technique::armor_penetration( const Character &u, damage_type type ) co std::string ma_technique::get_description() const { - std::stringstream dump; + std::string dump; std::string type; if( block_counter ) { @@ -1257,109 +1256,112 @@ std::string ma_technique::get_description() const type = _( "Offensive" ); } - dump << string_format( _( "Type: %s" ), type ) << std::endl; + dump += string_format( _( "Type: %s" ), type ) + "\n"; std::string temp = bonuses.get_description(); if( !temp.empty() ) { - dump << _( "Bonus: " ) << std::endl << temp; + dump += _( "Bonus: " ) + std::string( "\n" ) + temp; } - dump << reqs.get_description(); + dump += reqs.get_description(); if( weighting > 1 ) { - dump << string_format( _( "* Greater chance to activate: +%s%%" ), - ( 100 * ( weighting - 1 ) ) ) << std::endl; + dump += string_format( _( "* Greater chance to activate: +%s%%" ), + ( 100 * ( weighting - 1 ) ) ) + "\n"; } else if( weighting < -1 ) { - dump << string_format( _( "* Lower chance to activate: 1/%s" ), - abs( weighting ) ) << std::endl; + dump += string_format( _( "* Lower chance to activate: 1/%s" ), + abs( weighting ) ) + "\n"; } if( crit_ok ) { - dump << _( "* Can activate on a normal or a crit hit" ) << std::endl; + dump += _( "* Can activate on a normal or a crit hit" ) + + std::string( "\n" ); } else if( crit_tec ) { - dump << _( "* Will only activate on a crit" ) << std::endl; + dump += _( "* Will only activate on a crit" ) + std::string( "\n" ); } if( side_switch ) { - dump << _( "* Moves target behind you" ) << std::endl; + dump += _( "* Moves target behind you" ) + std::string( "\n" ); } if( wall_adjacent ) { - dump << _( "* Will only activate while near to a wall" ) << std::endl; + dump += _( "* Will only activate while near to a wall" ) + + std::string( "\n" ); } if( downed_target ) { - dump << _( "* Only works on a downed target" ) << std::endl; + dump += _( "* Only works on a downed target" ) + std::string( "\n" ); } if( stunned_target ) { - dump << _( "* Only works on a stunned target" ) << std::endl; + dump += _( "* Only works on a stunned target" ) + std::string( "\n" ); } if( human_target ) { - dump << _( "* Only works on a humanoid target" ) << std::endl; + dump += _( "* Only works on a humanoid target" ) + std::string( "\n" ); } if( powerful_knockback ) { - dump << _( "* Causes extra damage on knockback collision." ) << std::endl; + dump += _( "* Causes extra damage on knockback collision." ) + std::string( "\n" ); } if( dodge_counter ) { - dump << _( "* Will counterattack when you dodge" ) << std::endl; + dump += _( "* Will counterattack when you dodge" ) + std::string( "\n" ); } if( block_counter ) { - dump << _( "* Will counterattack when you block" ) << std::endl; + dump += _( "* Will counterattack when you block" ) + std::string( "\n" ); } if( miss_recovery ) { - dump << _( "* Will grant free recovery from a miss" ) << std::endl; + dump += _( "* Will grant free recovery from a miss" ) + + std::string( "\n" ); } if( grab_break ) { - dump << _( "* Will break a grab" ) << std::endl; + dump += _( "* Will break a grab" ) + std::string( "\n" ); } if( aoe == "wide" ) { - dump << _( "* Will attack in a wide arc in front of you" ) << std::endl; + dump += _( "* Will attack in a wide arc in front of you" ) + std::string( "\n" ); } else if( aoe == "spin" ) { - dump << _( "* Will attack adjacent enemies around you" ) << std::endl; + dump += _( "* Will attack adjacent enemies around you" ) + std::string( "\n" ); } else if( aoe == "impale" ) { - dump << _( "* Will attack your target and another one behind it" ) << - std::endl; + dump += _( "* Will attack your target and another one behind it" ) + + std::string( "\n" ); } if( knockback_dist ) { - dump << string_format( _( "* Will knock back enemies %d %s" ), - knockback_dist, ngettext( "tile", "tiles", knockback_dist ) ) << std::endl; + dump += string_format( _( "* Will knock back enemies %d %s" ), + knockback_dist, ngettext( "tile", "tiles", knockback_dist ) ) + "\n"; } if( knockback_follow ) { - dump << _( "* Will follow enemies after knockback." ) << std::endl; + dump += _( "* Will follow enemies after knockback." ) + std::string( "\n" ); } if( down_dur ) { - dump << string_format( _( "* Will down enemies for %d %s" ), - down_dur, ngettext( "turn", "turns", down_dur ) ) << std::endl; + dump += string_format( _( "* Will down enemies for %d %s" ), + down_dur, ngettext( "turn", "turns", down_dur ) ) + "\n"; } if( stun_dur ) { - dump << string_format( _( "* Will stun target for %d %s" ), - stun_dur, ngettext( "turn", "turns", stun_dur ) ) << std::endl; + dump += string_format( _( "* Will stun target for %d %s" ), + stun_dur, ngettext( "turn", "turns", stun_dur ) ) + "\n"; } if( disarms ) { - dump << _( "* Will disarm the target" ) << std::endl; + dump += _( "* Will disarm the target" ) + std::string( "\n" ); } if( take_weapon ) { - dump << _( "* Will disarm the target and take their weapon" ) << - std::endl; + dump += _( "* Will disarm the target and take their weapon" ) + + std::string( "\n" ); } - return dump.str(); + return dump; } bool ma_style_callback::key( const input_context &ctxt, const input_event &event, int entnum, @@ -1377,51 +1379,52 @@ bool ma_style_callback::key( const input_context &ctxt, const input_event &event if( !style_selected.str().empty() ) { const martialart &ma = style_selected.obj(); - std::ostringstream buffer; + std::string buffer; if( ma.force_unarmed ) { - buffer << _( "This style forces you to use unarmed strikes, even if wielding a weapon." ); - buffer << std::endl; + buffer += _( "This style forces you to use unarmed strikes, even if wielding a weapon." ); + buffer += "\n"; } else if( ma.allow_melee ) { - buffer << _( "This style can be used with all weapons." ); - buffer << std::endl; + buffer += _( "This style can be used with all weapons." ); + buffer += "\n"; } else if( ma.strictly_melee ) { - buffer << _( "This is an armed combat style." ); - buffer << std::endl; + buffer += _( "This is an armed combat style." ); + buffer += "\n"; } - buffer << "--" << std::endl; + buffer += "--\n"; if( ma.arm_block_with_bio_armor_arms || ma.arm_block != 99 || ma.leg_block_with_bio_armor_legs || ma.leg_block != 99 ) { if( ma.arm_block_with_bio_armor_arms ) { - buffer << _( "You can arm block by installing the Arms Alloy Plating CBM" ); - buffer << std::endl; + buffer += _( "You can arm block by installing the Arms Alloy Plating CBM" ); + buffer += "\n"; } else if( ma.arm_block != 99 ) { - buffer << string_format( - _( "You can arm block at unarmed combat: %s" ), - ma.arm_block ) << std::endl; + buffer += string_format( + _( "You can arm block at unarmed combat: %s" ), + ma.arm_block ) + "\n"; } if( ma.leg_block_with_bio_armor_legs ) { - buffer << _( "You can leg block by installing the Legs Alloy Plating CBM" ); - buffer << std::endl; + buffer += _( "You can leg block by installing the Legs Alloy Plating CBM" ); + buffer += "\n"; } else if( ma.leg_block != 99 ) { - buffer << string_format( - _( "You can leg block at unarmed combat: %s" ), - ma.leg_block ) << std::endl; + buffer += string_format( + _( "You can leg block at unarmed combat: %s" ), + ma.leg_block ); + buffer += "\n"; } - buffer << "--" << std::endl; + buffer += "--\n"; } auto buff_desc = [&]( const std::string & title, const std::vector &buffs, bool passive = false ) { if( !buffs.empty() ) { - buffer << string_format( _( "
%s buffs:
" ), title ); + buffer += string_format( _( "
%s buffs:
" ), title ); for( const auto &buff : buffs ) { - buffer << std::endl << buff->get_description( passive ) ; + buffer += "\n" + buff->get_description( passive ); } - buffer << "--" << std::endl; + buffer += "--\n"; } }; @@ -1438,14 +1441,15 @@ bool ma_style_callback::key( const input_context &ctxt, const input_event &event buff_desc( _( "Get hit" ), ma.ongethit_buffs ); for( const auto &tech : ma.techniques ) { - buffer << string_format( _( "
Technique:
%s " ), - _( tech.obj().name ) ) << std::endl; - buffer << tech.obj().get_description() << "--" << std::endl; + buffer += string_format( _( "
Technique:
%s " ), + _( tech.obj().name ) ) + "\n"; + buffer += tech.obj().get_description() + "--\n"; } if( !ma.weapons.empty() ) { - buffer << ngettext( "Weapon:", "Weapons:", ma.weapons.size() ) << " "; - buffer << enumerate_as_string( ma.weapons.begin(), ma.weapons.end(), []( const std::string & wid ) { + buffer += ngettext( "Weapon:", "Weapons:", + ma.weapons.size() ) + std::string( " " ); + buffer += enumerate_as_string( ma.weapons.begin(), ma.weapons.end(), []( const std::string & wid ) { return item::nname( wid ); } ); } @@ -1454,7 +1458,7 @@ bool ma_style_callback::key( const input_context &ctxt, const input_event &event point( TERMX > FULL_SCREEN_WIDTH ? ( TERMX - FULL_SCREEN_WIDTH ) / 2 : 0, TERMY > FULL_SCREEN_HEIGHT ? ( TERMY - FULL_SCREEN_HEIGHT ) / 2 : 0 ) ); - std::string text = replace_colors( buffer.str() ); + std::string text = replace_colors( buffer ); int width = FULL_SCREEN_WIDTH - 4; int height = FULL_SCREEN_HEIGHT - 2; const auto vFolded = foldstring( text, width ); diff --git a/src/material.cpp b/src/material.cpp index d3d8309e6ba10..ffc29bfd67944 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -93,7 +93,8 @@ void material_type::load( const JsonObject &jsobj, const std::string & ) for( JsonObject brn : jsobj.get_array( "burn_data" ) ) { _burn_data.emplace_back( load_mat_burn_data( brn ) ); } - } else { + } + if( _burn_data.empty() ) { // If not specified, supply default mat_burn_data mbd; if( _fire_resist <= 0 ) { @@ -255,7 +256,7 @@ bool material_type::reinforces() const const mat_burn_data &material_type::burn_data( size_t intensity ) const { - return _burn_data[ std::min( intensity, fd_fire.obj().get_max_intensity() ) - 1 ]; + return _burn_data[ std::min( intensity, _burn_data.size() ) - 1 ]; } const mat_burn_products &material_type::burn_products() const diff --git a/src/mattack_actors.cpp b/src/mattack_actors.cpp index 7114931720c2e..ab1f8bb3704ea 100644 --- a/src/mattack_actors.cpp +++ b/src/mattack_actors.cpp @@ -214,8 +214,7 @@ void melee_actor::load_internal( const JsonObject &obj, const std::string & ) { // Optional: if( obj.has_array( "damage_max_instance" ) ) { - JsonArray arr = obj.get_array( "damage_max_instance" ); - damage_max_instance = load_damage_instance( arr ); + damage_max_instance = load_damage_instance( obj.get_array( "damage_max_instance" ) ); } else if( obj.has_object( "damage_max_instance" ) ) { damage_max_instance = load_damage_instance( obj ); } diff --git a/src/melee.cpp b/src/melee.cpp index 700c5788770f0..04491bbd019f2 100644 --- a/src/melee.cpp +++ b/src/melee.cpp @@ -498,17 +498,29 @@ void player::melee_attack( Creature &t, bool allow_special, const matec_id &forc perform_technique( technique, t, d, move_cost ); } - if( allow_special && !t.is_dead_state() ) { - perform_special_attacks( t ); - } - // Proceed with melee attack. if( !t.is_dead_state() ) { // Handles speed penalties to monster & us, etc std::string specialmsg = melee_special_effects( t, d, cur_weapon ); - dealt_damage_instance dealt_dam; // gets overwritten with the dealt damage values + // gets overwritten with the dealt damage values + dealt_damage_instance dealt_dam; + dealt_damage_instance dealt_special_dam; + if( allow_special ) { + perform_special_attacks( t, dealt_special_dam ); + } t.deal_melee_hit( this, hit_spread, critical_hit, d, dealt_dam ); + if( ( cur_weapon.is_null() && ( dealt_dam.type_damage( DT_CUT ) > 0 || + dealt_dam.type_damage( DT_STAB ) > 0 ) ) || ( dealt_special_dam.type_damage( DT_CUT ) > 0 || + dealt_special_dam.type_damage( DT_STAB ) > 0 ) ) { + if( has_trait( trait_POISONOUS ) ) { + add_msg_if_player( m_good, _( "You poison %s!" ), t.disp_name() ); + t.add_effect( effect_poison, 6_turns ); + } else if( has_trait( trait_POISONOUS2 ) ) { + add_msg_if_player( m_good, _( "You inject your venom into %s!" ), t.disp_name() ); + t.add_effect( effect_badpoison, 6_turns ); + } + } // Make a rather quiet sound, to alert any nearby monsters if( !is_quiet() ) { // check martial arts silence @@ -567,7 +579,7 @@ void player::melee_attack( Creature &t, bool allow_special, const matec_id &forc const int deft_bonus = hit_spread < 0 && has_trait( trait_DEFT ) ? 50 : 0; /** @EFFECT_MELEE reduces stamina cost of melee attacks */ const int mod_sta = ( weight_cost + encumbrance_cost - melee - deft_bonus + 50 ) * -1; - mod_stat( "stamina", std::min( -50, mod_sta ) ); + mod_stamina( std::min( -50, mod_sta ) ); add_msg( m_debug, "Stamina burn: %d", std::min( -50, mod_sta ) ); mod_moves( -move_cost ); // trigger martial arts on-attack effects @@ -840,6 +852,35 @@ void player::roll_bash_damage( bool crit, damage_instance &di, bool average, bash_dam += average ? ( mindrunk + maxdrunk ) * 0.5f : rng( mindrunk, maxdrunk ); } + if( unarmed ) { + const bool left_empty = !natural_attack_restricted_on( bp_hand_l ); + const bool right_empty = !natural_attack_restricted_on( bp_hand_r ) && + weap.is_null(); + if( left_empty || right_empty ) { + float per_hand = 0.0f; + for( const std::pair< trait_id, trait_data > &mut : my_mutations ) { + if( mut.first->flags.count( "NEED_ACTIVE_TO_MELEE" ) > 0 && !has_active_mutation( mut.first ) ) { + continue; + } + float unarmed_bonus = 0.0f; + const int bash_bonus = mut.first->bash_dmg_bonus; + if( mut.first->flags.count( "UNARMED_BONUS" ) > 0 && bash_bonus > 0 ) { + unarmed_bonus += std::min( get_skill_level( skill_unarmed ) / 2, 4 ); + } + per_hand += bash_bonus + unarmed_bonus; + const std::pair rand_bash = mut.first->rand_bash_bonus; + per_hand += average ? ( rand_bash.first + rand_bash.second ) / 2.0f : rng( rand_bash.first, + rand_bash.second ); + } + bash_dam += per_hand; // First hand + if( left_empty && right_empty ) { + // Second hand + bash_dam += per_hand; + } + } + + } + /** @EFFECT_STR increases bashing damage */ float weap_dam = weap.damage_melee( DT_BASH ) + stat_bonus; /** @EFFECT_UNARMED caps bash damage with unarmed weapons */ @@ -886,7 +927,6 @@ void player::roll_cut_damage( bool crit, damage_instance &di, bool average, cons float cut_mul = 1.0f; int cutting_skill = get_skill_level( skill_cutting ); - int unarmed_skill = get_skill_level( skill_unarmed ); if( has_active_bionic( bio_cqb ) ) { cutting_skill = BIO_CQB_LEVEL; @@ -899,26 +939,24 @@ void player::roll_cut_damage( bool crit, damage_instance &di, bool average, cons weap.is_null(); if( left_empty || right_empty ) { float per_hand = 0.0f; - if( has_trait( trait_CLAWS ) || ( has_active_mutation( trait_CLAWS_RETRACT ) ) ) { - per_hand += 3; - } if( has_bionic( bionic_id( "bio_razors" ) ) ) { per_hand += 2; } - if( has_trait( trait_TALONS ) ) { - /** @EFFECT_UNARMED increases cutting damage with TALONS */ - per_hand += 3 + ( unarmed_skill > 8 ? 4 : unarmed_skill / 2 ); - } - // Stainless Steel Claws do stabbing damage, too. - if( has_trait( trait_CLAWS_RAT ) || has_trait( trait_CLAWS_ST ) ) { - /** @EFFECT_UNARMED increases cutting damage with CLAWS_RAT and CLAWS_ST */ - per_hand += 1 + ( unarmed_skill > 8 ? 4 : unarmed_skill / 2 ); + for( const std::pair< trait_id, trait_data > &mut : my_mutations ) { + if( mut.first->flags.count( "NEED_ACTIVE_TO_MELEE" ) > 0 && !has_active_mutation( mut.first ) ) { + continue; + } + float unarmed_bonus = 0.0f; + const int cut_bonus = mut.first->cut_dmg_bonus; + if( mut.first->flags.count( "UNARMED_BONUS" ) > 0 && cut_bonus > 0 ) { + unarmed_bonus += std::min( get_skill_level( skill_unarmed ) / 2, 4 ); + } + per_hand += cut_bonus + unarmed_bonus; + const std::pair rand_cut = mut.first->rand_cut_bonus; + per_hand += average ? ( rand_cut.first + rand_cut.second ) / 2.0f : rng( rand_cut.first, + rand_cut.second ); } // TODO: add acidproof check back to slime hands (probably move it elsewhere) - if( has_trait( trait_SLIME_HANDS ) ) { - /** @EFFECT_UNARMED increases cutting damage with SLIME_HANDS */ - per_hand += average ? 2.5f : rng( 2, 3 ); - } cut_dam += per_hand; // First hand if( left_empty && right_empty ) { @@ -1656,22 +1694,16 @@ bool player::block_hit( Creature *source, body_part &bp_hit, damage_instance &da return true; } -void player::perform_special_attacks( Creature &t ) +void player::perform_special_attacks( Creature &t, dealt_damage_instance &dealt_dam ) { - bool can_poison = false; - std::vector special_attacks = mutation_attacks( t ); - std::string target = t.disp_name(); - bool practiced = false; for( const auto &att : special_attacks ) { if( t.is_dead_state() ) { break; } - dealt_damage_instance dealt_dam; - // TODO: Make this hit roll use unarmed skill, not weapon skill + weapon to_hit int hit_spread = t.deal_melee_attack( this, hit_roll() * 0.8 ); if( hit_spread >= 0 ) { @@ -1686,20 +1718,6 @@ void player::perform_special_attacks( Creature &t ) if( dam > 0 ) { player_hit_message( this, att.text, t, dam ); } - - can_poison = can_poison || - dealt_dam.type_damage( DT_CUT ) > 0 || - dealt_dam.type_damage( DT_STAB ) > 0; - } - - if( can_poison && ( has_trait( trait_POISONOUS ) || has_trait( trait_POISONOUS2 ) ) ) { - if( has_trait( trait_POISONOUS ) ) { - add_msg_if_player( m_good, _( "You poison %s!" ), target ); - t.add_effect( effect_poison, 6_turns ); - } else if( has_trait( trait_POISONOUS2 ) ) { - add_msg_if_player( m_good, _( "You inject your venom into %s!" ), target ); - t.add_effect( effect_badpoison, 6_turns ); - } } } diff --git a/src/memorial_logger.cpp b/src/memorial_logger.cpp index d2a2095daaaf8..598115af3e5e1 100644 --- a/src/memorial_logger.cpp +++ b/src/memorial_logger.cpp @@ -878,14 +878,6 @@ void memorial_logger::notify( const cata::event &e ) } break; } - case event_type::launches_nuke: { - oter_id oter = e.get( "target_terrain" ); - //~ %s is terrain name - add( pgettext( "memorial_male", "Launched a nuke at a %s." ), - pgettext( "memorial_female", "Launched a nuke at a %s." ), - oter->get_name() ); - break; - } case event_type::learns_martial_art: { character_id ch = e.get( "character" ); if( ch == g->u.getID() ) { diff --git a/src/mission.cpp b/src/mission.cpp index 74db84ea3e7d2..5e031ba7e09ca 100644 --- a/src/mission.cpp +++ b/src/mission.cpp @@ -673,7 +673,7 @@ std::string mission::dialogue_for_topic( const std::string &in_topic ) const const auto &response = type->dialogue.find( topic ); if( response != type->dialogue.end() ) { - return _( response->second ); + return response->second.translated(); } return string_format( "Someone forgot to code this message id is %s, topic is %s!", diff --git a/src/mission.h b/src/mission.h index 15595e6decf56..ec8f815b02eac 100644 --- a/src/mission.h +++ b/src/mission.h @@ -172,7 +172,8 @@ tripoint target_om_ter_random( const std::string &omter, int reveal_rad, mission bool must_see, int range, tripoint loc = overmap::invalid_tripoint ); void set_reveal( const std::string &terrain, std::vector> &funcs ); -void set_reveal_any( JsonArray &ja, std::vector> &funcs ); +void set_reveal_any( const JsonArray &ja, + std::vector> &funcs ); mission_target_params parse_mission_om_target( const JsonObject &jo ); cata::optional assign_mission_target( const mission_target_params ¶ms ); tripoint get_om_terrain_pos( const mission_target_params ¶ms ); @@ -240,7 +241,7 @@ struct mission_type { std::function end = mission_end::standard; std::function fail = mission_fail::standard; - std::map dialogue; + std::map dialogue; // A dynamic goal condition invoked by MGOAL_CONDITION. std::function goal_condition; diff --git a/src/mission_start.cpp b/src/mission_start.cpp index ea08e2e866002..672155a5b0d81 100644 --- a/src/mission_start.cpp +++ b/src/mission_start.cpp @@ -59,7 +59,7 @@ void mission_start::place_dog( mission *miss ) tinymap doghouse; doghouse.load( tripoint( house.x * 2, house.y * 2, house.z ), false ); - doghouse.add_spawn( mon_dog, 1, point( SEEX, SEEY ), true, -1, miss->uid ); + doghouse.add_spawn( mon_dog, 1, { SEEX, SEEY, house.z }, true, -1, miss->uid ); doghouse.save(); } @@ -72,7 +72,7 @@ void mission_start::place_zombie_mom( mission *miss ) tinymap zomhouse; zomhouse.load( tripoint( house.x * 2, house.y * 2, house.z ), false ); - zomhouse.add_spawn( mon_zombie, 1, point( SEEX, SEEY ), false, -1, miss->uid, + zomhouse.add_spawn( mon_zombie, 1, { SEEX, SEEY, house.z }, false, -1, miss->uid, Name::get( nameIsFemaleName | nameIsGivenName ) ); zomhouse.save(); } @@ -102,21 +102,21 @@ void mission_start::kill_horde_master( mission *miss ) overmap_buffer.reveal( site, 6 ); tinymap tile; tile.load( tripoint( site.x * 2, site.y * 2, site.z ), false ); - tile.add_spawn( mon_zombie_master, 1, point( SEEX, SEEY ), false, -1, miss->uid, + tile.add_spawn( mon_zombie_master, 1, { SEEX, SEEY, site.z }, false, -1, miss->uid, _( "Demonic Soul" ) ); - tile.add_spawn( mon_zombie_brute, 3, point( SEEX, SEEY ) ); - tile.add_spawn( mon_zombie_dog, 3, point( SEEX, SEEY ) ); + tile.add_spawn( mon_zombie_brute, 3, { SEEX, SEEY, site.z } ); + tile.add_spawn( mon_zombie_dog, 3, { SEEX, SEEY, site.z } ); if( overmap::inbounds( tripoint( SEEX, SEEY, 0 ), 1 ) ) { for( int x = SEEX - 1; x <= SEEX + 1; x++ ) { for( int y = SEEY - 1; y <= SEEY + 1; y++ ) { - tile.add_spawn( mon_zombie, rng( 3, 10 ), point( x, y ) ); + tile.add_spawn( mon_zombie, rng( 3, 10 ), { x, y, site.z } ); } - tile.add_spawn( mon_zombie_dog, rng( 0, 2 ), point( SEEX, SEEY ) ); + tile.add_spawn( mon_zombie_dog, rng( 0, 2 ), { SEEX, SEEY, site.z } ); } } - tile.add_spawn( mon_zombie_necro, 2, point( SEEX, SEEY ) ); - tile.add_spawn( mon_zombie_hulk, 1, point( SEEX, SEEY ) ); + tile.add_spawn( mon_zombie_necro, 2, { SEEX, SEEY, site.z } ); + tile.add_spawn( mon_zombie_hulk, 1, { SEEX, SEEY, site.z } ); tile.save(); } diff --git a/src/mission_util.cpp b/src/mission_util.cpp index 19c9308d661bd..18f1c889605ed 100644 --- a/src/mission_util.cpp +++ b/src/mission_util.cpp @@ -359,56 +359,56 @@ tripoint mission_util::target_om_ter_random( const std::string &omter, int revea mission_target_params mission_util::parse_mission_om_target( const JsonObject &jo ) { mission_target_params p; - if( jo.has_string( "om_terrain" ) ) { + if( jo.has_member( "om_terrain" ) ) { p.overmap_terrain = jo.get_string( "om_terrain" ); } - if( jo.has_string( "om_terrain_match_type" ) ) { + if( jo.has_member( "om_terrain_match_type" ) ) { p.overmap_terrain_match_type = jo.get_enum_value( "om_terrain_match_type" ); } - if( jo.has_bool( "origin_npc" ) ) { + if( jo.get_bool( "origin_npc", false ) ) { p.origin_u = false; } - if( jo.has_string( "om_terrain_replace" ) ) { + if( jo.has_member( "om_terrain_replace" ) ) { p.replaceable_overmap_terrain = jo.get_string( "om_terrain_replace" ); } - if( jo.has_string( "om_special" ) ) { + if( jo.has_member( "om_special" ) ) { p.overmap_special = overmap_special_id( jo.get_string( "om_special" ) ); } - if( jo.has_int( "reveal_radius" ) ) { + if( jo.has_member( "reveal_radius" ) ) { p.reveal_radius = std::max( 1, jo.get_int( "reveal_radius" ) ); } - if( jo.has_bool( "must_see" ) ) { + if( jo.has_member( "must_see" ) ) { p.must_see = jo.get_bool( "must_see" ); } - if( jo.has_bool( "cant_see" ) ) { + if( jo.has_member( "cant_see" ) ) { p.cant_see = jo.get_bool( "cant_see" ); } - if( jo.has_bool( "exclude_seen" ) ) { + if( jo.has_member( "exclude_seen" ) ) { p.random = jo.get_bool( "exclude" ); } - if( jo.has_bool( "random" ) ) { + if( jo.has_member( "random" ) ) { p.random = jo.get_bool( "random" ); } - if( jo.has_int( "search_range" ) ) { + if( jo.has_member( "search_range" ) ) { p.search_range = std::max( 1, jo.get_int( "search_range" ) ); } - if( jo.has_int( "min_distance" ) ) { + if( jo.has_member( "min_distance" ) ) { p.min_distance = std::max( 1, jo.get_int( "min_distance" ) ); } - if( jo.has_int( "offset_x" ) || jo.has_int( "offset_y" ) || jo.has_int( "offset_z" ) ) { + if( jo.has_member( "offset_x" ) || jo.has_member( "offset_y" ) || jo.has_member( "offset_z" ) ) { tripoint offset; - if( jo.has_int( "offset_x" ) ) { + if( jo.has_member( "offset_x" ) ) { offset.x = jo.get_int( "offset_x" ); } - if( jo.has_int( "offset_y" ) ) { + if( jo.has_member( "offset_y" ) ) { offset.y = jo.get_int( "offset_y" ); } - if( jo.has_int( "offset_z" ) ) { + if( jo.has_member( "offset_z" ) ) { offset.z = jo.get_int( "offset_z" ); } p.offset = offset; } - if( jo.has_int( "z" ) ) { + if( jo.has_member( "z" ) ) { p.z = jo.get_int( "z" ); } return p; @@ -423,12 +423,11 @@ void mission_util::set_reveal( const std::string &terrain, funcs.emplace_back( mission_func ); } -void mission_util::set_reveal_any( JsonArray &ja, +void mission_util::set_reveal_any( const JsonArray &ja, std::vector> &funcs ) { std::vector terrains; - while( ja.has_more() ) { - std::string terrain = ja.next_string(); + for( const std::string &terrain : ja ) { terrains.push_back( terrain ); } const auto mission_func = [ terrains ]( mission * miss ) { @@ -440,9 +439,6 @@ void mission_util::set_reveal_any( JsonArray &ja, void mission_util::set_assign_om_target( const JsonObject &jo, std::vector> &funcs ) { - if( !jo.has_string( "om_terrain" ) ) { - jo.throw_error( "'om_terrain' is required for assign_mission_target" ); - } mission_target_params p = parse_mission_om_target( jo ); const auto mission_func = [p]( mission * miss ) { mission_target_params mtp = p; @@ -462,7 +458,7 @@ bool mission_util::set_update_mapgen( const JsonObject &jo, return false; } - if( jo.has_string( "om_special" ) && jo.has_string( "om_terrain" ) ) { + if( jo.has_member( "om_terrain" ) ) { const std::string om_terrain = jo.get_string( "om_terrain" ); const auto mission_func = [update_map, om_terrain]( mission * miss ) { tripoint update_pos3 = mission_util::reveal_om_ter( om_terrain, 1, false ); @@ -485,10 +481,9 @@ bool mission_util::load_funcs( const JsonObject &jo, if( jo.has_string( "reveal_om_ter" ) ) { const std::string target_terrain = jo.get_string( "reveal_om_ter" ); set_reveal( target_terrain, funcs ); - } else if( jo.has_array( "reveal_om_ter" ) ) { - JsonArray target_terrain = jo.get_array( "reveal_om_ter" ); - set_reveal_any( target_terrain, funcs ); - } else if( jo.has_object( "assign_mission_target" ) ) { + } else if( jo.has_member( "reveal_om_ter" ) ) { + set_reveal_any( jo.get_array( "reveal_om_ter" ), funcs ); + } else if( jo.has_member( "assign_mission_target" ) ) { JsonObject mission_target = jo.get_object( "assign_mission_target" ); set_assign_om_target( mission_target, funcs ); } @@ -498,7 +493,7 @@ bool mission_util::load_funcs( const JsonObject &jo, if( !set_update_mapgen( update_mapgen, funcs ) ) { return false; } - } else if( jo.has_array( "update_mapgen" ) ) { + } else { for( JsonObject update_mapgen : jo.get_array( "update_mapgen" ) ) { if( !set_update_mapgen( update_mapgen, funcs ) ) { return false; diff --git a/src/mod_manager.h b/src/mod_manager.h index 5722324fa76ad..d83ce12f037ff 100644 --- a/src/mod_manager.h +++ b/src/mod_manager.h @@ -141,8 +141,7 @@ class mod_manager /** * Load mod info from a json object. Put the loaded modinfo * directly into @ref mod_map. - * @throws std::string on all kind of errors. The string - * contains the error message. + * @throws JsonError on all kind of errors. */ void load_modfile( const JsonObject &jo, const std::string &path ); diff --git a/src/mod_tileset.cpp b/src/mod_tileset.cpp index 09c27d76c7a60..3c0fa9a9ef9f3 100644 --- a/src/mod_tileset.cpp +++ b/src/mod_tileset.cpp @@ -24,6 +24,11 @@ void load_mod_tileset( const JsonObject &jsobj, const std::string &, const std:: for( const std::string &compatible_tileset_id : compatibility ) { all_mod_tilesets.back().add_compatible_tileset( compatible_tileset_id ); } + if( jsobj.has_member( "tiles-new" ) ) { + // tiles-new is read when initializing graphics, inside `tileset_loader::load`. + // calling get_array here to suppress warnings in the unit test. + jsobj.get_array( "tiles-new" ); + } } void reset_mod_tileset() diff --git a/src/monattack.cpp b/src/monattack.cpp index eb1cc5e891535..e4d5a863f55aa 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -1,6 +1,6 @@ #include "monattack.h" -#include +#include #include #include #include @@ -738,6 +738,7 @@ bool mattack::pull_metal_weapon( monster *z ) // Wielded steel or iron items except for built-in things like bionic claws or monomolecular blade if( !foe->weapon.has_flag( "NO_UNWIELD" ) && ( foe->weapon.made_of( material_id( "iron" ) ) || + foe->weapon.made_of( material_id( "hardsteel" ) ) || foe->weapon.made_of( material_id( "steel" ) ) || foe->weapon.made_of( material_id( "budget_steel" ) ) ) ) { int wp_skill = foe->get_skill_level( skill_melee ); @@ -753,6 +754,9 @@ bool mattack::pull_metal_weapon( monster *z ) target->add_msg_player_or_npc( m_type, _( "%s is pulled away from your hands!" ), _( "%s is pulled away from 's hands!" ), foe->weapon.tname() ); z->add_item( foe->remove_weapon() ); + if( foe->has_activity( activity_id( "ACT_RELOAD" ) ) ) { + foe->cancel_activity(); + } } else { target->add_msg_player_or_npc( m_type, _( "The %s unsuccessfully attempts to pull your weapon away." ), diff --git a/src/monexamine.cpp b/src/monexamine.cpp index 735ae2c6996a9..8cbe1cdf03e96 100644 --- a/src/monexamine.cpp +++ b/src/monexamine.cpp @@ -252,12 +252,15 @@ bool monexamine::pet_menu( monster &z ) int monexamine::pet_armor_pos( monster &z ) { - int pos = g->inv_for_filter( _( "Pet armor" ), [z]( const item & it ) { + auto filter = [z]( const item & it ) { return z.type->bodytype == it.get_pet_armor_bodytype() && z.get_volume() >= it.get_pet_armor_min_vol() && z.get_volume() <= it.get_pet_armor_max_vol(); - } ); - return pos; + }; + + item_location loc = game_menus::inv::titled_filter_menu( filter, g->u, _( "Pet armor" ) ); + + return g->u.get_item_position( loc.get_item() ); } void monexamine::remove_battery( monster &z ) @@ -460,21 +463,24 @@ void monexamine::rename_pet( monster &z ) void monexamine::attach_bag_to( monster &z ) { std::string pet_name = z.get_name(); - int pos = g->inv_for_filter( _( "Bag item" ), []( const item & it ) { + + auto filter = []( const item & it ) { return it.is_armor() && it.get_storage() > 0_ml; - } ); + }; - if( pos == INT_MIN ) { + item_location loc = game_menus::inv::titled_filter_menu( filter, g->u, _( "Bag item" ) ); + + if( !loc ) { add_msg( _( "Never mind." ) ); return; } - item &it = g->u.i_at( pos ); + item &it = *loc; // force it to the front of the monster's inventory in case they have armor on z.inv.insert( z.inv.begin(), it ); add_msg( _( "You mount the %1$s on your %2$s, ready to store gear." ), it.display_name(), pet_name ); - g->u.i_rem( pos ); + g->u.i_rem( &*loc ); z.add_effect( effect_has_bag, 1_turns, num_bp, true ); // Update encumbrance in case we were wearing it g->u.flag_encumbrance(); diff --git a/src/monster.cpp b/src/monster.cpp index 0c3e76417bc7f..251116dfee51a 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -443,7 +443,7 @@ void monster::try_reproduce() if( season_match && female && one_in( chance ) ) { int spawn_cnt = rng( 1, type->baby_count ); if( type->baby_monster ) { - g->m.add_spawn( type->baby_monster, spawn_cnt, pos().xy() ); + g->m.add_spawn( type->baby_monster, spawn_cnt, pos() ); } else { g->m.add_item_or_charges( pos(), item( type->baby_egg, *baby_timer, spawn_cnt ), true ); } diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index 6aebf2d8783ed..fd50a23330c26 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -629,9 +629,7 @@ void mtype::load( const JsonObject &jo, const std::string &src ) if( was_loaded && jo.has_member( "copy-from" ) && looks_like.empty() ) { looks_like = jo.get_string( "copy-from" ); } - if( jo.has_member( "looks_like" ) ) { - looks_like = jo.get_string( "looks_like" ); - } + jo.read( "looks_like", looks_like ); assign( jo, "bodytype", bodytype ); assign( jo, "color", color ); @@ -679,8 +677,7 @@ void mtype::load( const JsonObject &jo, const std::string &src ) // TODO: make this work with `was_loaded` if( jo.has_array( "melee_damage" ) ) { - JsonArray arr = jo.get_array( "melee_damage" ); - melee_damage = load_damage_instance( arr ); + melee_damage = load_damage_instance( jo.get_array( "melee_damage" ) ); } else if( jo.has_object( "melee_damage" ) ) { melee_damage = load_damage_instance( jo ); } @@ -698,8 +695,7 @@ void mtype::load( const JsonObject &jo, const std::string &src ) } if( jo.has_member( "death_drops" ) ) { - JsonIn &stream = *jo.get_raw( "death_drops" ); - death_drops = item_group::load_item_group( stream, "distribution" ); + death_drops = item_group::load_item_group( jo.get_member( "death_drops" ), "distribution" ); } assign( jo, "harvest", harvest ); @@ -1024,14 +1020,13 @@ void mtype::add_special_attacks( const JsonObject &jo, const std::string &member return; } - JsonArray outer = jo.get_array( member ); - while( outer.has_more() ) { - if( outer.test_array() ) { - add_special_attack( outer.next_array(), src ); - } else if( outer.test_object() ) { - add_special_attack( outer.next_object(), src ); + for( const JsonValue &entry : jo.get_array( member ) ) { + if( entry.test_array() ) { + add_special_attack( entry.get_array(), src ); + } else if( entry.test_object() ) { + add_special_attack( entry.get_object(), src ); } else { - outer.throw_error( "array element is neither array nor object." ); + entry.throw_error( "array element is neither array nor object." ); } } } diff --git a/src/mutation.h b/src/mutation.h index 40d27df15ab01..ee12948f04fbb 100644 --- a/src/mutation.h +++ b/src/mutation.h @@ -125,6 +125,11 @@ struct mutation_branch { float hp_adjustment = 0.0f; // Modify strength stat without changing HP float str_modifier = 0.0f; + //melee bonuses + int cut_dmg_bonus = 0; + std::pair rand_cut_bonus; + int bash_dmg_bonus = 0; + std::pair rand_bash_bonus; // Additional bonuses float dodge_modifier = 0.0f; float speed_modifier = 1.0f; @@ -141,6 +146,9 @@ struct mutation_branch { cata::optional scent_mask; int bleed_resist = 0; + /**Map of crafting skills modifiers, can be negative*/ + std::map craft_skill_bonus; + /**What do you smell like*/ cata::optional scent_typeid; @@ -316,7 +324,7 @@ struct mutation_branch { * Callback for the init system (@ref DynamicDataLoader), loads a trait * group definitions. * @param jsobj The json object to load from. - * @throw std::string if the json object contains invalid data. + * @throw JsonError if the json object contains invalid data. */ static void load_trait_group( const JsonObject &jsobj ); @@ -332,7 +340,7 @@ struct mutation_branch { * @param gid The ID of the group that is to be loaded. * @param subtype The type of the trait group, either "collection", "distribution" or "old" * (i.e. the old list-based format, `[ ["TRAIT", 100] ]`). - * @throw std::string if the json object contains invalid data. + * @throw JsonError if the json object contains invalid data. */ static void load_trait_group( const JsonObject &jsobj, const trait_group::Trait_group_tag &gid, const std::string &subtype ); @@ -355,7 +363,7 @@ struct mutation_branch { * Note that each entry in the array has to be a JSON object. The other function above * can also load data from arrays of strings, where the strings are item or group ids. */ - static void load_trait_group( JsonArray &entries, const trait_group::Trait_group_tag &gid, + static void load_trait_group( const JsonArray &entries, const trait_group::Trait_group_tag &gid, bool is_collection ); /** diff --git a/src/mutation_data.cpp b/src/mutation_data.cpp index 9adbc6a75eaac..f3c9209783917 100644 --- a/src/mutation_data.cpp +++ b/src/mutation_data.cpp @@ -215,16 +215,14 @@ static mut_attack load_mutation_attack( const JsonObject &jo ) jo.read( "chance", ret.chance ); if( jo.has_array( "base_damage" ) ) { - JsonArray jo_dam = jo.get_array( "base_damage" ); - ret.base_damage = load_damage_instance( jo_dam ); + ret.base_damage = load_damage_instance( jo.get_array( "base_damage" ) ); } else if( jo.has_object( "base_damage" ) ) { JsonObject jo_dam = jo.get_object( "base_damage" ); ret.base_damage = load_damage_instance( jo_dam ); } if( jo.has_array( "strength_damage" ) ) { - JsonArray jo_dam = jo.get_array( "strength_damage" ); - ret.strength_damage = load_damage_instance( jo_dam ); + ret.strength_damage = load_damage_instance( jo.get_array( "strength_damage" ) ); } else if( jo.has_object( "strength_damage" ) ) { JsonObject jo_dam = jo.get_object( "strength_damage" ); ret.strength_damage = load_damage_instance( jo_dam ); @@ -330,6 +328,8 @@ void mutation_branch::load( const JsonObject &jo, const std::string & ) optional( jo, was_loaded, "hp_adjustment", hp_adjustment, 0.0f ); optional( jo, was_loaded, "stealth_modifier", stealth_modifier, 0.0f ); optional( jo, was_loaded, "str_modifier", str_modifier, 0.0f ); + optional( jo, was_loaded, "cut_dmg_bonus", cut_dmg_bonus, 0 ); + optional( jo, was_loaded, "bash_dmg_bonus", bash_dmg_bonus, 0 ); optional( jo, was_loaded, "dodge_modifier", dodge_modifier, 0.0f ); optional( jo, was_loaded, "speed_modifier", speed_modifier, 1.0f ); optional( jo, was_loaded, "movecost_modifier", movecost_modifier, 1.0f ); @@ -369,6 +369,19 @@ void mutation_branch::load( const JsonObject &jo, const std::string & ) optional( jo, was_loaded, "mana_multiplier", mana_multiplier, 1.0f ); optional( jo, was_loaded, "mana_regen_multiplier", mana_regen_multiplier, 1.0f ); + if( jo.has_object( "rand_cut_bonus" ) ) { + JsonObject sm = jo.get_object( "rand_cut_bonus" ); + rand_cut_bonus.first = sm.get_int( "min" ); + rand_cut_bonus.second = sm.get_int( "max" ); + } + + if( jo.has_object( "rand_bash_bonus" ) ) { + JsonObject sm = jo.get_object( "rand_bash_bonus" ); + rand_bash_bonus.first = sm.get_int( "min" ); + rand_bash_bonus.second = sm.get_int( "max" ); + } + + if( jo.has_object( "social_modifiers" ) ) { JsonObject sm = jo.get_object( "social_modifiers" ); social_mods = load_mutation_social_mods( sm ); @@ -398,6 +411,15 @@ void mutation_branch::load( const JsonObject &jo, const std::string & ) spells_learned.emplace( sp, ja.next_int() ); } + for( JsonArray ja : jo.get_array( "craft_skill_bonus" ) ) { + const skill_id skid( ja.next_string() ); + if( skid.is_valid() ) { + craft_skill_bonus.emplace( skid, ja.next_int() ); + } else { + jo.throw_error( "invalid skill_id" ); + } + } + for( JsonArray ja : jo.get_array( "lumination" ) ) { const body_part bp = get_body_part_token( ja.next_string() ); lumination.emplace( bp, ja.next_float() ); @@ -639,21 +661,21 @@ static Trait_group &make_group_or_throw( const trait_group::Trait_group_tag &gid return *found->second; } -void mutation_branch::load_trait_group( JsonArray &entries, const trait_group::Trait_group_tag &gid, - const bool is_collection ) +void mutation_branch::load_trait_group( const JsonArray &entries, + const trait_group::Trait_group_tag &gid, const bool is_collection ) { Trait_group &tg = make_group_or_throw( gid, is_collection ); - while( entries.has_more() ) { + for( const JsonValue &entry : entries ) { // Backwards-compatibility with old format ["TRAIT", 100] - if( entries.test_array() ) { - JsonArray subarr = entries.next_array(); + if( entry.test_array() ) { + JsonArray subarr = entry.get_array(); trait_id id( subarr.get_string( 0 ) ); tg.add_entry( std::make_unique( id, subarr.get_int( 1 ) ) ); // Otherwise load new format {"trait": ... } or {"group": ...} } else { - JsonObject subobj = entries.next_object(); + JsonObject subobj = entry.get_object(); add_entry( tg, subobj ); } } @@ -684,29 +706,28 @@ void mutation_branch::load_trait_group( const JsonObject &jsobj, } } if( jsobj.has_member( "traits" ) ) { - JsonArray traits = jsobj.get_array( "traits" ); - while( traits.has_more() ) { - if( traits.test_string() ) { - tg.add_trait_entry( trait_id( traits.next_string() ), 100 ); - } else if( traits.test_array() ) { - JsonArray subtrait = traits.next_array(); + for( const JsonValue &entry : jsobj.get_array( "traits" ) ) { + if( entry.test_string() ) { + tg.add_trait_entry( trait_id( entry.get_string() ), 100 ); + } else if( entry.test_array() ) { + JsonArray subtrait = entry.get_array(); tg.add_trait_entry( trait_id( subtrait.get_string( 0 ) ), subtrait.get_int( 1 ) ); } else { - JsonObject subobj = traits.next_object(); + JsonObject subobj = entry.get_object(); add_entry( tg, subobj ); } } } if( jsobj.has_member( "groups" ) ) { - JsonArray traits = jsobj.get_array( "groups" ); - while( traits.has_more() ) { - if( traits.test_string() ) { - tg.add_group_entry( trait_group::Trait_group_tag( traits.next_string() ), 100 ); - } else if( traits.test_array() ) { - JsonArray subtrait = traits.next_array(); - tg.add_group_entry( trait_group::Trait_group_tag( traits.get_string( 0 ) ), subtrait.get_int( 1 ) ); + for( const JsonValue &entry : jsobj.get_array( "groups" ) ) { + if( entry.test_string() ) { + tg.add_group_entry( trait_group::Trait_group_tag( entry.get_string() ), 100 ); + } else if( entry.test_array() ) { + JsonArray subtrait = entry.get_array(); + tg.add_group_entry( trait_group::Trait_group_tag( subtrait.get_string( 0 ) ), + subtrait.get_int( 1 ) ); } else { - JsonObject subobj = traits.next_object(); + JsonObject subobj = entry.get_object(); add_entry( tg, subobj ); } } @@ -729,8 +750,7 @@ void mutation_branch::add_entry( Trait_group &tg, const JsonObject &obj ) if( ptr ) { Trait_group &tg2 = dynamic_cast( *ptr ); - while( jarr.has_more() ) { - JsonObject job2 = jarr.next_object(); + for( const JsonObject &job2 : jarr ) { add_entry( tg2, job2 ); } tg.add_entry( std::move( ptr ) ); diff --git a/src/newcharacter.cpp b/src/newcharacter.cpp index 96e5cbaaa1cb0..e5d4d43c5234c 100644 --- a/src/newcharacter.cpp +++ b/src/newcharacter.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -115,7 +114,8 @@ void Character::pick_name( bool bUseDefault ) } } -static matype_id choose_ma_style( const character_type type, const std::vector &styles ) +static matype_id choose_ma_style( const character_type type, const std::vector &styles, + const avatar &u ) { if( type == PLTYPE_NOW || type == PLTYPE_FULL_RANDOM ) { return random_entry( styles ); @@ -129,8 +129,10 @@ static matype_id choose_ma_style( const character_type type, const std::vectoraddictions(); if( !prof_addictions.empty() ) { - buffer << colorize( _( "Addictions:" ), c_light_blue ) << "\n"; + buffer += colorize( _( "Addictions:" ), c_light_blue ) + "\n"; for( const auto &a : prof_addictions ) { const auto format = pgettext( "set_profession_addictions", "%1$s (%2$d)" ); - buffer << string_format( format, addiction_name( a ), a.intensity ) << "\n"; + buffer += string_format( format, addiction_name( a ), a.intensity ) + "\n"; } } // Profession traits const auto prof_traits = sorted_profs[cur_id]->get_locked_traits(); - buffer << colorize( _( "Profession traits:" ), c_light_blue ) << "\n"; + buffer += colorize( _( "Profession traits:" ), c_light_blue ) + "\n"; if( prof_traits.empty() ) { - buffer << pgettext( "set_profession_trait", "None" ) << "\n"; + buffer += pgettext( "set_profession_trait", "None" ) + std::string( "\n" ); } else { for( const auto &t : prof_traits ) { - buffer << mutation_branch::get_name( t ) << "\n"; + buffer += mutation_branch::get_name( t ) + "\n"; } } // Profession skills const auto prof_skills = sorted_profs[cur_id]->skills(); - buffer << colorize( _( "Profession skills:" ), c_light_blue ) << "\n"; + buffer += colorize( _( "Profession skills:" ), c_light_blue ) + "\n"; if( prof_skills.empty() ) { - buffer << pgettext( "set_profession_skill", "None" ) << "\n"; + buffer += pgettext( "set_profession_skill", "None" ) + std::string( "\n" ); } else { for( const auto &sl : prof_skills ) { const auto format = pgettext( "set_profession_skill", "%1$s (%2$d)" ); - buffer << string_format( format, sl.first.obj().name(), sl.second ) << "\n"; + buffer += string_format( format, sl.first.obj().name(), sl.second ) + "\n"; } } // Profession items const auto prof_items = sorted_profs[cur_id]->items( u.male, u.get_mutations() ); - buffer << colorize( _( "Profession items:" ), c_light_blue ) << "\n"; + buffer += colorize( _( "Profession items:" ), c_light_blue ) + "\n"; if( prof_items.empty() ) { - buffer << pgettext( "set_profession_item", "None" ) << "\n"; + buffer += pgettext( "set_profession_item", "None" ) + std::string( "\n" ); } else { // TODO: If the item group is randomized *at all*, these will be different each time // and it won't match what you actually start with // TODO: Put like items together like the inventory does, so we don't have to scroll // through a list of a dozen forks. - std::ostringstream buffer_wielded; - std::ostringstream buffer_worn; - std::ostringstream buffer_inventory; + std::string buffer_wielded; + std::string buffer_worn; + std::string buffer_inventory; for( const auto &it : prof_items ) { if( it.has_flag( "no_auto_equip" ) ) { - buffer_inventory << it.display_name() << "\n"; + buffer_inventory += it.display_name() + "\n"; } else if( it.has_flag( "auto_wield" ) ) { - buffer_wielded << it.display_name() << "\n"; + buffer_wielded += it.display_name() + "\n"; } else if( it.is_armor() ) { - buffer_worn << it.display_name() << "\n"; + buffer_worn += it.display_name() + "\n"; } else { - buffer_inventory << it.display_name() << "\n"; + buffer_inventory += it.display_name() + "\n"; } } - buffer << colorize( _( "Wielded:" ), c_cyan ) << "\n"; - buffer << ( !buffer_wielded.str().empty() ? buffer_wielded.str() : - pgettext( "set_profession_item_wielded", "None\n" ) ); - buffer << colorize( _( "Worn:" ), c_cyan ) << "\n"; - buffer << ( !buffer_worn.str().empty() ? buffer_worn.str() : - pgettext( "set_profession_item_worn", "None\n" ) ); - buffer << colorize( _( "Inventory:" ), c_cyan ) << "\n"; - buffer << ( !buffer_inventory.str().empty() ? buffer_inventory.str() : - pgettext( "set_profession_item_inventory", "None\n" ) ); + buffer += colorize( _( "Wielded:" ), c_cyan ) + "\n"; + buffer += !buffer_wielded.empty() ? buffer_wielded : pgettext( "set_profession_item_wielded", + "None\n" ); + buffer += colorize( _( "Worn:" ), c_cyan ) + "\n"; + buffer += !buffer_worn.empty() ? buffer_worn : pgettext( "set_profession_item_worn", "None\n" ); + buffer += colorize( _( "Inventory:" ), c_cyan ) + "\n"; + buffer += !buffer_inventory.empty() ? buffer_inventory : pgettext( "set_profession_item_inventory", + "None\n" ); } // Profession bionics, active bionics shown first @@ -1448,36 +1449,36 @@ tab_direction set_profession( const catacurses::window &w, avatar &u, points_lef std::sort( begin( prof_CBMs ), end( prof_CBMs ), []( const bionic_id & a, const bionic_id & b ) { return a->activated && !b->activated; } ); - buffer << colorize( _( "Profession bionics:" ), c_light_blue ) << "\n"; + buffer += colorize( _( "Profession bionics:" ), c_light_blue ) + "\n"; if( prof_CBMs.empty() ) { - buffer << pgettext( "set_profession_bionic", "None" ) << "\n"; + buffer += pgettext( "set_profession_bionic", "None" ) + std::string( "\n" ); } else { for( const auto &b : prof_CBMs ) { const auto &cbm = b.obj(); if( cbm.activated && cbm.toggled ) { - buffer << cbm.name << " (" << _( "toggled" ) << ")\n"; + buffer += string_format( _( "%s (toggled)" ), cbm.name ) + "\n"; } else if( cbm.activated ) { - buffer << cbm.name << " (" << _( "activated" ) << ")\n"; + buffer += string_format( _( "%s (activated)" ), cbm.name ) + "\n"; } else { - buffer << cbm.name << "\n"; + buffer += cbm.name + "\n"; } } } // Profession pet cata::optional montype; if( !sorted_profs[cur_id]->pets().empty() ) { - buffer << colorize( _( "Pets:" ), c_light_blue ) << "\n"; + buffer += colorize( _( "Pets:" ), c_light_blue ) + "\n"; for( auto elem : sorted_profs[cur_id]->pets() ) { monster mon( elem ); - buffer << mon.get_name() << "\n"; + buffer += mon.get_name() + "\n"; } } // Profession spells if( !sorted_profs[cur_id]->spells().empty() ) { - buffer << colorize( _( "Spells:" ), c_light_blue ) << "\n"; + buffer += colorize( _( "Spells:" ), c_light_blue ) + "\n"; for( const std::pair spell_pair : sorted_profs[cur_id]->spells() ) { - buffer << spell_pair.first->name << _( " level " ) << spell_pair.second << "\n"; + buffer += string_format( _( "%s level %d" ), spell_pair.first->name, spell_pair.second ) + "\n"; } } werase( w_items ); @@ -1485,7 +1486,7 @@ tab_direction set_profession( const catacurses::window &w, avatar &u, points_lef _( "Press %1$s or %2$s to scroll." ), ctxt.get_desc( "LEFT" ), ctxt.get_desc( "RIGHT" ) ); - const int iheight = print_scrollable( w_items, desc_offset, buffer.str(), c_light_gray, + const int iheight = print_scrollable( w_items, desc_offset, buffer, c_light_gray, scroll_msg ); werase( w_sorting ); diff --git a/src/npc.cpp b/src/npc.cpp index 195c9bbdb8728..97388f25faf9a 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "auto_pickup.h" #include "avatar.h" @@ -984,8 +983,6 @@ void npc::start_read( item &chosen, player *pl ) act.str_values.emplace_back( "martial_art" ); } assign_activity( act ); - set_attitude( NPCATT_ACTIVITY ); - set_mission( NPC_MISSION_ACTIVITY ); } void npc::do_npc_read() @@ -1054,7 +1051,7 @@ bool npc::wear_if_wanted( const item &it ) for( int i = 0; i < num_hp_parts; i++ ) { hp_part hpp = static_cast( i ); body_part bp = player::hp_to_bp( hpp ); - if( hp_cur[i] <= 0 && it.covers( bp ) ) { + if( is_limb_broken( hpp ) && it.covers( bp ) ) { splint = true; break; } @@ -1162,9 +1159,20 @@ bool npc::wield( item &it ) // check if the item is in a holster int position = inv.position_by_item( &it ); - item &holster = inv.find_item( position ); - if( holster.tname() != it.tname() && holster.is_holster() && !holster.contents.empty() ) { - invoke_item( &holster ); + if( position != INT_MIN ) { + item &maybe_holster = inv.find_item( position ); + assert( !maybe_holster.is_null() ); + if( &maybe_holster != &it && maybe_holster.is_holster() ) { + assert( !maybe_holster.contents.empty() ); + const size_t old_size = maybe_holster.contents.size(); + invoke_item( &maybe_holster ); + // @TODO change invoke_item to somehow report this change + // Hacky: test whether wielding the item from the holster has been done. + // (Wielding may be prevented by various reasons: see player::wield_contained) + if( old_size != maybe_holster.contents.size() ) { + return true; + } + } } moves -= 15; @@ -1181,7 +1189,7 @@ bool npc::wield( item &it ) return true; } -void npc::drop( const std::list> &what, const tripoint &target, +void npc::drop( const drop_locations &what, const tripoint &target, bool stash ) { Character::drop( what, target, stash ); @@ -2251,80 +2259,80 @@ int npc::print_info( const catacurses::window &w, int line, int vLines, int colu std::string npc::opinion_text() const { - std::stringstream ret; + std::string ret; if( op_of_u.trust <= -10 ) { - ret << _( "Completely untrusting" ); + ret += _( "Completely untrusting" ); } else if( op_of_u.trust <= -6 ) { - ret << _( "Very untrusting" ); + ret += _( "Very untrusting" ); } else if( op_of_u.trust <= -3 ) { - ret << _( "Untrusting" ); + ret += _( "Untrusting" ); } else if( op_of_u.trust <= 2 ) { - ret << _( "Uneasy" ); + ret += _( "Uneasy" ); } else if( op_of_u.trust <= 4 ) { - ret << _( "Trusting" ); + ret += _( "Trusting" ); } else if( op_of_u.trust < 10 ) { - ret << _( "Very trusting" ); + ret += _( "Very trusting" ); } else { - ret << _( "Completely trusting" ); + ret += _( "Completely trusting" ); } - ret << " (" << _( "Trust: " ) << op_of_u.trust << "); "; + ret += string_format( _( " (Trust: %d); " ), op_of_u.trust ); if( op_of_u.fear <= -10 ) { - ret << _( "Thinks you're laughably harmless" ); + ret += _( "Thinks you're laughably harmless" ); } else if( op_of_u.fear <= -6 ) { - ret << _( "Thinks you're harmless" ); + ret += _( "Thinks you're harmless" ); } else if( op_of_u.fear <= -3 ) { - ret << _( "Unafraid" ); + ret += _( "Unafraid" ); } else if( op_of_u.fear <= 2 ) { - ret << _( "Wary" ); + ret += _( "Wary" ); } else if( op_of_u.fear <= 5 ) { - ret << _( "Afraid" ); + ret += _( "Afraid" ); } else if( op_of_u.fear < 10 ) { - ret << _( "Very afraid" ); + ret += _( "Very afraid" ); } else { - ret << _( "Terrified" ); + ret += _( "Terrified" ); } - ret << " (" << _( "Fear: " ) << op_of_u.fear << "); "; + ret += string_format( _( " (Fear: %d); " ), op_of_u.fear ); if( op_of_u.value <= -10 ) { - ret << _( "Considers you a major liability" ); + ret += _( "Considers you a major liability" ); } else if( op_of_u.value <= -6 ) { - ret << _( "Considers you a burden" ); + ret += _( "Considers you a burden" ); } else if( op_of_u.value <= -3 ) { - ret << _( "Considers you an annoyance" ); + ret += _( "Considers you an annoyance" ); } else if( op_of_u.value <= 2 ) { - ret << _( "Doesn't care about you" ); + ret += _( "Doesn't care about you" ); } else if( op_of_u.value <= 5 ) { - ret << _( "Values your presence" ); + ret += _( "Values your presence" ); } else if( op_of_u.value < 10 ) { - ret << _( "Treasures you" ); + ret += _( "Treasures you" ); } else { - ret << _( "Best Friends Forever!" ); + ret += _( "Best Friends Forever!" ); } - ret << " (" << _( "Value: " ) << op_of_u.value << "); "; + ret += string_format( _( " (Value: %d); " ), op_of_u.value ); if( op_of_u.anger <= -10 ) { - ret << _( "You can do no wrong!" ); + ret += _( "You can do no wrong!" ); } else if( op_of_u.anger <= -6 ) { - ret << _( "You're good people" ); + ret += _( "You're good people" ); } else if( op_of_u.anger <= -3 ) { - ret << _( "Thinks well of you" ); + ret += _( "Thinks well of you" ); } else if( op_of_u.anger <= 2 ) { - ret << _( "Ambivalent" ); + ret += _( "Ambivalent" ); } else if( op_of_u.anger <= 5 ) { - ret << _( "Pissed off" ); + ret += _( "Pissed off" ); } else if( op_of_u.anger < 10 ) { - ret << _( "Angry" ); + ret += _( "Angry" ); } else { - ret << _( "About to kill you" ); + ret += _( "About to kill you" ); } - ret << " (" << _( "Anger: " ) << op_of_u.anger << ")"; + ret += string_format( _( " (Anger: %d)" ), op_of_u.anger ); - return ret.str(); + return ret; } static void maybe_shift( cata::optional &pos, int dx, int dy ) @@ -2871,6 +2879,11 @@ void npc::process_turn() { player::process_turn(); + // NPCs shouldn't be using stamina, but if they have, set it back to max + if( calendar::once_every( 1_minutes ) && get_stamina() < get_stamina_max() ) { + set_stamina( get_stamina_max() ); + } + if( is_player_ally() && calendar::once_every( 1_hours ) && get_hunger() < 200 && get_thirst() < 100 && op_of_u.trust < 5 ) { // Friends who are well fed will like you more @@ -3042,34 +3055,34 @@ mfaction_id npc::get_monster_faction() const std::string npc::extended_description() const { - std::ostringstream ss; + std::string ss; // For some reason setting it using str or constructor doesn't work - ss << Character::extended_description(); + ss += Character::extended_description(); - ss << std::endl << "--" << std::endl; + ss += "\n--\n"; if( attitude == NPCATT_KILL ) { - ss << _( "Is trying to kill you." ); + ss += _( "Is trying to kill you." ); } else if( attitude == NPCATT_FLEE || attitude == NPCATT_FLEE_TEMP ) { - ss << _( "Is trying to flee from you." ); + ss += _( "Is trying to flee from you." ); } else if( is_player_ally() ) { - ss << _( "Is your friend." ); + ss += _( "Is your friend." ); } else if( is_following() ) { - ss << _( "Is following you." ); + ss += _( "Is following you." ); } else if( is_leader() ) { - ss << _( "Is guiding you." ); + ss += _( "Is guiding you." ); } else if( guaranteed_hostile() ) { - ss << _( "Will try to kill you or flee from you if you reveal yourself." ); + ss += _( "Will try to kill you or flee from you if you reveal yourself." ); } else { - ss << _( "Is neutral." ); + ss += _( "Is neutral." ); } if( hit_by_player ) { - ss << "--" << std::endl; - ss << _( "Is still innocent and killing them will be considered murder." ); + ss += "--\n"; + ss += _( "Is still innocent and killing them will be considered murder." ); // TODO: "But you don't care because you're an edgy psycho" } - return replace_colors( ss.str() ); + return replace_colors( ss ); } void npc::set_companion_mission( npc &p, const std::string &mission_id ) diff --git a/src/npc.h b/src/npc.h index 837ed246ea1c0..cc40cfc466a5c 100644 --- a/src/npc.h +++ b/src/npc.h @@ -61,6 +61,8 @@ using npc_class_id = string_id; using mission_type_id = string_id; using mfaction_id = int_id; using overmap_location_str_id = string_id; +using drop_location = std::pair; +using drop_locations = std::list; void parse_tags( std::string &phrase, const Character &u, const Character &me, const itype_id &item_type = "null" ); @@ -915,7 +917,7 @@ class npc : public player void do_npc_read(); void stow_item( item &it ); bool wield( item &it ) override; - void drop( const std::list> &what, const tripoint &target, + void drop( const drop_locations &what, const tripoint &target, bool stash ) override; bool adjust_worn(); bool has_healing_item( healing_options try_to_fix ); diff --git a/src/npc_class.cpp b/src/npc_class.cpp index 7ad7c54a0bb30..949ca3871001a 100644 --- a/src/npc_class.cpp +++ b/src/npc_class.cpp @@ -247,8 +247,8 @@ void npc_class::load( const JsonObject &jo, const std::string & ) optional( jo, was_loaded, "carry_override", carry_override ); optional( jo, was_loaded, "weapon_override", weapon_override ); - if( jo.has_array( "traits" ) ) { - traits = trait_group::load_trait_group( *jo.get_raw( "traits" ), "collection" ); + if( jo.has_member( "traits" ) ) { + traits = trait_group::load_trait_group( jo.get_member( "traits" ), "collection" ); } if( jo.has_array( "spells" ) ) { diff --git a/src/npcmove.cpp b/src/npcmove.cpp index 9aab9393cfafb..80b52f8e5b41f 100644 --- a/src/npcmove.cpp +++ b/src/npcmove.cpp @@ -680,7 +680,6 @@ void npc::move() } regen_ai_cache(); adjust_power_cbms(); - if( activity.id() == "ACT_OPERATION" ) { execute_action( npc_player_activity ); return;// NPCs under operation should just stay still @@ -849,8 +848,6 @@ void npc::move() const std::vector jobs_to_rotate = job_duties[job]; if( !jobs_to_rotate.empty() ) { assign_activity( random_entry( jobs_to_rotate ) ); - set_mission( NPC_MISSION_ACTIVITY ); - set_attitude( NPCATT_ACTIVITY ); action = npc_player_activity; found_job = true; } else { @@ -1357,9 +1354,17 @@ npc_action npc::method_of_attack() // reach attacks are silent and consume no ammo so prefer these if available int reach_range = weapon.reach_range( *this ); - if( reach_range > 1 && reach_range >= dist && clear_shot_reach( pos(), tar ) ) { - add_msg( m_debug, "%s is trying a reach attack", disp_name() ); - return npc_reach_attack; + if( !trigdist ) { + if( reach_range > 1 && reach_range >= dist && clear_shot_reach( pos(), tar ) ) { + add_msg( m_debug, "%s is trying a reach attack", disp_name() ); + return npc_reach_attack; + } + } else { + if( reach_range > 1 && reach_range >= round( trig_dist( pos(), tar ) ) && + clear_shot_reach( pos(), tar ) ) { + add_msg( m_debug, "%s is trying a reach attack", disp_name() ); + return npc_reach_attack; + } } // if the best mode is within the confident range try for a shot @@ -1847,7 +1852,7 @@ npc_action npc::address_needs( float danger ) return npc_noop; } - if( one_in( 2 ) && find_corpse_to_pulp() ) { + if( one_in( 3 ) && find_corpse_to_pulp() ) { if( !do_pulp() ) { move_to_next(); } @@ -2173,7 +2178,7 @@ bool npc::can_move_to( const tripoint &p, bool no_bashing ) const { // Allow moving into any bashable spots, but penalize them during pathing // Doors are not passable for hallucinations - return( rl_dist( pos(), p ) <= 1 && + return( rl_dist( pos(), p ) <= 1 && g->m.has_floor( p ) && !g->is_dangerous_tile( p ) && ( g->m.passable( p ) || ( can_open_door( p, !g->m.is_outside( pos() ) ) && !is_hallucination() ) || ( !no_bashing && g->m.bash_rating( smash_ability(), p ) > 0 ) ) ); @@ -2595,7 +2600,7 @@ void npc::move_away_from( const std::vector &spheres, bool no_bashing ) return g->m.passable( elem ); } ); - algo::sort_by_rating( escape_points.begin(), escape_points.end(), [&]( const tripoint & elem ) { + cata::sort_by_rating( escape_points.begin(), escape_points.end(), [&]( const tripoint & elem ) { const int danger = std::accumulate( spheres.begin(), spheres.end(), 0, [&]( const int sum, const sphere & s ) { return sum + std::max( s.radius - rl_dist( elem, s.center ), 0 ); @@ -3177,11 +3182,10 @@ bool npc::do_pulp() if( rl_dist( *pulp_location, pos() ) > 1 || pulp_location->z != posz() ) { return false; } - // TODO: Don't recreate the activity every time int old_moves = moves; assign_activity( activity_id( "ACT_PULP" ), calendar::INDEFINITELY_LONG, 0 ); - activity.placement = *pulp_location; + activity.placement = g->m.getabs( *pulp_location ); activity.do_turn( *this ); return moves != old_moves; } @@ -4315,13 +4319,13 @@ bool npc::complain() } // Radiation every 10 minutes - if( radiation > 90 ) { + if( get_rad() > 90 ) { activate_bionic_by_id( bio_radscrubber ); std::string speech = _( "I'm suffering from radiation sickness…" ); - if( complain_about( radiation_string, 10_minutes, speech, radiation > 150 ) ) { + if( complain_about( radiation_string, 10_minutes, speech, get_rad() > 150 ) ) { return true; } - } else if( !radiation ) { + } else if( !get_rad() ) { deactivate_bionic_by_id( bio_radscrubber ); } diff --git a/src/npctalk.cpp b/src/npctalk.cpp index 59a1b3a46a9af..b0fa2e0c49064 100644 --- a/src/npctalk.cpp +++ b/src/npctalk.cpp @@ -23,6 +23,7 @@ #include "debug.h" #include "faction_camp.h" #include "game.h" +#include "game_inventory.h" #include "help.h" #include "input.h" #include "item.h" @@ -1777,7 +1778,7 @@ talk_trial::talk_trial( const JsonObject &jo ) read_condition( jo, "condition", condition, false ); - if( jo.has_array( "mod" ) ) { + if( jo.has_member( "mod" ) ) { for( JsonArray jmod : jo.get_array( "mod" ) ) { trial_mod this_modifier; this_modifier.first = jmod.next_string(); @@ -2675,13 +2676,12 @@ void talk_effect_t::load_effect( const JsonObject &jo ) JsonObject sub_effect = jo.get_object( member_name ); parse_sub_effect( sub_effect ); } else if( jo.has_array( member_name ) ) { - JsonArray ja = jo.get_array( member_name ); - while( ja.has_more() ) { - if( ja.test_string() ) { - const std::string type = ja.next_string(); + for( const JsonValue &entry : jo.get_array( member_name ) ) { + if( entry.test_string() ) { + const std::string type = entry.get_string(); parse_string_effect( type, jo ); - } else if( ja.test_object() ) { - JsonObject sub_effect = ja.next_object(); + } else if( entry.test_object() ) { + JsonObject sub_effect = entry.get_object(); parse_sub_effect( sub_effect ); } else { jo.throw_error( "invalid effect array syntax", member_name ); @@ -2868,16 +2868,15 @@ dynamic_line_t::dynamic_line_t( const JsonObject &jo ) { if( jo.has_member( "and" ) ) { std::vector lines; - JsonArray ja = jo.get_array( "and" ); - while( ja.has_more() ) { - if( ja.test_string() ) { - lines.emplace_back( ja.next_string() ); - } else if( ja.test_array() ) { - lines.emplace_back( ja.next_array() ); - } else if( ja.test_object() ) { - lines.emplace_back( ja.next_object() ); + for( const JsonValue &entry : jo.get_array( "and" ) ) { + if( entry.test_string() ) { + lines.emplace_back( entry.get_string() ); + } else if( entry.test_array() ) { + lines.emplace_back( entry.get_array() ); + } else if( entry.test_object() ) { + lines.emplace_back( entry.get_object() ); } else { - ja.throw_error( "invalid format: must be string, array or object" ); + entry.throw_error( "invalid format: must be string, array or object" ); } } function = [lines]( const dialogue & d ) { @@ -2887,11 +2886,11 @@ dynamic_line_t::dynamic_line_t( const JsonObject &jo ) } return all_lines; }; - } else if( jo.has_member( "give_hint" ) ) { + } else if( jo.get_bool( "give_hint", false ) ) { function = [&]( const dialogue & ) { return get_hint(); }; - } else if( jo.has_member( "use_reason" ) ) { + } else if( jo.get_bool( "use_reason", false ) ) { function = [&]( const dialogue & d ) { std::string tmp = d.reason; d.reason.clear(); @@ -2919,6 +2918,10 @@ dynamic_line_t::dynamic_line_t( const JsonObject &jo ) const dynamic_line_t no = from_member( jo, "no" ); for( const std::string &sub_member : dialogue_data::simple_string_conds ) { if( jo.has_bool( sub_member ) ) { + // This also marks the member as visited. + if( !jo.get_bool( sub_member ) ) { + jo.throw_error( "value must be true", sub_member ); + } dcondition = conditional_t( sub_member ); function = [dcondition, yes, no]( const dialogue & d ) { return ( dcondition( d ) ? yes : no )( d ); @@ -2949,15 +2952,15 @@ dynamic_line_t::dynamic_line_t( const JsonObject &jo ) dynamic_line_t::dynamic_line_t( JsonArray ja ) { std::vector lines; - while( ja.has_more() ) { - if( ja.test_string() ) { - lines.emplace_back( ja.next_string() ); - } else if( ja.test_array() ) { - lines.emplace_back( ja.next_array() ); - } else if( ja.test_object() ) { - lines.emplace_back( ja.next_object() ); + for( const JsonValue &entry : ja ) { + if( entry.test_string() ) { + lines.emplace_back( entry.get_string() ); + } else if( entry.test_array() ) { + lines.emplace_back( entry.get_array() ); + } else if( entry.test_object() ) { + lines.emplace_back( entry.get_object() ); } else { - ja.throw_error( "invalid format: must be string, array or object" ); + entry.throw_error( "invalid format: must be string, array or object" ); } } function = [lines]( const dialogue & d ) { @@ -3215,11 +3218,12 @@ std::string give_item_to( npc &p, bool allow_use, bool allow_carry ) if( p.is_hallucination() ) { return _( "No thanks, I'm good." ); } - const int inv_pos = g->inv_for_all( _( "Offer what?" ), _( "You have no items to offer." ) ); - item &given = g->u.i_at( inv_pos ); - if( given.is_null() ) { + item_location loc = game_menus::inv::titled_menu( g->u, _( "Offer what?" ), + _( "You have no items to offer." ) ); + if( !loc ) { return _( "Changed your mind?" ); } + item &given = *loc; if( ( &given == &g->u.weapon && given.has_flag( "NO_UNWIELD" ) ) || ( g->u.is_worn( given ) && given.has_flag( "NO_TAKEOFF" ) ) ) { @@ -3236,7 +3240,7 @@ std::string give_item_to( npc &p, bool allow_use, bool allow_carry ) // Eating first, to avoid evaluating bread as a weapon const auto consume_res = try_consume( p, given, no_consume_reason ); if( consume_res == CONSUMED_ALL ) { - g->u.i_rem( inv_pos ); + g->u.i_rem( &given ); } if( consume_res != REFUSED ) { g->u.moves -= 100; @@ -3276,7 +3280,7 @@ std::string give_item_to( npc &p, bool allow_use, bool allow_carry ) } if( taken ) { - g->u.i_rem( inv_pos ); + g->u.i_rem( &given ); g->u.moves -= 100; p.has_new_items = true; return _( "Thanks!" ); diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp index fddad96c87ac2..a4a48b01995d6 100644 --- a/src/npctalk_funcs.cpp +++ b/src/npctalk_funcs.cpp @@ -193,16 +193,12 @@ void talk_function::start_trade( npc &p ) void talk_function::sort_loot( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_MOVE_LOOT" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::do_construction( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_MULTIPLE_CONSTRUCTION" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::do_read( npc &p ) @@ -220,9 +216,7 @@ void talk_function::find_mount( npc &p ) // first find one nearby for( monster &critter : g->all_monsters() ) { if( p.can_mount( critter ) ) { - p.set_attitude( NPCATT_ACTIVITY ); // keep the horse still for some time, so that NPC can catch up to it nad mount it. - p.set_mission( NPC_MISSION_ACTIVITY ); p.assign_activity( activity_id( "ACT_FIND_MOUNT" ) ); p.chosen_mount = g->shared_from( critter ); // we found one, thats all we need. @@ -237,51 +231,37 @@ void talk_function::find_mount( npc &p ) void talk_function::do_butcher( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_MULTIPLE_BUTCHER" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::do_chop_plank( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_MULTIPLE_CHOP_PLANKS" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::do_vehicle_deconstruct( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_VEHICLE_DECONSTRUCTION" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::do_vehicle_repair( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_VEHICLE_REPAIR" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::do_chop_trees( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_MULTIPLE_CHOP_TREES" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::do_farming( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_MULTIPLE_FARM" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::do_fishing( npc &p ) { - p.set_attitude( NPCATT_ACTIVITY ); p.assign_activity( activity_id( "ACT_MULTIPLE_FISH" ) ); - p.set_mission( NPC_MISSION_ACTIVITY ); } void talk_function::revert_activity( npc &p ) @@ -392,7 +372,7 @@ void talk_function::assign_camp( npc &p ) void talk_function::stop_guard( npc &p ) { - if( p.mission != NPC_MISSION_GUARD_ALLY && p.mission != NPC_MISSION_ASSIGNED_CAMP ) { + if( !p.is_player_ally() ) { p.set_attitude( NPCATT_NULL ); p.set_mission( NPC_MISSION_NULL ); return; @@ -786,6 +766,7 @@ void talk_function::leave( npc &p ) if( new_solo_fac ) { new_solo_fac->known_by_u = true; } + p.chatbin.first_topic = "TALK_STRANGER_NEUTRAL"; p.set_attitude( NPCATT_NULL ); } @@ -914,11 +895,14 @@ void talk_function::start_training( npc &p ) // quicker to learn with instruction as opposed to books. // if this is a known spell, then there is a set time to gain some exp. // if player doesnt know this spell, then the NPC will teach all of it - // which takes as long as it takes. + // which takes max 6 hours, min 3 hours. + // TODO: a system for NPCs to train new stuff in bits and pieces + // and remember the progress. if( knows ) { time = 1_hours; } else { - time = time_duration::from_seconds( g->u.magic.time_to_learn_spell( g->u, sp_id ) / 2 ); + time = time_duration::from_seconds( clamp( g->u.magic.time_to_learn_spell( g->u, sp_id ) / 50, 7200, + 21600 ) ); } } else { debugmsg( "start_training with no valid skill or style set" ); @@ -931,10 +915,11 @@ void talk_function::start_training( npc &p ) } else if( !npc_trading::pay_npc( p, cost ) ) { return; } - player_activity act = player_activity( activity_id( "ACT_TRAIN" ), to_turns( time ) * 100, + player_activity act = player_activity( activity_id( "ACT_TRAIN" ), to_moves( time ), p.getID().get_value(), 0, name ); act.values.push_back( expert_multiplier ); g->u.assign_activity( act ); + p.add_effect( effect_asked_to_train, 6_hours ); } diff --git a/src/npctrade.cpp b/src/npctrade.cpp index c3930f4e81cf2..5ad8634d524e3 100644 --- a/src/npctrade.cpp +++ b/src/npctrade.cpp @@ -1,6 +1,6 @@ #include "npctrade.h" -#include +#include #include #include #include @@ -63,9 +63,6 @@ void npc_trading::transfer_items( std::vector &stuff, player &give } if( ip.loc.where() == item_location::type::character ) { - if( gift.typeId() == giver.weapon.typeId() ) { - giver.remove_weapon(); - } if( ip.charges > 0 ) { giver.use_charges( gift.typeId(), charges ); } else if( ip.count > 0 ) { @@ -74,6 +71,11 @@ void npc_trading::transfer_items( std::vector &stuff, player &give } } } else { + if( ip.charges > 0 ) { + ip.loc.get_item()->set_var( "trade_charges", charges ); + } else { + ip.loc.get_item()->set_var( "trade_amount", 1 ); + } from_map.push_back( &ip.loc ); } } @@ -611,7 +613,23 @@ bool npc_trading::trade( npc &np, int cost, const std::string &deal ) npc_trading::transfer_items( trade_win.theirs, np, g->u, from_map, true ); for( item_location *loc_ptr : from_map ) { - loc_ptr->remove_item(); + if( !loc_ptr ) { + continue; + } + item *it = loc_ptr->get_item(); + if( !it ) { + continue; + } + if( it->has_var( "trade_charges" ) && it->count_by_charges() ) { + it->charges -= static_cast( it->get_var( "trade_charges", 0 ) ); + if( it->charges <= 0 ) { + loc_ptr->remove_item(); + } else { + it->erase_var( "trade_charges" ); + } + } else if( it->has_var( "trade_amount" ) ) { + loc_ptr->remove_item(); + } } // NPCs will remember debts, to the limit that they'll extend credit or previous debts diff --git a/src/npctrade.h b/src/npctrade.h index 1413656975fde..2ba4aa91cc0f3 100644 --- a/src/npctrade.h +++ b/src/npctrade.h @@ -2,7 +2,7 @@ #ifndef NPCTRADE_H #define NPCTRADE_H -#include +#include #include #include #include diff --git a/src/omdata.h b/src/omdata.h index cd6c102fbe85e..6b1c53584ef20 100644 --- a/src/omdata.h +++ b/src/omdata.h @@ -453,6 +453,8 @@ class overmap_special void load( const JsonObject &jo, const std::string &src ); void finalize(); void check() const; + // Minimum size of the box that can contain whole overmap special + box dimensions; private: // These locations are the default values if ones are not specified for the individual OMTs. std::set> default_locations; diff --git a/src/options.cpp b/src/options.cpp index b5e6f20971bb1..df472bb059c3b 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -884,8 +884,8 @@ static std::vector build_resource_list( resource_names.emplace_back( resource_name, view_name.empty() ? no_translation( resource_name ) : to_translation( view_name ) ); if( resource_option.count( resource_name ) != 0 ) { - DebugLog( D_ERROR, DC_ALL ) << "Found " << operation_name << " duplicate with name " << - resource_name; + debugmsg( "Found \"%s\" duplicate with name \"%s\" (new definition will be ignored)", + operation_name, resource_name ); } else { resource_option.insert( std::pair( resource_name, resource_dir ) ); } @@ -1140,9 +1140,11 @@ void options_manager::add_options_general() false ); - add( "DANGEROUS_RUNNING", "general", translate_marker( "Dangerous running" ), - translate_marker( "If true, the player will not be prevented from moving into known hazardous tiles while running." ), - false + add( "DANGEROUS_TERRAIN_WARNING_PROMPT", "general", + translate_marker( "Dangerous terrain warning prompt" ), + translate_marker( "Always: You will be prompted to move onto dangerous tiles. Running: You will only be able to move onto dangerous tiles while running and will be prompted. Crouching: You will only be able to move onto a dangerous tile while crouching and will be prompted. Never: You will not be able to move onto a dangerous tile unless running and will not be warned or prompted." ), + { { "ALWAYS", to_translation( "Always" ) }, { "RUNNING", translate_marker( "Running" ) }, { "CROUCHING", translate_marker( "Crouching" ) }, { "NEVER", translate_marker( "Never" ) } }, + "ALWAYS" ); mOptionsSort["general"]++; @@ -1245,11 +1247,6 @@ void options_manager::add_options_general() "ask" ); - add( "MAP_UI_SEARCH_RADIUS", "general", translate_marker( "Map search radius" ), - translate_marker( "Radius around the cursor to search in the map UI. Setting very high may be slow." ), - 10, 4000, 100 - ); - mOptionsSort["general"]++; add( "SOUND_ENABLED", "general", translate_marker( "Sound Enabled" ), @@ -1549,6 +1546,10 @@ void options_manager::add_options_interface() translate_marker( "If true, show item symbols in inventory and pick up menu." ), false ); + add( "AMMO_IN_NAMES", "interface", translate_marker( "Add ammo to weapon/magazine names" ), + translate_marker( "If true, the default ammo is added to weapon and magazine names. For example \"Mosin-Nagant M44 (4/5)\" becomes \"Mosin-Nagant M44 (4/5 7.62x54mm)\"." ), + true + ); mOptionsSort["interface"]++; @@ -1940,9 +1941,9 @@ void options_manager::add_options_world_default() add( "WORLD_END", "world_default", translate_marker( "World end handling" ), translate_marker( "Handling of game world when last character dies." ), { - { "keep", translate_marker( "Keep" ) }, { "reset", translate_marker( "Reset" ) }, - { "delete", translate_marker( "Delete" ) }, { "query", translate_marker( "Query" ) } - }, "keep" + { "reset", translate_marker( "Reset" ) }, { "delete", translate_marker( "Delete" ) }, + { "query", translate_marker( "Query" ) }, { "keep", translate_marker( "Keep" ) } + }, "reset" ); mOptionsSort["world_default"]++; @@ -2691,6 +2692,7 @@ std::string options_manager::show( bool ingame, const bool world_options_only ) // keybinding screen erased the internal borders of main menu, restore it: draw_borders_internal( w_options_header, mapLines ); } else if( action == "QUIT" ) { + catacurses::clear(); catacurses::refresh(); break; } @@ -2819,16 +2821,12 @@ void options_manager::deserialize( JsonIn &jsin ) jsin.start_array(); while( !jsin.end_array() ) { JsonObject joOptions = jsin.get_object(); + joOptions.allow_omitted_members(); const std::string name = migrateOptionName( joOptions.get_string( "name" ) ); const std::string value = migrateOptionValue( joOptions.get_string( "name" ), joOptions.get_string( "value" ) ); - // Verify format of options file - if( !joOptions.has_string( "info" ) || !joOptions.has_string( "default" ) ) { - dbg( D_ERROR ) << "options object " << name << " was missing info or default"; - } - add_retry( name, value ); options[ name ].setValue( value ); } diff --git a/src/output.cpp b/src/output.cpp index ef614fe5b395c..e36ee01f5f4fc 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -1,6 +1,6 @@ #include "output.h" -#include +#include #include #include #include diff --git a/src/output.h b/src/output.h index fe721eef35b14..0003513f2d52b 100644 --- a/src/output.h +++ b/src/output.h @@ -4,7 +4,6 @@ #include #include -#include #include #include #include @@ -665,18 +664,18 @@ std::string enumerate_as_string( const _Container &values, return _( ", " ); } (); - std::ostringstream res; + std::string res; for( auto iter = values.begin(); iter != values.end(); ++iter ) { if( iter != values.begin() ) { if( std::next( iter ) == values.end() ) { - res << final_separator; + res += final_separator; } else { - res << _( ", " ); + res += _( ", " ); } } - res << *iter; + res += *iter; } - return res.str(); + return res; } /** @@ -975,12 +974,12 @@ void refresh_display(); template std::string colorize_symbols( const std::string &str, F color_of ) { - std::ostringstream res; + std::string res; nc_color prev_color = c_unset; const auto closing_tag = [ &res, prev_color ]() { if( prev_color != c_unset ) { - res << ""; + res += ""; } }; @@ -989,16 +988,16 @@ std::string colorize_symbols( const std::string &str, F color_of ) if( prev_color != new_color ) { closing_tag(); - res << ""; + res += ""; prev_color = new_color; } - res << elem; + res += elem; } closing_tag(); - return res.str(); + return res; } #endif diff --git a/src/overmap.cpp b/src/overmap.cpp index 634592fde1c66..1aeed0c2eedec 100644 --- a/src/overmap.cpp +++ b/src/overmap.cpp @@ -582,8 +582,8 @@ void oter_type_t::load( const JsonObject &jo, const std::string &src ) << id.c_str() << " (" << name << ")"; } if( !jo.has_string( "sym" ) && jo.has_number( "sym" ) ) { - DebugLog( D_ERROR, D_MAP_GEN ) << "sym is defined as number instead of string for overmap_terrain: " - << id.c_str() << " (" << name << ")"; + debugmsg( "sym is defined as number instead of string for overmap_terrain %s (%s)", id.c_str(), + name ); } load_overmap_terrain_mapgens( jo, id.str() ); } @@ -726,10 +726,10 @@ bool oter_t::is_hardcoded() const "ants_lab_stairs", "fema", "fema_entrance", - "haz_sar", - "haz_sar_b1", - "haz_sar_entrance", - "haz_sar_entrance_b1", + "haz_sar", // remove after 0.E. + "haz_sar_b1", // remove after 0.E. + "haz_sar_entrance", // remove after 0.E. + "haz_sar_entrance_b1", // remove after 0.E. "ice_lab", "ice_lab_stairs", "ice_lab_core", @@ -911,6 +911,19 @@ void overmap_special::finalize() } } + // Calculate dimensions + tripoint dimension_min; + tripoint dimension_max; + for( auto &t : terrains ) { + dimension_min = tripoint( std::min( dimension_min.x, t.p.x ), + std::min( dimension_min.y, t.p.y ), + std::min( dimension_min.z, t.p.z ) ); + dimension_max = tripoint( std::max( dimension_max.x, t.p.x ), + std::max( dimension_max.y, t.p.y ), + std::max( dimension_max.z, t.p.z ) ); + } + dimensions = box( dimension_min, dimension_max ); + for( auto &elem : connections ) { const auto &oter = get_terrain_at( elem.p ); if( !elem.terrain && oter.terrain ) { @@ -1416,6 +1429,11 @@ void overmap::generate( const overmap *north, const overmap *east, const overmap *south, const overmap *west, overmap_special_batch &enabled_specials ) { + if( g->gametype() == SGAME_DEFENSE ) { + dbg( D_INFO ) << "overmap::generate skipped in Defense special game mode!"; + return; + } + dbg( D_INFO ) << "overmap::generate start…"; populate_connections_out_from_neighbors( north, east, south, west ); @@ -1790,6 +1808,26 @@ void overmap::clear_mon_groups() zg.clear(); } +void overmap::clear_overmap_special_placements() +{ + overmap_special_placements.clear(); +} +void overmap::clear_cities() +{ + cities.clear(); +} +void overmap::clear_connections_out() +{ + connections_out.clear(); +} + +void overmap::place_special_forced( const overmap_special_id &special_id, const tripoint &p, + om_direction::type dir ) +{ + static city invalid_city; + place_special( *special_id, p, dir, invalid_city, false, false ); +} + void mongroup::wander( const overmap &om ) { const city *target_city = nullptr; diff --git a/src/overmap.h b/src/overmap.h index cbaf949d7f2da..b5ba0b8dbc6b6 100644 --- a/src/overmap.h +++ b/src/overmap.h @@ -295,6 +295,11 @@ class overmap } void clear_mon_groups(); + void clear_overmap_special_placements(); + void clear_cities(); + void clear_connections_out(); + void place_special_forced( const overmap_special_id &special_id, const tripoint &p, + om_direction::type dir ); private: std::multimap zg; public: diff --git a/src/overmap_ui.cpp b/src/overmap_ui.cpp index a293bb01cd995..34f9449f87fd2 100644 --- a/src/overmap_ui.cpp +++ b/src/overmap_ui.cpp @@ -1089,14 +1089,9 @@ void create_note( const tripoint &curs ) static bool search( tripoint &curs, const tripoint &orig, const bool show_explored, const bool fast_scroll, std::string &action ) { - const int radius = get_option( "MAP_UI_SEARCH_RADIUS" ); - std::string term = string_input_popup() .title( _( "Search term:" ) ) - .description( string_format( - _( "Multiple entries separated with comma (,). Excludes starting with hyphen (-)\n" - "Current search radius is %d. It can be changed in options." ), - radius ) ) + .description( _( "Multiple entries separated with comma (,). Excludes starting with hyphen (-)." ) ) .query_string(); if( term.empty() ) { return false; @@ -1105,6 +1100,7 @@ static bool search( tripoint &curs, const tripoint &orig, const bool show_explor std::vector locations; std::vector overmap_checked; + const int radius = OMAPX / 2; // arbitrary for( const tripoint &p : points_in_radius( curs, radius ) ) { overmap_with_local_coords om_loc = overmap_buffer.get_existing_om_global( p ); @@ -1330,7 +1326,7 @@ static tripoint display( const tripoint &orig, const draw_data_t &data = draw_da if( data.select != tripoint( -1, -1, -1 ) ) { curs = tripoint( data.select ); } - + bool chosen_water_option = false; // Configure input context for navigating the map. input_context ictxt( "OVERMAP" ); ictxt.register_action( "ANY_INPUT" ); @@ -1429,12 +1425,30 @@ static tripoint display( const tripoint &orig, const draw_data_t &data = draw_da curs.y = p.y; } } else if( action == "CHOOSE_DESTINATION" ) { + path_type ptype; + bool in_vehicle = g->u.in_vehicle && g->u.controlling_vehicle; + const optional_vpart_position vp = g->m.veh_at( g->u.pos() ); + if( vp && in_vehicle ) { + vehicle &veh = vp->vehicle(); + ptype.only_water = veh.can_float() && veh.is_watercraft() && veh.is_in_water(); + ptype.only_road = !ptype.only_water; + } else { + const oter_id oter = overmap_buffer.ter( curs ); + // if we choose a water tile, then we dont need to be prompted if we want to swim + if( is_river_or_lake( oter ) ) { + ptype.amphibious = true; + } else if( !chosen_water_option ) { + if( query_yn( _( "Allow swimming to get to destination?" ) ) ) { + ptype.amphibious = true; + } + chosen_water_option = true; + } + } const tripoint player_omt_pos = g->u.global_omt_location(); if( !g->u.omt_path.empty() && g->u.omt_path.front() == curs ) { if( query_yn( _( "Travel to this point?" ) ) ) { // renew the path incase of a leftover dangling path point - g->u.omt_path = overmap_buffer.get_npc_path( player_omt_pos, curs, g->u.in_vehicle && - g->u.controlling_vehicle ); + g->u.omt_path = overmap_buffer.get_npc_path( player_omt_pos, curs, ptype ); if( g->u.in_vehicle && g->u.controlling_vehicle ) { vehicle *player_veh = veh_pointer_or_null( g->m.veh_at( g->u.pos() ) ); player_veh->omt_path = g->u.omt_path; @@ -1450,8 +1464,7 @@ static tripoint display( const tripoint &orig, const draw_data_t &data = draw_da if( curs == player_omt_pos ) { g->u.omt_path.clear(); } else { - g->u.omt_path = overmap_buffer.get_npc_path( player_omt_pos, curs, g->u.in_vehicle && - g->u.controlling_vehicle ); + g->u.omt_path = overmap_buffer.get_npc_path( player_omt_pos, curs, ptype ); } } else if( action == "TOGGLE_BLINKING" ) { uistate.overmap_blinking = !uistate.overmap_blinking; diff --git a/src/overmapbuffer.cpp b/src/overmapbuffer.cpp index 13a98ced83887..bccaff5c8395b 100644 --- a/src/overmapbuffer.cpp +++ b/src/overmapbuffer.cpp @@ -666,8 +666,14 @@ bool overmapbuffer::reveal( const tripoint ¢er, int radius, return result; } +std::vector overmapbuffer::get_npc_path( const tripoint &src, const tripoint &dest ) +{ + path_type ptype; + return get_npc_path( src, dest, ptype ); +} + std::vector overmapbuffer::get_npc_path( const tripoint &src, const tripoint &dest, - bool road_only ) + path_type &ptype ) { std::vector path; static const int RADIUS = 4; // Maximal radius of search (in overmaps) @@ -692,13 +698,17 @@ std::vector overmapbuffer::get_npc_path( const tripoint &src, const tr int res = 0; const oter_id oter = get_ter_at( cur.pos ); int travel_cost = static_cast( oter->get_travel_cost() ); - if( road_only && ( !is_ot_match( "road", oter, ot_match_type::type ) && - !is_ot_match( "bridge", oter, ot_match_type::type ) && - !is_ot_match( "road_nesw_manhole", oter, ot_match_type::type ) ) ) { + if( ptype.only_road && ( !is_ot_match( "road", oter, ot_match_type::type ) && + !is_ot_match( "bridge", oter, ot_match_type::type ) && + !is_ot_match( "road_nesw_manhole", oter, ot_match_type::type ) ) ) { + return pf::rejected; + } + if( ptype.only_water && ( !is_river_or_lake( oter ) || + is_ot_match( "bridge", oter, ot_match_type::type ) ) ) { return pf::rejected; } if( is_ot_match( "empty_rock", oter, ot_match_type::type ) || - is_ot_match( "open_air", oter, ot_match_type::type ) || oter->is_lake() ) { + is_ot_match( "open_air", oter, ot_match_type::type ) ) { return pf::rejected; } else if( is_ot_match( "forest", oter, ot_match_type::type ) ) { travel_cost = 10; @@ -708,8 +718,8 @@ std::vector overmapbuffer::get_npc_path( const tripoint &src, const tr is_ot_match( "bridge", oter, ot_match_type::type ) || is_ot_match( "road_nesw_manhole", oter, ot_match_type::type ) ) { travel_cost = 1; - } else if( is_river( oter ) ) { - travel_cost = 20; + } else if( is_river_or_lake( oter ) ) { + travel_cost = ptype.only_water || ptype.amphibious ? 1 : 20; } res += travel_cost; res += manhattan_dist( finish, cur.pos ); diff --git a/src/overmapbuffer.h b/src/overmapbuffer.h index 04a5eaafb8bb8..7f8a84d07b84a 100644 --- a/src/overmapbuffer.h +++ b/src/overmapbuffer.h @@ -33,6 +33,12 @@ class vehicle; class basecamp; class map_extra; +struct path_type { + bool only_road = false; + bool only_water = false; + bool amphibious = false; +}; + struct radio_tower_reference { /** The radio tower itself, points into @ref overmap::radios */ radio_tower *tower; @@ -301,8 +307,8 @@ class overmapbuffer bool reveal( const tripoint ¢er, int radius ); bool reveal( const tripoint ¢er, int radius, const std::function &filter ); - std::vector get_npc_path( const tripoint &src, const tripoint &dest, - bool road_only = false ); + std::vector get_npc_path( const tripoint &src, const tripoint &dest ); + std::vector get_npc_path( const tripoint &src, const tripoint &dest, path_type &ptype ); bool reveal_route( const tripoint &source, const tripoint &dest, int radius = 0, bool road_only = false ); /** diff --git a/src/pickup.cpp b/src/pickup.cpp index 863209a068d37..288ea626d3f7b 100644 --- a/src/pickup.cpp +++ b/src/pickup.cpp @@ -567,6 +567,15 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from ) int pickupH = maxitems + pickupBorderRows; int pickupW = 44; + //find max length of item name and resize pickup window width + for( const std::list &cur_list : stacked_here ) { + const item &this_item = *cur_list.front(); + int item_len = utf8_width( remove_color_tags( this_item.display_name() ) ) + 10; + if( item_len > pickupW && item_len < TERMX ) { + pickupW = item_len; + } + } + int itemsW = pickupW; int pickupX = 0; diff --git a/src/pixel_minimap.cpp b/src/pixel_minimap.cpp index 6a00d83ee5584..2c9b59f5fa387 100644 --- a/src/pixel_minimap.cpp +++ b/src/pixel_minimap.cpp @@ -23,13 +23,13 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/src/player.cpp b/src/player.cpp index 34a9bddd36bea..067d76e01bf1e 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -930,12 +930,7 @@ void player::mod_stat( const std::string &stat, float modifier ) } else if( stat == "oxygen" ) { oxygen += modifier; } else if( stat == "stamina" ) { - if( get_stamina() + modifier < 0 ) { - add_effect( effect_winded, 10_turns ); - } mod_stamina( modifier ); - set_stamina( std::min( get_stamina(), get_stamina_max() ) ); - set_stamina( std::max( 0, get_stamina() ) ); } else { // Fall through to the creature method. Character::mod_stat( stat, modifier ); @@ -964,11 +959,18 @@ bool player::has_conflicting_trait( const trait_id &flag ) const bool player::has_opposite_trait( const trait_id &flag ) const { - for( auto &i : flag->cancels ) { + for( const trait_id &i : flag->cancels ) { if( has_trait( i ) ) { return true; } } + for( const std::pair &mut : my_mutations ) { + for( const trait_id &canceled_trait : mut.first->cancels ) { + if( canceled_trait == flag ) { + return true; + } + } + } return false; } @@ -1920,8 +1922,8 @@ void player::apply_damage( Creature *source, body_part hurt, int dam, const bool hp_cur[hurtpart] -= dam_to_bodypart; g->events().send( getID(), dam_to_bodypart ); - if( hp_cur[hurtpart] <= 0 && ( source == nullptr || !source->is_hallucination() ) ) { - if( !weapon.is_null() && !can_wield( weapon ).success() ) { + if( is_limb_broken( hurtpart ) && ( source == nullptr || !source->is_hallucination() ) ) { + if( !weapon.is_null() && can_unwield( weapon ).success() ) { put_into_vehicle_or_drop( *this, item_drop_reason::tumbling, { weapon } ); i_rem( &weapon ); } @@ -2229,7 +2231,7 @@ void player::update_body( const time_point &from, const time_point &to ) reset_activity_level(); } // Radiation kills health even at low doses - update_health( has_trait( trait_RADIOGENIC ) ? 0 : -radiation ); + update_health( has_trait( trait_RADIOGENIC ) ? 0 : -get_rad() ); get_sick(); } @@ -2272,8 +2274,7 @@ void player::update_stomach( const time_point &from, const time_point &to ) // Digest nutrients in guts, they will be distributed to needs levels food_summary digested_to_body = guts.digest( *this, rates, five_mins, half_hours ); // Water from stomach skips guts and gets absorbed by body - set_thirst( std::max( - -100, get_thirst() - units::to_milliliter( digested_to_guts.water ) / 5 ) ); + mod_thirst( - units::to_milliliter( digested_to_guts.water ) / 5 ); guts.ingest( digested_to_guts ); // Apply nutrients, unless this is an NPC and NO_NPC_FOOD is enabled. if( !is_npc() || !get_option( "NO_NPC_FOOD" ) ) { @@ -2340,7 +2341,7 @@ void player::update_stomach( const time_point &from, const time_point &to ) void player::get_sick() { // NPCs are too dumb to handle infections now - if( is_npc() || has_trait( trait_DISIMMUNE ) ) { + if( is_npc() || has_trait_flag( "NO_DISEASE" ) ) { // In a shocking twist, disease immunity prevents diseases. return; } @@ -2830,8 +2831,8 @@ void player::regen( int rate_multiplier ) } } - if( radiation > 0 ) { - radiation = std::max( 0, radiation - roll_remainder( rate_multiplier / 50.0f ) ); + if( get_rad() > 0 ) { + mod_rad( -roll_remainder( rate_multiplier / 50.0f ) ); } } @@ -2997,10 +2998,10 @@ void player::process_one_effect( effect &it, bool is_new ) if( val != 0 ) { mod = 1; if( is_new || it.activated( calendar::turn, "RAD", val, reduced, mod ) ) { - radiation += bound_mod_to_vals( radiation, val, it.get_max_val( "RAD", reduced ), 0 ); + mod_rad( bound_mod_to_vals( get_rad(), val, it.get_max_val( "RAD", reduced ), 0 ) ); // Radiation can't go negative - if( radiation < 0 ) { - radiation = 0; + if( get_rad() < 0 ) { + set_rad( 0 ); } } } @@ -3102,9 +3103,9 @@ void player::process_one_effect( effect &it, bool is_new ) if( val != 0 ) { mod = 1; if( is_new || it.activated( calendar::turn, "STAMINA", val, reduced, mod ) ) { - mod_stat( "stamina", bound_mod_to_vals( get_stamina(), val, - it.get_max_val( "STAMINA", reduced ), - it.get_min_val( "STAMINA", reduced ) ) ); + mod_stamina( bound_mod_to_vals( get_stamina(), val, + it.get_max_val( "STAMINA", reduced ), + it.get_min_val( "STAMINA", reduced ) ) ); } } @@ -3316,10 +3317,10 @@ void player::process_items() } else if( identifier == "adv_UPS_off" ) { ch_UPS += w.ammo_remaining() / 0.6; } - if( !update_required && w.has_flag( "ENCUMBRANCE_UPDATE" ) ) { + if( !update_required && w.encumbrance_update_ ) { update_required = true; } - w.unset_flag( "ENCUMBRANCE_UPDATE" ); + w.encumbrance_update_ = false; } if( update_required ) { reset_encumbrance(); @@ -4042,7 +4043,8 @@ ret_val player::can_wear( const item &it ) const if( it.is_power_armor() ) { for( auto &elem : worn ) { - if( ( elem.get_covered_body_parts() & it.get_covered_body_parts() ).any() ) { + if( ( elem.get_covered_body_parts() & it.get_covered_body_parts() ).any() && + !elem.has_flag( "POWERARMOR_COMPATIBLE" ) ) { return ret_val::make_failure( _( "Can't wear power armor over other gear!" ) ); } } @@ -4071,8 +4073,8 @@ ret_val player::can_wear( const item &it ) const // Only headgear can be worn with power armor, except other power armor components. // You can't wear headgear if power armor helmet is already sitting on your head. bool has_helmet = false; - if( is_wearing_power_armor( &has_helmet ) && - ( has_helmet || !( it.covers( bp_head ) || it.covers( bp_mouth ) || it.covers( bp_eyes ) ) ) ) { + if( !it.has_flag( "POWERARMOR_COMPATIBLE" ) && ( ( is_wearing_power_armor( &has_helmet ) && + ( has_helmet || !( it.covers( bp_head ) || it.covers( bp_mouth ) || it.covers( bp_eyes ) ) ) ) ) ) { return ret_val::make_failure( _( "Can't wear %s with power armor!" ), it.tname() ); } } @@ -4293,19 +4295,6 @@ hint_rating player::rate_action_wear( const item &it ) const return can_wear( it ).success() ? HINT_GOOD : HINT_IFFY; } -hint_rating player::rate_action_change_side( const item &it ) const -{ - if( !is_worn( it ) ) { - return HINT_IFFY; - } - - if( !it.is_sided() ) { - return HINT_CANT; - } - - return HINT_GOOD; -} - bool player::can_reload( const item &it, const itype_id &ammo ) const { if( !it.is_reloadable_with( ammo ) ) { @@ -4770,46 +4759,6 @@ player::wear_item( const item &to_wear, bool interactive ) return new_item_it; } -bool player::change_side( item &it, bool interactive ) -{ - if( !it.swap_side() ) { - if( interactive ) { - add_msg_player_or_npc( m_info, - _( "You cannot swap the side on which your %s is worn." ), - _( " cannot swap the side on which their %s is worn." ), - it.tname() ); - } - return false; - } - - if( interactive ) { - add_msg_player_or_npc( m_info, _( "You swap the side on which your %s is worn." ), - _( " swaps the side on which their %s is worn." ), - it.tname() ); - } - - mod_moves( -250 ); - reset_encumbrance(); - - return true; -} - -bool player::change_side( int pos, bool interactive ) -{ - item &it( i_at( pos ) ); - - if( !is_worn( it ) ) { - if( interactive ) { - add_msg_player_or_npc( m_info, - _( "You are not wearing that item." ), - _( " isn't wearing that item." ) ); - } - return false; - } - - return change_side( it, interactive ); -} - hint_rating player::rate_action_takeoff( const item &it ) const { if( !it.is_armor() ) { @@ -4823,34 +4772,7 @@ hint_rating player::rate_action_takeoff( const item &it ) const return HINT_IFFY; } -std::list player::get_dependent_worn_items( const item &it ) const -{ - std::list dependent; - // Adds dependent worn items recursively - const std::function add_dependent = [ & ]( const item & it ) { - for( const auto &wit : worn ) { - if( &wit == &it || !wit.is_worn_only_with( it ) ) { - continue; - } - const auto iter = std::find_if( dependent.begin(), dependent.end(), - [ &wit ]( const item * dit ) { - return &wit == dit; - } ); - if( iter == dependent.end() ) { // Not in the list yet - add_dependent( wit ); - dependent.push_back( &wit ); - } - } - }; - - if( is_worn( it ) ) { - add_dependent( it ); - } - - return dependent; -} - -ret_val player::can_takeoff( const item &it, const std::list *res ) const +ret_val player::can_takeoff( const item &it, const std::list *res ) { auto iter = std::find_if( worn.begin(), worn.end(), [ &it ]( const item & wit ) { return &it == &wit; @@ -4874,7 +4796,7 @@ ret_val player::can_takeoff( const item &it, const std::list *res ) return ret_val::make_success(); } -bool player::takeoff( const item &it, std::list *res ) +bool player::takeoff( item &it, std::list *res ) { const auto ret = can_takeoff( it, res ); if( !ret.success() ) { @@ -4890,7 +4812,8 @@ bool player::takeoff( const item &it, std::list *res ) if( volume_carried() + it.volume() > volume_capacity_reduced_by( it.get_storage() ) ) { if( is_npc() || query_yn( _( "No room in inventory for your %s. Drop it?" ), colorize( it.tname(), it.color_in_inventory() ) ) ) { - drop( get_item_position( &it ), pos() ); + item_location loc( *this, &it ); + drop( loc, pos() ); return true; // the drop activity ends up taking off the item anyway so shouldn't try to do it again here } else { return false; @@ -5830,7 +5753,7 @@ comfort_level player::base_comfort_value( const tripoint &p ) const } else if( plantsleep ) { if( vp || furn_at_pos != f_null ) { // Sleep ain't happening in a vehicle or on furniture - comfort = static_cast( comfort_level::uncomfortable ); + comfort = static_cast( comfort_level::impossible ); } else { // It's very easy for Chloromorphs to get to sleep on soil! if( ter_at_pos == t_dirt || ter_at_pos == t_pit || ter_at_pos == t_dirtmound || @@ -5843,7 +5766,7 @@ comfort_level player::base_comfort_value( const tripoint &p ) const } // Sleep ain't happening else { - comfort = static_cast( comfort_level::uncomfortable ); + comfort = static_cast( comfort_level::impossible ); } } // Has webforce @@ -5852,7 +5775,7 @@ comfort_level player::base_comfort_value( const tripoint &p ) const // Thick Web and you're good to go comfort += static_cast( comfort_level::very_comfortable ); } else { - comfort = static_cast( comfort_level::uncomfortable ); + comfort = static_cast( comfort_level::impossible ); } } @@ -6350,32 +6273,35 @@ std::string player::weapname( unsigned int truncate ) const } } -bool player::wield_contents( item &container, int pos, bool penalties, int base_cost ) +bool player::wield_contents( item &container, item *internal_item, bool penalties, int base_cost ) { // if index not specified and container has multiple items then ask the player to choose one - if( pos < 0 ) { + if( internal_item == nullptr ) { std::vector opts; std::transform( container.contents.begin(), container.contents.end(), std::back_inserter( opts ), []( const item & elem ) { return elem.display_name(); } ); if( opts.size() > 1 ) { - pos = uilist( _( "Wield what?" ), opts ); + int pos = uilist( _( "Wield what?" ), opts ); if( pos < 0 ) { return false; } } else { - pos = 0; + internal_item = &container.contents.front(); } } - if( pos >= static_cast( container.contents.size() ) ) { + const bool has = std::any_of( container.contents.begin(), + container.contents.end(), [internal_item]( const item & it ) { + return internal_item == ⁢ + } ); + if( !has ) { debugmsg( "Tried to wield non-existent item from container (player::wield_contents)" ); return false; } - auto target = std::next( container.contents.begin(), pos ); - const auto ret = can_wield( *target ); + const ret_val ret = can_wield( *internal_item ); if( !ret.success() ) { add_msg_if_player( m_info, "%s", ret.c_str() ); return false; @@ -6390,8 +6316,10 @@ bool player::wield_contents( item &container, int pos, bool penalties, int base_ inv.unsort(); } - weapon = std::move( *target ); - container.contents.erase( target ); + weapon = std::move( *internal_item ); + container.contents.remove_if( [internal_item]( const item & it ) { + return internal_item == ⁢ + } ); container.on_contents_changed(); inv.update_invlet( weapon ); @@ -6507,7 +6435,7 @@ void player::environmental_revert_effect() set_stim( 0 ); set_pain( 0 ); set_painkiller( 0 ); - radiation = 0; + set_rad( 0 ); recalc_sight_limits(); reset_encumbrance(); diff --git a/src/player.h b/src/player.h index f7a002b23cd5c..b6f4a5d873257 100644 --- a/src/player.h +++ b/src/player.h @@ -122,7 +122,8 @@ enum class rechargeable_cbm { }; enum class comfort_level { - uncomfortable = -999, + impossible = -999, + uncomfortable = -7, neutral = 0, slightly_comfortable = 3, comfortable = 5, @@ -523,7 +524,7 @@ class player : public Character void perform_technique( const ma_technique &technique, Creature &t, damage_instance &di, int &move_cost ); /** Performs special attacks and their effects (poisonous, stinger, etc.) */ - void perform_special_attacks( Creature &t ); + void perform_special_attacks( Creature &t, dealt_damage_instance &dealt_dam ); /** Returns a vector of valid mutation attacks */ std::vector mutation_attacks( Creature &t ) const; @@ -671,6 +672,14 @@ class player : public Character /** Get calorie & vitamin contents for a comestible, taking into * account player traits */ nutrients compute_effective_nutrients( const item & ) const; + /** Get range of possible nutrient content, for a particular recipe, + * depending on choice of ingredients */ + std::pair compute_nutrient_range( + const item &, const recipe_id &, + const cata::flat_set &extra_flags = {} ) const; + /** Same, but across arbitrary recipes */ + std::pair compute_nutrient_range( + const itype_id &, const cata::flat_set &extra_flags = {} ) const; /** Get vitamin usage rate (minutes per unit) accounting for bionics, mutations and effects */ time_duration vitamin_rate( const vitamin_id &vit ) const; @@ -734,7 +743,7 @@ class player : public Character * Check player capable of taking off an item. * @param it Thing to be taken off */ - ret_val can_takeoff( const item &it, const std::list *res = nullptr ) const; + ret_val can_takeoff( const item &it, const std::list *res = nullptr ); /** * Check player capable of wielding an item. @@ -794,14 +803,9 @@ class player : public Character */ cata::optional::iterator> wear_item( const item &to_wear, bool interactive = true ); - /** Swap side on which item is worn; returns false on fail. If interactive is false, don't alert player or drain moves */ - bool change_side( item &it, bool interactive = true ); - bool change_side( int pos, bool interactive = true ); - /** Returns all items that must be taken off before taking off this item */ - std::list get_dependent_worn_items( const item &it ) const; /** Takes off an item, returning false on fail. The taken off item is processed in the interact */ - bool takeoff( const item &it, std::list *res = nullptr ); + bool takeoff( item &it, std::list *res = nullptr ); bool takeoff( int pos ); /** So far only called by unload() from game.cpp */ @@ -816,7 +820,7 @@ class player : public Character * @param penalties Whether item volume and temporary effects (e.g. GRABBED, DOWNED) should be considered. * @param base_cost Cost due to storage type. */ - bool wield_contents( item &container, int pos = 0, bool penalties = true, + bool wield_contents( item &container, item *internal_item = nullptr, bool penalties = true, int base_cost = INVENTORY_HANDLING_PENALTY ); /** * Stores an item inside another consuming moves proportional to weapon skill and volume @@ -881,7 +885,6 @@ class player : public Character * rates usability lower for non-tools (books, etc.) */ hint_rating rate_action_use( const item &it ) const; hint_rating rate_action_wear( const item &it ) const; - hint_rating rate_action_change_side( const item &it ) const; hint_rating rate_action_eat( const item &it ) const; hint_rating rate_action_takeoff( const item &it ) const; hint_rating rate_action_reload( const item &it ) const; diff --git a/src/player_display.cpp b/src/player_display.cpp index 4ff479fe9602a..98b5d3cbc7e71 100644 --- a/src/player_display.cpp +++ b/src/player_display.cpp @@ -127,7 +127,8 @@ void player::print_encumbrance( const catacurses::window &win, const int line, ( highlighted ? c_green : c_light_gray ); mvwprintz( win, point( 1, 1 + i ), limb_color, "%s", out ); // accumulated encumbrance from clothing, plus extra encumbrance from layering - mvwprintz( win, point( 8, 1 + i ), encumb_color( e.encumbrance ), "%3d", e.armor_encumbrance ); + mvwprintz( win, point( 8, 1 + i ), encumb_color( e.encumbrance ), "%3d", + e.encumbrance - e.layer_penalty ); // separator in low toned color mvwprintz( win, point( 11, 1 + i ), c_light_gray, "+" ); // take into account the new encumbrance system for layers @@ -151,39 +152,28 @@ void player::print_encumbrance( const catacurses::window &win, const int line, static std::string swim_cost_text( int moves ) { - return string_format( ngettext( "Swimming costs %+d movement point. ", - "Swimming costs %+d movement points. ", - moves ), - moves ); + return string_format( _( "Swimming movement point cost: %+d\n" ), moves ); } static std::string run_cost_text( int moves ) { - return string_format( ngettext( "Running costs %+d movement point. ", - "Running costs %+d movement points. ", - moves ), - moves ); + return string_format( _( "Running movement point cost: %+d\n" ), moves ); } static std::string reload_cost_text( int moves ) { - return string_format( ngettext( "Reloading costs %+d movement point. ", - "Reloading costs %+d movement points. ", - moves ), - moves ); + return string_format( _( "Reloading movement point cost: %+d\n" ), moves ); } static std::string melee_cost_text( int moves ) { - return string_format( ngettext( "Melee and thrown attacks cost %+d movement point. ", - "Melee and thrown attacks cost %+d movement points. ", - moves ), - moves ); + return string_format( + _( "Melee and thrown attack movement point cost: %+d\n" ), moves ); } static std::string dodge_skill_text( double mod ) { - return string_format( _( "Dodge skill %+.1f. " ), mod ); + return string_format( _( "Dodge skill: %+.1f\n" ), mod ); } static int get_encumbrance( const player &p, body_part bp, bool combine ) @@ -203,7 +193,7 @@ static std::string get_encumbrance_description( const player &p, body_part bp, b switch( bp ) { case bp_torso: { const int melee_roll_pen = std::max( -eff_encumbrance, -80 ); - s += string_format( _( "Melee attack rolls %+d%%; " ), melee_roll_pen ); + s += string_format( _( "Melee attack rolls: %+d%%\n" ), melee_roll_pen ); s += dodge_skill_text( -( eff_encumbrance / 10.0 ) ); s += swim_cost_text( ( eff_encumbrance / 10.0 ) * ( 80 - p.get_skill_level( skill_swimming ) * 3 ) ); @@ -211,29 +201,31 @@ static std::string get_encumbrance_description( const player &p, body_part bp, b break; } case bp_head: - s += _( "Head encumbrance has no effect; it simply limits how much you can put on." ); + s += _( "Head encumbrance has no effect; it simply limits how much you can put on." ); break; case bp_eyes: - s += string_format( _( "Perception %+d when checking traps or firing ranged weapons;\n" - "Dispersion %+d when throwing items." ), - -( eff_encumbrance / 10 ), - eff_encumbrance * 10 ); + s += string_format( + _( "Perception when checking traps or firing ranged weapons: %+d\n" + "Dispersion when throwing items: %+d" ), + -( eff_encumbrance / 10 ), + eff_encumbrance * 10 ); break; case bp_mouth: - s += _( "Covering your mouth will make it more difficult to breathe and catch your breath." ); + s += _( "Covering your mouth will make it more difficult to breathe and catch your breath." ); break; case bp_arm_l: case bp_arm_r: - s += _( "Arm encumbrance affects stamina cost of melee attacks and accuracy with ranged weapons." ); + s += _( "Arm encumbrance affects stamina cost of melee attacks and accuracy with ranged weapons." ); break; case bp_hand_l: case bp_hand_r: - s += _( "Reduces the speed at which you can handle or manipulate items\n" ); + s += _( "Reduces the speed at which you can handle or manipulate items.\n\n" ); s += reload_cost_text( ( eff_encumbrance / 10 ) * 15 ); - s += string_format( _( "Dexterity %+.1f when throwing items;\n" ), -( eff_encumbrance / 10.0f ) ); + s += string_format( _( "Dexterity when throwing items: %+.1f\n" ), + -( eff_encumbrance / 10.0f ) ); s += melee_cost_text( eff_encumbrance / 2 ); - s += "\n"; - s += string_format( _( "Reduces aim speed of guns by %.1f." ), p.aim_speed_encumbrance_modifier() ); + s += string_format( _( "Reduced gun aim speed: %.1f" ), + p.aim_speed_encumbrance_modifier() ); break; case bp_leg_l: case bp_leg_r: @@ -346,7 +338,7 @@ static void draw_stats_tab( const catacurses::window &w_stats, const catacurses: _( "Your weight is a general indicator of how much fat your body has stored up," " which in turn shows how prepared you are to survive for a time without food." " Having too much, or too little, can be unhealthy." ) ); - fold_and_print( w_info, point( 1, 1 + lines ), FULL_SCREEN_WIDTH - 2, c_magenta, + fold_and_print( w_info, point( 1, 1 + lines ), FULL_SCREEN_WIDTH - 2, c_light_gray, you.get_weight_description() ); } wrefresh( w_stats ); @@ -406,7 +398,7 @@ static void draw_encumbrance_tab( const catacurses::window &w_encumb, } const std::string s = get_encumbrance_description( you, bp, combined_here ); // NOLINTNEXTLINE(cata-use-named-point-constants) - fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_magenta, s ); + fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_light_gray, s ); wrefresh( w_info ); action = ctxt.handle_input(); @@ -467,7 +459,7 @@ static void draw_traits_tab( const catacurses::window &w_traits, const catacurse if( line < traitslist.size() ) { const auto &mdata = traitslist[line].obj(); // NOLINTNEXTLINE(cata-use-named-point-constants) - fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_magenta, string_format( + fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_light_gray, string_format( "%s: %s", colorize( mdata.name(), mdata.get_display_color() ), traitslist[line]->desc() ) ); } wrefresh( w_traits ); @@ -537,7 +529,7 @@ static void draw_bionics_tab( const catacurses::window &w_bionics, const catacur } if( line < bionicslist.size() ) { // NOLINTNEXTLINE(cata-use-named-point-constants) - fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_white, "%s", + fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_light_gray, "%s", bionicslist[line].info().description ); } wrefresh( w_bionics ); @@ -611,7 +603,7 @@ static void draw_effects_tab( const catacurses::window &w_effects, const catacur } if( line < actual_size ) { // NOLINTNEXTLINE(cata-use-named-point-constants) - fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_magenta, + fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_light_gray, effect_name_and_text[line].second ); } wrefresh( w_effects ); @@ -764,7 +756,7 @@ static void draw_skills_tab( const catacurses::window &w_skills, const catacurse if( selectedSkill ) { // NOLINTNEXTLINE(cata-use-named-point-constants) - fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_magenta, + fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_light_gray, selectedSkill->description() ); } wrefresh( w_info ); diff --git a/src/player_hardcoded_effects.cpp b/src/player_hardcoded_effects.cpp index 7914c99e38e21..8ee8026192902 100644 --- a/src/player_hardcoded_effects.cpp +++ b/src/player_hardcoded_effects.cpp @@ -1290,13 +1290,11 @@ void player::hardcoded_effects( effect &it ) } } } else if( id == effect_mending ) { - // TODO: Remove this and encapsulate hp_cur instead - if( hp_cur[bp_to_hp( bp )] > 0 ) { + if( !is_limb_broken( bp_to_hp( bp ) ) ) { it.set_duration( 0_turns ); } } else if( id == effect_disabled ) { - // TODO: Remove this and encapsulate hp_cur instead - if( hp_cur[bp_to_hp( bp )] > 0 ) { + if( !is_limb_broken( bp_to_hp( bp ) ) ) { // Just unpause, in case someone added it as a temporary effect (numbing poison etc.) it.unpause_effect(); } diff --git a/src/profession.cpp b/src/profession.cpp index ef58e88775e93..e185f61c6d434 100644 --- a/src/profession.cpp +++ b/src/profession.cpp @@ -37,17 +37,18 @@ static class json_item_substitution void check_consistency(); private: - void do_load( const JsonObject &jo ); - struct trait_requirements { - static trait_requirements load( JsonArray &arr ); - std::vector present, absent; + trait_requirements( const JsonObject &obj ); + trait_requirements() = default; + std::vector present; + std::vector absent; bool meets_condition( const std::vector &traits ) const; }; struct substitution { trait_requirements trait_reqs; struct info { - static info load( JsonArray &arr ); + info( const JsonValue &value ); + info() = default; itype_id new_item; double ratio = 1.0; // new charges / old charges }; @@ -196,19 +197,19 @@ void profession::load( const JsonObject &jo, const std::string & ) optional( items_obj, was_loaded, "both", legacy_starting_items, item_reader {} ); } if( items_obj.has_object( "both" ) ) { - _starting_items = item_group::load_item_group( *items_obj.get_raw( "both" ), "collection" ); + _starting_items = item_group::load_item_group( items_obj.get_member( "both" ), "collection" ); } if( items_obj.has_array( "male" ) ) { optional( items_obj, was_loaded, "male", legacy_starting_items_male, item_reader {} ); } if( items_obj.has_object( "male" ) ) { - _starting_items_male = item_group::load_item_group( *items_obj.get_raw( "male" ), "collection" ); + _starting_items_male = item_group::load_item_group( items_obj.get_member( "male" ), "collection" ); } if( items_obj.has_array( "female" ) ) { optional( items_obj, was_loaded, "female", legacy_starting_items_female, item_reader {} ); } if( items_obj.has_object( "female" ) ) { - _starting_items_female = item_group::load_item_group( *items_obj.get_raw( "female" ), + _starting_items_female = item_group::load_item_group( items_obj.get_member( "female" ), "collection" ); } } @@ -482,39 +483,31 @@ void json_item_substitution::reset() bonuses.clear(); } -json_item_substitution::substitution::info json_item_substitution::substitution::info::load( - JsonArray &arr ) +json_item_substitution::substitution::info::info( const JsonValue &value ) { - json_item_substitution::substitution::info ret; - ret.new_item = arr.next_string(); - if( arr.test_float() && ( ret.ratio = arr.next_float() ) <= 0.0 ) { - arr.throw_error( "Ratio must be positive" ); + if( value.test_string() ) { + new_item = value.get_string(); + } else { + const JsonObject jo = value.get_object(); + new_item = jo.get_string( "item" ); + ratio = jo.get_float( "ratio" ); + if( ratio <= 0.0 ) { + jo.throw_error( "Ratio must be positive", "ratio" ); + } } - return ret; } -json_item_substitution::trait_requirements json_item_substitution::trait_requirements::load( - JsonArray &arr ) +json_item_substitution::trait_requirements::trait_requirements( const JsonObject &obj ) { - trait_requirements ret; - arr.read_next( ret.present ); - if( arr.test_array() ) { - arr.read_next( ret.absent ); + for( const std::string &line : obj.get_array( "present" ) ) { + present.emplace_back( line ); } - return ret; -} - -void json_item_substitution::load( const JsonObject &jo ) -{ - if( !jo.has_array( "substitutions" ) ) { - jo.throw_error( "No `substitutions` array found." ); - } - for( JsonObject subobj : jo.get_array( "substitutions" ) ) { - do_load( subobj ); + for( const std::string &line : obj.get_array( "absent" ) ) { + absent.emplace_back( line ); } } -void json_item_substitution::do_load( const JsonObject &jo ) +void json_item_substitution::load( const JsonObject &jo ) { const bool item_mode = jo.has_string( "item" ); const std::string title = jo.get_string( item_mode ? "item" : "trait" ); @@ -530,32 +523,33 @@ void json_item_substitution::do_load( const JsonObject &jo ) jo.throw_error( "Duplicate definition of item" ); } - if( jo.has_array( "bonus" ) ) { - if( !item_mode ) { - jo.throw_error( "Bonuses can only be used in item mode" ); + if( item_mode ) { + if( jo.has_member( "bonus" ) ) { + bonuses.emplace_back( title, trait_requirements( jo.get_object( "bonus" ) ) ); } - JsonArray arr = jo.get_array( "bonus" ); - bonuses.emplace_back( title, trait_requirements::load( arr ) ); - } else if( !jo.has_array( "sub" ) ) { - jo.throw_error( "Missing sub array" ); - } - for( JsonArray line : jo.get_array( "sub" ) ) { - substitution s; - const itype_id old_it = item_mode ? title : line.next_string(); - if( item_mode ) { - s.trait_reqs = trait_requirements::load( line ); - } else { + for( const JsonValue &sub : jo.get_array( "sub" ) ) { + substitution s; + JsonObject obj = sub.get_object(); + s.trait_reqs = trait_requirements( obj ); + for( const JsonValue &info : obj.get_array( "new" ) ) { + s.infos.emplace_back( info ); + } + substitutions[title].push_back( s ); + } + } else { + for( const JsonObject &sub : jo.get_array( "sub" ) ) { + substitution s; + const itype_id old_it = sub.get_string( "item" ); if( check_duplicate_item( old_it ) ) { - line.throw_error( "Duplicate definition of item" ); + sub.throw_error( "Duplicate definition of item" ); } s.trait_reqs.present.push_back( trait_id( title ) ); + for( const JsonValue &info : sub.get_array( "new" ) ) { + s.infos.emplace_back( info ); + } + substitutions[old_it].push_back( s ); } - // Error if the array doesn't have at least one new_item - do { - s.infos.push_back( substitution::info::load( line ) ); - } while( line.has_more() ); - substitutions[old_it].push_back( s ); } } diff --git a/src/ranged.cpp b/src/ranged.cpp index ee51786d0c8f5..e84bbcb69c1cd 100644 --- a/src/ranged.cpp +++ b/src/ranged.cpp @@ -595,7 +595,7 @@ dealt_projectile_attack player::throw_item( const tripoint &target, const item & } } if( !throw_assist ) { - mod_stat( "stamina", stamina_cost ); + mod_stamina( stamina_cost ); } const skill_id &skill_used = skill_throw; @@ -1254,6 +1254,8 @@ std::vector target_handler::target_ui( player &pc, target_mode mode, sight_dispersion = pc.effective_dispersion( relevant->sight_dispersion() ); } + const bool allow_zlevel_shift = g->m.has_zlevels() && get_option( "FOV_3D" ); + const tripoint src = pc.pos(); tripoint dst = pc.pos(); @@ -1549,7 +1551,7 @@ std::vector target_handler::target_ui( player &pc, target_mode mode, action = aim_mode->action; } - if( g->m.has_zlevels() && ( action == "LEVEL_UP" || action == "LEVEL_DOWN" ) ) { + if( allow_zlevel_shift && ( action == "LEVEL_UP" || action == "LEVEL_DOWN" ) ) { // Just determine our delta-z. const int dz = action == "LEVEL_UP" ? 1 : -1; diff --git a/src/recipe.cpp b/src/recipe.cpp index 23979151f4f80..c17b6d77a9260 100644 --- a/src/recipe.cpp +++ b/src/recipe.cpp @@ -483,6 +483,23 @@ std::string recipe::result_name() const return name; } +bool recipe::will_be_blacklisted() const +{ + if( requirements_.is_blacklisted() ) { + return true; + } + + auto any_is_blacklisted = []( const std::vector> &reqs ) { + auto req_is_blacklisted = []( const std::pair &req ) { + return req.first->is_blacklisted(); + }; + + return std::any_of( reqs.begin(), reqs.end(), req_is_blacklisted ); + }; + + return any_is_blacklisted( reqs_internal ) || any_is_blacklisted( reqs_external ); +} + std::function recipe::get_component_filter() const { const item result = create_result(); diff --git a/src/recipe.h b/src/recipe.h index ea75db9f922a5..c5170b370e963 100644 --- a/src/recipe.h +++ b/src/recipe.h @@ -62,6 +62,10 @@ class recipe return requirements_.is_blacklisted(); } + // Slower equivalent of is_blacklisted that needs to be used before + // recipe finalization happens + bool will_be_blacklisted() const; + std::function get_component_filter() const; /** Prevent this recipe from ever being added to the player's learned recipies ( used for special NPC crafting ) */ diff --git a/src/recipe_dictionary.cpp b/src/recipe_dictionary.cpp index 81c6c951f919b..68efd587926c7 100644 --- a/src/recipe_dictionary.cpp +++ b/src/recipe_dictionary.cpp @@ -5,6 +5,7 @@ #include #include +#include "cata_algo.h" #include "cata_utility.h" #include "init.h" #include "item.h" @@ -332,6 +333,11 @@ std::map::const_iterator recipe_dictionary::end() const return recipes.end(); } +bool recipe_dictionary::is_item_on_loop( const itype_id &i ) const +{ + return items_on_loops.count( i ); +} + void recipe_dictionary::finalize_internal( std::map &obj ) { for( auto &elem : obj ) { @@ -357,6 +363,49 @@ void recipe_dictionary::finalize_internal( std::map &obj ) } ); } +void recipe_dictionary::find_items_on_loops() +{ + // Check for infinite recipe loops in food (which are problematic for + // nutrient calculations). + // + // Start by building a directed graph of itypes to potential components of + // those itypes. + items_on_loops.clear(); + std::unordered_map> potential_components_of; + for( const itype *i : item_controller->all() ) { + if( !i->comestible || i->item_tags.count( "NUTRIENT_OVERRIDE" ) ) { + continue; + } + std::vector &potential_components = potential_components_of[i->get_id()]; + for( const recipe_id &rec : i->recipes ) { + const requirement_data requirements = rec->requirements(); + const requirement_data::alter_item_comp_vector &component_requirements = + requirements.get_components(); + + for( const std::vector &component_options : component_requirements ) { + for( const item_comp &component_option : component_options ) { + potential_components.push_back( component_option.type ); + } + } + } + } + + // Now check that graph for loops + std::vector> loops = cata::find_cycles( potential_components_of ); + for( const std::vector &loop : loops ) { + std::string error_message = + "loop in comestible recipes detected: " + loop.back(); + for( const itype_id &i : loop ) { + error_message += " -> " + i; + items_on_loops.insert( i ); + } + error_message += ". Such loops can be broken by either removing or altering " + "recipes or marking one of the items involved with the NUTRIENT_OVERRIDE " + "flag"; + debugmsg( error_message ); + } +} + void recipe_dictionary::finalize() { DynamicDataLoader::get_instance().load_deferred( deferred ); @@ -416,6 +465,8 @@ void recipe_dictionary::finalize() recipe_dict.blueprints.insert( &e.second ); } } + + recipe_dict.find_items_on_loops(); } void recipe_dictionary::reset() @@ -424,6 +475,7 @@ void recipe_dictionary::reset() recipe_dict.autolearn.clear(); recipe_dict.recipes.clear(); recipe_dict.uncraft.clear(); + recipe_dict.items_on_loops.clear(); } void recipe_dictionary::delete_if( const std::function &pred ) diff --git a/src/recipe_dictionary.h b/src/recipe_dictionary.h index dcd0bafaaf1c0..9e9ab4ee6d8f6 100644 --- a/src/recipe_dictionary.h +++ b/src/recipe_dictionary.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "recipe.h" @@ -39,6 +40,8 @@ class recipe_dictionary std::map::const_iterator begin() const; std::map::const_iterator end() const; + bool is_item_on_loop( const itype_id & ) const; + /** Returns disassembly recipe (or null recipe if no match) */ static const recipe &get_uncraft( const itype_id &id ); @@ -63,8 +66,10 @@ class recipe_dictionary std::map uncraft; std::set autolearn; std::set blueprints; + std::unordered_set items_on_loops; static void finalize_internal( std::map &obj ); + void find_items_on_loops(); }; extern recipe_dictionary recipe_dict; diff --git a/src/recipe_groups.cpp b/src/recipe_groups.cpp index 6c1987dfa145a..11a666ec39c9f 100644 --- a/src/recipe_groups.cpp +++ b/src/recipe_groups.cpp @@ -57,7 +57,7 @@ void recipe_group_data::check() const { for( const auto &a : recipes ) { if( !a.first.is_valid() ) { - debugmsg( "%s is not a valid recipe", a.second ); + debugmsg( "%s is not a valid recipe", a.first.c_str() ); } } } diff --git a/src/regional_settings.cpp b/src/regional_settings.cpp index 24a72990e289e..0b90d3c203ea5 100644 --- a/src/regional_settings.cpp +++ b/src/regional_settings.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include @@ -760,10 +761,24 @@ void groundcover_extra::finalize() // FIXME: return bool for failure } if( wtotal > 1000000 ) { - debugmsg( "plant coverage total exceeds 100%%" ); + std::stringstream ss; + for( auto it = percent_str.begin(); it != percent_str.end(); ++it ) { + if( it != percent_str.begin() ) { + ss << '+'; + } + ss << it->second; + } + debugmsg( "plant coverage total (%s=%de-4) exceeds 100%%", ss.str(), wtotal ); } if( btotal > 1000000 ) { - debugmsg( "boosted plant coverage total exceeds 100%%" ); + std::stringstream ss; + for( auto it = boosted_percent_str.begin(); it != boosted_percent_str.end(); ++it ) { + if( it != boosted_percent_str.begin() ) { + ss << '+'; + } + ss << it->second; + } + debugmsg( "boosted plant coverage total (%s=%de-4) exceeds 100%%", ss.str(), btotal ); } tf_id.furn = f_null; diff --git a/src/requirements.cpp b/src/requirements.cpp index 27e0060b921c4..3563635cbca89 100644 --- a/src/requirements.cpp +++ b/src/requirements.cpp @@ -1,10 +1,9 @@ #include "requirements.h" -#include +#include #include #include #include -#include #include #include #include @@ -156,9 +155,9 @@ std::string item_comp::to_string( const int batch, const int avail ) const } } -void quality_requirement::load( JsonArray &jsarr ) +void quality_requirement::load( const JsonValue &value ) { - JsonObject quality_data = jsarr.next_object(); + const JsonObject quality_data = value.get_object(); type = quality_id( quality_data.get_string( "id" ) ); level = quality_data.get_int( "level", 1 ); count = quality_data.get_int( "amount", 1 ); @@ -168,27 +167,27 @@ void quality_requirement::load( JsonArray &jsarr ) // Note: level is not checked, negative values and 0 are allow, see butchering quality. } -void tool_comp::load( JsonArray &ja ) +void tool_comp::load( const JsonValue &value ) { - if( ja.test_string() ) { + if( value.test_string() ) { // constructions uses this format: [ "tool", ... ] - type = ja.next_string(); + type = value.get_string(); count = -1; } else { - JsonArray comp = ja.next_array(); + JsonArray comp = value.get_array(); type = comp.get_string( 0 ); count = comp.get_int( 1 ); requirement = comp.size() > 2 && comp.get_string( 2 ) == "LIST"; } if( count == 0 ) { - ja.throw_error( "tool count must not be 0" ); + value.throw_error( "tool count must not be 0" ); } // Note: negative count means charges (of the tool) should be consumed } -void item_comp::load( JsonArray &ja ) +void item_comp::load( const JsonValue &value ) { - JsonArray comp = ja.next_array(); + JsonArray comp = value.get_array(); type = comp.get_string( 0 ); count = comp.get_int( 1 ); size_t handled = 2; @@ -201,20 +200,19 @@ void item_comp::load( JsonArray &ja ) } } if( count <= 0 ) { - ja.throw_error( "item count must be a positive number" ); + value.throw_error( "item count must be a positive number" ); } } template -void requirement_data::load_obj_list( JsonArray &jsarr, std::vector< std::vector > &objs ) +void requirement_data::load_obj_list( const JsonArray &jsarr, std::vector< std::vector > &objs ) { - while( jsarr.has_more() ) { - if( jsarr.test_array() ) { + for( const JsonValue &entry : jsarr ) { + if( entry.test_array() ) { std::vector choices; - JsonArray ja = jsarr.next_array(); - while( ja.has_more() ) { + for( const JsonValue &subentry : entry.get_array() ) { choices.push_back( T() ); - choices.back().load( ja ); + choices.back().load( subentry ); } if( !choices.empty() ) { objs.push_back( choices ); @@ -223,7 +221,7 @@ void requirement_data::load_obj_list( JsonArray &jsarr, std::vector< std::vector // tool qualities don't normally use a list of alternatives // each quality is mandatory. objs.push_back( std::vector( 1 ) ); - objs.back().back().load( jsarr ); + objs.back().back().load( entry ); } } } @@ -268,12 +266,9 @@ void requirement_data::load_requirement( const JsonObject &jsobj, const requirem { requirement_data req; - JsonArray jsarr = jsobj.get_array( "components" ); - requirement_data::load_obj_list( jsarr, req.components ); - jsarr = jsobj.get_array( "qualities" ); - requirement_data::load_obj_list( jsarr, req.qualities ); - jsarr = jsobj.get_array( "tools" ); - requirement_data::load_obj_list( jsarr, req.tools ); + load_obj_list( jsobj.get_array( "components" ), req.components ); + load_obj_list( jsobj.get_array( "qualities" ), req.qualities ); + load_obj_list( jsobj.get_array( "tools" ), req.tools ); if( !id.is_null() ) { req.id_ = id; @@ -311,65 +306,65 @@ template std::string requirement_data::print_all_objs( const std::string &header, const std::vector< std::vector > &objs ) { - std::ostringstream buffer; + std::string buffer; for( const auto &list : objs ) { - if( !buffer.str().empty() ) { - buffer << "\n" << _( "and " ); + if( !buffer.empty() ) { + buffer += std::string( "\n" ) + _( "and " ); } for( auto it = list.begin(); it != list.end(); ++it ) { if( it != list.begin() ) { - buffer << _( " or " ); + buffer += _( " or " ); } - buffer << it->to_string(); + buffer += it->to_string(); } } - if( buffer.str().empty() ) { + if( buffer.empty() ) { return std::string(); } - return header + "\n" + buffer.str() + "\n"; + return header + "\n" + buffer + "\n"; } std::string requirement_data::list_all() const { - std::ostringstream buffer; - buffer << print_all_objs( _( "These tools are required:" ), tools ); - buffer << print_all_objs( _( "These tools are required:" ), qualities ); - buffer << print_all_objs( _( "These components are required:" ), components ); - return buffer.str(); + std::string buffer; + buffer += print_all_objs( _( "These tools are required:" ), tools ); + buffer += print_all_objs( _( "These tools are required:" ), qualities ); + buffer += print_all_objs( _( "These components are required:" ), components ); + return buffer; } template std::string requirement_data::print_missing_objs( const std::string &header, const std::vector< std::vector > &objs ) { - std::ostringstream buffer; + std::string buffer; for( const auto &list : objs ) { if( any_marked_available( list ) ) { continue; } - if( !buffer.str().empty() ) { - buffer << "\n" << _( "and " ); + if( !buffer.empty() ) { + buffer += std::string( "\n" ) + _( "and " ); } for( auto it = list.begin(); it != list.end(); ++it ) { if( it != list.begin() ) { - buffer << _( " or " ); + buffer += _( " or " ); } - buffer << it->to_string(); + buffer += it->to_string(); } } - if( buffer.str().empty() ) { + if( buffer.empty() ) { return std::string(); } - return header + "\n" + buffer.str() + "\n"; + return header + "\n" + buffer + "\n"; } std::string requirement_data::list_missing() const { - std::ostringstream buffer; - buffer << print_missing_objs( _( "These tools are missing:" ), tools ); - buffer << print_missing_objs( _( "These tools are missing:" ), qualities ); - buffer << print_missing_objs( _( "These components are missing:" ), components ); - return buffer.str(); + std::string buffer; + buffer += print_missing_objs( _( "These tools are missing:" ), tools ); + buffer += print_missing_objs( _( "These tools are missing:" ), qualities ); + buffer += print_missing_objs( _( "These components are missing:" ), components ); + return buffer; } void quality_requirement::check_consistency( const std::string &display_name ) const diff --git a/src/requirements.h b/src/requirements.h index 452558e2273e0..7fbf2a84c84ac 100644 --- a/src/requirements.h +++ b/src/requirements.h @@ -14,6 +14,7 @@ #include "type_id.h" class nc_color; +class JsonValue; class JsonObject; class JsonArray; class JsonIn; @@ -76,7 +77,7 @@ struct tool_comp : public component { tool_comp() = default; tool_comp( const itype_id &TYPE, int COUNT ) : component( TYPE, COUNT ) { } - void load( JsonArray &ja ); + void load( const JsonValue &value ); bool has( const inventory &crafting_inv, const std::function &filter, int batch = 1, std::function visitor = std::function() ) const; std::string to_string( int batch = 1, int avail = 0 ) const; @@ -92,7 +93,7 @@ struct item_comp : public component { item_comp() = default; item_comp( const itype_id &TYPE, int COUNT ) : component( TYPE, COUNT ) { } - void load( JsonArray &ja ); + void load( const JsonValue &value ); bool has( const inventory &crafting_inv, const std::function &filter, int batch = 1, std::function visitor = std::function() ) const; std::string to_string( int batch = 1, int avail = 0 ) const; @@ -114,7 +115,7 @@ struct quality_requirement { quality_requirement( const quality_id &TYPE, int COUNT, int LEVEL ) : type( TYPE ), count( COUNT ), level( LEVEL ) { } - void load( JsonArray &jsarr ); + void load( const JsonValue &value ); bool has( const inventory &crafting_inv, const std::function &filter, int = 0, std::function visitor = std::function() ) const; std::string to_string( int batch = 1, int avail = 0 ) const; @@ -142,8 +143,8 @@ struct quality_requirement { * * Requirements (item_comp, tool_comp, quality_requirement) must have those * functions: - * Load from the next entry of the json array: - * void load(JsonArray &jarr); + * Load from an entry of a json array: + * void load(const JsonValue &value); * Check whether the player has fulfills the requirement with this crafting * inventory (or by mutation): * bool has(const inventory &crafting_inv) const; @@ -326,7 +327,7 @@ struct requirement_data { template static bool any_marked_available( const std::vector &comps ); template - static void load_obj_list( JsonArray &jsarr, std::vector< std::vector > &objs ); + static void load_obj_list( const JsonArray &jsarr, std::vector< std::vector > &objs ); template static const T *find_by_type( const std::vector< std::vector > &vec, const ID &type ); }; diff --git a/src/rng.cpp b/src/rng.cpp index 8acab811637a2..63a643e183d54 100644 --- a/src/rng.cpp +++ b/src/rng.cpp @@ -1,6 +1,6 @@ #include "rng.h" -#include +#include #include #include diff --git a/src/safemode_ui.cpp b/src/safemode_ui.cpp index ae03647b6a93f..d4b1fdbee119e 100644 --- a/src/safemode_ui.cpp +++ b/src/safemode_ui.cpp @@ -682,7 +682,7 @@ void safemode::load( const bool is_character_in ) JsonIn jsin( fin ); deserialize( jsin ); } catch( const JsonError &e ) { - DebugLog( D_ERROR, DC_ALL ) << "safemode::load: " << e; + debugmsg( "Error while loading safemode settings: %s", e.what() ); } } diff --git a/src/savegame.cpp b/src/savegame.cpp index 6aaa00943c8f7..136722172e72e 100644 --- a/src/savegame.cpp +++ b/src/savegame.cpp @@ -49,7 +49,7 @@ extern std::map> quick_shortcuts_map; * Changes that break backwards compatibility should bump this number, so the game can * load a legacy format loader. */ -const int savegame_version = 25; +const int savegame_version = 26; /* * This is a global set by detected version header in .sav, maps.txt, or overmap. @@ -706,7 +706,6 @@ void overmap::convert_terrain( const std::unordered_map & old.compare( 0, 5, "cabin" ) == 0 || old.compare( 0, 5, "pond_" ) == 0 || old.compare( 0, 6, "bandit" ) == 0 || - old.compare( 0, 7, "haz_sar" ) == 0 || old.compare( 0, 7, "shelter" ) == 0 || old.compare( 0, 8, "campsite" ) == 0 || old.compare( 0, 9, "pwr_large" ) == 0 || @@ -786,6 +785,60 @@ void overmap::convert_terrain( const std::unordered_map & } else { debugmsg( "Malformed Megastore" ); } + + } else if( old.compare( 0, 7, "haz_sar" ) == 0 ) { + if( old == "haz_sar_entrance" || old == "haz_sar_entrance_north" ) { + ter_set( pos, oter_id( "haz_sar_1_1_north" ) ); + ter_set( pos + point_west, oter_id( "haz_sar_1_2_north" ) ); + ter_set( pos + point_south, oter_id( "haz_sar_1_3_north" ) ); + ter_set( pos + point_south_west, oter_id( "haz_sar_1_4_north" ) ); + } else if( old == "haz_sar_entrance_south" ) { + ter_set( pos, oter_id( "haz_sar_1_1_south" ) ); + ter_set( pos + point_north, oter_id( "haz_sar_1_2_south" ) ); + ter_set( pos + point_west, oter_id( "haz_sar_1_3_south" ) ); + ter_set( pos + point_north_west, oter_id( "haz_sar_1_4_south" ) ); + } else if( old == "haz_sar_entrance_east" ) { + ter_set( pos, oter_id( "haz_sar_1_1_east" ) ); + ter_set( pos + point_north, oter_id( "haz_sar_1_2_east" ) ); + ter_set( pos + point_west, oter_id( "haz_sar_1_3_east" ) ); + ter_set( pos + point_north_west, oter_id( "haz_sar_1_4_east" ) ); + } else if( old == "haz_sar_entrance_west" ) { + ter_set( pos, oter_id( "haz_sar_1_1_west" ) ); + ter_set( pos + point_south, oter_id( "haz_sar_1_2_west" ) ); + ter_set( pos + point_east, oter_id( "haz_sar_1_3_west" ) ); + ter_set( pos + point_south_east, oter_id( "haz_sar_1_4_west" ) ); + } + + if( old == "haz_sar_entrance_b1" || old == "haz_sar_entrance_b1_north" ) { + ter_set( pos, oter_id( "haz_sar_b_1_north" ) ); + ter_set( pos + point_west, oter_id( "haz_sar_b_2_north" ) ); + ter_set( pos + point_south, oter_id( "haz_sar_b_3_north" ) ); + ter_set( pos + point_south_west, oter_id( "haz_sar_b_4_north" ) ); + } else if( old == "haz_sar_entrance_b1_south" ) { + ter_set( pos, oter_id( "haz_sar_b_1_south" ) ); + ter_set( pos + point_north, oter_id( "haz_sar_b_2_south" ) ); + ter_set( pos + point_west, oter_id( "haz_sar_b_3_south" ) ); + ter_set( pos + point_north_west, oter_id( "haz_sar_b_4_south" ) ); + } else if( old == "haz_sar_entrance_b1_east" ) { + ter_set( pos, oter_id( "haz_sar_b_1_east" ) ); + ter_set( pos + point_north, oter_id( "haz_sar_b_2_east" ) ); + ter_set( pos + point_west, oter_id( "haz_sar_b_3_east" ) ); + ter_set( pos + point_north_west, oter_id( "haz_sar_b_4_east" ) ); + } else if( old == "haz_sar_entrance_b1_west" ) { + ter_set( pos, oter_id( "haz_sar_b_1_west" ) ); + ter_set( pos + point_south, oter_id( "haz_sar_b_2_west" ) ); + ter_set( pos + point_east, oter_id( "haz_sar_b_3_west" ) ); + ter_set( pos + point_south_east, oter_id( "haz_sar_b_4_west" ) ); + } + + } else if( old == "house_base_north" ) { + ter_set( pos, oter_id( "house_north" ) ); + } else if( old == "house_base_south" ) { + ter_set( pos, oter_id( "house_south" ) ); + } else if( old == "house_base_east" ) { + ter_set( pos, oter_id( "house_east" ) ); + } else if( old == "house_base_west" ) { + ter_set( pos, oter_id( "house_west" ) ); } for( const auto &conv : nearby ) { diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index 4629e0ea02a3f..3545b43368581 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -5,7 +5,7 @@ #include "npc_favor.h" // IWYU pragma: associated #include "pldata.h" // IWYU pragma: associated -#include +#include #include #include #include @@ -1826,20 +1826,18 @@ void monster::load( const JsonObject &data ) // sp_timeout indicates an old save, prior to the special_attacks refactor if( data.has_array( "sp_timeout" ) ) { JsonArray parray = data.get_array( "sp_timeout" ); - if( !parray.empty() ) { - int index = 0; - int ptimeout = 0; - while( parray.has_more() && index < static_cast( type->special_attacks_names.size() ) ) { - if( parray.read_next( ptimeout ) ) { - // assume timeouts saved in same order as current monsters.json listing - const std::string &aname = type->special_attacks_names[index++]; - auto &entry = special_attacks[aname]; - if( ptimeout >= 0 ) { - entry.cooldown = ptimeout; - } else { // -1 means disabled, unclear what <-1 values mean in old saves - entry.cooldown = type->special_attacks.at( aname )->cooldown; - entry.enabled = false; - } + size_t index = 0; + int ptimeout = 0; + while( parray.has_more() && index < type->special_attacks_names.size() ) { + if( parray.read_next( ptimeout ) ) { + // assume timeouts saved in same order as current monsters.json listing + const std::string &aname = type->special_attacks_names[index++]; + auto &entry = special_attacks[aname]; + if( ptimeout >= 0 ) { + entry.cooldown = ptimeout; + } else { // -1 means disabled, unclear what <-1 values mean in old saves + entry.cooldown = type->special_attacks.at( aname )->cooldown; + entry.enabled = false; } } } @@ -2084,8 +2082,8 @@ void item::io( Archive &archive ) archive.io( "item_vars", item_vars, io::empty_default_tag() ); // TODO: change default to empty string archive.io( "name", corpse_name, std::string() ); - archive.io( "owner", owner ); - archive.io( "old_owner", old_owner ); + archive.io( "owner", owner, owner.NULL_ID() ); + archive.io( "old_owner", old_owner, old_owner.NULL_ID() ); archive.io( "invlet", invlet, '\0' ); archive.io( "damaged", damage_, 0 ); archive.io( "active", active, false ); diff --git a/src/sdl_utils.cpp b/src/sdl_utils.cpp index cdd776328baae..3b47c1b557009 100644 --- a/src/sdl_utils.cpp +++ b/src/sdl_utils.cpp @@ -2,7 +2,7 @@ #include "sdl_utils.h" -#include +#include #include #include "color.h" diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp index 7dc3d76ff473e..382e836634376 100644 --- a/src/sdltiles.cpp +++ b/src/sdltiles.cpp @@ -3,7 +3,7 @@ #include "sdltiles.h" // IWYU pragma: associated #include "cursesdef.h" // IWYU pragma: associated -#include +#include #include #include #include @@ -109,16 +109,16 @@ class Font { public: Font( int w, int h ) : -#if defined(__ANDROID__) - opacity( 1.0f ), -#endif fontwidth( w ), fontheight( h ) { } virtual ~Font() = default; + + virtual bool isGlyphProvided( const std::string &ch ) const = 0; /** * Draw character t at (x,y) on the screen, * using (curses) color. */ - virtual void OutputChar( const std::string &ch, int x, int y, unsigned char color ) = 0; + virtual void OutputChar( const std::string &ch, int x, int y, + unsigned char color, float opacity = 1.0f ) = 0; virtual void draw_ascii_lines( unsigned char line_id, int drawx, int drawy, int FG ) const; bool draw_window( const catacurses::window &w ); bool draw_window( const catacurses::window &w, int offsetx, int offsety ); @@ -126,9 +126,6 @@ class Font static std::unique_ptr load_font( const std::string &typeface, int fontsize, int fontwidth, int fontheight, bool fontblending ); public: -#if defined(__ANDROID__) - float opacity; // 0-1 -#endif // the width of the font, background is always this size int fontwidth; // the height of the font, background is always this size @@ -144,7 +141,9 @@ class CachedTTFFont : public Font CachedTTFFont( int w, int h, std::string typeface, int fontsize, bool fontblending ); ~CachedTTFFont() override = default; - void OutputChar( const std::string &ch, int x, int y, unsigned char color ) override; + bool isGlyphProvided( const std::string &ch ) const override; + void OutputChar( const std::string &ch, int x, int y, + unsigned char color, float opacity = 1.0f ) override; protected: SDL_Texture_Ptr create_glyph( const std::string &ch, int color ); @@ -181,15 +180,33 @@ class BitmapFont : public Font BitmapFont( int w, int h, const std::string &typeface_path ); ~BitmapFont() override = default; - void OutputChar( const std::string &ch, int x, int y, unsigned char color ) override; - void OutputChar( int t, int x, int y, unsigned char color ); + bool isGlyphProvided( const std::string &ch ) const override; + void OutputChar( const std::string &ch, int x, int y, + unsigned char color, float opacity = 1.0f ) override; + void OutputChar( int t, int x, int y, + unsigned char color, float opacity = 1.0f ); void draw_ascii_lines( unsigned char line_id, int drawx, int drawy, int FG ) const override; protected: std::array::COLOR_NAMES_COUNT> ascii; int tilewidth; }; -static std::unique_ptr font; +class FontFallbackList : public Font +{ + public: + FontFallbackList( int w, int h, const std::vector &typefaces, + int fontsize, bool fontblending ); + ~FontFallbackList() override = default; + + bool isGlyphProvided( const std::string &ch ) const override; + void OutputChar( const std::string &ch, int x, int y, + unsigned char color, float opacity = 1.0f ) override; + protected: + std::vector> fonts; + std::map>::iterator> glyph_font; +}; + +static std::unique_ptr font; static std::unique_ptr map_font; static std::unique_ptr overmap_font; @@ -656,8 +673,13 @@ SDL_Texture_Ptr CachedTTFFont::create_glyph( const std::string &ch, const int co return CreateTextureFromSurface( renderer, sglyph ); } +bool CachedTTFFont::isGlyphProvided( const std::string &ch ) const +{ + return TTF_GlyphIsProvided( font.get(), UTF8_getch( ch ) ); +} + void CachedTTFFont::OutputChar( const std::string &ch, const int x, const int y, - const unsigned char color ) + const unsigned char color, const float opacity ) { key_t key {ch, static_cast( color & 0xf )}; @@ -676,51 +698,105 @@ void CachedTTFFont::OutputChar( const std::string &ch, const int x, const int y, return; } SDL_Rect rect {x, y, value.width, fontheight}; -#if defined(__ANDROID__) if( opacity != 1.0f ) { SDL_SetTextureAlphaMod( value.texture.get(), opacity * 255.0f ); } -#endif RenderCopy( renderer, value.texture, nullptr, &rect ); -#if defined(__ANDROID__) if( opacity != 1.0f ) { SDL_SetTextureAlphaMod( value.texture.get(), 255 ); } -#endif } -void BitmapFont::OutputChar( const std::string &ch, int x, int y, unsigned char color ) +bool BitmapFont::isGlyphProvided( const std::string &ch ) const { - const int t = UTF8_getch( ch ); - BitmapFont::OutputChar( t, x, y, color ); + const uint32_t t = UTF8_getch( ch ); + switch( t ) { + case LINE_XOXO_UNICODE: + case LINE_OXOX_UNICODE: + case LINE_XXOO_UNICODE: + case LINE_OXXO_UNICODE: + case LINE_OOXX_UNICODE: + case LINE_XOOX_UNICODE: + case LINE_XXXO_UNICODE: + case LINE_XXOX_UNICODE: + case LINE_XOXX_UNICODE: + case LINE_OXXX_UNICODE: + case LINE_XXXX_UNICODE: + return true; + default: + return t < 256; + } } -void BitmapFont::OutputChar( int t, int x, int y, unsigned char color ) +void BitmapFont::OutputChar( const std::string &ch, const int x, const int y, + const unsigned char color, const float opacity ) { - if( t > 256 ) { - return; - } - SDL_Rect src; - src.x = ( t % tilewidth ) * fontwidth; - src.y = ( t / tilewidth ) * fontheight; - src.w = fontwidth; - src.h = fontheight; - SDL_Rect rect; - rect.x = x; - rect.y = y; - rect.w = fontwidth; - rect.h = fontheight; -#if defined(__ANDROID__) - if( opacity != 1.0f ) { - SDL_SetTextureAlphaMod( ascii[color].get(), opacity * 255 ); - } -#endif - RenderCopy( renderer, ascii[color], &src, &rect ); -#if defined(__ANDROID__) - if( opacity != 1.0f ) { - SDL_SetTextureAlphaMod( ascii[color].get(), 255 ); + const int t = UTF8_getch( ch ); + BitmapFont::OutputChar( t, x, y, color, opacity ); +} + +void BitmapFont::OutputChar( const int t, const int x, const int y, + const unsigned char color, const float opacity ) +{ + if( t <= 256 ) { + SDL_Rect src; + src.x = ( t % tilewidth ) * fontwidth; + src.y = ( t / tilewidth ) * fontheight; + src.w = fontwidth; + src.h = fontheight; + SDL_Rect rect; + rect.x = x; + rect.y = y; + rect.w = fontwidth; + rect.h = fontheight; + if( opacity != 1.0f ) { + SDL_SetTextureAlphaMod( ascii[color].get(), opacity * 255 ); + } + RenderCopy( renderer, ascii[color], &src, &rect ); + if( opacity != 1.0f ) { + SDL_SetTextureAlphaMod( ascii[color].get(), 255 ); + } + } else { + unsigned char uc = 0; + switch( t ) { + case LINE_XOXO_UNICODE: + uc = LINE_XOXO_C; + break; + case LINE_OXOX_UNICODE: + uc = LINE_OXOX_C; + break; + case LINE_XXOO_UNICODE: + uc = LINE_XXOO_C; + break; + case LINE_OXXO_UNICODE: + uc = LINE_OXXO_C; + break; + case LINE_OOXX_UNICODE: + uc = LINE_OOXX_C; + break; + case LINE_XOOX_UNICODE: + uc = LINE_XOOX_C; + break; + case LINE_XXXO_UNICODE: + uc = LINE_XXXO_C; + break; + case LINE_XXOX_UNICODE: + uc = LINE_XXOX_C; + break; + case LINE_XOXX_UNICODE: + uc = LINE_XOXX_C; + break; + case LINE_OXXX_UNICODE: + uc = LINE_OXXX_C; + break; + case LINE_XXXX_UNICODE: + uc = LINE_XXXX_C; + break; + default: + return; + } + draw_ascii_lines( uc, x, y, color ); } -#endif } #if defined(__ANDROID__) @@ -2222,10 +2298,10 @@ void draw_quick_shortcuts() text_scale; } text_y = ( WindowHeight - ( height + font->fontheight * text_scale ) * 0.5f ) / text_scale; - font->opacity = get_option( "ANDROID_SHORTCUT_OPACITY_SHADOW" ) * 0.01f; - font->OutputChar( text, text_x + 1, text_y + 1, 0 ); - font->opacity = get_option( "ANDROID_SHORTCUT_OPACITY_FG" ) * 0.01f; - font->OutputChar( text, text_x, text_y, get_option( "ANDROID_SHORTCUT_COLOR" ) ); + font->OutputChar( text, text_x + 1, text_y + 1, 0, + get_option( "ANDROID_SHORTCUT_OPACITY_SHADOW" ) * 0.01f ); + font->OutputChar( text, text_x, text_y, get_option( "ANDROID_SHORTCUT_COLOR" ), + get_option( "ANDROID_SHORTCUT_OPACITY_FG" ) * 0.01f ); if( hovered ) { // draw a second button hovering above the first one font->OutputChar( text, text_x, text_y - ( height * 1.2f / text_scale ), @@ -2242,15 +2318,14 @@ void draw_quick_shortcuts() hint_length ); // scale to fit comfortably } SDL_RenderSetScale( renderer.get(), text_scale, text_scale ); - font->opacity = get_option( "ANDROID_SHORTCUT_OPACITY_SHADOW" ) * 0.01f; text_x = ( WindowWidth - ( ( font->fontwidth * hint_length ) * text_scale ) ) * 0.5f / text_scale; text_y = ( WindowHeight - font->fontheight * text_scale ) * 0.5f / text_scale; - font->OutputChar( hint_text, text_x + 1, text_y + 1, 0 ); - font->opacity = get_option( "ANDROID_SHORTCUT_OPACITY_FG" ) * 0.01f; - font->OutputChar( hint_text, text_x, text_y, get_option( "ANDROID_SHORTCUT_COLOR" ) ); + font->OutputChar( hint_text, text_x + 1, text_y + 1, 0, + get_option( "ANDROID_SHORTCUT_OPACITY_SHADOW" ) * 0.01f ); + font->OutputChar( hint_text, text_x, text_y, get_option( "ANDROID_SHORTCUT_COLOR" ), + get_option( "ANDROID_SHORTCUT_OPACITY_FG" ) * 0.01f ); } } - font->opacity = 1.0f; SDL_RenderSetScale( renderer.get(), 1.0f, 1.0f ); i++; if( ( i + 1 ) * width > WindowWidth ) { @@ -3464,10 +3539,8 @@ void catacurses::init_interface() load_soundset(); // Reset the font pointer - font = Font::load_font( fl.typeface, fl.fontsize, fl.fontwidth, fl.fontheight, fl.fontblending ); - if( !font ) { - throw std::runtime_error( "loading font data failed" ); - } + font = std::make_unique( fl.fontwidth, fl.fontheight, + fl.typeface, fl.fontsize, fl.fontblending ); map_font = Font::load_font( fl.map_typeface, fl.map_fontsize, fl.map_fontwidth, fl.map_fontheight, fl.fontblending ); overmap_font = Font::load_font( fl.overmap_typeface, fl.overmap_fontsize, @@ -3824,12 +3897,48 @@ CachedTTFFont::CachedTTFFont( const int w, const int h, std::string typeface, in TTF_SetFontStyle( font.get(), TTF_STYLE_NORMAL ); } +FontFallbackList::FontFallbackList( const int w, const int h, + const std::vector &typefaces, + const int fontsize, const bool fontblending ) + : Font( w, h ) +{ + for( const std::string &typeface : typefaces ) { + std::unique_ptr font = Font::load_font( typeface, fontsize, w, h, fontblending ); + if( !font ) { + throw std::runtime_error( "Cannot load font " + typeface ); + } + fonts.emplace_back( std::move( font ) ); + } + if( fonts.empty() ) { + throw std::runtime_error( "Typeface list is empty" ); + } +} + +bool FontFallbackList::isGlyphProvided( const std::string & ) const +{ + return true; +} + +void FontFallbackList::OutputChar( const std::string &ch, const int x, const int y, + const unsigned char color, const float opacity ) +{ + auto cached = glyph_font.find( ch ); + if( cached == glyph_font.end() ) { + for( auto it = fonts.begin(); it != fonts.end(); ++it ) { + if( std::next( it ) == fonts.end() || ( *it )->isGlyphProvided( ch ) ) { + cached = glyph_font.emplace( ch, it ).first; + } + } + } + ( *cached->second )->OutputChar( ch, x, y, color, opacity ); +} + static int map_font_width() { if( use_tiles && tilecontext ) { return tilecontext->get_tile_width(); } - return ( map_font ? map_font : font )->fontwidth; + return ( map_font ? map_font.get() : font.get() )->fontwidth; } static int map_font_height() @@ -3837,17 +3946,17 @@ static int map_font_height() if( use_tiles && tilecontext ) { return tilecontext->get_tile_height(); } - return ( map_font ? map_font : font )->fontheight; + return ( map_font ? map_font.get() : font.get() )->fontheight; } static int overmap_font_width() { - return ( overmap_font ? overmap_font : font )->fontwidth; + return ( overmap_font ? overmap_font.get() : font.get() )->fontwidth; } static int overmap_font_height() { - return ( overmap_font ? overmap_font : font )->fontheight; + return ( overmap_font ? overmap_font.get() : font.get() )->fontheight; } void to_map_font_dim_width( int &w ) diff --git a/src/start_location.cpp b/src/start_location.cpp index d4e9458764f12..db320c81afedd 100644 --- a/src/start_location.cpp +++ b/src/start_location.cpp @@ -160,7 +160,7 @@ static void board_up( map &m, const tripoint_range &range ) // If the furniture is movable and the character can move it, use it to barricade // g->u is workable here as NPCs by definition are not starting the game. (Let's hope.) ///\EFFECT_STR determines what furniture might be used as a starting area barricade - if( m.furn( p ).obj().move_str_req > 0 && m.furn( p ).obj().move_str_req < g->u.get_str() ) { + if( m.furn( p ).obj().is_movable() && m.furn( p ).obj().move_str_req < g->u.get_str() ) { if( m.furn( p ).obj().movecost == 0 ) { // Obstacles are better, prefer them furnitures1.push_back( p ); diff --git a/src/stomach.cpp b/src/stomach.cpp index f6cd607dd4393..59717ca597e33 100644 --- a/src/stomach.cpp +++ b/src/stomach.cpp @@ -7,6 +7,62 @@ #include "units.h" #include "game.h" #include "itype.h" +#include "vitamin.h" + +void nutrients::min_in_place( const nutrients &r ) +{ + kcal = std::min( kcal, r.kcal ); + for( const std::pair &vit_pair : vitamin::all() ) { + const vitamin_id &vit = vit_pair.first; + int other = r.get_vitamin( vit ); + if( other == 0 ) { + vitamins.erase( vit ); + } else { + auto our_vit = vitamins.find( vit ); + if( our_vit != vitamins.end() ) { + our_vit->second = std::min( our_vit->second, other ); + } + } + } +} + +void nutrients::max_in_place( const nutrients &r ) +{ + kcal = std::max( kcal, r.kcal ); + for( const std::pair &vit_pair : vitamin::all() ) { + const vitamin_id &vit = vit_pair.first; + int other = r.get_vitamin( vit ); + if( other != 0 ) { + int &val = vitamins[vit]; + val = std::max( val, other ); + } + } +} + +int nutrients::get_vitamin( const vitamin_id &vit ) const +{ + auto it = vitamins.find( vit ); + if( it == vitamins.end() ) { + return 0; + } + return it->second; +} + +bool nutrients::operator==( const nutrients &r ) const +{ + if( kcal != r.kcal ) { + return false; + } + // Can't just use vitamins == r.vitamins, because there might be zero + // entries in the map, which need to compare equal to missing entries. + for( const std::pair &vit_pair : vitamin::all() ) { + const vitamin_id &vit = vit_pair.first; + if( get_vitamin( vit ) != r.get_vitamin( vit ) ) { + return false; + } + } + return true; +} nutrients &nutrients::operator+=( const nutrients &r ) { diff --git a/src/stomach.h b/src/stomach.h index c2ac702b86096..dc24efee8f0ba 100644 --- a/src/stomach.h +++ b/src/stomach.h @@ -19,6 +19,18 @@ struct nutrients { /** vitamins potentially provided by this comestible (if any) */ std::map vitamins; + /** Replace the values here with the minimum (or maximum) of themselves and the corresponding + * values taken from r. */ + void min_in_place( const nutrients &r ); + void max_in_place( const nutrients &r ); + + int get_vitamin( const vitamin_id & ) const; + + bool operator==( const nutrients &r ) const; + bool operator!=( const nutrients &r ) const { + return !( *this == r ); + } + nutrients &operator+=( const nutrients &r ); nutrients &operator-=( const nutrients &r ); nutrients &operator*=( int r ); diff --git a/src/string_input_popup.h b/src/string_input_popup.h index f8124aa849fa8..e1914e34f8215 100644 --- a/src/string_input_popup.h +++ b/src/string_input_popup.h @@ -2,7 +2,7 @@ #ifndef STRING_INPUT_POPUP_H #define STRING_INPUT_POPUP_H -#include +#include #include #include #include diff --git a/src/suffer.cpp b/src/suffer.cpp index 541e149fcb433..cb98005ec8bf4 100644 --- a/src/suffer.cpp +++ b/src/suffer.cpp @@ -304,7 +304,7 @@ void Character::suffer_while_awake( const int current_stim ) if( one_turn_in( 8_hours ) ) { add_msg( m_bad, _( "You're suddenly overcome with the urge to sleep and you pass out." ) ); - add_effect( effect_lying_down, 20_minutes ); + fall_asleep( 20_minutes ); } } @@ -480,7 +480,8 @@ void Character::suffer_from_schizophrenia() str[0] = toupper( str[0] ); add_msg_if_player( m_bad, "%s", str ); - drop( get_item_position( &weapon ), pos() ); + item_location loc( *this, &weapon ); + drop( loc, pos() ); return; } // Talk to self @@ -1032,45 +1033,45 @@ void Character::suffer_from_radiation() } if( calendar::once_every( 15_minutes ) ) { - if( radiation < 0 ) { - radiation = 0; - } else if( radiation > 2000 ) { - radiation = 2000; + if( get_rad() < 0 ) { + set_rad( 0 ); + } else if( get_rad() > 2000 ) { + set_rad( 2000 ); } - if( get_option( "RAD_MUTATION" ) && rng( 100, 10000 ) < radiation ) { + if( get_option( "RAD_MUTATION" ) && rng( 100, 10000 ) < get_rad() ) { mutate(); - radiation -= 50; - } else if( radiation > 50 && rng( 1, 3000 ) < radiation && ( stomach.contains() > 0_ml || + mod_rad( -50 ); + } else if( get_rad() > 50 && rng( 1, 3000 ) < get_rad() && ( stomach.contains() > 0_ml || radiation_increasing || !in_sleep_state() ) ) { vomit(); - radiation -= 1; + mod_rad( -1 ); } } const bool radiogenic = has_trait( trait_RADIOGENIC ); - if( radiogenic && calendar::once_every( 30_minutes ) && radiation > 0 ) { + if( radiogenic && calendar::once_every( 30_minutes ) && get_rad() > 0 ) { // At 200 irradiation, twice as fast as REGEN - if( x_in_y( radiation, 200 ) ) { + if( x_in_y( get_rad(), 200 ) ) { healall( 1 ); if( rad_mut == 0 ) { // Don't heal radiation if we're generating it naturally // That would counter the main downside of radioactivity - radiation -= 5; + mod_rad( -5 ); } } } - if( !radiogenic && radiation > 0 ) { + if( !radiogenic && get_rad() > 0 ) { // Even if you heal the radiation itself, the damage is done. const int hmod = get_healthy_mod(); - if( hmod > 200 - radiation ) { - set_healthy_mod( std::max( -200, 200 - radiation ) ); + if( hmod > 200 - get_rad() ) { + set_healthy_mod( std::max( -200, 200 - get_rad() ) ); } } - if( radiation > 200 && calendar::once_every( 10_minutes ) && x_in_y( radiation, 1000 ) ) { + if( get_rad() > 200 && calendar::once_every( 10_minutes ) && x_in_y( get_rad(), 1000 ) ) { hurtall( 1, nullptr ); - radiation -= 5; + mod_rad( -5 ); } if( !reactor_plut && !tank_plut && !slow_rad ) { @@ -1145,7 +1146,7 @@ void Character::suffer_from_radiation() tank_plut *= 0.6; } while( slow_rad >= 1000 ) { - radiation += 1; + mod_rad( 1 ); slow_rad -= 1000; } } @@ -1503,7 +1504,7 @@ bool Character::irradiate( float rads, bool bypass ) } int rads_max = roll_remainder( rads ); - radiation += rng( 0, rads_max ); + mod_rad( rng( 0, rads_max ) ); // Apply rads to any radiation badges. for( item *const it : inv_dump() ) { @@ -1550,7 +1551,7 @@ void Character::mend( int rate_multiplier ) // Wearing splints can slowly mend a broken limb back to 1 hp. bool any_broken = false; for( int i = 0; i < num_hp_parts; i++ ) { - if( hp_cur[i] <= 0 ) { + if( is_limb_broken( static_cast( i ) ) ) { any_broken = true; break; } @@ -1577,8 +1578,8 @@ void Character::mend( int rate_multiplier ) healing_factor *= addiction_scaling( 0.25f, 0.75f, addiction_level( ADD_ALCOHOL ) ); } - if( radiation > 0 && !has_trait( trait_RADIOGENIC ) ) { - healing_factor *= clamp( ( 1000.0f - radiation ) / 1000.0f, 0.0f, 1.0f ); + if( get_rad() > 0 && !has_trait( trait_RADIOGENIC ) ) { + healing_factor *= clamp( ( 1000.0f - get_rad() ) / 1000.0f, 0.0f, 1.0f ); } // Bed rest speeds up mending @@ -1624,7 +1625,7 @@ void Character::mend( int rate_multiplier ) } for( int i = 0; i < num_hp_parts; i++ ) { - const bool broken = ( hp_cur[i] <= 0 ); + const bool broken = is_limb_broken( static_cast( i ) ); if( !broken ) { continue; } diff --git a/src/teleport.cpp b/src/teleport.cpp index 7a63eb5b025e0..c9be878b80af8 100644 --- a/src/teleport.cpp +++ b/src/teleport.cpp @@ -22,7 +22,7 @@ bool teleport::teleport( Creature &critter, int min_distance, int max_distance, const bool c_is_u = p != nullptr && p == &g->u; int tries = 0; tripoint origin = critter.pos(); - tripoint new_pos; + tripoint new_pos = origin; //The teleportee is dimensionally anchored so nothing happens if( p && ( p->worn_with_flag( "DIMENSIONAL_ANCHOR" ) || p->has_effect_with_flag( "DIMENSIONAL_ANCHOR" ) ) ) { diff --git a/src/text_snippets.cpp b/src/text_snippets.cpp index 77702961c2293..86cfb0bee09dc 100644 --- a/src/text_snippets.cpp +++ b/src/text_snippets.cpp @@ -18,28 +18,27 @@ void snippet_library::load_snippet( const JsonObject &jsobj ) hash_to_id_migration = cata::nullopt; const std::string category = jsobj.get_string( "category" ); if( jsobj.has_array( "text" ) ) { - JsonArray jarr = jsobj.get_array( "text" ); - add_snippets_from_json( category, jarr ); + add_snippets_from_json( category, jsobj.get_array( "text" ) ); } else { add_snippet_from_json( category, jsobj ); } } -void snippet_library::add_snippets_from_json( const std::string &category, JsonArray &jarr ) +void snippet_library::add_snippets_from_json( const std::string &category, const JsonArray &jarr ) { if( hash_to_id_migration.has_value() ) { debugmsg( "snippet_library::add_snippets_from_json called after snippet_library::migrate_hash_to_id." ); } hash_to_id_migration = cata::nullopt; - while( jarr.has_more() ) { - if( jarr.test_string() ) { + for( const JsonValue &entry : jarr ) { + if( entry.test_string() ) { translation text; - if( !jarr.read_next( text ) ) { - jarr.throw_error( "Error reading snippet from JSON array" ); + if( !entry.read( text ) ) { + entry.throw_error( "Error reading snippet from JSON array" ); } snippets_by_category[category].no_id.emplace_back( text ); } else { - JsonObject jo = jarr.next_object(); + JsonObject jo = entry.get_object(); add_snippet_from_json( category, jo ); } } diff --git a/src/text_snippets.h b/src/text_snippets.h index f20dd03b6c380..91d062efd4946 100644 --- a/src/text_snippets.h +++ b/src/text_snippets.h @@ -24,7 +24,7 @@ class snippet_library * Entries in the array can be simple strings, or json objects (for the * later see add_snippet_from_json). */ - void add_snippets_from_json( const std::string &category, JsonArray &jarr ); + void add_snippets_from_json( const std::string &category, const JsonArray &jarr ); /** * Load a single snippet text from the json object. The object should have * a "text" member with the text of the snippet. diff --git a/src/trait_group.cpp b/src/trait_group.cpp index da028ca39a8b1..578f65e3c7ef7 100644 --- a/src/trait_group.cpp +++ b/src/trait_group.cpp @@ -50,31 +50,31 @@ static Trait_group_tag get_unique_trait_group_id() } } -Trait_group_tag trait_group::load_trait_group( JsonIn &stream, const std::string &default_subtype ) +Trait_group_tag trait_group::load_trait_group( const JsonValue &value, + const std::string &default_subtype ) { - if( stream.test_string() ) { - return Trait_group_tag( stream.get_string() ); - } else if( stream.test_object() ) { + if( value.test_string() ) { + return Trait_group_tag( value.get_string() ); + } else if( value.test_object() ) { const Trait_group_tag group = get_unique_trait_group_id(); - JsonObject jo = stream.get_object(); + JsonObject jo = value.get_object(); const std::string subtype = jo.get_string( "subtype", default_subtype ); mutation_branch::load_trait_group( jo, group, subtype ); return group; - } else if( stream.test_array() ) { + } else if( value.test_array() ) { const Trait_group_tag group = get_unique_trait_group_id(); - JsonArray jarr = stream.get_array(); if( default_subtype != "collection" && default_subtype != "distribution" ) { - jarr.throw_error( "invalid subtype for trait group" ); + value.throw_error( "invalid subtype for trait group" ); } - mutation_branch::load_trait_group( jarr, group, default_subtype == "collection" ); + mutation_branch::load_trait_group( value.get_array(), group, default_subtype == "collection" ); return group; } else { - stream.error( "invalid trait group, must be string (group id) or object/array (the group data)" ); + value.throw_error( "invalid trait group, must be string (group id) or object/array (the group data)" ); return Trait_group_tag{}; } } diff --git a/src/trait_group.h b/src/trait_group.h index 4744814629e54..cb2dd1bd4c24c 100644 --- a/src/trait_group.h +++ b/src/trait_group.h @@ -12,6 +12,7 @@ class JsonObject; class JsonIn; class Trait_group; +class JsonValue; namespace trait_group { @@ -38,23 +39,22 @@ void load_trait_group( const JsonObject &jsobj, const Trait_group_tag &gid, /** * Get a trait group ID and optionally load an inlined trait group. * - * If the next value in the JSON stream is string, it's assumed to be a trait group id and it's + * If the value is string, it's assumed to be a trait group id and it's * returned directly. * - * If the next value is a JSON object, it is loaded as a trait group. The group will be given a + * If the value is a JSON object, it is loaded as a trait group. The group will be given a * unique id (if the JSON object contains an id, it is ignored) and that id will be returned. * If the JSON object does not contain a subtype, the given default is used. * - * If the next value is a JSON array, it is loaded as a trait group: the default_subtype will be + * If the value is a JSON array, it is loaded as a trait group: the default_subtype will be * used as subtype of the new trait group and the array is loaded like the "entries" array of * a trait group definition (see format of trait groups). * - * @param stream Stream to load from * @param default_subtype If an inlined trait group is loaded this is used as the default * subtype. It must be either "distribution" or "collection". See @ref Trait_group. - * @throw std::string as usual for JSON errors, including invalid input values. + * @throw JsonError as usual for JSON errors, including invalid input values. */ -Trait_group_tag load_trait_group( JsonIn &stream, const std::string &default_subtype ); +Trait_group_tag load_trait_group( const JsonValue &value, const std::string &default_subtype ); /** * Show a debug menu for testing trait groups. diff --git a/src/translations.cpp b/src/translations.cpp index c00601b533829..0f58e0bfeea30 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -475,7 +475,8 @@ void translation::deserialize( JsonIn &jsin ) #ifndef CATA_IN_TOOL if( test_mode ) { check_style = !jsobj.has_member( "//NOLINT(cata-text-style)" ); - throw_error = [&jsobj]( const std::string & msg, const int offset ) { + // Copying jsobj to avoid use-after-free + throw_error = [jsobj]( const std::string & msg, const int offset ) { jsobj.get_raw( "str" )->error( msg, offset ); }; } diff --git a/src/trap.cpp b/src/trap.cpp index ead593c7ec56c..651619e1c69cb 100644 --- a/src/trap.cpp +++ b/src/trap.cpp @@ -120,18 +120,17 @@ void trap::load( const JsonObject &jo, const std::string & ) optional( jo, was_loaded, "comfort", comfort, 0 ); optional( jo, was_loaded, "floor_bedding_warmth", floor_bedding_warmth, 0 ); assign( jo, "trigger_weight", trigger_weight ); - JsonArray ja = jo.get_array( "drops" ); - while( ja.has_more() ) { + for( const JsonValue &entry : jo.get_array( "drops" ) ) { std::string item_type; int quantity = 0; int charges = 0; - if( ja.test_object() ) { - JsonObject jc = ja.next_object(); + if( entry.test_object() ) { + JsonObject jc = entry.get_object(); item_type = jc.get_string( "item" ); quantity = jc.get_int( "quantity", 1 ); charges = jc.get_int( "charges", 1 ); } else { - item_type = ja.next_string(); + item_type = entry.get_string(); quantity = 1; charges = 1; } @@ -153,13 +152,12 @@ void trap::load( const JsonObject &jo, const std::string & ) vehicle_data.sound_variant = jv.get_string( "sound_variant", "" ); vehicle_data.spawn_items.clear(); if( jv.has_array( "spawn_items" ) ) { - JsonArray ja = jv.get_array( "spawn_items" ); - while( ja.has_more() ) { - if( ja.test_object() ) { - JsonObject joitm = ja.next_object(); + for( const JsonValue &entry : jv.get_array( "spawn_items" ) ) { + if( entry.test_object() ) { + JsonObject joitm = entry.get_object(); vehicle_data.spawn_items.emplace_back( joitm.get_string( "id" ), joitm.get_float( "chance" ) ); } else { - vehicle_data.spawn_items.emplace_back( ja.next_string(), 1.0 ); + vehicle_data.spawn_items.emplace_back( entry.get_string(), 1.0 ); } } } diff --git a/src/trap.h b/src/trap.h index c5b075f7cc398..c8e61e96bf25e 100644 --- a/src/trap.h +++ b/src/trap.h @@ -229,7 +229,7 @@ struct trap { */ /** * Loads the trap and adds it to the trapmap, and the traplist. - * @throw std::string if the json is invalid as usual. + * @throw JsonError if the json is invalid as usual. */ static void load_trap( const JsonObject &jo, const std::string &src ); /** diff --git a/src/tutorial.h b/src/tutorial.h deleted file mode 100644 index a4507587dab9b..0000000000000 --- a/src/tutorial.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once -#ifndef TUTORIAL_H -#define TUTORIAL_H - -class JsonObject; - -void load_tutorial_messages( const JsonObject &jo ); -void clear_tutorial_messages(); - -#endif diff --git a/src/ui.cpp b/src/ui.cpp index 13d86ab4a2d1c..7b2bedc127ea5 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -1,6 +1,6 @@ #include "ui.h" -#include +#include #include #include #include diff --git a/src/uistate.h b/src/uistate.h index 293101cd36624..16e823f3d2120 100644 --- a/src/uistate.h +++ b/src/uistate.h @@ -206,9 +206,9 @@ class uistatedata } // viewing vehicle cargo if( jo.has_array( "adv_inv_in_vehicle" ) ) { - auto ja = jo.get_array( "adv_inv_in_vehicle" ); - for( size_t i = 0; ja.has_more(); ++i ) { - adv_inv_in_vehicle[i] = ja.next_bool(); + const JsonArray ja = jo.get_array( "adv_inv_in_vehicle" ); + for( size_t i = 0; i < adv_inv_in_vehicle.size() && i < ja.size(); ++i ) { + adv_inv_in_vehicle[i] = ja.get_bool( i ); } } // filter strings @@ -256,11 +256,10 @@ class uistatedata jo.read( "list_item_priority_active", list_item_priority_active ); for( const JsonMember &member : jo.get_object( "input_history" ) ) { - JsonArray ja = member.get_array(); std::vector &v = gethistory( member.name() ); v.clear(); - while( ja.has_more() ) { - v.push_back( ja.next_string() ); + for( const std::string &line : member.get_array() ) { + v.push_back( line ); } } // fetch list_item settings from input_history diff --git a/src/units.cpp b/src/units.cpp new file mode 100644 index 0000000000000..de19b3665ba15 --- /dev/null +++ b/src/units.cpp @@ -0,0 +1,27 @@ +#include "json.h" +#include "units.h" + +namespace units +{ +template<> +void volume::serialize( JsonOut &jsout ) const +{ + if( value_ % 1000 == 0 ) { + jsout.write( string_format( "%d L", value_ / 1000 ) ); + } else { + jsout.write( string_format( "%d ml", value_ ) ); + } +} + +template<> +void mass::serialize( JsonOut &jsout ) const +{ + if( value_ % 1000000 == 0 ) { + jsout.write( string_format( "%d kg", value_ / 1000000 ) ); + } else if( value_ % 1000 == 0 ) { + jsout.write( string_format( "%d g", value_ / 1000 ) ); + } else { + jsout.write( string_format( "%d mg", value_ ) ); + } +} +} // namespace units diff --git a/src/units.h b/src/units.h index a25930a05b3cb..f4ae0898fb734 100644 --- a/src/units.h +++ b/src/units.h @@ -656,6 +656,11 @@ static const std::vector> money_units = { { { "kUSD", 1_kUSD }, } }; +static const std::vector> volume_units = { { + { "ml", 1_ml }, + { "L", 1_liter } + } +}; } // namespace units template diff --git a/src/veh_type.cpp b/src/veh_type.cpp index 8151b2c5de948..1c47cbb693e45 100644 --- a/src/veh_type.cpp +++ b/src/veh_type.cpp @@ -376,9 +376,7 @@ void vpart_info::load( const JsonObject &jo, const std::string &src ) if( jo.has_member( "broken_symbol" ) ) { def.sym_broken = jo.get_string( "broken_symbol" )[ 0 ]; } - if( jo.has_member( "looks_like" ) ) { - def.looks_like = jo.get_string( "looks_like" ); - } + jo.read( "looks_like", def.looks_like ); if( jo.has_member( "color" ) ) { def.color = color_from_string( jo.get_string( "color" ) ); @@ -388,8 +386,7 @@ void vpart_info::load( const JsonObject &jo, const std::string &src ) } if( jo.has_member( "breaks_into" ) ) { - JsonIn &stream = *jo.get_raw( "breaks_into" ); - def.breaks_into_group = item_group::load_item_group( stream, "collection" ); + def.breaks_into_group = item_group::load_item_group( jo.get_member( "breaks_into" ), "collection" ); } auto qual = jo.get_array( "qualities" ); @@ -946,13 +943,12 @@ void vehicle_prototype::load( const JsonObject &jo ) if( part.has_string( "part" ) ) { add_part_obj( part, pos ); } else if( part.has_array( "parts" ) ) { - JsonArray subparts = part.get_array( "parts" ); - while( subparts.has_more() ) { - if( subparts.test_string() ) { - std::string part_name = subparts.next_string(); + for( const JsonValue &entry : part.get_array( "parts" ) ) { + if( entry.test_string() ) { + std::string part_name = entry.get_string(); add_part_string( part_name, pos ); } else { - JsonObject subpart = subparts.next_object(); + JsonObject subpart = entry.get_object(); add_part_obj( subpart, pos ); } } @@ -978,9 +974,8 @@ void vehicle_prototype::load( const JsonObject &jo ) if( spawn_info.has_array( "items" ) ) { //Array of items that all spawn together (i.e. jack+tire) - JsonArray item_group = spawn_info.get_array( "items" ); - while( item_group.has_more() ) { - next_spawn.item_ids.push_back( item_group.next_string() ); + for( const std::string &line : spawn_info.get_array( "items" ) ) { + next_spawn.item_ids.push_back( line ); } } else if( spawn_info.has_string( "items" ) ) { //Treat single item as array @@ -988,9 +983,8 @@ void vehicle_prototype::load( const JsonObject &jo ) } if( spawn_info.has_array( "item_groups" ) ) { //Pick from a group of items, just like map::place_items - JsonArray item_group_names = spawn_info.get_array( "item_groups" ); - while( item_group_names.has_more() ) { - next_spawn.item_groups.push_back( item_group_names.next_string() ); + for( const std::string &line : spawn_info.get_array( "item_groups" ) ) { + next_spawn.item_groups.push_back( line ); } } else if( spawn_info.has_string( "item_groups" ) ) { next_spawn.item_groups.push_back( spawn_info.get_string( "item_groups" ) ); diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 9c31a94431647..bbb7b0e8e20c1 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -735,6 +735,9 @@ std::set vehicle::immediate_path( int rotate ) void vehicle::stop_autodriving() { + if( !is_autodriving && !is_patrolling && !is_following ) { + return; + } if( velocity > 0 ) { if( is_patrolling || is_following ) { autodrive( 0, 10 ); @@ -4458,7 +4461,7 @@ void vehicle::consume_fuel( int load, const int t_seconds, bool skip_electric ) g->u.mod_thirst( 1 ); g->u.mod_fatigue( 1 ); } - g->u.mod_stat( "stamina", -( base_burn + mod ) ); + g->u.mod_stamina( -( base_burn + mod ) ); add_msg( m_debug, "Load: %d", load ); add_msg( m_debug, "Mod: %d", mod ); add_msg( m_debug, "Burn: %d", -( base_burn + mod ) ); diff --git a/src/vehicle_move.cpp b/src/vehicle_move.cpp index f5b9c9147896b..f59a8117a45a6 100644 --- a/src/vehicle_move.cpp +++ b/src/vehicle_move.cpp @@ -544,7 +544,7 @@ veh_collision vehicle::part_collision( int part, const tripoint &p, // Hit nothing or we aren't actually hitting return ret; } - + stop_autodriving(); // Calculate mass AFTER checking for collision // because it involves iterating over all cargo const float mass = to_kilogram( total_mass() ); diff --git a/src/vitamin.cpp b/src/vitamin.cpp index 92a8f762b1e40..e6425c2ec1a65 100644 --- a/src/vitamin.cpp +++ b/src/vitamin.cpp @@ -78,6 +78,10 @@ void vitamin::load_vitamin( const JsonObject &jo ) vit.disease_excess_.emplace_back( e.get_int( 0 ), e.get_int( 1 ) ); } + for( std::string e : jo.get_array( "flags" ) ) { + vit.flags_.insert( e ); + } + if( vitamins_all.find( vit.id_ ) != vitamins_all.end() ) { jo.throw_error( "parsed vitamin overwrites existing definition", "id" ); } else { diff --git a/src/vitamin.h b/src/vitamin.h index 34bc54f238a55..9d03d4fc9c155 100644 --- a/src/vitamin.h +++ b/src/vitamin.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "calendar.h" @@ -48,6 +49,10 @@ class vitamin return name_.translated(); } + bool has_flag( const std::string &flag ) const { + return flags_.count( flag ) > 0; + } + /** Disease effect with increasing intensity proportional to vitamin deficiency */ const efftype_id &deficiency() const { return deficiency_; @@ -102,6 +107,7 @@ class vitamin time_duration rate_; std::vector> disease_; std::vector> disease_excess_; + std::set flags_; }; #endif diff --git a/src/weather.cpp b/src/weather.cpp index 3ff7296a31b88..2cdbac5932c84 100644 --- a/src/weather.cpp +++ b/src/weather.cpp @@ -715,8 +715,14 @@ int get_local_windchill( double temperature, double humidity, double windpower ) tmpwind = tmpwind * 0.44704; tmptemp = temp_to_celsius( tmptemp ); - windchill = 0.33 * ( humidity / 100.00 * 6.105 * exp( 17.27 * tmptemp / - ( 237.70 + tmptemp ) ) ) - 0.70 * tmpwind - 4.00; + // Cap the vapor pressure term to 50C of extra heat, as this term + // otherwise grows logistically to an asymptotic value of about 2e7 + // for large values of temperature. This is presumably due to the + // model being designed for reasonable ambient temperature values, + // rather than extremely high ones. + windchill = 0.33 * std::min( 150.00, humidity / 100.00 * 6.105 * + exp( 17.27 * tmptemp / ( 237.70 + tmptemp ) ) ) - 0.70 * + tmpwind - 4.00; // Convert to Fahrenheit, but omit the '+ 32' because we are only dealing with a piece of the felt air temperature equation. windchill = windchill * 9 / 5; } diff --git a/src/weather_data.cpp b/src/weather_data.cpp index 6799251e7b3c4..daabd5c9fd172 100644 --- a/src/weather_data.cpp +++ b/src/weather_data.cpp @@ -18,7 +18,7 @@ weather_animation_t get_weather_animation( weather_type const type ) static const std::map map { {WEATHER_ACID_DRIZZLE, weather_animation_t {0.01f, c_light_green, '.'}}, {WEATHER_ACID_RAIN, weather_animation_t {0.02f, c_light_green, ','}}, - {WEATHER_LIGHT_DRIZZLE, weather_animation_t{0.01f, c_light_green, ','}}, + {WEATHER_LIGHT_DRIZZLE, weather_animation_t{0.01f, c_light_blue, ','}}, {WEATHER_DRIZZLE, weather_animation_t {0.01f, c_light_blue, '.'}}, {WEATHER_RAINY, weather_animation_t {0.02f, c_light_blue, ','}}, {WEATHER_THUNDER, weather_animation_t {0.02f, c_light_blue, '.'}}, diff --git a/src/wincurse.cpp b/src/wincurse.cpp index 09ca2dc1c13d2..4a94e1936b5f4 100644 --- a/src/wincurse.cpp +++ b/src/wincurse.cpp @@ -619,9 +619,10 @@ void catacurses::init_interface() } // Use desired font, if possible + assert( !fl.typeface.empty() ); font = CreateFontW( fontheight, fontwidth, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - PROOF_QUALITY, FF_MODERN, widen( fl.typeface ).c_str() ); + PROOF_QUALITY, FF_MODERN, widen( fl.typeface.front() ).c_str() ); // Transparent font backgrounds SetBkMode( backbuffer, TRANSPARENT ); diff --git a/src/worldfactory.cpp b/src/worldfactory.cpp index 6880d44cae343..a4fb5c973b0ba 100644 --- a/src/worldfactory.cpp +++ b/src/worldfactory.cpp @@ -486,6 +486,7 @@ WORLDPTR worldfactory::pick_world( bool show_prompt ) const std::string action = ctxt.handle_input(); if( action == "QUIT" ) { + catacurses::clear(); catacurses::refresh(); break; } else if( !world_pages[selpage].empty() && action == "DOWN" ) { @@ -757,6 +758,7 @@ void worldfactory::show_active_world_mods( const std::vector &world_mods } } else if( action == "QUIT" || action == "CONFIRM" ) { + catacurses::clear(); catacurses::refresh(); break; } @@ -1164,6 +1166,7 @@ int worldfactory::show_worldgen_tab_confirm( const catacurses::window &win, WORL if( !valid_worldname( world->world_name ) ) { continue; } + catacurses::clear(); catacurses::refresh(); return 1; } @@ -1171,6 +1174,7 @@ int worldfactory::show_worldgen_tab_confirm( const catacurses::window &win, WORL // erase entire window to avoid overlapping of query with possible popup about invalid worldname werase( w_confirmation ); wrefresh( w_confirmation ); + catacurses::clear(); catacurses::refresh(); if( valid_worldname( worldname ) ) { @@ -1328,15 +1332,11 @@ void WORLD::load_options( JsonIn &jsin ) jsin.start_array(); while( !jsin.end_array() ) { JsonObject jo = jsin.get_object(); + jo.allow_omitted_members(); const std::string name = opts.migrateOptionName( jo.get_string( "name" ) ); const std::string value = opts.migrateOptionValue( jo.get_string( "name" ), jo.get_string( "value" ) ); - // Verify format of options file - if( !jo.has_string( "info" ) || !jo.has_string( "default" ) ) { - dbg( D_ERROR ) << "options object " << name << " was missing info or default"; - } - if( name == "CORE_VERSION" ) { version = std::max( std::atoi( value.c_str() ), 0 ); continue; diff --git a/tests/algo_test.cpp b/tests/algo_test.cpp new file mode 100644 index 0000000000000..14ba445c960f4 --- /dev/null +++ b/tests/algo_test.cpp @@ -0,0 +1,48 @@ +#define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER + +#include "cata_algo.h" + +#include "catch/catch.hpp" + +static void check_cycle_finding( std::unordered_map> &g, + std::vector> &expected ) +{ + CAPTURE( g ); + std::vector> loops = cata::find_cycles( g ); + // Canonicalize the list of loops by rotating each to be lexicographically + // least and then sorting. + for( std::vector &loop : loops ) { + auto min = std::min_element( loop.begin(), loop.end() ); + std::rotate( loop.begin(), min, loop.end() ); + } + std::sort( loops.begin(), loops.end() ); + CHECK( loops == expected ); +} + + +TEST_CASE( "find_cycles_small" ) +{ + std::unordered_map> g = { + { 0, { 1 } }, + { 1, { 0 } }, + }; + std::vector> expected = { + { 0, 1 }, + }; + check_cycle_finding( g, expected ); +} +TEST_CASE( "find_cycles" ) +{ + std::unordered_map> g = { + { 0, { 0, 1 } }, + { 1, { 0, 2, 3, 17 } }, + { 2, { 1 } }, + { 3, {} }, + }; + std::vector> expected = { + { 0 }, + { 0, 1 }, + { 1, 2 }, + }; + check_cycle_finding( g, expected ); +} diff --git a/tests/bionics_test.cpp b/tests/bionics_test.cpp index 03cad7b9cef50..573d84a3e6d92 100644 --- a/tests/bionics_test.cpp +++ b/tests/bionics_test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include diff --git a/tests/colony_test.cpp b/tests/colony_test.cpp index e2ae8f0f6ad5a..ba774b6983c7d 100644 --- a/tests/colony_test.cpp +++ b/tests/colony_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include // std::find #include // std::greater #include // std::move diff --git a/tests/comestible_tests.cpp b/tests/comestible_tests.cpp index 1c99a77137e97..a18d06a17d55a 100644 --- a/tests/comestible_tests.cpp +++ b/tests/comestible_tests.cpp @@ -1,11 +1,13 @@ -#include +#include #include #include #include #include #include +#include "avatar.h" #include "catch/catch.hpp" +#include "game.h" #include "itype.h" #include "recipe_dictionary.h" #include "recipe.h" @@ -108,7 +110,7 @@ static item food_or_food_container( const item &it ) return it.is_food_container() ? it.contents.front() : it; } -TEST_CASE( "recipe_permutations" ) +TEST_CASE( "recipe_permutations", "[recipe]" ) { // Are these tests failing? Here's how to fix that: // If the average is over the upper bound, you need to increase the calories for the item @@ -155,3 +157,20 @@ TEST_CASE( "recipe_permutations" ) } } } + +TEST_CASE( "cooked_veggies_get_correct_calorie_prediction", "[recipe]" ) +{ + // This test verifies that predicted calorie ranges properly take into + // account the "RAW"/"COOKED" flags. + const item veggy_wild_cooked( "veggy_wild_cooked" ); + const recipe_id veggy_wild_cooked_recipe( "veggy_wild_cooked" ); + + const avatar &u = g->u; + + nutrients default_nutrition = u.compute_effective_nutrients( veggy_wild_cooked ); + std::pair predicted_nutrition = + u.compute_nutrient_range( veggy_wild_cooked, veggy_wild_cooked_recipe ); + + CHECK( default_nutrition.kcal == predicted_nutrition.first.kcal ); + CHECK( default_nutrition.kcal == predicted_nutrition.second.kcal ); +} diff --git a/tests/crafting_test.cpp b/tests/crafting_test.cpp index 88991a8acd950..a3ec63c051d9a 100644 --- a/tests/crafting_test.cpp +++ b/tests/crafting_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/creature_test.cpp b/tests/creature_test.cpp index 257066ac1af26..62d3f27d4554c 100644 --- a/tests/creature_test.cpp +++ b/tests/creature_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/tests/fake_messages.cpp b/tests/fake_messages.cpp index 480f7ebea20d4..6bca667a402d7 100644 --- a/tests/fake_messages.cpp +++ b/tests/fake_messages.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/health_test.cpp b/tests/health_test.cpp index f835d002e5c24..698dad13bfc7f 100644 --- a/tests/health_test.cpp +++ b/tests/health_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/invlet_test.cpp b/tests/invlet_test.cpp index 3119a59d654a9..28737f2095475 100644 --- a/tests/invlet_test.cpp +++ b/tests/invlet_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -244,9 +244,9 @@ static void drop_at_feet( player &p, const int id ) item *found = retrieve_item( p, id ); REQUIRE( found ); - int pos = p.get_item_position( found ); + item_location loc( p, found ); p.moves = 100; - p.drop( pos, p.pos() ); + p.drop( loc, p.pos() ); p.activity.do_turn( p ); REQUIRE( g->m.i_at( p.pos() ).size() == size_before + 1 ); diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp index ffa2434c47404..46a1e4ea495e1 100644 --- a/tests/iteminfo_test.cpp +++ b/tests/iteminfo_test.cpp @@ -57,6 +57,7 @@ TEST_CASE( "gun_lists_default_ammo", "[item][iteminfo]" ) "--\n" "Gun is not loaded, so stats below assume the default ammo: wooden broadhead arrow\n" ); } + TEST_CASE( "gun_damage_multiplier_not_integer", "[item][iteminfo]" ) { iteminfo_query q( { iteminfo_parts::GUN_DAMAGE, iteminfo_parts::GUN_DAMAGE_AMMOPROP, @@ -67,3 +68,34 @@ TEST_CASE( "gun_damage_multiplier_not_integer", "[item][iteminfo]" ) "--\n" "Damage: 18*1.25 = 22\n" ); } + +TEST_CASE( "nutrients_in_regular_item", "[item][iteminfo]" ) +{ + iteminfo_query q( { iteminfo_parts::FOOD_NUTRITION, iteminfo_parts::FOOD_VITAMINS, + iteminfo_parts::FOOD_QUENCH + } ); + item i( "icecream" ); + iteminfo_test( + i, q, + "--\n" + "Calories (kcal): 325 " + "Quench: 0\n" + "Vitamins (RDA): Calcium (9%), Vitamin A (9%), and Vitamin B12 (11%)\n" ); +} + +TEST_CASE( "nutrient_ranges_for_recipe_exemplars", "[item][iteminfo]" ) +{ + iteminfo_query q( { iteminfo_parts::FOOD_NUTRITION, iteminfo_parts::FOOD_VITAMINS, + iteminfo_parts::FOOD_QUENCH + } ); + item i( "icecream" ); + i.set_var( "recipe_exemplar", "icecream" ); + iteminfo_test( + i, q, + "--\n" + "Nutrition will vary with chosen ingredients.\n" + "Calories (kcal): 317-" + "469 Quench: 0\n" + "Vitamins (RDA): Calcium (7-28%), Iron (0-83%), " + "Vitamin A (3-11%), Vitamin B12 (2-6%), and Vitamin C (1-85%)\n" ); +} diff --git a/tests/iuse_test.cpp b/tests/iuse_test.cpp index 3cb25a3aba25b..c7963425ffc80 100644 --- a/tests/iuse_test.cpp +++ b/tests/iuse_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/tests/line_test.cpp b/tests/line_test.cpp index f7dc61528ce4e..f2f2481e9cdc7 100644 --- a/tests/line_test.cpp +++ b/tests/line_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/map_memory.cpp b/tests/map_memory.cpp index 21f43811b122a..26e01337fbd3c 100644 --- a/tests/map_memory.cpp +++ b/tests/map_memory.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/math_functions.cpp b/tests/math_functions.cpp index c3c3d8846401f..2ba62a55ff289 100644 --- a/tests/math_functions.cpp +++ b/tests/math_functions.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/tests/melee_test.cpp b/tests/melee_test.cpp index 09bc0ca573648..0f03f85dc7fa4 100644 --- a/tests/melee_test.cpp +++ b/tests/melee_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/tests/memorial_test.cpp b/tests/memorial_test.cpp index b51a9dca3edee..2ab932db43d2c 100644 --- a/tests/memorial_test.cpp +++ b/tests/memorial_test.cpp @@ -184,9 +184,6 @@ TEST_CASE( "memorials" ) check_memorial( m, b, "Installed bad bionic: Alarm System.", ch, cbm ); - check_memorial( - m, b, "Launched a nuke at a garage.", oter_id( "s_garage_north" ) ); - check_memorial( m, b, "Learned Aikido.", ch, matype_id( "style_aikido" ) ); diff --git a/tests/monster_test.cpp b/tests/monster_test.cpp index c3b4427b322b6..d655a7ee41665 100644 --- a/tests/monster_test.cpp +++ b/tests/monster_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/npc_talk_test.cpp b/tests/npc_talk_test.cpp index 95030b3ed27ea..c59e1c55a223c 100644 --- a/tests/npc_talk_test.cpp +++ b/tests/npc_talk_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/npc_test.cpp b/tests/npc_test.cpp index 2b4d53105576a..2988840121c43 100644 --- a/tests/npc_test.cpp +++ b/tests/npc_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/reloading_test.cpp b/tests/reloading_test.cpp index 292b15dbcd229..47c02e4aa4cb0 100644 --- a/tests/reloading_test.cpp +++ b/tests/reloading_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/rot_test.cpp b/tests/rot_test.cpp index 8e1f874af3bff..8a172751aaca5 100644 --- a/tests/rot_test.cpp +++ b/tests/rot_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/tests/stomach_contents_tests.cpp b/tests/stomach_contents_tests.cpp index 7c13bc8e6c7da..89d86403380b0 100644 --- a/tests/stomach_contents_tests.cpp +++ b/tests/stomach_contents_tests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "avatar.h" diff --git a/tests/string_formatter_test.cpp b/tests/string_formatter_test.cpp index 0c2e043d1cad5..001a83c06e95d 100644 --- a/tests/string_formatter_test.cpp +++ b/tests/string_formatter_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/temperature_test.cpp b/tests/temperature_test.cpp index cf1629f0c0bea..773a01ea61b8a 100644 --- a/tests/temperature_test.cpp +++ b/tests/temperature_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/tests/test_main.cpp b/tests/test_main.cpp index 65d7d2db73153..446426bb7f92c 100644 --- a/tests/test_main.cpp +++ b/tests/test_main.cpp @@ -13,9 +13,9 @@ #endif // _GLIBCXX_DEBUG #define CATCH_CONFIG_RUNNER -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/tests/vehicle_drag.cpp b/tests/vehicle_drag.cpp index 6ff2a3abe5e55..34600c61708aa 100644 --- a/tests/vehicle_drag.cpp +++ b/tests/vehicle_drag.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/vehicle_efficiency.cpp b/tests/vehicle_efficiency.cpp index 9017a17cd9506..890846a0dab99 100644 --- a/tests/vehicle_efficiency.cpp +++ b/tests/vehicle_efficiency.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include @@ -429,22 +429,22 @@ TEST_CASE( "vehicle_make_efficiency_case", "[.]" ) // Fix test for electric vehicles TEST_CASE( "vehicle_efficiency", "[vehicle] [engine]" ) { - test_vehicle( "beetle", 745101, 294587, 242197, 79708, 60855 ); - test_vehicle( "car", 1050050, 522175, 313125, 48143, 29452 ); - test_vehicle( "car_sports", 1083646, 456200, 320929, 39494, 24378 ); - test_vehicle( "electric_car", 1055519, 215663, 125341, 18172, 9614 ); - test_vehicle( "suv", 1249718, 988969, 499869, 73538, 35070 ); + test_vehicle( "beetle", 745101, 297500, 244600, 80500, 61460 ); + test_vehicle( "car", 1050050, 527300, 316200, 48620, 29740 ); + test_vehicle( "car_sports", 1083646, 456200, 324100, 39880, 24620 ); + test_vehicle( "electric_car", 1055519, 217800, 126500, 18350, 9710 ); + test_vehicle( "suv", 1249718, 998800, 504800, 74270, 35420 ); test_vehicle( "motorcycle", 163085, 77300, 63120, 47530, 39030 ); test_vehicle( "quad_bike", 265345, 75950, 75950, 35190, 35190 ); test_vehicle( "scooter", 62587, 266900, 258300, 195200, 184400 ); test_vehicle( "superbike", 242085, 72120, 46820, 34580, 21610 ); - test_vehicle( "ambulance", 1751089, 432000, 356896, 65848, 50876 ); - test_vehicle( "fire_engine", 2540401, 1169000, 972534, 246049, 216909 ); - test_vehicle( "fire_truck", 6226393, 308500, 199989, 19950, 4747 ); + test_vehicle( "ambulance", 1751089, 435300, 360400, 66500, 51380 ); + test_vehicle( "fire_engine", 2540401, 1174000, 982200, 248500, 219000 ); + test_vehicle( "fire_truck", 6226393, 308500, 201900, 19950, 4747 ); test_vehicle( "truck_swat", 5959334, 505800, 348000, 30060, 7719 ); test_vehicle( "tractor_plow", 723658, 528000, 528000, 117000, 117000 ); test_vehicle( "apc", 5801619, 1100000, 948300, 132800, 86880 ); - test_vehicle( "humvee", 5499145, 607600, 341100, 25880, 9263 ); - test_vehicle( "road_roller", 8705726, 359830, 414037, 22990, 6996 ); - test_vehicle( "golf_cart", 444630, 52800, 105591, 27250, 14207 ); + test_vehicle( "humvee", 5501345, 607600, 341100, 25880, 9263 ); + test_vehicle( "road_roller", 8705726, 363400, 418100, 22990, 6996 ); + test_vehicle( "golf_cart", 444630, 52460, 105500, 27250, 14200 ); } diff --git a/tests/vision_test.cpp b/tests/vision_test.cpp index bf9c86a7407c4..41abaddd4cf26 100644 --- a/tests/vision_test.cpp +++ b/tests/vision_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/wield_times_test.cpp b/tests/wield_times_test.cpp index fd5d4a7667769..2d16fd1efa5cc 100644 --- a/tests/wield_times_test.cpp +++ b/tests/wield_times_test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tools/clang-tidy-plugin/test/text-style.cpp b/tools/clang-tidy-plugin/test/text-style.cpp index aefed8fa59d67..745438b09a360 100644 --- a/tools/clang-tidy-plugin/test/text-style.cpp +++ b/tools/clang-tidy-plugin/test/text-style.cpp @@ -86,6 +86,9 @@ static void bar() foo( "..." ); // CHECK-MESSAGES: [[@LINE-1]]:11: warning: ellipsis preferred over three dots. // CHECK-FIXES: foo( "\u2026" ); + foo( "foo..." ); + // CHECK-MESSAGES: [[@LINE-1]]:14: warning: ellipsis preferred over three dots. + // CHECK-FIXES: foo( "foo\u2026" ); foo( "Three. \nTwo. One." ); // CHECK-MESSAGES: [[@LINE-1]]:17: warning: unnecessary spaces at end of line. // CHECK-FIXES: foo( "Three.\nTwo. One." ); diff --git a/tools/format/CMakeLists.txt b/tools/format/CMakeLists.txt new file mode 100644 index 0000000000000..465eeaae64bee --- /dev/null +++ b/tools/format/CMakeLists.txt @@ -0,0 +1,11 @@ +include(ExternalProject) + +add_executable( + json_formatter + format.cpp + ${CMAKE_SOURCE_DIR}/src/json.cpp + ) + +ADD_DEFINITIONS(-DCATA_IN_TOOL) + +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src ) diff --git a/tools/format/format.cpp b/tools/format/format.cpp index 320c7f2aa3cae..06b1e45446f0a 100644 --- a/tools/format/format.cpp +++ b/tools/format/format.cpp @@ -94,8 +94,16 @@ static void format( JsonIn &jsin, JsonOut &jsout, int depth, bool force_wrap ) } else if( jsin.test_object() ) { format_collection( jsin, jsout, depth, write_object, force_wrap ); } else if( jsin.test_string() ) { - std::string str = jsin.get_string(); - jsout.write( str ); + // The string may contain escape sequences which we want to keep in the output. + const int start_pos = jsin.tell(); + jsin.get_string(); + const int end_pos = jsin.tell(); + std::string str = jsin.substr( start_pos, end_pos - start_pos ); + str = str.substr( str.find( '"' ) ); + str = str.substr( 0, str.rfind( '"' ) + 1 ); + jsout.write_separator(); + *jsout.get_stream() << str; + jsout.set_need_separator(); } else if( jsin.test_number() ) { // Have to introspect into the string to distinguish integers from floats. // Otherwise they won't serialize correctly.